From b4f534e5d9c682388d59070d107a9063a0112503 Mon Sep 17 00:00:00 2001
From: HammerGS <drivingguy@hotmail.com>
Date: Fri, 29 Nov 2024 12:49:24 -0700
Subject: [PATCH] Updating Board Tagging

---
 .../boards/AGoAC Maps/16x17 Desert 2.board    |  1 +
 .../32x17 Caustic Valley (Water).board        |  3 +-
 .../Alien Worlds/32x17 Lunar Base.board       |  1 +
 ...evil's Bath (CSV) - cold bath option.board |  5 +-
 .../32x17 Holth Forest (CGB).board            |  3 +-
 .../32x17 Kozice Valley (CDS).board           |  5 +-
 .../32x17 Lake Losiije (CNC).board            |  5 +-
 ...tu Mountains (CW) - Thin Snow + road.board |  5 +-
 ...tu Mountains (CW) - Thin Snow option.board |  5 +-
 ...zoristu Mountains (CW) - road option.board |  5 +-
 .../32x17 Pozoristu Mountains (CW).board      |  5 +-
 .../32x17 Racice River Delta (CSJ).board      |  3 +-
 .../32x17 Robyn's Crossing (CJF).board        |  5 +-
 .../boards/Deserts/16x17 Badlands 2.board     |  3 +-
 .../data/boards/Deserts/16x17 Mines 2.board   |  1 +
 megamek/data/boards/Deserts/16x17 Oasis.board |  1 +
 .../boards/Deserts/64x34 Deserts BFM.board    |  1 +
 .../16x17 Steiner Stadium.board               |  2 +
 .../16x17 Grasslands Forward Base.board       |  1 +
 .../32x17 Grasslands B BattleMat.board        |  1 +
 .../32x17 Tundra BattleMat.board              |  3 +-
 .../Map Set 6/16x17 City (Downtown).board     |  4 +-
 .../Map Set 6/16x17 City (Residential).board  |  4 +-
 .../Map Set 6/16x17 City (Skyscraper).board   |  2 +
 .../Map Set 6/16x17 City (Suburbs).board      |  3 +-
 .../boards/Map Set 7/16x17 Dropport 2.board   |  1 +
 .../Map Set 7/16x17 Military Base 1.board     |  3 +-
 .../Map Set 7/16x17 Military Base 2.board     |  3 +-
 .../data/boards/Map Set 7/16x17 Seaport.board |  5 +-
 .../boards/Map Set 8/64x68 Airfield.board     | 15 ++--
 .../boards/Map Set 8/64x68 Courtyard.board    |  4 --
 .../data/boards/Map Set 8/64x68 Peak.board    |  1 +
 .../data/boards/Map Set 8/64x68 Resort.board  |  3 +-
 .../boards/Map Set 8/64x68 River Valley.board |  8 +--
 .../16x17 Hartford Gardens.board              |  4 +-
 .../16x17 Scrapyard (Lava).board              |  1 +
 .../16x17 Scrapyard (Water).board             |  2 +
 .../Solaris VII Maps/30x17 Coliseum.board     |  2 +
 .../GunEmplacementsFortressHangar.board       |  6 ++
 .../Templates/SkinnedBuildingsRoads.board     |  5 +-
 .../Templates/SkinnedVariableBuildings.board  |  2 +
 .../data/boards/Templates/Transitions.board   |  1 +
 .../boards/Templates/TransitionsTrees.board   |  1 +
 .../16x17 WWE2018 DigSite.board               |  3 +-
 .../32x34 WWE2018 DigDefendOrDie.board        |  3 +-
 .../buildingsnobasement/32x34 FCCW6.board     |  5 +-
 .../32x51 Benjamin 4.board                    |  2 +
 .../buildingsnobasement/35x35 Benj POW.board  |  3 +-
 .../buildingsnobasement/45x45 Benj 1-1.board  |  4 +-
 .../buildingsnobasement/45x45 Benj 1-2.board  |  6 +-
 .../buildingsnobasement/45x45 FCCW 4-1.board  |  2 +
 .../buildingsnobasement/48x34 FCCW 4-6.board  |  4 +-
 .../buildingsnobasement/Flughafen 4.board     |  1 +
 .../buildingsnobasement/Flughafen 6.board     |  1 +
 .../buildingsnobasement/Industry 1.board      |  1 +
 .../buildingsnobasement/Industry 2.board      |  1 +
 .../Ishiyamaspecial2.board                    |  3 +-
 .../buildingsnobasement/ModCan06 16x17.board  |  4 +-
 .../buildingsnobasement/ModCan19 16x17.board  |  3 +-
 .../Munitionsfabrik 1.board                   |  2 +
 .../Munitionsfabrik 2.board                   |  2 +
 .../buildingsnobasement/Stadtgebiet 1.board   |  4 ++
 .../buildingsnobasement/Stadtgebiet 2.board   |  2 +
 .../buildingsnobasement/Stronghold.board      |  7 +-
 .../boards/buildingsnobasement/citadel.board  |  6 +-
 .../buildingsnobasement/citydowntown.board    |  4 +-
 .../buildingsnobasement/cityresidential.board |  4 +-
 .../buildingsnobasement/cityskyscraper.board  |  2 +
 .../buildingsnobasement/citysuburbs.board     |  3 +-
 .../buildingsnobasement/dropport2.board       |  1 +
 .../buildingsnobasement/militarybase1.board   |  3 +-
 .../buildingsnobasement/militarybase2.board   |  3 +-
 .../boards/buildingsnobasement/oasis.board    |  6 +-
 .../boards/buildingsnobasement/seaport.board  |  5 +-
 .../seaportwithfueltanks.board                |  5 +-
 .../buildingsnobasement/urbanruins.board      | 10 +--
 .../boards/solaris/BorealReach-14x14.board    |  1 +
 .../boards/solaris/BorealReach-26x12.board    |  5 +-
 .../solaris/ColosseumChaosMode-15x14.board    |  2 +
 .../boards/solaris/IshiyamaESW01-10x10.board  |  3 +-
 .../boards/solaris/IshiyamaESW02-10x10.board  |  3 +-
 .../boards/solaris/IshiyamaEW01-10x10.board   |  3 +-
 .../boards/solaris/IshiyamaEW02-10x10.board   |  3 +-
 .../boards/solaris/IshiyamaNES01-10x10.board  |  3 +-
 .../boards/solaris/IshiyamaNES02-10x10.board  |  3 +-
 .../boards/solaris/IshiyamaNESW01-10x10.board |  5 +-
 .../boards/solaris/IshiyamaNESW02-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW03-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW04-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW05-10x10.board |  5 +-
 .../boards/solaris/IshiyamaNESW06-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW07-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW08-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW09-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW10-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW11-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW12-10x10.board |  5 +-
 .../boards/solaris/IshiyamaNESW13-10x10.board |  5 +-
 .../boards/solaris/IshiyamaNESW14-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW15-10x10.board |  5 +-
 .../boards/solaris/IshiyamaNESW16-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW17-10x10.board |  5 +-
 .../boards/solaris/IshiyamaNESW18-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW19-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW20-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW21-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW22-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW23-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW24-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW25-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW26-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW27-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW28-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW29-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW30-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW31-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW32-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW33-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW34-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW35-10x10.board |  3 +-
 .../boards/solaris/IshiyamaNESW36-10x10.board |  1 +
 .../boards/solaris/IshiyamaNESW37-10x10.board |  1 +
 .../boards/solaris/IshiyamaNEW01-10x10.board  |  3 +-
 .../boards/solaris/IshiyamaNEW02-10x10.board  |  3 +-
 .../boards/solaris/IshiyamaNS01-10x10.board   |  3 +-
 .../boards/solaris/IshiyamaNS02-10x10.board   |  3 +-
 .../boards/solaris/IshiyamaNSW01-10x10.board  |  3 +-
 .../boards/solaris/IshiyamaNSW02-10x10.board  |  3 +-
 ...104x65 - Antallos River Valley Farms.board | 10 +--
 ...100x80 - Antallos Fortress with Town.board |  9 ++-
 ...avelwan Drop Port - Gimmie the Money.board |  9 ++-
 ...asteland Oasis Village Hilly Approch.board |  8 ++-
 .../104x65 - Antallos Port Krin - Large.board |  7 +-
 ...104x65 - Antallos River Valley Farms.board | 10 +--
 ...Antallos Wasteland Village Low Cover.board |  6 +-
 ...- Raid on Outpost Ulysses - Full Map.board |  7 +-
 ...Raid on Outpost Ulysses - North Half.board |  5 ++
 .../35x35 - Antallos Ancient City.board       |  3 +-
 ...5x45 - Antallos Wasteland Settlement.board |  7 +-
 .../55x55 - Antallos Desert Dense Urban.board |  5 +-
 ...os Desert Dunes and Large Mesa Depot.board |  1 +
 ...tallos Desert Dunes and Small Depots.board |  1 +
 ...asteland Marsh Channels Ruined Depot.board |  5 +-
 ...Raid on Outpost Ulysses - NE Quarter.board |  5 ++
 ...x68 - Antallos Active Wasteland City.board |  9 ++-
 ...allos Mesa Town and Base Entrance v2.board |  6 +-
 ...x49 - Antallos Oasis Pumping Station.board |  3 +-
 ... Channels Ruined Depot - Expanded v2.board |  5 +-
 ...sa Town and Base Entrance - Expanded.board |  6 +-
 .../unofficial/Aokarasu/32x34 FCCW6.board     |  5 +-
 .../Aokarasu/32x51 Benjamin 4.board           |  2 +
 .../unofficial/Aokarasu/35x35 Benj POW.board  |  3 +-
 .../unofficial/Aokarasu/45x45 Benj 1-1.board  |  4 +-
 .../unofficial/Aokarasu/45x45 Benj 1-2.board  |  6 +-
 .../unofficial/Aokarasu/45x45 FCCW 4-1.board  |  2 +
 .../unofficial/Aokarasu/45x45 FCCW 4-4.board  |  3 +-
 .../unofficial/Aokarasu/48x34 FCCW 4-6.board  |  4 +-
 .../unofficial/Aokarasu/80x17 Benj 7.board    |  3 +-
 .../unofficial/ArekP64/150x110 Bunkers.board  |  1 +
 .../ArekP64/80x60 SpacePort 7.board           |  8 ++-
 .../ArekP64/90x85 Sea Airfield.board          |  8 ++-
 .../45x45 Jotun Mountains Kore.board          | 10 ++-
 .../AshnodsMaps/50x50 Hell World.board        |  1 +
 .../AshnodsMaps/50x50 Wetlands.board          |  1 +
 ...of Kalnock (IceRoughed) -1- Up-Right.board |  3 +-
 ...alnock (IceRoughed) -2- Middle-Right.board |  3 +-
 ... Kalnock (IceRoughed) -3- Down-Right.board |  3 +-
 ... of Kalnock (IceRoughed) -4- Up-Left.board |  1 +
 ...Kalnock (IceRoughed) -5- Middle-Left.board |  3 +-
 ...f Kalnock (IceRoughed) -6- Down-Left.board |  1 +
 ...attle of Kalnock (Iced) -1- Up-Right.board |  3 +-
 ...e of Kalnock (Iced) -2- Middle-Right.board |  3 +-
 ...tle of Kalnock (Iced) -3- Down-Right.board |  3 +-
 ...Battle of Kalnock (Iced) -4- Up-Left.board |  3 +-
 ...le of Kalnock (Iced) -5- Middle-Left.board |  3 +-
 ...ttle of Kalnock (Iced) -6- Down-Left.board |  1 +
 ...20x14 Battle of Kalnock -1- Up-Right.board |  3 +-
 ...4 Battle of Kalnock -2- Middle-Right.board |  3 +-
 ...x14 Battle of Kalnock -3- Down-Right.board |  3 +-
 .../20x14 Battle of Kalnock -4- Up-Left.board |  3 +-
 ...14 Battle of Kalnock -5- Middle-Left.board |  3 +-
 ...0x14 Battle of Kalnock -6- Down-Left.board |  1 +
 ...of Kalnock (IceRoughed) -0- Complete.board |  3 +-
 ...attle of Kalnock (Iced) -0- Complete.board |  3 +-
 ...40x42 Battle of Kalnock -0- Complete.board |  3 +-
 .../16x17 Battle of Stanrey -1- Up-Left.board |  1 +
 ...6x17 Battle of Stanrey -2- Up-Middle.board |  1 +
 ...16x17 Battle of Stanrey -3- Up-Right.board |  1 +
 ...6x17 Battle of Stanrey -4- Down-Left.board |  1 +
 ...17 Battle of Stanrey -5- Down-Middle.board |  1 +
 ... Battle of Stanrey -00- Complete (A).board |  1 +
 ... Battle of Stanrey -01- Complete (B).board |  1 +
 .../Biggest Boss/20x50 Green Desert.board     |  1 +
 .../Biggest Boss/35x30 AbandonedDesert.board  |  3 +-
 .../40x20 Coast of the Islands 01.board       |  1 +
 .../40x20 Coast of the Islands 02.board       |  1 +
 .../CSL Maps/32X32 Factory V9.board           |  3 +-
 .../CSL Maps/48X33 City Invasion V0.8.board   |  7 +-
 .../100x100 -Arid- Ventifact Channels.board   |  1 +
 .../35x35 - Grass - Helicopter Base.board     |  7 +-
 .../35x35 -Arid- Riverine Bridge.board        |  3 +-
 .../40x40 - Arid - Boarding Call.board        |  2 +
 .../General/45x45 -Arid- Overlay.board        |  3 +-
 .../General/45x45 -Desert- Mesa Oasis.board   |  1 +
 .../48x51 - Arid - Portside Connection.board  |  4 +-
 .../General/48x51 -Arid- Railyard.board       |  7 +-
 .../50x50  -Grass- A Dam'd Shame.board        |  4 +-
 .../General/50x50  A Dam'd Shame.board        |  4 +-
 .../General/50x50 -Arid- CarvedLands.board    |  1 +
 .../50x50 -Grass- Bisected Star Fort.board    |  8 ++-
 .../General/50x50 -Grass- QRF Airbase.board   |  8 ++-
 .../General/50x50 -Grass- Smash n Grab.board  |  5 +-
 .../50x50 -Volcanic- Sintered Lands.board     |  3 +-
 .../60x60 - Grass - Volcanic Isle.board       |  7 +-
 .../60x60 - Mars - Reclaimed Earth.board      |  6 +-
 .../General/60x60 - Snow - Snap Thaw.board    |  7 +-
 .../General/60x60 -Grass- Loch and Load.board |  5 +-
 .../General/60x60 -Grass- Ribbon Farms.board  |  7 +-
 .../80x40 -Grass- Mangrove Coast BOTTOM.board |  7 +-
 .../80x80 - Grass - Aerodyne Airport.board    | 13 ++--
 .../80x80 -Grass- Mangrove Coast FULL.board   |  5 +-
 .../Cartes/16x17 Petite Ville.board           |  3 +-
 .../unofficial/Cartes/25x25 Hel Hasard.board  |  5 +-
 .../Cartes/25x25 Mohenne ville.board          |  7 +-
 .../Cartes/25x25 Moyenne ville.board          |  3 +-
 .../unofficial/Cartes/25x25 Plages.board      |  4 +-
 .../Cartes/25x25 la reine des glace.board     |  1 +
 .../boards/unofficial/Cartes/30x30 GP1.board  |  5 +-
 .../unofficial/Cartes/30x30 Ici city.board    |  7 +-
 .../unofficial/Cartes/35x35 Hell Land.board   |  5 +-
 .../unofficial/Cartes/35x35 Port Arhtur.board |  6 +-
 .../unofficial/Chappy/100x100 Battle.board    |  5 ++
 .../Chappy/50x50 Three Bridges.board          |  7 +-
 .../unofficial/Chappy/80x80 Castle Base.board |  9 ++-
 .../unofficial/Chappy/80x80 Castle Town.board |  9 ++-
 .../Church/Tukayyid - Ghost Bear.board        |  3 +-
 .../Church/Tukayyid - Landing Zone.board      |  1 +
 .../Church/Tukayyid - Smoke Jaguar.board      |  1 +
 .../DarkISI/16x17 Flughafen 4.board           |  1 +
 .../DarkISI/16x17 Flughafen 6.board           |  1 +
 .../unofficial/DarkISI/16x17 Industry 1.board |  1 +
 .../unofficial/DarkISI/16x17 Industry 2.board |  1 +
 .../DarkISI/16x17 Munitionsfabrik 1.board     |  2 +
 .../DarkISI/16x17 Munitionsfabrik 2.board     |  2 +
 .../DarkISI/16x17 Stadtgebiet 1.board         |  4 ++
 .../DarkISI/16x17 Stadtgebiet 2.board         |  2 +
 .../Deadborder/35x35 Ancient City.board       |  1 +
 .../35x35 Butros Line Princess Edition.board  |  3 +-
 .../35x35 Butros Town Princess Edition.board  |  5 +-
 .../Deadborder/35x35 Butros Town.board        |  3 +-
 .../35x35 Capitol Hill Princess Edition.board |  6 +-
 .../Deadborder/35x35 Capitol Hill.board       |  2 +
 .../Deadborder/35x35 Dry Creek.board          |  1 +
 .../Deadborder/35x35 Dystopia River.board     |  2 +
 ...x35 Endo Steel City Princess Edition.board |  8 ++-
 .../Deadborder/35x35 Endo Steel City.board    |  4 +-
 .../35x35 Fort Boutros Princess Edition.board |  2 +
 .../Deadborder/35x35 Fort Boutros.board       |  2 +
 .../35x35 Frozen City Princess Edition.board  |  9 +--
 .../Deadborder/35x35 Frozen City.board        |  9 +--
 .../Deadborder/35x35 Ghost Town Rubble.board  |  1 +
 .../unofficial/Deadborder/35x35 Hubland.board |  2 +
 .../35x35 Industrial Thingamajig.board        |  3 +-
 ...Konkerdong Memorial Princess Edition.board |  3 +-
 .../35x35 Konkerdong Memorial.board           |  3 +-
 .../35x35 Lost City Princess Edition.board    |  7 +-
 .../Deadborder/35x35 Lost City.board          |  4 +-
 .../35x35 Lost Colony Princess Edition.board  |  3 +-
 .../Deadborder/35x35 Lost Colony.board        |  1 +
 ...35x35 Madmans Manor Princess Edition.board |  3 +-
 .../Deadborder/35x35 Madmans Manor.board      |  3 +-
 .../35x35 Metropia Princess Edition.board     |  1 +
 .../35x35 Occupy Paragon City.board           |  1 +
 ...x35 Proving Grounds King of the Hill.board |  2 +
 .../Deadborder/35x35 Proving Grounds.board    |  2 +
 .../unofficial/Deadborder/35x35 RenCen.board  |  3 +-
 .../35x35 Ruins of the Space Age.board        |  1 +
 .../35x35 Rust Yards Princess Edition.board   |  3 +
 .../Deadborder/35x35 Rust Yards.board         |  5 +-
 .../Deadborder/35x35 Salty Shores.board       |  1 +
 .../Deadborder/35x35 Taphaultlandia.board     |  1 +
 .../35x35 The Cauldron Princess Edition.board |  1 +
 .../Deadborder/35x35 The Cauldron.board       |  1 +
 .../Deadborder/35x35 Tin City.board           |  4 +-
 ...35 Traffic Mountain Princess Edition.board |  6 +-
 .../Deadborder/35x35 Traffic Mountain.board   |  6 +-
 .../Derv_Maps/16x68 Chemical Rush.board       | 12 +++-
 .../Derv_Maps/16x68 Urban Decay.board         |  8 ++-
 .../Derv_Maps/21x21 Defiance Interior.board   |  7 +-
 .../25x25 Airport 3000 Classic.board          |  1 +
 .../Derv_Maps/25x25 Airport 3000.board        |  2 +
 .../Derv_Maps/25x25 Dead Marshes.board        |  7 +-
 .../Derv_Maps/25x25 Flooded City.board        |  8 ++-
 .../unofficial/Derv_Maps/25x25 Freezer.board  |  5 +-
 .../unofficial/Derv_Maps/25x25 Hpg Hill.board |  6 +-
 .../unofficial/Derv_Maps/25x25 Joy.board      |  1 +
 .../Derv_Maps/25x25 Red Pillers.board         |  1 +
 .../Derv_Maps/25x25 Tomato Plains.board       |  1 +
 .../unofficial/Derv_Maps/25x25 Triforce.board |  3 +-
 .../Derv_Maps/25x25 Twin Mesa.board           |  3 +-
 .../Derv_Maps/25x45 New Hoover.board          |  5 +-
 .../30x34 Solaris Dunes of Doom.board         |  4 +-
 .../30x34 Solaris Fire Mountain.board         |  2 +
 .../30x34 Solaris Hot and Cold.board          |  3 +-
 .../30x34 Solaris Ice Age Glacier.board       |  7 +-
 .../Derv_Maps/30x34 Solaris Mud Pit.board     |  1 +
 .../Derv_Maps/30x55 Gates of Hesperus.board   |  3 +-
 .../Derv_Maps/32x17 Mars Melt.board           |  1 +
 .../Derv_Maps/32x34 Solaris Frozen Hell.board |  3 +-
 .../Derv_Maps/32x34 Solaris Lava Caves.board  |  3 +-
 .../Derv_Maps/34x35 Colosseum.board           |  3 +-
 .../unofficial/Derv_Maps/34x35 Factory.board  |  3 +-
 .../unofficial/Derv_Maps/35x35 2Fort.board    |  7 +-
 .../Derv_Maps/35x35 A Bridge 2 Far Beta.board |  5 +-
 .../Derv_Maps/35x35 Aftermath Beta.board      |  1 +
 .../Derv_Maps/35x35 Aftermath Classic.board   |  1 +
 .../Derv_Maps/35x35 Aftermath.board           |  5 +-
 .../Derv_Maps/35x35 Aim Nine Classic.board    |  4 +-
 .../unofficial/Derv_Maps/35x35 Aim Nine.board |  8 ++-
 .../Derv_Maps/35x35 Applegate.board           |  5 +-
 .../Derv_Maps/35x35 Archipelago.board         |  1 +
 .../Derv_Maps/35x35 Arctic Wasteland.board    |  5 +-
 .../Derv_Maps/35x35 Atreus Classic.board      |  2 +
 .../unofficial/Derv_Maps/35x35 Atreus.board   |  9 ++-
 .../Derv_Maps/35x35 Avalon City 2.board       |  7 +-
 .../Derv_Maps/35x35 Avalon City.board         |  6 +-
 .../Derv_Maps/35x35 Bear Trap.board           |  6 +-
 .../Derv_Maps/35x35 Blakes Atreus.board       |  3 +
 .../Derv_Maps/35x35 Blood on the Snow.board   |  7 +-
 .../Derv_Maps/35x35 Booster's Tower.board     |  3 +-
 .../unofficial/Derv_Maps/35x35 Bowie.board    |  4 +-
 .../Derv_Maps/35x35 Busy City 2.board         |  6 +-
 .../Derv_Maps/35x35 Castle Hill.board         | 10 ++-
 .../Derv_Maps/35x35 City of Angles.board      |  4 +-
 .../Derv_Maps/35x35 Deadly Games (City).board |  4 +-
 .../35x35 Deadly Games (Empty).board          |  4 +-
 .../Derv_Maps/35x35 Deadly Games (Lava).board |  9 ++-
 .../35x35 Deadly Games (Meadow).board         |  6 +-
 .../Derv_Maps/35x35 Deadly Games.board        | 12 ++--
 .../35x35 Defiance Industries Exterior.board  |  3 +-
 .../Derv_Maps/35x35 Desert Castle.board       |  3 +-
 .../Derv_Maps/35x35 Desert Mesa Base.board    |  6 +-
 .../Derv_Maps/35x35 Destruction.board         |  3 +
 .../Derv_Maps/35x35 Dezolis Alpha.board       |  3 +-
 .../Derv_Maps/35x35 Diver's Grotto.board      |  3 +-
 .../unofficial/Derv_Maps/35x35 Domed.board    |  1 +
 .../unofficial/Derv_Maps/35x35 Dormancy.board |  1 +
 .../Derv_Maps/35x35 Double City.board         |  6 +-
 .../Derv_Maps/35x35 Dropship Hub.board        |  2 +
 .../unofficial/Derv_Maps/35x35 Dustball.board |  2 +
 .../Derv_Maps/35x35 Eagle's Nest.board        |  5 +-
 .../Derv_Maps/35x35 Eisenjaeger.board         |  7 +-
 .../Derv_Maps/35x35 Fields of Isis.board      |  3 +-
 .../Derv_Maps/35x35 Firebase Gamma.board      |  6 +-
 .../unofficial/Derv_Maps/35x35 Five O.board   |  3 +-
 .../Derv_Maps/35x35 Fort Sumter.board         |  9 ++-
 .../Derv_Maps/35x35 General Motors.board      |  3 +
 .../unofficial/Derv_Maps/35x35 Highway.board  |  3 +-
 .../Derv_Maps/35x35 Hildco Industries.board   |  5 +-
 .../Derv_Maps/35x35 Hot Water.board           |  3 +-
 .../unofficial/Derv_Maps/35x35 Hoth.board     |  3 +-
 .../Derv_Maps/35x35 Hub Retracted.board       |  1 +
 .../Derv_Maps/35x35 Il Tramonto.board         |  1 +
 .../Derv_Maps/35x35 Imperial Sewers.board     |  6 +-
 .../Derv_Maps/35x35 Iron Swamp.board          |  5 +-
 .../Derv_Maps/35x35 Ishikawajima.board        |  4 +-
 .../unofficial/Derv_Maps/35x35 Karkand.board  |  2 +
 .../Derv_Maps/35x35 Kervil Islands.board      |  3 +-
 .../unofficial/Derv_Maps/35x35 Koryo.board    | 15 ++--
 .../Derv_Maps/35x35 Lonely Mountain.board     |  3 +-
 .../Derv_Maps/35x35 Lost and Gone.board       |  1 +
 .../unofficial/Derv_Maps/35x35 Lostech.board  |  1 +
 .../Derv_Maps/35x35 Lunar Surface.board       |  4 +-
 .../Derv_Maps/35x35 Mannedorf 2.board         |  2 +
 .../Derv_Maps/35x35 Mars Surface.board        |  3 +-
 .../Derv_Maps/35x35 Mash Drift.board          |  4 +-
 .../unofficial/Derv_Maps/35x35 Mash.board     |  3 +-
 .../Derv_Maps/35x35 Miami Beach Beta.board    |  5 +-
 .../Derv_Maps/35x35 Miami Beach.board         |  6 +-
 .../Derv_Maps/35x35 Mini City.board           |  4 +-
 .../Derv_Maps/35x35 Mountain Rush.board       |  5 +-
 .../Derv_Maps/35x35 Mt. Olympus.board         |  1 +
 .../Derv_Maps/35x35 New Avalon 3070.board     |  7 +-
 .../Derv_Maps/35x35 Newton Township.board     |  4 +-
 .../unofficial/Derv_Maps/35x35 Oasis.board    |  1 +
 .../Derv_Maps/35x35 Oilspill Drained.board    |  3 +-
 .../unofficial/Derv_Maps/35x35 Oilspill.board |  3 +-
 .../Derv_Maps/35x35 Palace Gates.board        |  4 +-
 .../Derv_Maps/35x35 Pitt Fight.board          |  5 +-
 .../Derv_Maps/35x35 Port Kallin.board         |  5 +-
 .../Derv_Maps/35x35 Pyre Light.board          |  1 +
 .../Derv_Maps/35x35 Quatre Belle.board        |  3 +-
 .../Derv_Maps/35x35 Rectortown Reloaded.board |  4 +-
 .../Derv_Maps/35x35 Rectortown.board          |  5 +-
 .../unofficial/Derv_Maps/35x35 Red Base.board |  1 +
 .../unofficial/Derv_Maps/35x35 Reefer.board   |  1 +
 .../Derv_Maps/35x35 Refit Yard.board          |  4 +-
 .../Derv_Maps/35x35 Road to Madre.board       |  5 +-
 .../Derv_Maps/35x35 Royal Guard.board         | 10 +--
 .../Derv_Maps/35x35 Silver Cliffs.board       |  3 +-
 .../unofficial/Derv_Maps/35x35 Sim City.board |  1 +
 .../unofficial/Derv_Maps/35x35 Sirius V.board | 11 ++-
 .../unofficial/Derv_Maps/35x35 Sirius.board   |  3 +-
 .../Derv_Maps/35x35 Snake River.board         |  3 +-
 .../Derv_Maps/35x35 Snow Capped.board         |  1 +
 .../unofficial/Derv_Maps/35x35 Snowfox.board  |  2 +
 .../Derv_Maps/35x35 Solaris City.board        |  4 +-
 .../Derv_Maps/35x35 Space Conflict.board      |  3 +-
 .../unofficial/Derv_Maps/35x35 Spice.board    |  1 +
 .../unofficial/Derv_Maps/35x35 Sprawl.board   |  1 +
 .../unofficial/Derv_Maps/35x35 Stamford.board |  1 +
 .../Derv_Maps/35x35 Toad Pools.board          |  3 +-
 .../Derv_Maps/35x35 Twin Oasis.board          |  1 +
 .../Derv_Maps/35x35 Veil Surface.board        |  3 +-
 .../Derv_Maps/35x35 Wet Pincussion.board      |  3 +-
 .../Derv_Maps/35x35 Yen-Lo-Tse Pass.board     |  9 +--
 .../Derv_Maps/35x35 the Barrens.board         |  1 +
 .../Derv_Maps/35x35 the High Ground.board     |  3 +-
 .../Derv_Maps/35x38 Solaris Badlands.board    |  3 +-
 .../unofficial/Derv_Maps/35x45 Liberty.board  |  2 +
 .../Derv_Maps/35x75 Revival Conquest.board    |  1 +
 .../Derv_Maps/39x59 Macduff River.board       |  7 +-
 .../Derv_Maps/40x30 Factory_Complex_A.board   |  1 +
 ...x40 Arctic Industrial Facility Delta.board |  8 ++-
 ...x40 Arctic Industrial Facility Tango.board |  3 +
 .../40x40 Arctic Star Port Bravo.board        |  7 +-
 .../Derv_Maps/40x40 Auxiliary Starport.board  |  2 +
 .../Derv_Maps/40x40 Defiance Hesperus.board   |  4 +-
 ...x40 Desert Industrial Facility Bravo.board |  2 +
 ...x40 Desert Industrial Facility Delta.board |  6 +-
 .../40x40 Desert Space Port Bravo.board       |  1 +
 .../40x40 Desert Space Port Tango.board       |  1 +
 .../Derv_Maps/40x40 Factory_Complex_B.board   |  1 +
 .../Derv_Maps/40x40 Greenfield Firebase.board |  3 +-
 .../unofficial/Derv_Maps/40x40 Hpg2.board     |  1 +
 .../40x40 Industrial Facility Delta.board     |  4 +-
 .../40x40 Industrial Facility Echo.board      |  1 +
 .../40x40 Industrial Facility Tango.board     |  2 +
 ...0x40 Lunar Industrial Facility Bravo.board |  2 +
 ...0x40 Lunar Industrial Facility Delta.board |  1 +
 ...40x40 Lunar Industrial Facility Echo.board |  1 +
 .../40x40 Lunar Star Port Bravo.board         |  1 +
 .../40x40 Lunar Star Port Delta.board         |  1 +
 .../40x40 Lunar Star Port Tango.board         |  2 +
 .../Derv_Maps/40x40 Marik Estates.board       |  1 +
 .../Derv_Maps/40x40 Nagelring Summer.board    |  3 +-
 .../unofficial/Derv_Maps/40x40 New Kroy.board |  2 +
 .../40x40 Norse Battlemech Works.board        |  1 +
 .../40x40 Orbital Facility Tango.board        |  2 +
 .../Derv_Maps/40x40 Star Port Bravo.board     |  3 +-
 .../40x40 Volcanic Industrial Bravo.board     |  1 +
 .../40x40 Volcanic Industrial Delta.board     |  1 +
 .../40x40 Volcanic Industrial Echo.board      |  2 +
 .../40x40 Volcanic Industrial Tango.board     |  1 +
 .../40x40 Volcanic Star Port Bravo.board      |  1 +
 .../40x40 Volcanic Star Port Delta.board      |  5 +-
 .../40x40 Volcanic Star Port Echo.board       |  1 +
 .../40x40 Volcanic Star Port Tango.board      |  2 +
 .../40x45 Desert Space Port Echo.board        |  1 +
 .../Derv_Maps/41x41 Galaxy Split.board        |  7 +-
 .../Derv_Maps/41x41 Jade Falcon Trial.board   |  4 +-
 .../unofficial/Derv_Maps/45x45 Airfield.board |  2 +
 .../Derv_Maps/45x45 Alexander Valley.board    |  5 +-
 .../unofficial/Derv_Maps/45x45 Alpine.board   |  7 +-
 .../Derv_Maps/45x45 Dead City.board           |  3 +
 .../Derv_Maps/45x45 Deadoralive.board         |  3 +-
 .../unofficial/Derv_Maps/45x45 Dixon.board    |  7 +-
 .../Derv_Maps/45x45 Eden Heights.board        |  7 +-
 .../Derv_Maps/45x45 Fires of Industry.board   | 12 ++--
 .../unofficial/Derv_Maps/45x45 Geneva.board   |  6 +-
 .../unofficial/Derv_Maps/45x45 Geyser.board   |  3 +-
 .../Derv_Maps/45x45 Gilroys Harbor.board      |  8 ++-
 .../unofficial/Derv_Maps/45x45 Khan.board     |  2 +
 .../Derv_Maps/45x45 Ks_Hellcity.board         |  3 +-
 .../unofficial/Derv_Maps/45x45 Lyon 2.board   |  8 ++-
 .../unofficial/Derv_Maps/45x45 Lyon.board     |  4 +-
 .../unofficial/Derv_Maps/45x45 Mad Moon.board |  1 +
 .../Derv_Maps/45x45 Missilebase.board         |  1 +
 .../Derv_Maps/45x45 Rubber Boots.board        |  3 +-
 .../Derv_Maps/45x45 Sea Peaks.board           |  3 +-
 .../45x45 Silverrock Hatchet Bridge.board     |  3 +-
 .../Derv_Maps/45x45 Two Towers.board          |  2 +
 .../unofficial/Derv_Maps/48x34 Oanhu.board    |  6 +-
 .../Derv_Maps/50x35 Lost Treasure.board       |  3 +-
 .../Derv_Maps/50x40 Caustic Valley.board      |  3 +-
 .../Derv_Maps/50x50 Boreal Town 2.board       |  7 +-
 .../Derv_Maps/50x50 Borealtown.board          |  7 +-
 .../Derv_Maps/55x45 Brigadier Blues.board     |  2 +
 .../Derv_Maps/55x45 New Wuhan Hpg.board       | 10 +--
 .../unofficial/Derv_Maps/60x60 Crucible.board |  1 +
 .../Derv_Maps/60x60 Lost Monolith.board       |  3 +-
 .../Derv_Maps/60x60 Sandhurst.board           | 13 ++--
 .../unofficial/Derv_Maps/60x60 Sudeten.board  |  3 +-
 .../Derv_Maps/60x60 Torrington.board          |  3 +-
 .../Derv_Maps/61x30 Bearly Ridge.board        |  3 +-
 .../62x62 Operation Homecoming.board          | 17 +++--
 .../unofficial/Derv_Maps/75x25 Yucatan.board  |  5 +-
 .../Derv_Maps/80x80 Devilstower2014.board     |  5 +-
 .../80x80 Devilstower3078 Final Assault.board |  9 ++-
 .../Derv_Maps/80x80 Devilstower3078.board     | 12 +++-
 .../Derv_Maps/90x41 Whats Done Behind.board   | 13 ++--
 .../Cobra/35x35 Cobras Campain.board          |  4 +-
 .../Cobra/45x45 Cobras Fastaid.board          |  3 +-
 ... Defiance Industries Assembly Line 1.board |  2 +
 ... Defiance Industries Assembly Line 2.board |  2 +
 ... Defiance Industries Assembly Line 3.board |  3 +
 ... Defiance Industries Defense Station.board |  1 +
 .../11x11 Defiance Industries Dynamo.board    |  1 +
 ...fiance Industries Employee Housing 1.board |  1 +
 .../11x11 Defiance Industries Empty.board     |  1 +
 ... Defiance Industries Loading Station.board |  3 +-
 .../11x11 Defiance Industries Mechbay.board   |  2 +
 ...ance Industries Munitions Storehouse.board |  1 +
 ...1 Defiance Industries Ore Processing.board |  2 +
 ...Defiance Industries Puddling Furnace.board |  1 +
 ...1x11 Defiance Industries Testing Pit.board |  3 +-
 .../11x11 Defiance Industries Warehouse.board |  2 +
 .../Dervs/100x100 Before Isengard.board       |  1 +
 .../Dervs/21x21 Defiance Interior.board       |  7 +-
 .../unofficial/Dervs/25x25 Airport 3000.board |  2 +
 .../Dervs/30x55 Gates of Hesperus.board       |  3 +-
 .../unofficial/Dervs/32x17 Mars Melt.board    |  1 +
 .../boards/unofficial/Dervs/35x35 2fort.board |  7 +-
 .../unofficial/Dervs/35x35 Aftermath.board    |  5 +-
 .../unofficial/Dervs/35x35 Aim Nine.board     |  8 ++-
 .../unofficial/Dervs/35x35 Applegate.board    |  5 +-
 .../unofficial/Dervs/35x35 Archipelago.board  |  1 +
 .../Dervs/35x35 Arctic Wasteland.board        |  5 +-
 .../unofficial/Dervs/35x35 Atreus.board       |  9 ++-
 .../unofficial/Dervs/35x35 Busy City 2.board  |  6 +-
 .../unofficial/Dervs/35x35 Castle Hill.board  | 10 ++-
 .../unofficial/Dervs/35x35 Double City.board  |  6 +-
 .../unofficial/Dervs/35x35 Eisenjaeger.board  |  7 +-
 .../unofficial/Dervs/35x35 Fort Sumter.board  |  9 ++-
 .../boards/unofficial/Dervs/35x35 Koryo.board | 15 ++--
 .../unofficial/Dervs/35x35 Mannedorf 2.board  |  2 +
 .../unofficial/Dervs/35x35 Mars Surface.board |  3 +-
 .../unofficial/Dervs/35x35 Mt Cho.board       |  5 +-
 .../unofficial/Dervs/35x35 Port Kallin.board  |  5 +-
 .../unofficial/Dervs/35x35 Refit Yard.board   |  4 +-
 .../unofficial/Dervs/35x35 Veil Surface.board |  3 +-
 .../unofficial/Dervs/35x45 Liberty.board      |  4 +-
 .../Dervs/39x59 MacDuff River.board           |  7 +-
 ...x40 Arctic Industrial Facility Delta.board |  8 ++-
 ...x40 Arctic Industrial Facility Tango.board |  3 +
 .../unofficial/Dervs/41x41 Galaxy Split.board |  7 +-
 .../unofficial/Dervs/45x45 Airfield.board     |  2 +
 .../Dervs/45x45 Alexander Valley.board        |  5 +-
 .../unofficial/Dervs/45x45 Alpine.board       |  7 +-
 .../unofficial/Dervs/45x45 Lyon 2.board       |  8 ++-
 .../45x45 Silverrock Hatchet Bridge.board     |  3 +-
 .../boards/unofficial/Dervs/48x34 Oanhu.board |  6 +-
 .../Dervs/50x140 Coyote Valley.board          |  8 ++-
 .../Dervs/50x35 Lost Treasure.board           |  3 +-
 .../Dervs/50x50 Boreal Town 2.board           |  7 +-
 .../Dervs/50x50 Nowhere to Turn.board         |  1 +
 .../Dervs/55x45 New Wuhan HPG.board           | 10 +--
 .../Dervs/56x37 Avalon City Conquest.board    |  1 +
 .../unofficial/Dervs/60x60 Sandhurst.board    | 13 ++--
 .../unofficial/Dervs/60x60 Torrington.board   |  3 +-
 .../unofficial/Dervs/61x30 Bearly Ridge.board |  5 +-
 .../Dervs/62x62 Operation Homecoming.board    | 17 +++--
 .../unofficial/Dervs/75x25 Yucatan.board      |  5 +-
 .../Dervs/78x78 Lake Africa (Full).board      |  5 +-
 .../Dervs/78x78 Lake Africa Dry.board         |  6 +-
 .../unofficial/Dervs/78x78 Lake Africa.board  |  5 +-
 .../Dervs/90x41 Whats done behind.board       | 13 ++--
 ... Defiance Industries Assembly Line 1.board |  2 +
 ... Defiance Industries Assembly Line 2.board |  2 +
 ... Defiance Industries Assembly Line 3.board |  3 +
 ... Defiance Industries Defense Station.board |  1 +
 .../11x11 Defiance Industries Dynamo.board    |  1 +
 ...fiance Industries Employee Housing 1.board |  1 +
 .../11x11 Defiance Industries Empty.board     |  1 +
 ... Defiance Industries Loading Station.board |  3 +-
 .../11x11 Defiance Industries Mechbay.board   |  2 +
 ...ance Industries Munitions Storehouse.board |  1 +
 ...1 Defiance Industries Ore Processing.board |  2 +
 ...Defiance Industries Puddling Furnace.board |  1 +
 ...1x11 Defiance Industries Testing Pit.board |  3 +-
 .../11x11 Defiance Industries Warehouse.board |  2 +
 .../Drewbacca/16x17 The Long Run 3.board      |  2 +
 .../Drewbacca/16x17 Under Siege 1.board       |  1 +
 .../Drewbacca/16x17 Under Siege 2.board       |  1 +
 .../EVS/100x80 Battlescarred Fort.board       |  6 +-
 .../EVS/105x100 Pirate Lagoon.board           |  8 ++-
 .../EVS/110x80 Port Scaramuch.board           | 12 ++--
 .../boards/unofficial/EVS/115x90 I-81.board   |  5 +-
 .../115x90 Lunar Crater - Mining colony.board |  7 +-
 .../EVS/115x90 Martian spaceport.board        |  6 +-
 .../unofficial/EVS/130x100 Wildcat Mine.board |  2 +
 .../EVS/155x90 Desert Coalition Airbase.board |  8 ++-
 .../EVS/160x40 Tidewater Highway.board        | 10 +--
 .../unofficial/EVS/225x145 Kyrankoi.board     | 10 ++-
 .../EVS/45x70 Deep Cave Showdown.board        |  2 +
 .../EVS/48x51 Jungle Lowlands.board           |  4 +-
 .../EVS/50x50 Field repair outpost.board      |  4 +-
 .../unofficial/EVS/80x150 Mission Y.board     |  5 +-
 .../unofficial/EVS/80x80 Glacial valley.board |  3 +-
 .../85x80 Operation Avalanche Assault.board   | 12 ++--
 .../unofficial/EVS/86x51 Rail Crossing.board  |  4 +-
 .../unofficial/EVS/90x70 AgriDistrict.board   |  1 +
 .../unofficial/Easy/camp-wilderness.board     |  4 +-
 .../16x17 KlingenCon - Winteriscomming1.board |  3 +-
 .../16x17 KlingenCon - Winteriscomming2.board |  3 +-
 .../Flynn/16x17 WWE2020 Map 1 NW.board        |  1 +
 .../Flynn/16x17 WWE2020 Map 3 SW.board        |  1 +
 .../Flynn/16x17 WWE2020 Map 4 SE.board        |  1 +
 ...32x34 WWE2020 AndHellFollowedWithHim.board |  3 +-
 .../Flynn/33x35 Weihnachten2019.board         |  3 +-
 .../Flynn/33x35 Weihnachten2020.board         |  3 +-
 .../Flynn/33x35 Weihnachten2021.board         |  3 +-
 .../Flynn/33x35 Weihnachten2022.board         |  7 +-
 ...34x34 Starleague Depot01 Small Lakes.board |  3 +-
 .../Flynn/34x34 Starleague Depot05 Luna.board |  3 +-
 ...34 Starleague Depot08 Schlamschlacht.board |  5 +-
 .../34x34 Starleague Depot1 Small Lakes.board |  7 +-
 .../34x34 Starleague Depot10 Winter.board     |  9 +--
 .../34x34 Starleague Depot11 River.board      |  9 +--
 ...34 Starleague Depot14 shattered town.board |  5 +-
 ...4x34 Starleague Depot15 Jungle Party.board |  9 +--
 .../34x34 Starleague Depot16 Citygrid.board   |  4 +-
 .../34x34 Starleague Depot20 DesetStorm.board |  5 +-
 .../Flynn/34x34 Starleague Depot32 mars.board |  3 +-
 ...4x34 Starleague Depot33 Hell on Mars.board |  5 +-
 ...4x34 Starleague Depot36 TwinMountain.board |  5 +-
 .../34x34 Starleague Depot37 iceicebaby.board |  9 +--
 ...eague Depot39 Airfieldin the dessert.board |  1 +
 ...4 Starleague Depot40 FortressHexagon.board |  7 +-
 ...x34 Starleague Depot41 DersertValley.board |  5 +-
 .../34x34 Starleague Depot43 MoonCave.board   |  3 +-
 .../34x34 Starleague Depot45 MudJungle.board  |  5 +-
 .../Flynn/34x34 Starleague Depot5 Luna.board  |  3 +-
 .../34x34 Starleague Depot55 CityRuins.board  |  7 +-
 ...x34 Starleague Depot56 HeavyIndstrie.board |  8 ++-
 .../34x34 Starleague Depot58 MarsRiver.board  |  3 +-
 ...34 Starleague Depot59 Wintermountain.board |  8 ++-
 ...Starleague Depot60 SwampsintheJungel.board |  6 +-
 ...4 Starleague Depot61 winteriscomming.board |  7 +-
 ...34x34 Starleague Depot62 SteinerCity.board |  3 +
 ...x34 Starleague Depot63 CapellaJungel.board |  3 +-
 ...x34 Starleague Depot64 SandintheGear.board |  3 +-
 ...34x34 Starleague Depot66 HeavyJungel.board |  5 +-
 ...x34 Starleague Depot70 Kiudufortress.board |  4 +-
 ...x34 Starleague Depot71 OasisFortress.board |  1 +
 ...Starleague Depot72 BackSideoftheMoon.board |  2 +
 .../34x34 Starleague Depot73 GreenHell.board  |  9 +--
 ...x34 Starleague Depot74 SesamFortress.board |  5 +-
 .../unofficial/Flynn/35x35 MechRace.board     |  3 +-
 .../unofficial/Jackanapes/40x29 Op2M4.board   |  2 +
 .../unofficial/Jackanapes/40x33 Op1M3.board   |  1 +
 .../unofficial/Jackanapes/42x27 Op1M1.board   |  1 +
 .../unofficial/Jackanapes/52x42 Op2M1.board   |  1 +
 .../unofficial/Jackanapes/54x27 Op2M2.board   |  3 +
 .../unofficial/Jackanapes/56x36 Op1M4.board   |  3 +
 .../unofficial/Jackanapes/58x34 Op1M2.board   |  1 +
 .../Jackanapes/58x54 OP2Mescape.board         |  1 +
 .../Jackanapes/66x48 Op1Mbonus.board          |  2 +
 .../unofficial/Jackanapes/96x42 Op2M3.board   |  1 +
 .../boards/unofficial/Jackanapes/op1m1.board  |  1 +
 .../boards/unofficial/Jackanapes/op1m2.board  |  1 +
 .../boards/unofficial/Jackanapes/op1m3.board  |  2 +
 .../boards/unofficial/Jackanapes/op1m4.board  |  3 +
 .../Jakes Map Pack/12x12 Olympus H.board      |  1 +
 .../Jakes Map Pack/16x17 Ewoklandia A.board   |  1 +
 .../Jakes Map Pack/16x17 Ewoklandia C.board   |  1 +
 .../Jakes Map Pack/16x17 Ewoklandia D.board   |  1 +
 .../Jakes Map Pack/16x17 New Oslo A.board     |  2 +
 .../Jakes Map Pack/16x17 New Oslo B.board     |  2 +
 .../Jakes Map Pack/16x17 New Oslo C.board     |  3 +-
 .../Jakes Map Pack/16x17 New Oslo D.board     |  2 +
 .../Jakes Map Pack/16x17 New Oslo E.board     |  2 +
 .../Jakes Map Pack/16x17 Pagoda Fort.board    |  6 +-
 .../Jakes Map Pack/16x17 Poppyseed A.board    |  4 +-
 .../Jakes Map Pack/16x17 Poppyseed B.board    |  1 +
 .../Jakes Map Pack/16x17 Rhodes City A.board  |  1 +
 .../Jakes Map Pack/16x17 Rhodes City B.board  |  1 +
 .../Jakes Map Pack/16x17 Rhodes City C.board  |  2 +
 .../Jakes Map Pack/16x17 Sands Fort.board     |  3 +-
 .../25x25 Glacier Grievance.board             |  3 +-
 .../Jakes Map Pack/25x25 Ice Arena.board      |  1 +
 .../25x25 Tilting Grounds.board               |  5 +-
 .../35x35 A Bridge Too Far.board              |  5 +-
 .../Jakes Map Pack/35x35 Graus.board          |  1 +
 .../Jakes Map Pack/35x35 Icy Rift.board       |  3 +-
 .../Jakes Map Pack/35x35 North Scar.board     |  4 +-
 .../Jakes Map Pack/35x35 Painted Desert.board |  1 +
 .../Jakes Map Pack/35x35 Polar Wastes.board   |  3 +-
 .../Jakes Map Pack/35x35 Reykjavik.board      |  7 +-
 .../Jakes Map Pack/35x35 Syreen Ice.board     |  1 +
 .../35x35 Wide Blue River.board               |  4 +-
 .../35x35 Wide Green Spires.board             |  3 +-
 .../35x45 Defend The Base.board               |  5 +-
 .../Jakes Map Pack/45x45 Bain's Impass.board  |  3 +-
 .../Jakes Map Pack/45x45 Beach Bum.board      |  7 +-
 .../Jakes Map Pack/45x45 Crater Rock.board    |  3 +-
 .../Jakes Map Pack/45x45 Lena Station.board   |  1 +
 .../Jakes Map Pack/45x45 Mountain.board       |  1 +
 .../Jakes Map Pack/45x45 Rick Dom Dam.board   |  5 +-
 .../Jakes Map Pack/45x45 Swiss Moon.board     |  4 +-
 .../Jakes Map Pack/55x55 Hemlock Pass.board   |  3 +-
 .../Jakes Map Pack/8x8 Volga City C.board     |  1 +
 .../Jakes Map Pack/8x8 Volga City E.board     |  1 +
 .../Jakes Map Pack/8x8 Volga City F.board     |  1 +
 .../Jakes Map Pack/8x8 Volga City G.board     |  2 +
 .../Jakes Map Pack/8x8 Volga City I.board     |  1 +
 .../Jakes Map Pack/8x8 Volga City J.board     |  1 +
 .../unofficial/Jayof9s/16x17 Airfield.board   |  2 +
 .../Jayof9s/16x17 City Downtown Custom.board  |  4 +-
 .../16x17 City Niops Ivory Tower.board        |  5 +-
 ... City Street Grid Park 2 - Buildings.board |  1 +
 .../unofficial/Jayof9s/16x17 Fort 1.board     |  3 +-
 .../unofficial/Jayof9s/16x17 Fort 2.board     |  4 +-
 .../unofficial/Jayof9s/16x17 Fort 3.board     |  2 +
 .../unofficial/Jayof9s/30x50 Canyons06.board  |  5 +-
 .../Jayof9s/32x33 Grasslands 2 base.board     |  5 +-
 .../Jayof9s/32x33 Spaceport Damaged.board     |  5 ++
 .../32x33 Spaceport Left Damaged.board        |  5 ++
 .../Jayof9s/32x33 Spaceport Left.board        |  5 ++
 .../32x33 Spaceport Right Damaged.board       |  4 +-
 .../Jayof9s/32x33 Spaceport Right.board       |  4 +-
 .../32x33 Spaceport South Damaged.board       |  7 +-
 .../32x33 Spaceport South East Damaged.board  |  7 +-
 .../Jayof9s/32x33 Spaceport South East.board  |  7 +-
 .../Jayof9s/32x33 Spaceport South.board       |  7 +-
 .../unofficial/Jayof9s/32x33 Spaceport.board  |  5 ++
 .../Jayof9s/35x35 Alrakis Recon.board         |  3 +-
 .../35x35 Tigerlands Processing Plant.board   |  9 +--
 .../Jayof9s/35x45 Defend the Base Mk II.board |  5 +-
 .../unofficial/Jayof9s/44x45 Fortress.board   |  6 +-
 .../Jayof9s/45x45 Grasslands Mfg Plant.board  |  4 +-
 .../Jayof9s/45x45 Militia HQ v2.board         |  9 ++-
 .../unofficial/Jayof9s/45x45 Militia HQ.board |  7 +-
 .../Jayof9s/45x45 Moore Rainy Woods.board     |  5 +-
 .../Jayof9s/45x45 River Valley Factory.board  |  5 +-
 .../Jayof9s/45x46 Research Facility.board     |  5 +-
 .../55x55 Foot Fall Small Town v2.board       |  6 +-
 .../Jayof9s/55x55 Foot Fall Small Town.board  |  4 +-
 .../Jayof9s/55x55 Main Factory C.board        |  3 +
 .../55x55 Rural vs Urban Mountains.board      |  8 ++-
 .../Jayof9s/55x55 Rural vs Urban.board        | 14 ++--
 .../55x55 Shipka Wilderness Outpost v2.board  |  5 +-
 .../55x55 Shipka Wilderness Outpost.board     |  3 +-
 .../Jayof9s/64x65 Ancient Factory.board       |  4 +-
 .../Jayof9s/64x65 Modern Factory.board        |  5 +-
 .../Jayof9s/64x68 Pirate Base.board           |  3 +-
 .../Jayof9s/64x68 Rocky Battlefield.board     |  3 +-
 ...64x68 Rural vs Urban Mountains large.board |  5 +-
 .../Jayof9s/64x68 Temperate Factory 2.board   |  5 +-
 .../Jayof9s/64x68 Temperate Factory.board     |  5 +-
 .../Jihad Mappack/16x64 Chemical Rush.board   | 12 +++-
 .../Jihad Mappack/25x45 New Hoover.board      |  5 +-
 .../Jihad Mappack/35x35 Avalon Revised.board  |  7 +-
 .../Jihad Mappack/35x35 Desert Castle.board   |  3 +-
 .../Jihad Mappack/35x35 Highway.board         |  3 +-
 .../Jihad Mappack/35x35 Imperial Sewers.board |  6 +-
 .../Jihad Mappack/35x35 Ishikawajima.board    |  4 +-
 .../Jihad Mappack/35x35 Miami Beach.board     |  6 +-
 .../Jihad Mappack/35x35 Sirius V.board        | 11 ++-
 .../Jihad Mappack/35x35 Solaris City.board    |  4 +-
 .../Jihad Mappack/35x35 Wet Pincussion.board  |  3 +-
 .../45x45 Alexander Valley.board              |  5 +-
 .../Jihad Mappack/45x45 Dead or Alive.board   |  3 +-
 .../Jihad Mappack/45x45 Geneva.board          |  6 +-
 .../Jihad Mappack/45x55 Brigadier Blues.board |  2 +
 .../Jihad Mappack/50x40 Caustic Valley.board  |  5 +-
 .../Jihad Mappack/50x50 Boreal Town.board     |  7 +-
 .../80x80 Devilstower 2014.board              |  5 +-
 .../80x80 Devilstower 3078.board              | 12 +++-
 .../Jihad Mappack/A Bridge 2 Far.board        |  5 +-
 .../Jihad Mappack/miami beach.board           |  5 +-
 ...16x17 Colson Hills Outskirts 0 North.board |  5 +-
 ...16x17 Colson Hills Outskirts 1 South.board |  5 +-
 .../boards/unofficial/Kajis/16x17 Mines.board |  7 +-
 .../unofficial/Kajis/16x17 Outpost.board      |  6 +-
 .../unofficial/Kajis/16x17 Rough Snow.board   |  5 +-
 .../Kajis/16x34 Coson Hill Outskirts.board    |  7 +-
 .../unofficial/Kajis/30x17 The Alpine.board   |  1 +
 .../Kajis/30x17 The Castle Underground.board  |  4 +-
 .../unofficial/Kajis/30x17 The City.board     |  5 +-
 .../Kajis/30x17 The Country 6.board           |  5 +-
 .../Kajis/30x17 The Country 8.board           |  7 +-
 .../30x17 The Jungle 0 North-Northwest.board  |  3 +-
 .../Kajis/30x17 The Jungle 1 Far North.board  |  5 +-
 .../30x17 The Jungle 2 North-Northeast.board  |  3 +-
 .../Kajis/30x17 The Jungle 8 East.board       |  3 +-
 .../Kajis/30x17 The Martian Plains.board      |  1 +
 .../Kajis/30x17 The Moon 4 Southwest.board    |  4 +-
 .../Kajis/30x17 The Moon 5 Southeast.board    |  2 +
 .../Kajis/30x17 The Mountains.board           |  9 +--
 .../Kajis/30x17 The River Outpost.board       |  9 ++-
 .../Kajis/30x17 The River Town.board          |  5 +-
 .../Kajis/30x34 The Alpine Mountains.board    |  7 +-
 .../Kajis/30x34 The River City.board          |  7 +-
 .../Kajis/60x51 The Whole Moon.board          |  5 +-
 .../Kajis/90x85 The Whole Jungle.board        |  5 +-
 ...17 City Ruins With Rubble - Grass 13.board |  1 +
 ...Medium Bunker With Walls - Desert 18.board |  1 +
 ... Medium Bunker With Walls - Grass 19.board |  1 +
 ...nker With Walls Defended - Desert 20.board |  1 +
 ...unker With Walls Defended - Grass 21.board |  1 +
 .../Lanceman/16x17 Strike - Desert 22.board   |  1 +
 .../16x17 Strike - Fortress - Desert 23.board |  1 +
 .../16x17 Substation - Grass 27.board         |  1 +
 .../Lanceman/16x17 Supply - Desert 28.board   |  1 +
 .../16x17 The Channels 1 Alternate.board      |  1 +
 .../Lanceman/16x17 The Channels 1.board       |  1 +
 .../16x17 The Channels 2 Alternate.board      |  1 +
 .../Lanceman/16x17 The Channels 2.board       |  1 +
 .../16x17 The Channels 3 Alternate.board      |  1 +
 .../Lanceman/16x17 The Channels 3.board       |  1 +
 .../unofficial/Lanceman/50x700 Ocoee 11.board |  3 +-
 .../Lucho/10x10 Ishiyamaspecial.board         |  3 +-
 .../Lucho/10x10 Ishiyamaspecial2.board        |  3 +-
 .../unofficial/Lucho/16x17 Last Stand.board   |  1 +
 .../unofficial/Lucho/50x50  Citadel.board     |  6 +-
 .../Lucho/50x50  Marapendi Bogs.board         |  5 +-
 .../unofficial/Lucho/50x50  Oasis.board       |  6 +-
 .../unofficial/Lucho/50x50  Stronghold.board  |  7 +-
 .../unofficial/Lucho/50x50  Urbanruins.board  | 10 +--
 .../15x18 Hartford Gardens Jungle.board       |  2 +
 .../15x18 Hartford Gardens Woods.board        |  4 +-
 .../unofficial/ModCan/16x17 ModCan06.board    |  4 +-
 .../unofficial/ModCan/16x17 ModCan19.board    |  3 +-
 .../unofficial/Morkath/100x78_Shipyard.board  |  8 ++-
 .../Morkath/100x78_Shipyard_Entrance.board    |  7 +-
 .../Morkath/64x64_Ragnarok_PortCity.board     |  7 +-
 .../64x64_Ragnarok_PortCity_Destroyed.board   |  7 +-
 .../NerdyTB/54x27 BinaryIsles.board           |  7 +-
 .../unofficial/Nightsky/16x17 Village 1.board |  2 +
 .../Ratach Maps/100x100 TheEnclave.board      |  6 +-
 .../Ratach Maps/41x51 Highway.board           |  3 +-
 .../Razorback/16x17 City Park.board           |  4 +-
 .../RossMaps/40x40 Blue Creek CORW13.board    |  5 +-
 .../RossMaps/40x40 Circe Plantation13.board   |  5 +-
 .../RossMaps/40x40 Desert River13.board       |  5 +-
 .../RossMaps/40x40 Riverbed 13.board          |  3 +-
 .../unofficial/SeeM/160x170 Cmentarz.board    |  6 +-
 .../unofficial/SeeM/160x170 Zlotarzeka.board  |  6 +-
 .../128x102/128x102 FortGribbly-Desert.board  |  8 ++-
 .../128x102/128x102 FortGribbly-Grass.board   |  7 +-
 .../128x102/128x102 FortGribbly-Snow.board    | 10 ++-
 .../128x102/128x102 Headland Battery.board    | 12 +++-
 .../32x17 Holth Forest - before fire.board    |  3 +-
 .../32x34/32x34 BridgeTown1.board             |  3 +-
 .../SimonLandmine/32x34/32x34 Cfarms.board    |  3 +-
 .../32x34/32x34 Coastal A Bay-Sandbar.board   |  5 +-
 .../32x34/32x34 Coastal A Bay.board           |  5 +-
 .../32x34/32x34 Coastal A Bays1.board         |  3 +-
 .../32x34/32x34 Coastal A Prom.board          |  3 +-
 .../32x34/32x34 Coastal A Swamp.board         |  3 +-
 .../32x34/32x34 Coastal B Cliffs1.board       |  3 +-
 .../32x34/32x34 Coastal B Cliffs2.board       |  3 +-
 .../32x34/32x34 Coastal In Shore Fort.board   |  1 +
 .../32x34/32x34 Coastal In Shore Runway.board |  5 +-
 .../32x34/32x34 CoastalInshoreFarms.board     |  5 +-
 .../32x34/32x34 CoastalInshoreFort.board      |  3 +-
 .../32x34/32x34 CoastalInshoreRunway.board    |  5 +-
 .../32x34/32x34 DesertCity1 NE.board          |  6 +-
 .../32x34/32x34 DesertCity1 NW.board          |  4 +-
 .../32x34/32x34 DesertCity1 SE.board          |  2 +
 .../32x34/32x34 DesertCity1 SW.board          |  2 +
 .../32x34/32x34 DesertTown.board              |  1 +
 .../32x34/32x34 Fenland A2.board              |  4 +-
 .../32x34/32x34 Fenland B2.board              |  8 ++-
 .../32x34/32x34 FrozenValley1.board           |  3 +-
 .../32x34/32x34 FrozenValley2.board           |  3 +-
 .../32x34/32x34 JapaneseMansion.board         |  4 +-
 .../SimonLandmine/32x34/32x34 Lumpy.board     |  1 +
 .../32x34/32x34 LumpyWoods.board              |  3 +-
 .../32x34 MarshallCity1-HighBridges.board     |  3 +
 .../32x34/32x34 MarshallCity1.board           |  3 +
 .../SimonLandmine/32x34/32x34 Oasis1.board    |  1 +
 .../32x34/32x34 OpenCastMine.board            |  1 +
 .../32x34/32x34 OpenCastMineAbandoned.board   |  1 +
 .../32x34/32x34 OpenCastMineFlooded.board     |  1 +
 .../32x34/32x34 PirateCamp-LowerWalls.board   |  1 +
 .../32x34/32x34 Thermopylae Minor.board       |  5 +-
 .../48x34/48x34 02-HighGroundDefence.board    |  1 +
 .../48x34/48x34 DesertCanyonRiver1.board      |  5 +-
 .../48x34/48x34 DesertCanyonRiver2.board      |  5 +-
 .../48x51/48x51 BridgeTown1.board             |  3 +-
 .../48x51/48x51 Jungle Research Base.board    |  3 +
 .../SimonLandmine/48x51/48x51 MvM01.board     |  4 +-
 .../48x51/48x51 RavineCoast.board             |  7 +-
 .../48x51/48x51 Sandbar Fort.board            | 10 ++-
 .../48x51/48x51 Woodland Base.board           |  5 +-
 .../48x53/48x53 Aurigan Directorate v1.board  |  1 +
 .../48x53/48x53 Aurigan Directorate v2.board  |  1 +
 .../64x34/64x34 DesertCanyonRiver1.board      |  5 +-
 .../64x34/64x34 DesertCanyonRiver2.board      |  5 +-
 .../64x34 TrenchWarfare-DarykEdition1.board   |  1 +
 .../64x34 TrenchWarfare-DarykEdition2.board   |  3 +-
 .../64x34/64x34 TrenchWarfare.board           |  1 +
 .../64x51/64x51 MesaCity1 N - Mesas.board     |  7 +-
 .../64x51/64x51 Ostia Base v1.board           |  1 +
 .../64x68/64x68 CanalCity1 Inshore.board      |  7 +-
 .../64x68/64x68 CanalCity1 Offshore.board     |  1 +
 .../64x68/64x68 CanalCity1.board              | 12 ++--
 .../64x68/64x68 CanalCity2.board              |  6 +-
 .../64x68/64x68 Colt Ward Pass.board          |  3 +-
 .../64x68/64x68 Dam Valley - Breached.board   |  2 +
 .../64x68/64x68 Dam Valley.board              |  2 +
 .../64x68/64x68 Dam and Lake - Breached.board |  1 +
 ...8 DesertCanyonRiver - Iceweb Edition.board |  5 +-
 .../64x68/64x68 DesertCanyonRiver.board       |  5 +-
 .../64x68/64x68 DesertCity1.board             |  6 +-
 .../SimonLandmine/64x68/64x68 Drop-port.board |  5 +-
 .../SimonLandmine/64x68/64x68 Fenland.board   |  8 ++-
 .../64x68/64x68 Headland Battery.board        | 10 ++-
 .../SimonLandmine/64x68/64x68 Isthmus1.board  |  3 +-
 .../64x68/64x68 JapaneseMansion.board         |  6 +-
 ...Jungle Research Base - Trail Version.board |  5 +-
 .../64x68/64x68 Jungle Research Base.board    |  5 +-
 .../64x68/64x68 Motorway-M1-1.board           |  1 +
 .../64x68/64x68 Mount Massino.board           |  5 +-
 .../64x68/64x68 RavineCoast.board             |  9 ++-
 .../64x68/64x68 Sandbar Fort.board            | 12 ++--
 .../64x68/64x68 Star Fort - Desert.board      |  5 +-
 .../64x68/64x68 Star Fort - Grass.board       |  4 +-
 .../64x68/64x68 Star Fort - Snow.board        |  5 +-
 .../64x68/64x68 Winter Factory.board          |  5 +-
 .../64x68/64x68 Woodland Base.board           |  5 +-
 .../80x68/80x68 Star Fort - Grass.board       |  4 +-
 .../96x102/96x102 DesertCity1.board           | 14 ++--
 .../96x102/96x102 Headland Battery.board      | 12 +++-
 .../96x102/96x102 MesaCity1.board             |  7 +-
 .../96x51/96x51 MesaCity1 N - Mesas.board     |  7 +-
 .../96x51/96x51 MesaCity1 S - DropPort.board  |  6 +-
 .../96x68/96x68 Headland Battery.board        | 12 +++-
 .../16x17 River+Coast-river+coast-1.board     |  5 +-
 .../16x17 River+Coast-river+coast-2.board     |  3 +-
 .../16x17 River+Coast-river+coast-3.board     |  3 +-
 .../16x17 River+Coast-river+coast-4.board     |  3 +-
 .../16x17 River+Coast-river+coast-5.board     |  1 +
 ...17 River+Coast-river+coast-seabridge.board |  1 +
 .../TheValley/30x15 TheValley-Base1.board     |  5 +-
 .../30x15 TheValley-Earthworks1.board         |  1 +
 .../30x15 TheValley-Earthworks2.board         |  1 +
 .../TheValley/30x15 TheValley-Quarry.board    |  3 +-
 .../TheValley/30x15 TheValley-Wall2.board     |  5 +-
 .../16x34 (CW) Grand Valley Bri.board         |  5 +-
 ...2x17 (CDS) Kozice Valley Grain Mills.board |  7 +-
 ...32x17 (CGB) Dvigrad Forrest Sunj Bay.board |  4 +-
 .../Strategoslevel3/32x17 (CGB) Luk.board     |  3 +-
 .../32x17 (CJF) Humptullips.board             |  5 +-
 .../32x17 (CJF) Olalla (Fake).board           |  3 +-
 ... (CNC) North Losiije Broken Landings.board |  5 +-
 ...17 (CNC) North Losiije Park and Ride.board |  5 +-
 .../32x17 (CSJ) Tamo Mountains Bunker.board   |  5 +-
 .../Strategoslevel3/32x34 MountainSwoop.board |  7 +-
 .../Strategoslevel3/32x34 TalonStrike.board   |  5 +-
 .../Strategoslevel3/32x51 GenevaT50.board     |  1 +
 .../Strategoslevel3/32x51 GenevaT53.board     |  2 +
 .../Strategoslevel3/32x51 RenderingClaw.board |  7 +-
 .../Strategoslevel3/64x34 Geneva.board        |  3 +
 .../Strategoslevel3/64x34 GenevaT49.board     |  3 +
 .../64x68 Desert Airfiled No Water.board      |  6 +-
 ... Butte Hold - Big Fullas Supply Base.board |  4 +-
 .../100x80 - Desert Fortress - Alamo.board    |  4 +-
 .../128x68 - New Exford - Beach Fight.board   |  1 +
 ...0 - Butte Hold - Mater Defence Lines.board |  4 +-
 .../170x130 - Butte Hold - Singlestown.board  |  6 +-
 .../32x108 - Stewart - Hills Chase.board      |  3 +-
 ...5 - Desert - Mountain Valley Village.board |  8 +++
 .../40x40 - Jungle - Logistics Trail.board    | 10 ++-
 ...- Badlands - Canyon Reeducation Camp.board | 23 +++---
 ...Water Pure Industries - Factory Port.board |  6 +-
 .../UlyssesMaps/48x68 - Red Research.board    |  2 +
 .../UlyssesMaps/48x68 Red Research.board      |  2 +
 .../50x35 - Grass - East-West Crossing.board  |  3 +-
 ...ert - Sand - Highway Service Station.board |  6 ++
 .../64x68 - Checkpoint Ridge.board            |  4 +-
 .../64x68 - Jungle Landing Site.board         |  1 +
 .../UlyssesMaps/64x68 - Lava River Lair.board |  1 +
 ...64x68 - Phecda - Pirate Landing Zone.board |  3 +-
 ...x68 - Snow - Hill Fort Logistics Hub.board |  3 +-
 .../64x85 - Phecda - Snow Beach.board         |  3 +-
 .../UlyssesMaps/80x60 - Fulda Gap 1.board     |  5 +-
 ...Stewart - Corean Mechworks - Damaged.board |  5 +-
 .../80x85 - Stewart - Corean Mechworks.board  |  5 +-
 .../80x85 - Stewart - Hydropower.board        |  3 +-
 ...CTF - Factory - Flagstorm Industries.board |  1 +
 .../30x20 - Liao Arena - Jungle.board         |  1 +
 .../30x30 - Independent - Caldera Clash.board |  1 +
 ...x30 - Independent - Island Intercept.board |  1 +
 .../30x30 - Independent - Mudpit Murder.board |  4 +-
 ...30 - Independent - Urban Combat Zone.board |  2 +
 .../30x30 - Kurita - Ishiyama Caves.board     |  2 +
 ...einer Arena - Colosseum Alt Config A.board |  1 +
 .../40x20 - Steiner Arena - Colosseum.board   |  1 +
 ...- Desert - Urban - Data Centre Large.board | 43 +++++++----
 .../30x30 - Snow - MaxSec Prison Small.board  |  2 +
 ...- Hills - Early Warning Centre Small.board |  9 ++-
 ...sert - Sand - Generic Facility Small.board | 22 +++---
 ...- Desert - Urban - Data Centre Small.board | 25 ++++---
 .../40x40 - Grass - Air Base Small 2.board    |  1 +
 .../40x40 - Grass - Comms Centre Small.board  |  3 +-
 ... - Grass - Industrial Centre Small 2.board |  3 +-
 ...40 - Grass - Industrial Centre Small.board |  3 +
 .../40x40 - Jungle - Logistics Trail.board    |  1 +
 ...gle - Mountainside Comms-Data Centre.board | 28 +++++---
 ...illage - Early Warning Centre Medium.board | 55 ++++++++------
 ...ical - Urban - Paradise City Airport.board | 19 +++--
 ...pical-Jungle - Artillery Base Medium.board | 34 +++++----
 ...Grass-Urban - Logistics Centre Small.board |  4 +-
 .../60x50 - Urban - Orbital Defense.board     | 14 ++--
 ...Jungle - Comms Centre Approach Large.board |  3 +-
 ...t - Savannah - Command Centre Medium.board | 71 +++++++++++--------
 ...4x68 - Snow - Orbital Defense Medium.board |  2 +
 ...untain - Glacier Mining and Crevasse.board |  1 +
 ...l Facility Medium - Plantation House.board |  4 +-
 ...Facility Medium 2 - Rare Earths Mine.board |  4 +-
 ... - Tropical-Coast - Tank Base Medium.board |  6 +-
 ...ropical-Jungle - Comms Centre Medium.board |  3 +-
 ...cal-Jungle - Convoy Route N-S Medium.board |  1 +
 ...City Ruins - Beast is Loose Scenario.board |  2 +
 ...16x17 - Twycross - Desert Hills Edit.board |  2 +-
 ...6x17 - Twycross - Mountain Lake Edit.board |  3 +-
 ...kayyid - Dinju Mountains Farm Valley.board |  3 +-
 ...51 - Tukayyid - Dinju Mountains Pass.board |  4 +-
 ... Tukayyid - Racice River Delta Large.board |  6 +-
 ...68 - Tukayyid - Racice River Delta 2.board |  6 +-
 ...oziceValley - Route16 Urcunat Bridge.board |  3 +-
 .../Unknown/seaportwithfueltanks.board        |  5 +-
 .../unofficial/Vamp/Elevated Highway.board    |  7 +-
 .../unofficial/Vamp/Fortified Beach.board     |  6 +-
 .../100x124 Asteroid Biodome.board            | 11 ++-
 .../100x124 Asteroid Expanse.board            |  3 +-
 .../100x124 TC Mirfak Mudtown.board           |  3 +
 .../124x248 TC Mirfak Baudrys Delight.board   | 13 +++-
 .../124x248-TC-Mirfak-Baudrys_Delight.board   | 13 +++-
 .../128x128-TC-Mirfak-Winkel.board            | 13 ++--
 .../152x176_Tian-Tan_Industrial_Center.board  | 12 +++-
 .../160x96 Galatea Compound.board             |  1 +
 ...x128_Texlos_-_Livius_-_Valencia_City.board | 13 +++-
 .../VictorMorson/42x92 Gauntlet.board         |  5 +-
 .../VictorMorson/48x48 The Depot.board        |  8 ++-
 .../VictorMorson/48x48 The Trainjob.board     |  5 +-
 .../unofficial/VictorMorson/48x48.board       |  7 +-
 .../VictorMorson/64x64 Lunar Raid.board       |  6 +-
 .../VictorMorson/64x68 Diamond River.board    |  4 +-
 .../SOLARIS ARENA - Battlespire 1.board       |  8 ++-
 .../SOLARIS ARENA - Gridlock v2.board         |  9 ++-
 .../SOLARIS ARENA - HotterThanHell.board      |  7 +-
 .../SOLARIS ARENA - Jailbreak Fixed.board     |  8 ++-
 .../SOLARIS ARENA - King Of The Hill.board    |  5 +-
 .../SOLARIS ARENA - Labryinth v4.board        |  7 +-
 .../SOLARIS ARENA - Pirannha Island v3.board  |  6 +-
 .../SOLARIS ARENA - Pirannha Island v4.board  |  6 +-
 .../SOLARIS ARENA - Racetrack 1.board         |  6 +-
 .../SOLARIS ARENA - Suburbia.board            |  6 +-
 .../SOLARIS ARENA - Swamp Fever.board         |  8 ++-
 .../SOLARIS ARENA - The Maze v2.board         |  5 +-
 .../SOLARIS ARENA - The Maze.board            |  5 +-
 .../SOLARIS ARENA - The Pit v2.board          |  7 +-
 .../SOLARIS ARENA - The Pit.board             |  7 +-
 .../SOLARIS ARENA - UpHillBattle.board        |  8 ++-
 .../mikecj/48x34 Cullans Ford.board           |  6 +-
 .../pokefan548/(Aero) Canyon Run.board        |  1 +
 .../pokefan548/(Aero) Jape Jungle.board       |  1 +
 .../pokefan548/(Aero) Snowy Peaks.board       |  1 +
 .../(Aero) Volcanically Formed.board          |  1 +
 .../pokefan548/48x51 Greatwater Canyon.board  | 11 +--
 .../80x85 Beware The Pipeline.board           |  8 ++-
 .../16x17/16x17 Arctic Base.board             | 29 ++++----
 .../16x17/16x17 Cliffside Airfield 2.board    |  1 +
 .../16x17/16x17 Mountain Base.board           |  4 ++
 .../16x17/16x17 Snowy Trench 2.board          |  1 +
 .../16x34/16x34 Cliffside Airfield.board      |  1 +
 .../16x51/16x51 Cliffside Airfield.board      |  1 +
 .../16x51/16x51 Mountain Pass.board           | 12 ++--
 .../32x17/32x17 Arctic Base.board             | 29 ++++----
 .../32x17/32x17 Snowy Trench.board            |  3 +-
 .../32x34/32x34 Arctic Field.board            |  3 +-
 .../32x34/32x34 Arctic Mountain.board         |  3 +-
 .../32x51/32x51 Arctic Field.board            | 32 +++++----
 .../32x51/32x51 Arctic Mountain.board         | 14 ++--
 .../64x34/64x34 BFM Arctic.board              |  4 +-
 .../64x51/64x51 MOAM Arctic.board             | 43 ++++++-----
 .../45x45 Dieron Small Fort 1 (Revised).board |  5 +-
 .../ralgith/45x45 Dieron Small Fort 1.board   |  5 +-
 .../ralgith/45x45 Dieron Small Fort 2.board   |  7 +-
 ...uar - Huntress Field Repair Facility.board |  1 +
 .../ralgith/55x55 Dieron Airfield.board       |  4 +-
 .../ralgith/55x55 Dieron Factory Site 1.board |  7 +-
 .../ralgith/55x55 Dieron Factory Site 2.board |  3 +
 .../ralgith/55x55 Dieron Factory Site 3.board |  7 +-
 .../55x55 Dieron Large Mountain Fort 1.board  |  5 +-
 .../ralgith/58x59 Devil's Pass.board          |  5 +-
 .../64x65 St. Loris Quarry Depot.board        |  3 +
 .../ralgith/64x65 St. Loris South Fort.board  |  4 +-
 .../ralgith/75x75 Dieron Medium Town 1.board  |  3 +
 .../unofficial/txsoldier94/175x102 RL 1.board |  1 +
 .../unofficial/txsoldier94/175x102 RL 2.board |  1 +
 .../unofficial/txsoldier94/175x102 RL 3.board |  1 +
 .../175x102 RL 4_DevilsCrown.board            |  1 +
 .../txsoldier94/25x14 RL 1 1to1.board         |  1 +
 .../txsoldier94/25x14 RL 2 1to1.board         |  1 +
 .../txsoldier94/25x14 RL 3 1to1.board         |  1 +
 .../25x14 RL 4_DevilsCrown (1to1).board       |  1 +
 .../32x17 BattleForce_Classic.board           |  1 +
 1102 files changed, 3450 insertions(+), 1427 deletions(-)

diff --git a/megamek/data/boards/AGoAC Maps/16x17 Desert 2.board b/megamek/data/boards/AGoAC Maps/16x17 Desert 2.board
index f49b648d1d6..7e5712d7803 100644
--- a/megamek/data/boards/AGoAC Maps/16x17 Desert 2.board	
+++ b/megamek/data/boards/AGoAC Maps/16x17 Desert 2.board	
@@ -1,6 +1,7 @@
 size 16 17
 option exit_roads_to_pavement false
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "ground_fluff:4" "desert"
diff --git a/megamek/data/boards/Alien Worlds/32x17 Caustic Valley (Water).board b/megamek/data/boards/Alien Worlds/32x17 Caustic Valley (Water).board
index 52717b43fb0..5fc48fe7ec5 100644
--- a/megamek/data/boards/Alien Worlds/32x17 Caustic Valley (Water).board	
+++ b/megamek/data/boards/Alien Worlds/32x17 Caustic Valley (Water).board	
@@ -1,7 +1,8 @@
 size 32 17
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "rough:1" "mars"
diff --git a/megamek/data/boards/Alien Worlds/32x17 Lunar Base.board b/megamek/data/boards/Alien Worlds/32x17 Lunar Base.board
index 697b594fea2..ad3f9893d80 100644
--- a/megamek/data/boards/Alien Worlds/32x17 Lunar Base.board	
+++ b/megamek/data/boards/Alien Worlds/32x17 Lunar Base.board	
@@ -1,5 +1,6 @@
 size 32 17
 tag "LunarTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Devil's Bath (CSV) - cold bath option.board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Devil's Bath (CSV) - cold bath option.board
index d51c8d3dcf1..a9ec78f7134 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Devil's Bath (CSV) - cold bath option.board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Devil's Bath (CSV) - cold bath option.board	
@@ -1,9 +1,10 @@
 size 32 17
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 hex 0101 7 "" "desert"
 hex 0201 5 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Holth Forest (CGB).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Holth Forest (CGB).board
index 8fbbd59d0b6..3cda2b74684 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Holth Forest (CGB).board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Holth Forest (CGB).board	
@@ -2,9 +2,10 @@ size 32 17
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "tropical"
 hex 0201 0 "woods:1;foliage_elev:2" "tropical"
 hex 0301 0 "woods:1;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Kozice Valley (CDS).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Kozice Valley (CDS).board
index d0a8523ec7f..eb1a3770458 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Kozice Valley (CDS).board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Kozice Valley (CDS).board	
@@ -1,10 +1,11 @@
 size 32 17
 option exit_roads_to_pavement false
-tag "LightForest (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Lake Losiije (CNC).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Lake Losiije (CNC).board
index a1a8d49e6a2..c0df919ea36 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Lake Losiije (CNC).board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Lake Losiije (CNC).board	
@@ -1,10 +1,11 @@
 size 32 17
 tag "Rough (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "woods:1;foliage_elev:2" "desert"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow + road.board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow + road.board
index bf927ab32da..9cf70003a74 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow + road.board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow + road.board	
@@ -1,10 +1,11 @@
 size 32 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow option.board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow option.board
index ef4507fd5d3..45e517eb98b 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow option.board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - Thin Snow option.board	
@@ -1,9 +1,10 @@
 size 32 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - road option.board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - road option.board
index 6872236fa8c..ad9e579da3b 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - road option.board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW) - road option.board	
@@ -1,10 +1,11 @@
 size 32 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW).board
index 6142dfc3df3..eef67dd2cc1 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW).board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Pozoristu Mountains (CW).board	
@@ -1,9 +1,10 @@
 size 32 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Racice River Delta (CSJ).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Racice River Delta (CSJ).board
index ea948379a1d..37eecbb4839 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Racice River Delta (CSJ).board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Racice River Delta (CSJ).board	
@@ -1,9 +1,10 @@
 size 32 17
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "LightForest (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "" "desert"
diff --git a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Robyn's Crossing (CJF).board b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Robyn's Crossing (CJF).board
index 7d85d549a7e..1c17e5e6705 100644
--- a/megamek/data/boards/Battle of Tukayyid Pack/32x17 Robyn's Crossing (CJF).board	
+++ b/megamek/data/boards/Battle of Tukayyid Pack/32x17 Robyn's Crossing (CJF).board	
@@ -1,7 +1,8 @@
 size 32 17
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 4 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/Deserts/16x17 Badlands 2.board b/megamek/data/boards/Deserts/16x17 Badlands 2.board
index f21f79a048c..e6625a57207 100644
--- a/megamek/data/boards/Deserts/16x17 Badlands 2.board	
+++ b/megamek/data/boards/Deserts/16x17 Badlands 2.board	
@@ -1,7 +1,8 @@
 size 16 17
 tag "Cliffs (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
diff --git a/megamek/data/boards/Deserts/16x17 Mines 2.board b/megamek/data/boards/Deserts/16x17 Mines 2.board
index cbcca4765e2..1756e5be760 100644
--- a/megamek/data/boards/Deserts/16x17 Mines 2.board	
+++ b/megamek/data/boards/Deserts/16x17 Mines 2.board	
@@ -1,5 +1,6 @@
 size 16 17
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/Deserts/16x17 Oasis.board b/megamek/data/boards/Deserts/16x17 Oasis.board
index 102c0729e89..cfd4923970d 100644
--- a/megamek/data/boards/Deserts/16x17 Oasis.board	
+++ b/megamek/data/boards/Deserts/16x17 Oasis.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/Deserts/64x34 Deserts BFM.board b/megamek/data/boards/Deserts/64x34 Deserts BFM.board
index fad2ad04c54..5b042301c38 100644
--- a/megamek/data/boards/Deserts/64x34 Deserts BFM.board	
+++ b/megamek/data/boards/Deserts/64x34 Deserts BFM.board	
@@ -2,6 +2,7 @@ size 64 34
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/Essentials Box Maps/16x17 Steiner Stadium.board b/megamek/data/boards/Essentials Box Maps/16x17 Steiner Stadium.board
index 088f1ecd3ea..c2aa4599759 100644
--- a/megamek/data/boards/Essentials Box Maps/16x17 Steiner Stadium.board	
+++ b/megamek/data/boards/Essentials Box Maps/16x17 Steiner Stadium.board	
@@ -1,6 +1,8 @@
 size 16 17
 tag "Cliffs (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
+tag "Elevator (Auto)"
 hex 0101 5 "impassable:5" "volcano"
 hex 0201 5 "impassable:5" "volcano"
 hex 0301 5 "impassable:5" "volcano"
diff --git a/megamek/data/boards/GrassLands/16x17 Grasslands Forward Base.board b/megamek/data/boards/GrassLands/16x17 Grasslands Forward Base.board
index 1c9b2a818c6..cc794c62616 100644
--- a/megamek/data/boards/GrassLands/16x17 Grasslands Forward Base.board	
+++ b/megamek/data/boards/GrassLands/16x17 Grasslands Forward Base.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/Grasslands BattleMats/32x17 Grasslands B BattleMat.board b/megamek/data/boards/Grasslands BattleMats/32x17 Grasslands B BattleMat.board
index cc59322be98..fd0469aa3ed 100644
--- a/megamek/data/boards/Grasslands BattleMats/32x17 Grasslands B BattleMat.board	
+++ b/megamek/data/boards/Grasslands BattleMats/32x17 Grasslands B BattleMat.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/Grasslands BattleMats/32x17 Tundra BattleMat.board b/megamek/data/boards/Grasslands BattleMats/32x17 Tundra BattleMat.board
index 2a546d16258..6f7ee997b8a 100644
--- a/megamek/data/boards/Grasslands BattleMats/32x17 Tundra BattleMat.board	
+++ b/megamek/data/boards/Grasslands BattleMats/32x17 Tundra BattleMat.board	
@@ -1,7 +1,8 @@
 size 32 17
 tag "GrassTheme (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "woods:1;ground_fluff:4:2;foliage_elev:2" "grass"
 hex 0201 0 "woods:2;ground_fluff:4:2;foliage_elev:2" "grass"
 hex 0301 0 "ground_fluff:4:2" "grass"
diff --git a/megamek/data/boards/Map Set 6/16x17 City (Downtown).board b/megamek/data/boards/Map Set 6/16x17 City (Downtown).board
index 27b2aacc0f6..ca3f98c7c52 100644
--- a/megamek/data/boards/Map Set 6/16x17 City (Downtown).board	
+++ b/megamek/data/boards/Map Set 6/16x17 City (Downtown).board	
@@ -1,9 +1,11 @@
 size 16 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;building:1:8;bldg_cf:15" ""
 hex 0201 0 "" ""
 hex 0301 0 "bldg_elev:2;building:1:0;bldg_cf:15" ""
diff --git a/megamek/data/boards/Map Set 6/16x17 City (Residential).board b/megamek/data/boards/Map Set 6/16x17 City (Residential).board
index cde0f307cd7..989f1b4b3a1 100644
--- a/megamek/data/boards/Map Set 6/16x17 City (Residential).board	
+++ b/megamek/data/boards/Map Set 6/16x17 City (Residential).board	
@@ -1,9 +1,11 @@
 size 16 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;building:1:8;bldg_cf:15" ""
 hex 0201 0 "" ""
 hex 0301 0 "bldg_elev:3;building:1:12;bldg_cf:15" ""
diff --git a/megamek/data/boards/Map Set 6/16x17 City (Skyscraper).board b/megamek/data/boards/Map Set 6/16x17 City (Skyscraper).board
index 37cdc82ba62..14d8442bdd9 100644
--- a/megamek/data/boards/Map Set 6/16x17 City (Skyscraper).board	
+++ b/megamek/data/boards/Map Set 6/16x17 City (Skyscraper).board	
@@ -2,7 +2,9 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/Map Set 6/16x17 City (Suburbs).board b/megamek/data/boards/Map Set 6/16x17 City (Suburbs).board
index 0246dab1ffe..aa87ab6f0d3 100644
--- a/megamek/data/boards/Map Set 6/16x17 City (Suburbs).board	
+++ b/megamek/data/boards/Map Set 6/16x17 City (Suburbs).board	
@@ -1,9 +1,10 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;building:2:8;bldg_cf:40" ""
 hex 0201 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/Map Set 7/16x17 Dropport 2.board b/megamek/data/boards/Map Set 7/16x17 Dropport 2.board
index c74bc0257e3..96ea5492df6 100644
--- a/megamek/data/boards/Map Set 7/16x17 Dropport 2.board	
+++ b/megamek/data/boards/Map Set 7/16x17 Dropport 2.board	
@@ -2,6 +2,7 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
 hex 0201 0 "bldg_elev:3;building:2:30;bldg_cf:40" ""
 hex 0301 0 "bldg_elev:3;building:2:28;bldg_cf:40" ""
diff --git a/megamek/data/boards/Map Set 7/16x17 Military Base 1.board b/megamek/data/boards/Map Set 7/16x17 Military Base 1.board
index 47da4b4788a..ab25184a6fc 100644
--- a/megamek/data/boards/Map Set 7/16x17 Military Base 1.board	
+++ b/megamek/data/boards/Map Set 7/16x17 Military Base 1.board	
@@ -1,8 +1,9 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" ""
 hex 0201 0 "road:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/Map Set 7/16x17 Military Base 2.board b/megamek/data/boards/Map Set 7/16x17 Military Base 2.board
index 0ee46796cdc..b9230d64138 100644
--- a/megamek/data/boards/Map Set 7/16x17 Military Base 2.board	
+++ b/megamek/data/boards/Map Set 7/16x17 Military Base 2.board	
@@ -1,8 +1,9 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/Map Set 7/16x17 Seaport.board b/megamek/data/boards/Map Set 7/16x17 Seaport.board
index 8949dd80097..3ae9dd76507 100644
--- a/megamek/data/boards/Map Set 7/16x17 Seaport.board	
+++ b/megamek/data/boards/Map Set 7/16x17 Seaport.board	
@@ -1,10 +1,11 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/Map Set 8/64x68 Airfield.board b/megamek/data/boards/Map Set 8/64x68 Airfield.board
index 1c8e223e2c4..c86a01a75fe 100644
--- a/megamek/data/boards/Map Set 8/64x68 Airfield.board	
+++ b/megamek/data/boards/Map Set 8/64x68 Airfield.board	
@@ -1,20 +1,13 @@
 size 64 68
-tag "Rough (Auto)"
-tag "Foliage (Auto)"
-tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "Fields (Auto)"
 tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
-tag "Water (Auto)"
-tag "Cliffs (Auto)"
+tag "Hangar (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Flat (Auto)"
-tag "HighHills (Auto)"
-tag "MediumForest (Auto)"
 tag "Woods (Auto)"
-tag "LowHills (Auto)"
-tag "DenseForest (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/Map Set 8/64x68 Courtyard.board b/megamek/data/boards/Map Set 8/64x68 Courtyard.board
index 29887f69244..a123a5072ab 100644
--- a/megamek/data/boards/Map Set 8/64x68 Courtyard.board	
+++ b/megamek/data/boards/Map Set 8/64x68 Courtyard.board	
@@ -1,12 +1,8 @@
 size 64 68
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Fields (Auto)"
 tag "Roads (Auto)"
-tag "Flat (Auto)"
-tag "MediumForest (Auto)"
 tag "Woods (Auto)"
-tag "LightForest (Auto)"
 tag "LowHills (Auto)"
 hex 0101 2 "road:1:36" ""
 hex 0201 2 "road:1" ""
diff --git a/megamek/data/boards/Map Set 8/64x68 Peak.board b/megamek/data/boards/Map Set 8/64x68 Peak.board
index d60c706c8aa..437374b4793 100644
--- a/megamek/data/boards/Map Set 8/64x68 Peak.board	
+++ b/megamek/data/boards/Map Set 8/64x68 Peak.board	
@@ -1,6 +1,7 @@
 size 64 68
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/Map Set 8/64x68 Resort.board b/megamek/data/boards/Map Set 8/64x68 Resort.board
index c6353ff851a..f902ceb34b2 100644
--- a/megamek/data/boards/Map Set 8/64x68 Resort.board	
+++ b/megamek/data/boards/Map Set 8/64x68 Resort.board	
@@ -1,13 +1,14 @@
 size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 -3 "sand:1" ""
 hex 0201 -3 "sand:1" ""
diff --git a/megamek/data/boards/Map Set 8/64x68 River Valley.board b/megamek/data/boards/Map Set 8/64x68 River Valley.board
index 0e26fe55bbf..9b97997181a 100644
--- a/megamek/data/boards/Map Set 8/64x68 River Valley.board	
+++ b/megamek/data/boards/Map Set 8/64x68 River Valley.board	
@@ -1,17 +1,13 @@
 size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Fields (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
-tag "LightForest (Auto)"
+tag "Roads (Auto)"
+tag "Hangar (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Flat (Auto)"
 tag "HighHills (Auto)"
-tag "MediumForest (Auto)"
 tag "Woods (Auto)"
-tag "LowHills (Auto)"
 hex 0101 0 "water:1" ""
 hex 0201 0 "water:1" ""
 hex 0301 0 "water:1" ""
diff --git a/megamek/data/boards/Solaris VII Maps/16x17 Hartford Gardens.board b/megamek/data/boards/Solaris VII Maps/16x17 Hartford Gardens.board
index 1e734ae036a..bd376e828ad 100644
--- a/megamek/data/boards/Solaris VII Maps/16x17 Hartford Gardens.board	
+++ b/megamek/data/boards/Solaris VII Maps/16x17 Hartford Gardens.board	
@@ -1,8 +1,10 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:5;building:4:8;bldg_cf:110" ""
 hex 0201 1 "" ""
 hex 0301 0 "bldg_elev:5;building:4:0;bldg_cf:110" ""
diff --git a/megamek/data/boards/Solaris VII Maps/16x17 Scrapyard (Lava).board b/megamek/data/boards/Solaris VII Maps/16x17 Scrapyard (Lava).board
index d5f49b0b09d..0b0e120755e 100644
--- a/megamek/data/boards/Solaris VII Maps/16x17 Scrapyard (Lava).board	
+++ b/megamek/data/boards/Solaris VII Maps/16x17 Scrapyard (Lava).board	
@@ -2,6 +2,7 @@ size 16 17
 tag "Flat (Auto)"
 tag "DesertTheme (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "bldg_elev:5;building:4:12;bldg_cf:150" "desert"
 hex 0201 0 "bldg_elev:5;building:4:50;bldg_cf:150" "desert"
 hex 0301 0 "bldg_elev:5;building:4:20;bldg_cf:150" "desert"
diff --git a/megamek/data/boards/Solaris VII Maps/16x17 Scrapyard (Water).board b/megamek/data/boards/Solaris VII Maps/16x17 Scrapyard (Water).board
index 691b817f39f..d17ef45e567 100644
--- a/megamek/data/boards/Solaris VII Maps/16x17 Scrapyard (Water).board	
+++ b/megamek/data/boards/Solaris VII Maps/16x17 Scrapyard (Water).board	
@@ -1,7 +1,9 @@
 size 16 17
 tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "bldg_elev:5;building:4:12;bldg_cf:150" "desert"
 hex 0201 0 "bldg_elev:5;building:4:50;bldg_cf:150" "desert"
 hex 0301 0 "bldg_elev:5;building:4:20;bldg_cf:150" "desert"
diff --git a/megamek/data/boards/Solaris VII Maps/30x17 Coliseum.board b/megamek/data/boards/Solaris VII Maps/30x17 Coliseum.board
index b1080a9354c..bc6bb3c763d 100644
--- a/megamek/data/boards/Solaris VII Maps/30x17 Coliseum.board	
+++ b/megamek/data/boards/Solaris VII Maps/30x17 Coliseum.board	
@@ -2,6 +2,8 @@ size 30 17
 tag "Cliffs (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
+tag "Elevator (Auto)"
 hex 0101 5 "impassable:0" "desert"
 hex 0201 5 "impassable:0" "desert"
 hex 0301 5 "impassable:0" "desert"
diff --git a/megamek/data/boards/Templates/GunEmplacementsFortressHangar.board b/megamek/data/boards/Templates/GunEmplacementsFortressHangar.board
index 01aa5d6265f..1e501913c0b 100644
--- a/megamek/data/boards/Templates/GunEmplacementsFortressHangar.board
+++ b/megamek/data/boards/Templates/GunEmplacementsFortressHangar.board
@@ -2,6 +2,12 @@ size 16 17
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/Templates/SkinnedBuildingsRoads.board b/megamek/data/boards/Templates/SkinnedBuildingsRoads.board
index b3560aad151..2648ae02969 100644
--- a/megamek/data/boards/Templates/SkinnedBuildingsRoads.board
+++ b/megamek/data/boards/Templates/SkinnedBuildingsRoads.board
@@ -1,11 +1,14 @@
 size 36 49
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/Templates/SkinnedVariableBuildings.board b/megamek/data/boards/Templates/SkinnedVariableBuildings.board
index e664f189e88..4c5eaf39e10 100644
--- a/megamek/data/boards/Templates/SkinnedVariableBuildings.board
+++ b/megamek/data/boards/Templates/SkinnedVariableBuildings.board
@@ -2,6 +2,8 @@ size 31 8
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/Templates/Transitions.board b/megamek/data/boards/Templates/Transitions.board
index 53dccabbe80..726c2c12205 100644
--- a/megamek/data/boards/Templates/Transitions.board
+++ b/megamek/data/boards/Templates/Transitions.board
@@ -1,5 +1,6 @@
 size 16 17
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "ground_fluff:2:4" "tropical"
 hex 0201 0 "ground_fluff:2:4" "tropical"
 hex 0301 0 "ground_fluff:2:5" "tropical"
diff --git a/megamek/data/boards/Templates/TransitionsTrees.board b/megamek/data/boards/Templates/TransitionsTrees.board
index 1789e565756..5d4482505a4 100644
--- a/megamek/data/boards/Templates/TransitionsTrees.board
+++ b/megamek/data/boards/Templates/TransitionsTrees.board
@@ -1,5 +1,6 @@
 size 26 17
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/WWE2018 Terrain Set/16x17 WWE2018 DigSite.board b/megamek/data/boards/WWE2018 Terrain Set/16x17 WWE2018 DigSite.board
index c0022386229..61fb404b743 100644
--- a/megamek/data/boards/WWE2018 Terrain Set/16x17 WWE2018 DigSite.board	
+++ b/megamek/data/boards/WWE2018 Terrain Set/16x17 WWE2018 DigSite.board	
@@ -2,8 +2,9 @@ size 16 17
 tag "LightUrban (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 1 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/WWE2018 Terrain Set/32x34 WWE2018 DigDefendOrDie.board b/megamek/data/boards/WWE2018 Terrain Set/32x34 WWE2018 DigDefendOrDie.board
index 985525a7a75..a8d20e7cd90 100644
--- a/megamek/data/boards/WWE2018 Terrain Set/32x34 WWE2018 DigDefendOrDie.board	
+++ b/megamek/data/boards/WWE2018 Terrain Set/32x34 WWE2018 DigDefendOrDie.board	
@@ -1,7 +1,8 @@
 size 32 34
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
diff --git a/megamek/data/boards/buildingsnobasement/32x34 FCCW6.board b/megamek/data/boards/buildingsnobasement/32x34 FCCW6.board
index 5665d8f577b..0e722b4d5e2 100644
--- a/megamek/data/boards/buildingsnobasement/32x34 FCCW6.board	
+++ b/megamek/data/boards/buildingsnobasement/32x34 FCCW6.board	
@@ -2,10 +2,11 @@ size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/buildingsnobasement/32x51 Benjamin 4.board b/megamek/data/boards/buildingsnobasement/32x51 Benjamin 4.board
index 30ab7420605..5b9fa0488b6 100644
--- a/megamek/data/boards/buildingsnobasement/32x51 Benjamin 4.board	
+++ b/megamek/data/boards/buildingsnobasement/32x51 Benjamin 4.board	
@@ -1,6 +1,8 @@
 size 32 51
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:3;bldg_basement_type:1;pavement:1;building:2:12;bldg_cf:60" ""
 hex 0201 0 "bldg_elev:3;bldg_basement_type:1;pavement:1;building:2:56;bldg_cf:60" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/buildingsnobasement/35x35 Benj POW.board b/megamek/data/boards/buildingsnobasement/35x35 Benj POW.board
index 547b973b01e..454155fa499 100644
--- a/megamek/data/boards/buildingsnobasement/35x35 Benj POW.board	
+++ b/megamek/data/boards/buildingsnobasement/35x35 Benj POW.board	
@@ -3,8 +3,9 @@ tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
 tag "Swamp (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/buildingsnobasement/45x45 Benj 1-1.board b/megamek/data/boards/buildingsnobasement/45x45 Benj 1-1.board
index 4105d6a9cb2..0bbb640ba1a 100644
--- a/megamek/data/boards/buildingsnobasement/45x45 Benj 1-1.board	
+++ b/megamek/data/boards/buildingsnobasement/45x45 Benj 1-1.board	
@@ -1,9 +1,11 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/buildingsnobasement/45x45 Benj 1-2.board b/megamek/data/boards/buildingsnobasement/45x45 Benj 1-2.board
index 927b9f3a9de..b3d58ed2c5c 100644
--- a/megamek/data/boards/buildingsnobasement/45x45 Benj 1-2.board	
+++ b/megamek/data/boards/buildingsnobasement/45x45 Benj 1-2.board	
@@ -1,10 +1,12 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/45x45 FCCW 4-1.board b/megamek/data/boards/buildingsnobasement/45x45 FCCW 4-1.board
index f4be05255af..e1fc584465f 100644
--- a/megamek/data/boards/buildingsnobasement/45x45 FCCW 4-1.board	
+++ b/megamek/data/boards/buildingsnobasement/45x45 FCCW 4-1.board	
@@ -4,6 +4,8 @@ tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/buildingsnobasement/48x34 FCCW 4-6.board b/megamek/data/boards/buildingsnobasement/48x34 FCCW 4-6.board
index f32b86ad7b9..e841707775c 100644
--- a/megamek/data/boards/buildingsnobasement/48x34 FCCW 4-6.board	
+++ b/megamek/data/boards/buildingsnobasement/48x34 FCCW 4-6.board	
@@ -3,8 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/buildingsnobasement/Flughafen 4.board b/megamek/data/boards/buildingsnobasement/Flughafen 4.board
index eb8bf2f773b..3f5f2a97822 100644
--- a/megamek/data/boards/buildingsnobasement/Flughafen 4.board	
+++ b/megamek/data/boards/buildingsnobasement/Flughafen 4.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/buildingsnobasement/Flughafen 6.board b/megamek/data/boards/buildingsnobasement/Flughafen 6.board
index 4f0191d5ea5..e1f87a06617 100644
--- a/megamek/data/boards/buildingsnobasement/Flughafen 6.board	
+++ b/megamek/data/boards/buildingsnobasement/Flughafen 6.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
 tag "Jungle (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/Industry 1.board b/megamek/data/boards/buildingsnobasement/Industry 1.board
index bc23d3b9ec2..695a99bfc54 100644
--- a/megamek/data/boards/buildingsnobasement/Industry 1.board	
+++ b/megamek/data/boards/buildingsnobasement/Industry 1.board	
@@ -3,6 +3,7 @@ tag "LightUrban (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:2;bldg_basement_type:1;pavement:1;building:3:6;bldg_cf:90" ""
 hex 0301 0 "bldg_elev:2;bldg_basement_type:1;pavement:1;building:3:28;bldg_cf:90" ""
diff --git a/megamek/data/boards/buildingsnobasement/Industry 2.board b/megamek/data/boards/buildingsnobasement/Industry 2.board
index 874e1ace5f6..a9afc3514d5 100644
--- a/megamek/data/boards/buildingsnobasement/Industry 2.board	
+++ b/megamek/data/boards/buildingsnobasement/Industry 2.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/buildingsnobasement/Ishiyamaspecial2.board b/megamek/data/boards/buildingsnobasement/Ishiyamaspecial2.board
index dbd9de11cb7..44e96a86bd4 100644
--- a/megamek/data/boards/buildingsnobasement/Ishiyamaspecial2.board
+++ b/megamek/data/boards/buildingsnobasement/Ishiyamaspecial2.board
@@ -1,8 +1,9 @@
 size 10 10
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/buildingsnobasement/ModCan06 16x17.board b/megamek/data/boards/buildingsnobasement/ModCan06 16x17.board
index 2273e50b132..3ce683036f1 100644
--- a/megamek/data/boards/buildingsnobasement/ModCan06 16x17.board	
+++ b/megamek/data/boards/buildingsnobasement/ModCan06 16x17.board	
@@ -1,8 +1,10 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 4 "" ""
 hex 0201 4 "woods:1;foliage_elev:2" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/ModCan19 16x17.board b/megamek/data/boards/buildingsnobasement/ModCan19 16x17.board
index 5a3408c180c..b937c7df1fc 100644
--- a/megamek/data/boards/buildingsnobasement/ModCan19 16x17.board	
+++ b/megamek/data/boards/buildingsnobasement/ModCan19 16x17.board	
@@ -1,8 +1,9 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "" ""
 hex 0201 4 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/Munitionsfabrik 1.board b/megamek/data/boards/buildingsnobasement/Munitionsfabrik 1.board
index dfca0c5c005..b22ad794196 100644
--- a/megamek/data/boards/buildingsnobasement/Munitionsfabrik 1.board	
+++ b/megamek/data/boards/buildingsnobasement/Munitionsfabrik 1.board	
@@ -4,6 +4,8 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "arms:2" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/buildingsnobasement/Munitionsfabrik 2.board b/megamek/data/boards/buildingsnobasement/Munitionsfabrik 2.board
index 13eb5771d49..9a521e7df92 100644
--- a/megamek/data/boards/buildingsnobasement/Munitionsfabrik 2.board	
+++ b/megamek/data/boards/buildingsnobasement/Munitionsfabrik 2.board	
@@ -4,6 +4,8 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1;road:1:9" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/buildingsnobasement/Stadtgebiet 1.board b/megamek/data/boards/buildingsnobasement/Stadtgebiet 1.board
index bd6ecdfb04f..8377bd85093 100644
--- a/megamek/data/boards/buildingsnobasement/Stadtgebiet 1.board	
+++ b/megamek/data/boards/buildingsnobasement/Stadtgebiet 1.board	
@@ -3,7 +3,11 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1;road:1:9" ""
 hex 0201 0 "bldg_elev:3;bldg_basement_type:1;bldg_class:1;pavement:1;building:1:14;bldg_cf:15" ""
 hex 0301 0 "bldg_elev:3;bldg_basement_type:1;bldg_class:1;pavement:1;building:1:24;bldg_cf:15" ""
diff --git a/megamek/data/boards/buildingsnobasement/Stadtgebiet 2.board b/megamek/data/boards/buildingsnobasement/Stadtgebiet 2.board
index 10772080284..2e4a7fe4977 100644
--- a/megamek/data/boards/buildingsnobasement/Stadtgebiet 2.board	
+++ b/megamek/data/boards/buildingsnobasement/Stadtgebiet 2.board	
@@ -3,6 +3,8 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:2;bldg_basement_type:1;bldg_class:2;pavement:1;building:2:16;bldg_cf:40" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/buildingsnobasement/Stronghold.board b/megamek/data/boards/buildingsnobasement/Stronghold.board
index 799aefc5ab1..4a5b8bae93c 100644
--- a/megamek/data/boards/buildingsnobasement/Stronghold.board
+++ b/megamek/data/boards/buildingsnobasement/Stronghold.board
@@ -1,11 +1,12 @@
 size 50 50
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
 hex 0301 1 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/citadel.board b/megamek/data/boards/buildingsnobasement/citadel.board
index 1d76c1f27af..a0a7861d905 100644
--- a/megamek/data/boards/buildingsnobasement/citadel.board
+++ b/megamek/data/boards/buildingsnobasement/citadel.board
@@ -1,10 +1,12 @@
 size 50 50
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Jungle (Auto)"
 hex 0101 0 "water:5" ""
diff --git a/megamek/data/boards/buildingsnobasement/citydowntown.board b/megamek/data/boards/buildingsnobasement/citydowntown.board
index 64be50ac12f..5ea794d3492 100644
--- a/megamek/data/boards/buildingsnobasement/citydowntown.board
+++ b/megamek/data/boards/buildingsnobasement/citydowntown.board
@@ -1,9 +1,11 @@
 size 16 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:1;building:1:8;bldg_cf:15" ""
 hex 0201 0 "" ""
 hex 0301 0 "bldg_elev:2;bldg_basement_type:1;building:1:0;bldg_cf:15" ""
diff --git a/megamek/data/boards/buildingsnobasement/cityresidential.board b/megamek/data/boards/buildingsnobasement/cityresidential.board
index 2549f8ee3f6..6c4f38b3500 100644
--- a/megamek/data/boards/buildingsnobasement/cityresidential.board
+++ b/megamek/data/boards/buildingsnobasement/cityresidential.board
@@ -1,9 +1,11 @@
 size 16 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:1;building:1:8;bldg_cf:15" ""
 hex 0201 0 "" ""
 hex 0301 0 "bldg_elev:3;bldg_basement_type:1;building:1:12;bldg_cf:15" ""
diff --git a/megamek/data/boards/buildingsnobasement/cityskyscraper.board b/megamek/data/boards/buildingsnobasement/cityskyscraper.board
index 3d8531f1e6f..b070b2dabfe 100644
--- a/megamek/data/boards/buildingsnobasement/cityskyscraper.board
+++ b/megamek/data/boards/buildingsnobasement/cityskyscraper.board
@@ -2,7 +2,9 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/citysuburbs.board b/megamek/data/boards/buildingsnobasement/citysuburbs.board
index 6cfba559e0a..761919adbfe 100644
--- a/megamek/data/boards/buildingsnobasement/citysuburbs.board
+++ b/megamek/data/boards/buildingsnobasement/citysuburbs.board
@@ -1,9 +1,10 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:1;building:2:8;bldg_cf:40" ""
 hex 0201 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/buildingsnobasement/dropport2.board b/megamek/data/boards/buildingsnobasement/dropport2.board
index 7189589d408..a0b853b69da 100644
--- a/megamek/data/boards/buildingsnobasement/dropport2.board
+++ b/megamek/data/boards/buildingsnobasement/dropport2.board
@@ -2,6 +2,7 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
 hex 0201 0 "bldg_elev:3;bldg_basement_type:1;building:2:30;bldg_cf:40" ""
 hex 0301 0 "bldg_elev:3;bldg_basement_type:1;building:2:28;bldg_cf:40" ""
diff --git a/megamek/data/boards/buildingsnobasement/militarybase1.board b/megamek/data/boards/buildingsnobasement/militarybase1.board
index 16fecbb3e77..ba8f32c9cbf 100644
--- a/megamek/data/boards/buildingsnobasement/militarybase1.board
+++ b/megamek/data/boards/buildingsnobasement/militarybase1.board
@@ -1,8 +1,9 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" ""
 hex 0201 0 "road:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/militarybase2.board b/megamek/data/boards/buildingsnobasement/militarybase2.board
index b6defbb8771..a9d7cd165fb 100644
--- a/megamek/data/boards/buildingsnobasement/militarybase2.board
+++ b/megamek/data/boards/buildingsnobasement/militarybase2.board
@@ -1,8 +1,9 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/oasis.board b/megamek/data/boards/buildingsnobasement/oasis.board
index 85ff941d599..84de4b33a08 100644
--- a/megamek/data/boards/buildingsnobasement/oasis.board
+++ b/megamek/data/boards/buildingsnobasement/oasis.board
@@ -1,11 +1,13 @@
 size 50 50
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/seaport.board b/megamek/data/boards/buildingsnobasement/seaport.board
index f7e5b2a9188..236126b223b 100644
--- a/megamek/data/boards/buildingsnobasement/seaport.board
+++ b/megamek/data/boards/buildingsnobasement/seaport.board
@@ -1,10 +1,11 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/seaportwithfueltanks.board b/megamek/data/boards/buildingsnobasement/seaportwithfueltanks.board
index aad37fe9739..3d51240d334 100644
--- a/megamek/data/boards/buildingsnobasement/seaportwithfueltanks.board
+++ b/megamek/data/boards/buildingsnobasement/seaportwithfueltanks.board
@@ -1,10 +1,11 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/buildingsnobasement/urbanruins.board b/megamek/data/boards/buildingsnobasement/urbanruins.board
index 293a32cfbd0..99b29cf0dae 100644
--- a/megamek/data/boards/buildingsnobasement/urbanruins.board
+++ b/megamek/data/boards/buildingsnobasement/urbanruins.board
@@ -1,14 +1,16 @@
 size 50 50
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
-tag "Swamp (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
diff --git a/megamek/data/boards/solaris/BorealReach-14x14.board b/megamek/data/boards/solaris/BorealReach-14x14.board
index 40bf7afe460..d6fea08d1f4 100644
--- a/megamek/data/boards/solaris/BorealReach-14x14.board
+++ b/megamek/data/boards/solaris/BorealReach-14x14.board
@@ -2,6 +2,7 @@ size 14 14
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 -6 "pavement:1" "snow"
 hex 0201 0 "pavement:1" "snow"
diff --git a/megamek/data/boards/solaris/BorealReach-26x12.board b/megamek/data/boards/solaris/BorealReach-26x12.board
index ad9f3549d78..6439a9e8e93 100644
--- a/megamek/data/boards/solaris/BorealReach-26x12.board
+++ b/megamek/data/boards/solaris/BorealReach-26x12.board
@@ -1,9 +1,10 @@
 size 26 12
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
-tag "IceTerrain (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 hex 0101 2 "pavement:1" "snow"
 hex 0201 2 "" "snow"
 hex 0301 1 "" "snow"
diff --git a/megamek/data/boards/solaris/ColosseumChaosMode-15x14.board b/megamek/data/boards/solaris/ColosseumChaosMode-15x14.board
index ef562b74cd3..da13dc36133 100644
--- a/megamek/data/boards/solaris/ColosseumChaosMode-15x14.board
+++ b/megamek/data/boards/solaris/ColosseumChaosMode-15x14.board
@@ -1,6 +1,8 @@
 size 15 14
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
+tag "Elevator (Auto)"
 hex 0101 9 "pavement:1;impassable:1" ""
 hex 0201 9 "pavement:1;impassable:1" ""
 hex 0301 9 "pavement:1;impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaESW01-10x10.board b/megamek/data/boards/solaris/IshiyamaESW01-10x10.board
index a50dd99b312..e8e61d4204d 100644
--- a/megamek/data/boards/solaris/IshiyamaESW01-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaESW01-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaESW02-10x10.board b/megamek/data/boards/solaris/IshiyamaESW02-10x10.board
index 1356a2aef37..74b12bfd454 100644
--- a/megamek/data/boards/solaris/IshiyamaESW02-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaESW02-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaEW01-10x10.board b/megamek/data/boards/solaris/IshiyamaEW01-10x10.board
index 6cf6ee5ab5c..502764ef138 100644
--- a/megamek/data/boards/solaris/IshiyamaEW01-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaEW01-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaEW02-10x10.board b/megamek/data/boards/solaris/IshiyamaEW02-10x10.board
index 5e57e5162b2..1bd2c36b707 100644
--- a/megamek/data/boards/solaris/IshiyamaEW02-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaEW02-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNES01-10x10.board b/megamek/data/boards/solaris/IshiyamaNES01-10x10.board
index 7d8642937ae..c4e54a525e4 100644
--- a/megamek/data/boards/solaris/IshiyamaNES01-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNES01-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNES02-10x10.board b/megamek/data/boards/solaris/IshiyamaNES02-10x10.board
index 7c0c952843c..ed0b4f5a02a 100644
--- a/megamek/data/boards/solaris/IshiyamaNES02-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNES02-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW01-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW01-10x10.board
index e3546440d3d..3c868fba93c 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW01-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW01-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW02-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW02-10x10.board
index c29599171eb..01d3cdd13d1 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW02-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW02-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW03-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW03-10x10.board
index dbda85a7848..78f9e1d1939 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW03-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW03-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW04-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW04-10x10.board
index e10c05b2bae..afb860536ea 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW04-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW04-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW05-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW05-10x10.board
index d255e5c1181..248521c74d8 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW05-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW05-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW06-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW06-10x10.board
index c3940ad69a9..0ae1c54abc0 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW06-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW06-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW07-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW07-10x10.board
index c3c1e88735b..d5f3c8f2765 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW07-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW07-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW08-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW08-10x10.board
index 0a1f66ffd4d..db5bc25e7c0 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW08-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW08-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW09-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW09-10x10.board
index e77ab52c25b..34906c406de 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW09-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW09-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW10-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW10-10x10.board
index 528f0a096ee..b9cff4fba45 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW10-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW10-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW11-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW11-10x10.board
index ddead40d7cd..93cbb5d831e 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW11-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW11-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW12-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW12-10x10.board
index 39b043207ac..f6b51b3e566 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW12-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW12-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW13-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW13-10x10.board
index 1df8bf2ca2b..e704361bb0c 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW13-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW13-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW14-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW14-10x10.board
index 4698628bcc3..8f49ef31502 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW14-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW14-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW15-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW15-10x10.board
index 20a05d4c586..df1b12acc64 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW15-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW15-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW16-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW16-10x10.board
index 96187a97d6f..1ff429541d7 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW16-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW16-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW17-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW17-10x10.board
index 38c08ed367f..130416d3cc4 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW17-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW17-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW18-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW18-10x10.board
index 502bdbf3860..60a2f989d7c 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW18-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW18-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW19-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW19-10x10.board
index c8f6f34ff6f..1fb5653cab6 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW19-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW19-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW20-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW20-10x10.board
index 67b39434f57..9ec7b12a223 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW20-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW20-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 2 "" ""
 hex 0301 1 "" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW21-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW21-10x10.board
index 743f829ffab..58ca397146e 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW21-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW21-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW22-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW22-10x10.board
index 6830bce9124..e4fc398f5a5 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW22-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW22-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW23-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW23-10x10.board
index b7746715b86..ffbaeb23e1b 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW23-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW23-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW24-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW24-10x10.board
index 5b69e948a63..3d6aee1d954 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW24-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW24-10x10.board
@@ -1,8 +1,9 @@
 size 10 10
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW25-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW25-10x10.board
index 55a06748894..55299f444e6 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW25-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW25-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW26-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW26-10x10.board
index 4e0d87375fe..f202ced005d 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW26-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW26-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW27-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW27-10x10.board
index d7c56c81460..2dff015e679 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW27-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW27-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW28-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW28-10x10.board
index a25d3638f27..0b2beee049c 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW28-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW28-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW29-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW29-10x10.board
index 5c43b6a9a20..a9775891c0e 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW29-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW29-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW30-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW30-10x10.board
index 7751d6b0e02..69b0b2e5aa4 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW30-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW30-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW31-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW31-10x10.board
index 94598a3bb7c..c9b8f9857b6 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW31-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW31-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW32-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW32-10x10.board
index eb8a08ddfdd..c2f9c643b05 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW32-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW32-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW33-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW33-10x10.board
index bf06cf10d32..e8474eb605c 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW33-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW33-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW34-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW34-10x10.board
index fcd745cbc04..391d2a971f4 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW34-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW34-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW35-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW35-10x10.board
index 512d617ddd0..d72f7604e39 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW35-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW35-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW36-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW36-10x10.board
index 32b15460dd7..a2f9f86e16e 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW36-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW36-10x10.board
@@ -1,6 +1,7 @@
 size 10 10
 tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 2 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNESW37-10x10.board b/megamek/data/boards/solaris/IshiyamaNESW37-10x10.board
index af3c6224fe3..5fd8896bf30 100644
--- a/megamek/data/boards/solaris/IshiyamaNESW37-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNESW37-10x10.board
@@ -1,6 +1,7 @@
 size 10 10
 tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 4 "" ""
 hex 0201 4 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNEW01-10x10.board b/megamek/data/boards/solaris/IshiyamaNEW01-10x10.board
index 8f324d8f061..69571bea411 100644
--- a/megamek/data/boards/solaris/IshiyamaNEW01-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNEW01-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNEW02-10x10.board b/megamek/data/boards/solaris/IshiyamaNEW02-10x10.board
index bb301a61229..dae991deff8 100644
--- a/megamek/data/boards/solaris/IshiyamaNEW02-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNEW02-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNS01-10x10.board b/megamek/data/boards/solaris/IshiyamaNS01-10x10.board
index 48fc2defd8c..a95abffc049 100644
--- a/megamek/data/boards/solaris/IshiyamaNS01-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNS01-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNS02-10x10.board b/megamek/data/boards/solaris/IshiyamaNS02-10x10.board
index a6c8bef31ba..089f7e01757 100644
--- a/megamek/data/boards/solaris/IshiyamaNS02-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNS02-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNSW01-10x10.board b/megamek/data/boards/solaris/IshiyamaNSW01-10x10.board
index 144bc4c5666..712fd0d9d9c 100644
--- a/megamek/data/boards/solaris/IshiyamaNSW01-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNSW01-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/solaris/IshiyamaNSW02-10x10.board b/megamek/data/boards/solaris/IshiyamaNSW02-10x10.board
index 482abb53bfe..3e6d1e365bd 100644
--- a/megamek/data/boards/solaris/IshiyamaNSW02-10x10.board
+++ b/megamek/data/boards/solaris/IshiyamaNSW02-10x10.board
@@ -1,7 +1,8 @@
 size 10 10
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/unofficial/104x65 - Antallos River Valley Farms.board b/megamek/data/boards/unofficial/104x65 - Antallos River Valley Farms.board
index 747fa9cefdd..7bfab812c29 100644
--- a/megamek/data/boards/unofficial/104x65 - Antallos River Valley Farms.board	
+++ b/megamek/data/boards/unofficial/104x65 - Antallos River Valley Farms.board	
@@ -2,14 +2,16 @@ size 104 65
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
 tag "Cliffs (Auto)"
-tag "HighHills (Auto)"
-tag "MediumForest (Auto)"
-tag "DesertTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:0" "desert"
 hex 0201 0 "water:0" "desert"
 hex 0301 0 "water:0" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/100x80 - Antallos Fortress with Town.board b/megamek/data/boards/unofficial/5uper5kunk/100x80 - Antallos Fortress with Town.board
index 8ab9d0b5a35..83c01e7f9ac 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/100x80 - Antallos Fortress with Town.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/100x80 - Antallos Fortress with Town.board	
@@ -5,12 +5,17 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
-tag "DesertTheme (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 5 "" "desert"
 hex 0201 4 "" "desert"
 hex 0301 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/104x45 - Antallos Maqqavelwan Drop Port - Gimmie the Money.board b/megamek/data/boards/unofficial/5uper5kunk/104x45 - Antallos Maqqavelwan Drop Port - Gimmie the Money.board
index 351f19eab7b..71916f0072a 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/104x45 - Antallos Maqqavelwan Drop Port - Gimmie the Money.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/104x45 - Antallos Maqqavelwan Drop Port - Gimmie the Money.board	
@@ -3,11 +3,16 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "HighHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
+tag "Hangar (Auto)"
 tag "HeavyUrban (Auto)"
+tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/104x55 - Antallos Wasteland Oasis Village Hilly Approch.board b/megamek/data/boards/unofficial/5uper5kunk/104x55 - Antallos Wasteland Oasis Village Hilly Approch.board
index ad0968490e5..dc30096718c 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/104x55 - Antallos Wasteland Oasis Village Hilly Approch.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/104x55 - Antallos Wasteland Oasis Village Hilly Approch.board	
@@ -2,13 +2,15 @@ size 104 55
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "MediumForest (Auto)"
 tag "DesertTheme (Auto)"
-tag "MediumUrban (Auto)"
-tag "Water (Auto)"
+tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "rough:1" "desert"
 hex 0301 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos Port Krin - Large.board b/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos Port Krin - Large.board
index b6202688346..ba671d6aca7 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos Port Krin - Large.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos Port Krin - Large.board	
@@ -1,12 +1,15 @@
 size 104 65
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" "desert"
 hex 0201 0 "pavement:1" "desert"
 hex 0301 0 "bldg_elev:5;pavement:1;building:2:0;bldg_cf:36" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos River Valley Farms.board b/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos River Valley Farms.board
index 747fa9cefdd..7bfab812c29 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos River Valley Farms.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos River Valley Farms.board	
@@ -2,14 +2,16 @@ size 104 65
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
 tag "Cliffs (Auto)"
-tag "HighHills (Auto)"
-tag "MediumForest (Auto)"
-tag "DesertTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:0" "desert"
 hex 0201 0 "water:0" "desert"
 hex 0301 0 "water:0" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos Wasteland Village Low Cover.board b/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos Wasteland Village Low Cover.board
index 2c780b694da..b5c7bbcdeeb 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos Wasteland Village Low Cover.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/104x65 - Antallos Wasteland Village Low Cover.board	
@@ -3,11 +3,13 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Roads (Auto)"
-tag "LightForest (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
-tag "MediumUrban (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 2 "rough:1" "desert"
 hex 0201 2 "" "desert"
 hex 0301 2 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/128x128 - Raid on Outpost Ulysses - Full Map.board b/megamek/data/boards/unofficial/5uper5kunk/128x128 - Raid on Outpost Ulysses - Full Map.board
index 0287f416bc5..92105dff7dc 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/128x128 - Raid on Outpost Ulysses - Full Map.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/128x128 - Raid on Outpost Ulysses - Full Map.board	
@@ -4,12 +4,17 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
-tag "HighHills (Auto)"
 tag "Water (Auto)"
+tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "woods:1;foliage_elev:2" "grass"
 hex 0201 4 "woods:1;foliage_elev:2" "grass"
 hex 0301 4 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/128x64 - Raid on Outpost Ulysses - North Half.board b/megamek/data/boards/unofficial/5uper5kunk/128x64 - Raid on Outpost Ulysses - North Half.board
index 0e3ee9a98fb..c02ac94f699 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/128x64 - Raid on Outpost Ulysses - North Half.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/128x64 - Raid on Outpost Ulysses - North Half.board	
@@ -6,7 +6,12 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "woods:1;foliage_elev:2" "grass"
 hex 0201 4 "woods:1;foliage_elev:2" "grass"
 hex 0301 4 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/35x35 - Antallos Ancient City.board b/megamek/data/boards/unofficial/5uper5kunk/35x35 - Antallos Ancient City.board
index 5e26066d2ca..582ee836c0b 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/35x35 - Antallos Ancient City.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/35x35 - Antallos Ancient City.board	
@@ -2,9 +2,10 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Roads (Auto)"
-tag "LightForest (Auto)"
 tag "DesertTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -1 "" "desert"
 hex 0201 -1 "" "desert"
 hex 0301 -1 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/45x45 - Antallos Wasteland Settlement.board b/megamek/data/boards/unofficial/5uper5kunk/45x45 - Antallos Wasteland Settlement.board
index f8f5c729240..c74a97b8275 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/45x45 - Antallos Wasteland Settlement.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/45x45 - Antallos Wasteland Settlement.board	
@@ -2,13 +2,14 @@ size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
 tag "Cliffs (Auto)"
+tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
-tag "HeavyUrban (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 2 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dense Urban.board b/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dense Urban.board
index 124fd983d74..24ebdd29eab 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dense Urban.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dense Urban.board	
@@ -1,11 +1,14 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
+tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "HeavyUrban (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -1 "" "desert"
 hex 0201 -1 "" "desert"
 hex 0301 -1 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dunes and Large Mesa Depot.board b/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dunes and Large Mesa Depot.board
index 5c5f59468de..ed11024d4e3 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dunes and Large Mesa Depot.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dunes and Large Mesa Depot.board	
@@ -6,6 +6,7 @@ tag "Roads (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "sand:1" "desert"
 hex 0201 0 "sand:1" "desert"
 hex 0301 1 "sand:1" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dunes and Small Depots.board b/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dunes and Small Depots.board
index 887dd72654f..febf562702e 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dunes and Small Depots.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Desert Dunes and Small Depots.board	
@@ -4,6 +4,7 @@ tag "Foliage (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -1 "sand:1" "desert"
 hex 0201 -1 "sand:1" "desert"
 hex 0301 -1 "sand:1" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Wasteland Marsh Channels Ruined Depot.board b/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Wasteland Marsh Channels Ruined Depot.board
index f46f9831c5b..47660c1cb2e 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Wasteland Marsh Channels Ruined Depot.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/55x55 - Antallos Wasteland Marsh Channels Ruined Depot.board	
@@ -2,13 +2,14 @@ size 55 55
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "Cliffs (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/64x64 - Raid on Outpost Ulysses - NE Quarter.board b/megamek/data/boards/unofficial/5uper5kunk/64x64 - Raid on Outpost Ulysses - NE Quarter.board
index d644c6f2dde..f4fa7a54475 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/64x64 - Raid on Outpost Ulysses - NE Quarter.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/64x64 - Raid on Outpost Ulysses - NE Quarter.board	
@@ -6,7 +6,12 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 5 "woods:1;foliage_elev:2" "grass"
 hex 0201 5 "woods:1;foliage_elev:2" "grass"
 hex 0301 5 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/64x68 - Antallos Active Wasteland City.board b/megamek/data/boards/unofficial/5uper5kunk/64x68 - Antallos Active Wasteland City.board
index 223ffe85c9c..93d4e1227b0 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/64x68 - Antallos Active Wasteland City.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/64x68 - Antallos Active Wasteland City.board	
@@ -2,13 +2,18 @@ size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Hangar (Auto)"
 tag "Cliffs (Auto)"
-tag "HighHills (Auto)"
-tag "DesertTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Mesa Town and Base Entrance v2.board b/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Mesa Town and Base Entrance v2.board
index 7e31ae1c24f..cdd6dc3214f 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Mesa Town and Base Entrance v2.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Mesa Town and Base Entrance v2.board	
@@ -3,12 +3,14 @@ option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
 tag "Cliffs (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 2 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Oasis Pumping Station.board b/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Oasis Pumping Station.board
index 12debbba0cd..81e3baa4dc6 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Oasis Pumping Station.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Oasis Pumping Station.board	
@@ -3,9 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "MediumForest (Auto)"
 tag "DesertTheme (Auto)"
+tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Wasteland Marsh Channels Ruined Depot - Expanded v2.board b/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Wasteland Marsh Channels Ruined Depot - Expanded v2.board
index e89e72fc31b..17a5a1d671b 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Wasteland Marsh Channels Ruined Depot - Expanded v2.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/80x49 - Antallos Wasteland Marsh Channels Ruined Depot - Expanded v2.board	
@@ -2,13 +2,14 @@ size 80 49
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "Cliffs (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/5uper5kunk/96x73 - Antallos Mesa Town and Base Entrance - Expanded.board b/megamek/data/boards/unofficial/5uper5kunk/96x73 - Antallos Mesa Town and Base Entrance - Expanded.board
index 07fe4b3cb57..28495b222d9 100644
--- a/megamek/data/boards/unofficial/5uper5kunk/96x73 - Antallos Mesa Town and Base Entrance - Expanded.board	
+++ b/megamek/data/boards/unofficial/5uper5kunk/96x73 - Antallos Mesa Town and Base Entrance - Expanded.board	
@@ -3,13 +3,15 @@ option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/Aokarasu/32x34 FCCW6.board b/megamek/data/boards/unofficial/Aokarasu/32x34 FCCW6.board
index beab4e12290..acd01ed000f 100644
--- a/megamek/data/boards/unofficial/Aokarasu/32x34 FCCW6.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/32x34 FCCW6.board	
@@ -2,10 +2,11 @@ size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/Aokarasu/32x51 Benjamin 4.board b/megamek/data/boards/unofficial/Aokarasu/32x51 Benjamin 4.board
index ffe1574ea5a..a023b0684e9 100644
--- a/megamek/data/boards/unofficial/Aokarasu/32x51 Benjamin 4.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/32x51 Benjamin 4.board	
@@ -1,7 +1,9 @@
 size 32 51
 option exit_roads_to_pavement false
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:3;pavement:1;building:2:12;bldg_cf:60" ""
 hex 0201 0 "bldg_elev:3;pavement:1;building:2:56;bldg_cf:60" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Aokarasu/35x35 Benj POW.board b/megamek/data/boards/unofficial/Aokarasu/35x35 Benj POW.board
index 5dffcfb18e5..a50dbd84a98 100644
--- a/megamek/data/boards/unofficial/Aokarasu/35x35 Benj POW.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/35x35 Benj POW.board	
@@ -3,8 +3,9 @@ tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
 tag "Swamp (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Aokarasu/45x45 Benj 1-1.board b/megamek/data/boards/unofficial/Aokarasu/45x45 Benj 1-1.board
index 7eaa96daead..00836dc862f 100644
--- a/megamek/data/boards/unofficial/Aokarasu/45x45 Benj 1-1.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/45x45 Benj 1-1.board	
@@ -1,9 +1,11 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Aokarasu/45x45 Benj 1-2.board b/megamek/data/boards/unofficial/Aokarasu/45x45 Benj 1-2.board
index 21428c8f0b8..c130e8ec745 100644
--- a/megamek/data/boards/unofficial/Aokarasu/45x45 Benj 1-2.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/45x45 Benj 1-2.board	
@@ -1,11 +1,13 @@
 size 45 45
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Aokarasu/45x45 FCCW 4-1.board b/megamek/data/boards/unofficial/Aokarasu/45x45 FCCW 4-1.board
index bf1478bfb42..5bc61b3f654 100644
--- a/megamek/data/boards/unofficial/Aokarasu/45x45 FCCW 4-1.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/45x45 FCCW 4-1.board	
@@ -4,6 +4,8 @@ tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Aokarasu/45x45 FCCW 4-4.board b/megamek/data/boards/unofficial/Aokarasu/45x45 FCCW 4-4.board
index e65ea27104a..754dcad1f42 100644
--- a/megamek/data/boards/unofficial/Aokarasu/45x45 FCCW 4-4.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/45x45 FCCW 4-4.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Swamp (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Aokarasu/48x34 FCCW 4-6.board b/megamek/data/boards/unofficial/Aokarasu/48x34 FCCW 4-6.board
index 57b84fbdc28..4819af7869d 100644
--- a/megamek/data/boards/unofficial/Aokarasu/48x34 FCCW 4-6.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/48x34 FCCW 4-6.board	
@@ -3,8 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Aokarasu/80x17 Benj 7.board b/megamek/data/boards/unofficial/Aokarasu/80x17 Benj 7.board
index d5aa52662a8..21e27f637e1 100644
--- a/megamek/data/boards/unofficial/Aokarasu/80x17 Benj 7.board	
+++ b/megamek/data/boards/unofficial/Aokarasu/80x17 Benj 7.board	
@@ -1,8 +1,9 @@
 size 80 17
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 3 "" "mars"
 hex 0201 3 "" "mars"
diff --git a/megamek/data/boards/unofficial/ArekP64/150x110 Bunkers.board b/megamek/data/boards/unofficial/ArekP64/150x110 Bunkers.board
index 5ba7a778bc3..56c213532e9 100644
--- a/megamek/data/boards/unofficial/ArekP64/150x110 Bunkers.board	
+++ b/megamek/data/boards/unofficial/ArekP64/150x110 Bunkers.board	
@@ -2,6 +2,7 @@ size 150 110
 tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 hex 0101 -1 "" ""
 hex 0201 -1 "" ""
 hex 0301 0 "" "Bunkers"
diff --git a/megamek/data/boards/unofficial/ArekP64/80x60 SpacePort 7.board b/megamek/data/boards/unofficial/ArekP64/80x60 SpacePort 7.board
index b5afb87b3dd..f1ff8076a66 100644
--- a/megamek/data/boards/unofficial/ArekP64/80x60 SpacePort 7.board	
+++ b/megamek/data/boards/unofficial/ArekP64/80x60 SpacePort 7.board	
@@ -1,13 +1,15 @@
 size 80 60
 option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/ArekP64/90x85 Sea Airfield.board b/megamek/data/boards/unofficial/ArekP64/90x85 Sea Airfield.board
index 1adf28a3a3d..c064d46e95a 100644
--- a/megamek/data/boards/unofficial/ArekP64/90x85 Sea Airfield.board	
+++ b/megamek/data/boards/unofficial/ArekP64/90x85 Sea Airfield.board	
@@ -1,12 +1,14 @@
 size 90 85
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "Woods (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "water:5" ""
 hex 0201 0 "water:5" ""
 hex 0301 0 "water:5" ""
diff --git a/megamek/data/boards/unofficial/AshnodsMaps/45x45 Jotun Mountains Kore.board b/megamek/data/boards/unofficial/AshnodsMaps/45x45 Jotun Mountains Kore.board
index fafaae99617..08a8d8f9fc9 100644
--- a/megamek/data/boards/unofficial/AshnodsMaps/45x45 Jotun Mountains Kore.board	
+++ b/megamek/data/boards/unofficial/AshnodsMaps/45x45 Jotun Mountains Kore.board	
@@ -1,13 +1,17 @@
 size 45 45
 tag "Foliage (Auto)"
+tag "MultipleTheme (Auto)"
+tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
+tag "Hangar (Auto)"
+tag "SnowTerrain (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
 tag "HighHills (Auto)"
-tag "IceTerrain (Auto)"
 tag "Lava (Auto)"
-tag "LightForest (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
-tag "SnowTerrain (Auto)"
 hex 0101 4 "snow:2;metal_deposit:10" ""
 hex 0201 4 "snow:2;metal_deposit:10" ""
 hex 0301 4 "snow:2;metal_deposit:10" ""
diff --git a/megamek/data/boards/unofficial/AshnodsMaps/50x50 Hell World.board b/megamek/data/boards/unofficial/AshnodsMaps/50x50 Hell World.board
index 8d3a3b40a7f..657de1b7b6c 100644
--- a/megamek/data/boards/unofficial/AshnodsMaps/50x50 Hell World.board	
+++ b/megamek/data/boards/unofficial/AshnodsMaps/50x50 Hell World.board	
@@ -2,6 +2,7 @@ size 50 50
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "LightForest (Auto)"
diff --git a/megamek/data/boards/unofficial/AshnodsMaps/50x50 Wetlands.board b/megamek/data/boards/unofficial/AshnodsMaps/50x50 Wetlands.board
index d57573065da..1b0cb0268d6 100644
--- a/megamek/data/boards/unofficial/AshnodsMaps/50x50 Wetlands.board	
+++ b/megamek/data/boards/unofficial/AshnodsMaps/50x50 Wetlands.board	
@@ -5,6 +5,7 @@ tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -1- Up-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -1- Up-Right.board
index bcebf49e41f..8ab6a62428e 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -1- Up-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -1- Up-Right.board	
@@ -1,7 +1,8 @@
 size 20 14
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "pavement:1" "snow"
 hex 0201 -1 "pavement:1" "snow"
 hex 0301 -1 "pavement:1" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -2- Middle-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -2- Middle-Right.board
index ae087558bc3..b8bae5f8a9e 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -2- Middle-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -2- Middle-Right.board	
@@ -1,7 +1,8 @@
 size 20 14
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -3- Down-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -3- Down-Right.board
index d6f412970e5..3ab3fb45d7a 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -3- Down-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -3- Down-Right.board	
@@ -1,7 +1,8 @@
 size 20 14
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -4- Up-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -4- Up-Left.board
index 425fb8d1045..595f1322cd4 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -4- Up-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -4- Up-Left.board	
@@ -2,6 +2,7 @@ size 20 14
 tag "Rough (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -5- Middle-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -5- Middle-Left.board
index 4bbdb831846..f492f57100f 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -5- Middle-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -5- Middle-Left.board	
@@ -1,7 +1,8 @@
 size 20 14
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" ""
 hex 0301 -2 "pavement:1" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -6- Down-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -6- Down-Left.board
index d0508289943..3c2e6067aee 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -6- Down-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (IceRoughed) -6- Down-Left.board	
@@ -1,6 +1,7 @@
 size 20 14
 tag "Rough (Auto)"
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "pavement:1" "snow"
 hex 0201 -2 "water:5" "snow"
 hex 0301 -1 "pavement:1" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -1- Up-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -1- Up-Right.board
index bd7777cec52..e812a202fbb 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -1- Up-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -1- Up-Right.board	
@@ -1,6 +1,7 @@
 size 20 14
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "pavement:1" "snow"
 hex 0201 -1 "pavement:1" "snow"
 hex 0301 -1 "pavement:1" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -2- Middle-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -2- Middle-Right.board
index 64c6668ef58..04c6ab61339 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -2- Middle-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -2- Middle-Right.board	
@@ -1,6 +1,7 @@
 size 20 14
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -3- Down-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -3- Down-Right.board
index 942dd220ae9..f2891907f74 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -3- Down-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -3- Down-Right.board	
@@ -1,7 +1,8 @@
 size 20 14
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -4- Up-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -4- Up-Left.board
index 904deba4363..7ccc867f13a 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -4- Up-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -4- Up-Left.board	
@@ -1,7 +1,8 @@
 size 20 14
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -5- Middle-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -5- Middle-Left.board
index 2ae59aec589..1f418719d50 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -5- Middle-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -5- Middle-Left.board	
@@ -1,6 +1,7 @@
 size 20 14
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" ""
 hex 0301 -2 "pavement:1" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -6- Down-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -6- Down-Left.board
index fc0460c571d..42a5c6c0247 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -6- Down-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock (Iced) -6- Down-Left.board	
@@ -1,5 +1,6 @@
 size 20 14
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "pavement:1" "snow"
 hex 0201 -2 "water:5" "snow"
 hex 0301 -1 "pavement:1" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -1- Up-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -1- Up-Right.board
index 1d568823b27..ceef211ccb7 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -1- Up-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -1- Up-Right.board	
@@ -1,6 +1,7 @@
 size 20 14
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "" "snow"
 hex 0201 -1 "" "snow"
 hex 0301 -1 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -2- Middle-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -2- Middle-Right.board
index e49ca8599c3..d1bd1d9f4fd 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -2- Middle-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -2- Middle-Right.board	
@@ -1,6 +1,7 @@
 size 20 14
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -3- Down-Right.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -3- Down-Right.board
index d45c2b92428..b173833349d 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -3- Down-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -3- Down-Right.board	
@@ -1,7 +1,8 @@
 size 20 14
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -4- Up-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -4- Up-Left.board
index 589d3a1b5fe..91e5b8dbb48 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -4- Up-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -4- Up-Left.board	
@@ -1,7 +1,8 @@
 size 20 14
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -5- Middle-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -5- Middle-Left.board
index 86017bf655e..ed9059bfb9c 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -5- Middle-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -5- Middle-Left.board	
@@ -1,6 +1,7 @@
 size 20 14
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" ""
 hex 0301 -2 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -6- Down-Left.board b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -6- Down-Left.board
index 8fc83bf88f1..a1488f22760 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -6- Down-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/20x14 Battle of Kalnock -6- Down-Left.board	
@@ -1,5 +1,6 @@
 size 20 14
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 -2 "" "snow"
 hex 0201 -2 "water:5" "snow"
 hex 0301 -1 "" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock (IceRoughed) -0- Complete.board b/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock (IceRoughed) -0- Complete.board
index 4fba5cde5fa..c21144ce6cf 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock (IceRoughed) -0- Complete.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock (IceRoughed) -0- Complete.board	
@@ -1,7 +1,8 @@
 size 40 42
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock (Iced) -0- Complete.board b/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock (Iced) -0- Complete.board
index 391278ef481..dc9377fb359 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock (Iced) -0- Complete.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock (Iced) -0- Complete.board	
@@ -1,6 +1,7 @@
 size 40 42
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock -0- Complete.board b/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock -0- Complete.board
index 7449266c199..d2adfd10b16 100644
--- a/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock -0- Complete.board	
+++ b/megamek/data/boards/unofficial/Battle of Kalnock/40x42 Battle of Kalnock -0- Complete.board	
@@ -1,6 +1,7 @@
 size 40 42
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 -2 "water:5" "snow"
 hex 0201 -2 "water:5" "snow"
diff --git a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -1- Up-Left.board b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -1- Up-Left.board
index 222a1ea3cfe..ff7189a8fde 100644
--- a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -1- Up-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -1- Up-Left.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "MarsTheme (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
 hex 0201 0 "woods:1;foliage_elev:2" "mars"
diff --git a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -2- Up-Middle.board b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -2- Up-Middle.board
index b87a1ed434d..eb554c89faf 100644
--- a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -2- Up-Middle.board	
+++ b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -2- Up-Middle.board	
@@ -1,5 +1,6 @@
 size 16 17
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 2 "" "mars"
diff --git a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -3- Up-Right.board b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -3- Up-Right.board
index 952c7cda900..10bd2198d63 100644
--- a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -3- Up-Right.board	
+++ b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -3- Up-Right.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "MarsTheme (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -4- Down-Left.board b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -4- Down-Left.board
index 952c7cda900..10bd2198d63 100644
--- a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -4- Down-Left.board	
+++ b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -4- Down-Left.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "MarsTheme (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -5- Down-Middle.board b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -5- Down-Middle.board
index d881bb013c2..6cc0d50b81a 100644
--- a/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -5- Down-Middle.board	
+++ b/megamek/data/boards/unofficial/Battle of Stanrey/16x17 Battle of Stanrey -5- Down-Middle.board	
@@ -1,5 +1,6 @@
 size 16 17
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Battle of Stanrey/48x34 Battle of Stanrey -00- Complete (A).board b/megamek/data/boards/unofficial/Battle of Stanrey/48x34 Battle of Stanrey -00- Complete (A).board
index aabe3c26e5a..3bf85e672f4 100644
--- a/megamek/data/boards/unofficial/Battle of Stanrey/48x34 Battle of Stanrey -00- Complete (A).board	
+++ b/megamek/data/boards/unofficial/Battle of Stanrey/48x34 Battle of Stanrey -00- Complete (A).board	
@@ -1,5 +1,6 @@
 size 48 34
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
 hex 0201 0 "woods:1;foliage_elev:2" "mars"
diff --git a/megamek/data/boards/unofficial/Battle of Stanrey/48x34 Battle of Stanrey -01- Complete (B).board b/megamek/data/boards/unofficial/Battle of Stanrey/48x34 Battle of Stanrey -01- Complete (B).board
index e9977706724..b97466ba9f2 100644
--- a/megamek/data/boards/unofficial/Battle of Stanrey/48x34 Battle of Stanrey -01- Complete (B).board	
+++ b/megamek/data/boards/unofficial/Battle of Stanrey/48x34 Battle of Stanrey -01- Complete (B).board	
@@ -1,5 +1,6 @@
 size 48 34
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Biggest Boss/20x50 Green Desert.board b/megamek/data/boards/unofficial/Biggest Boss/20x50 Green Desert.board
index c35ae83c129..06b4d04c58b 100644
--- a/megamek/data/boards/unofficial/Biggest Boss/20x50 Green Desert.board	
+++ b/megamek/data/boards/unofficial/Biggest Boss/20x50 Green Desert.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Biggest Boss/35x30 AbandonedDesert.board b/megamek/data/boards/unofficial/Biggest Boss/35x30 AbandonedDesert.board
index fba39e6e75b..543da48dc12 100644
--- a/megamek/data/boards/unofficial/Biggest Boss/35x30 AbandonedDesert.board	
+++ b/megamek/data/boards/unofficial/Biggest Boss/35x30 AbandonedDesert.board	
@@ -3,8 +3,9 @@ tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Biggest Boss/40x20 Coast of the Islands 01.board b/megamek/data/boards/unofficial/Biggest Boss/40x20 Coast of the Islands 01.board
index 3d4a009f1f5..cb4ffff6016 100644
--- a/megamek/data/boards/unofficial/Biggest Boss/40x20 Coast of the Islands 01.board	
+++ b/megamek/data/boards/unofficial/Biggest Boss/40x20 Coast of the Islands 01.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 -1 "water:3" "tropical"
diff --git a/megamek/data/boards/unofficial/Biggest Boss/40x20 Coast of the Islands 02.board b/megamek/data/boards/unofficial/Biggest Boss/40x20 Coast of the Islands 02.board
index 6e55a453d6a..bece36eb84e 100644
--- a/megamek/data/boards/unofficial/Biggest Boss/40x20 Coast of the Islands 02.board	
+++ b/megamek/data/boards/unofficial/Biggest Boss/40x20 Coast of the Islands 02.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/CSL Maps/32X32 Factory V9.board b/megamek/data/boards/unofficial/CSL Maps/32X32 Factory V9.board
index 1e3303daf13..9bd6741d5fa 100644
--- a/megamek/data/boards/unofficial/CSL Maps/32X32 Factory V9.board	
+++ b/megamek/data/boards/unofficial/CSL Maps/32X32 Factory V9.board	
@@ -2,8 +2,9 @@ size 32 32
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "road:1:36" ""
 hex 0201 0 "road:1" ""
diff --git a/megamek/data/boards/unofficial/CSL Maps/48X33 City Invasion V0.8.board b/megamek/data/boards/unofficial/CSL Maps/48X33 City Invasion V0.8.board
index 16dc54a3da2..d254156d9f6 100644
--- a/megamek/data/boards/unofficial/CSL Maps/48X33 City Invasion V0.8.board	
+++ b/megamek/data/boards/unofficial/CSL Maps/48X33 City Invasion V0.8.board	
@@ -1,12 +1,13 @@
 size 48 33
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" ""
 hex 0201 0 "road:1:45" ""
 hex 0301 0 "bldg_elev:2;building:2:0;bldg_cf:40" ""
diff --git a/megamek/data/boards/unofficial/Cakefish/General/100x100 -Arid- Ventifact Channels.board b/megamek/data/boards/unofficial/Cakefish/General/100x100 -Arid- Ventifact Channels.board
index d92aa969956..38209ccef69 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/100x100 -Arid- Ventifact Channels.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/100x100 -Arid- Ventifact Channels.board	
@@ -1,6 +1,7 @@
 size 100 100
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/35x35 - Grass - Helicopter Base.board b/megamek/data/boards/unofficial/Cakefish/General/35x35 - Grass - Helicopter Base.board
index ba99e4b0fc6..193d0e2e35c 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/35x35 - Grass - Helicopter Base.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/35x35 - Grass - Helicopter Base.board	
@@ -2,13 +2,16 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "woods:2;foliage_elev:2" "grass"
 hex 0201 4 "woods:2;foliage_elev:2" "grass"
 hex 0301 4 "woods:2;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/35x35 -Arid- Riverine Bridge.board b/megamek/data/boards/unofficial/Cakefish/General/35x35 -Arid- Riverine Bridge.board
index e2e92d97f5b..735e230efd5 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/35x35 -Arid- Riverine Bridge.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/35x35 -Arid- Riverine Bridge.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/40x40 - Arid - Boarding Call.board b/megamek/data/boards/unofficial/Cakefish/General/40x40 - Arid - Boarding Call.board
index 70e2d4a60fe..e537dc010a6 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/40x40 - Arid - Boarding Call.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/40x40 - Arid - Boarding Call.board	
@@ -4,10 +4,12 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 4 "" "desert"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/45x45 -Arid- Overlay.board b/megamek/data/boards/unofficial/Cakefish/General/45x45 -Arid- Overlay.board
index 39066a0ff22..f733f865d8a 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/45x45 -Arid- Overlay.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/45x45 -Arid- Overlay.board	
@@ -3,10 +3,11 @@ option exit_roads_to_pavement false
 tag "Foliage (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
 hex 0201 -1 "water:0:63" "desert"
 hex 0301 -1 "water:1:63" "desert"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/45x45 -Desert- Mesa Oasis.board b/megamek/data/boards/unofficial/Cakefish/General/45x45 -Desert- Mesa Oasis.board
index c27548a59ed..b3022b7add8 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/45x45 -Desert- Mesa Oasis.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/45x45 -Desert- Mesa Oasis.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/48x51 - Arid - Portside Connection.board b/megamek/data/boards/unofficial/Cakefish/General/48x51 - Arid - Portside Connection.board
index 4b7a049f058..7ab32e3da7a 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/48x51 - Arid - Portside Connection.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/48x51 - Arid - Portside Connection.board	
@@ -2,11 +2,13 @@ size 48 51
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 1 "road:1:36" "desert"
 hex 0201 1 "road:1" "desert"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/48x51 -Arid- Railyard.board b/megamek/data/boards/unofficial/Cakefish/General/48x51 -Arid- Railyard.board
index 2ca79ad96e1..c074701fcc8 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/48x51 -Arid- Railyard.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/48x51 -Arid- Railyard.board	
@@ -1,12 +1,15 @@
 size 48 51
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "woods:1;foliage_elev:2" "grass"
 hex 0201 1 "woods:1;foliage_elev:2" "grass"
 hex 0301 1 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/50x50  -Grass- A Dam'd Shame.board b/megamek/data/boards/unofficial/Cakefish/General/50x50  -Grass- A Dam'd Shame.board
index 2571b73d945..82fac2729f2 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/50x50  -Grass- A Dam'd Shame.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/50x50  -Grass- A Dam'd Shame.board	
@@ -3,12 +3,14 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "woods:1;foliage_elev:2" ""
 hex 0201 2 "woods:1;foliage_elev:2" ""
 hex 0301 2 "woods:1;foliage_elev:1" ""
diff --git a/megamek/data/boards/unofficial/Cakefish/General/50x50  A Dam'd Shame.board b/megamek/data/boards/unofficial/Cakefish/General/50x50  A Dam'd Shame.board
index 566fc0cffd1..596449c49f2 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/50x50  A Dam'd Shame.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/50x50  A Dam'd Shame.board	
@@ -3,12 +3,14 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "woods:1;foliage_elev:2" ""
 hex 0201 2 "woods:1;foliage_elev:2" ""
 hex 0301 2 "woods:1;foliage_elev:1" ""
diff --git a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Arid- CarvedLands.board b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Arid- CarvedLands.board
index b3c8de39235..025235521ff 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Arid- CarvedLands.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Arid- CarvedLands.board	
@@ -2,6 +2,7 @@ size 50 50
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- Bisected Star Fort.board b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- Bisected Star Fort.board
index 7de01021d92..ef5c48cd035 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- Bisected Star Fort.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- Bisected Star Fort.board	
@@ -2,11 +2,15 @@ size 50 50
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "" "grass"
 hex 0201 4 "" "grass"
 hex 0301 4 "" "grass"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- QRF Airbase.board b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- QRF Airbase.board
index c32c0d7da82..743349f3a31 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- QRF Airbase.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- QRF Airbase.board	
@@ -2,11 +2,15 @@ size 50 50
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 4 "" "grass"
 hex 0201 4 "" "grass"
 hex 0301 4 "" "grass"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- Smash n Grab.board b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- Smash n Grab.board
index 2c0484fa41a..fa5a57adb46 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- Smash n Grab.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Grass- Smash n Grab.board	
@@ -3,10 +3,11 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 5 "" ""
diff --git a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Volcanic- Sintered Lands.board b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Volcanic- Sintered Lands.board
index 93c1b491248..975958f0e34 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/50x50 -Volcanic- Sintered Lands.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/50x50 -Volcanic- Sintered Lands.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Lava (Auto)"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/60x60 - Grass - Volcanic Isle.board b/megamek/data/boards/unofficial/Cakefish/General/60x60 - Grass - Volcanic Isle.board
index 7da3d639492..de763e35b51 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/60x60 - Grass - Volcanic Isle.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/60x60 - Grass - Volcanic Isle.board	
@@ -2,14 +2,17 @@ size 60 60
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Hangar (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "water:5:63" ""
 hex 0201 0 "water:5:63" ""
 hex 0301 0 "water:5:63" ""
diff --git a/megamek/data/boards/unofficial/Cakefish/General/60x60 - Mars - Reclaimed Earth.board b/megamek/data/boards/unofficial/Cakefish/General/60x60 - Mars - Reclaimed Earth.board
index 35f43e1a2f7..aaf543e8822 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/60x60 - Mars - Reclaimed Earth.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/60x60 - Mars - Reclaimed Earth.board	
@@ -2,12 +2,16 @@ size 60 60
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -1 "" "mars"
 hex 0201 -1 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/60x60 - Snow - Snap Thaw.board b/megamek/data/boards/unofficial/Cakefish/General/60x60 - Snow - Snap Thaw.board
index 5fa75720290..28a9cd98ca5 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/60x60 - Snow - Snap Thaw.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/60x60 - Snow - Snap Thaw.board	
@@ -1,13 +1,16 @@
 size 60 60
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "woods:1;foliage_elev:2" "snow"
 hex 0201 2 "woods:1;foliage_elev:1" "snow"
 hex 0301 2 "woods:1;foliage_elev:1" "snow"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/60x60 -Grass- Loch and Load.board b/megamek/data/boards/unofficial/Cakefish/General/60x60 -Grass- Loch and Load.board
index c2de2aa6e56..e55b458ca31 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/60x60 -Grass- Loch and Load.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/60x60 -Grass- Loch and Load.board	
@@ -3,11 +3,14 @@ option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Cakefish/General/60x60 -Grass- Ribbon Farms.board b/megamek/data/boards/unofficial/Cakefish/General/60x60 -Grass- Ribbon Farms.board
index b40304174be..96bae94582f 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/60x60 -Grass- Ribbon Farms.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/60x60 -Grass- Ribbon Farms.board	
@@ -1,11 +1,14 @@
 size 60 60
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
-tag "GrassTheme (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Cakefish/General/80x40 -Grass- Mangrove Coast BOTTOM.board b/megamek/data/boards/unofficial/Cakefish/General/80x40 -Grass- Mangrove Coast BOTTOM.board
index b8f2a3e54bd..cd8869332b0 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/80x40 -Grass- Mangrove Coast BOTTOM.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/80x40 -Grass- Mangrove Coast BOTTOM.board	
@@ -1,10 +1,13 @@
 size 80 40
 tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
-tag "LowHills (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "woods:1;foliage_elev:1" ""
 hex 0201 1 "woods:1;foliage_elev:2" ""
 hex 0301 1 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Cakefish/General/80x80 - Grass - Aerodyne Airport.board b/megamek/data/boards/unofficial/Cakefish/General/80x80 - Grass - Aerodyne Airport.board
index 357722843ba..d6e1c224545 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/80x80 - Grass - Aerodyne Airport.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/80x80 - Grass - Aerodyne Airport.board	
@@ -1,14 +1,19 @@
 size 80 80
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
-tag "LowHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:3" ""
 hex 0201 0 "water:3" ""
 hex 0301 0 "water:3" ""
diff --git a/megamek/data/boards/unofficial/Cakefish/General/80x80 -Grass- Mangrove Coast FULL.board b/megamek/data/boards/unofficial/Cakefish/General/80x80 -Grass- Mangrove Coast FULL.board
index d9d26eca31b..69b475fc125 100644
--- a/megamek/data/boards/unofficial/Cakefish/General/80x80 -Grass- Mangrove Coast FULL.board	
+++ b/megamek/data/boards/unofficial/Cakefish/General/80x80 -Grass- Mangrove Coast FULL.board	
@@ -3,12 +3,15 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 -1 "water:0:63" "grass"
 hex 0201 -1 "water:1:63" "grass"
diff --git a/megamek/data/boards/unofficial/Cartes/16x17 Petite Ville.board b/megamek/data/boards/unofficial/Cartes/16x17 Petite Ville.board
index bb81866e658..37ce6dc22ad 100644
--- a/megamek/data/boards/unofficial/Cartes/16x17 Petite Ville.board	
+++ b/megamek/data/boards/unofficial/Cartes/16x17 Petite Ville.board	
@@ -1,8 +1,9 @@
 size 16 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Cartes/25x25 Hel Hasard.board b/megamek/data/boards/unofficial/Cartes/25x25 Hel Hasard.board
index 05557b87c76..d52a8ab78c5 100644
--- a/megamek/data/boards/unofficial/Cartes/25x25 Hel Hasard.board	
+++ b/megamek/data/boards/unofficial/Cartes/25x25 Hel Hasard.board	
@@ -1,9 +1,10 @@
 size 25 25
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -1 "water:1" ""
 hex 0201 -1 "water:1" ""
 hex 0301 1 "" ""
diff --git a/megamek/data/boards/unofficial/Cartes/25x25 Mohenne ville.board b/megamek/data/boards/unofficial/Cartes/25x25 Mohenne ville.board
index 518055970d0..ab4f46fd3a8 100644
--- a/megamek/data/boards/unofficial/Cartes/25x25 Mohenne ville.board	
+++ b/megamek/data/boards/unofficial/Cartes/25x25 Mohenne ville.board	
@@ -1,11 +1,12 @@
 size 25 25
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "" ""
 hex 0201 3 "" ""
 hex 0301 3 "" ""
diff --git a/megamek/data/boards/unofficial/Cartes/25x25 Moyenne ville.board b/megamek/data/boards/unofficial/Cartes/25x25 Moyenne ville.board
index f0258c3aa84..62c8f1756f9 100644
--- a/megamek/data/boards/unofficial/Cartes/25x25 Moyenne ville.board	
+++ b/megamek/data/boards/unofficial/Cartes/25x25 Moyenne ville.board	
@@ -1,8 +1,9 @@
 size 25 25
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 1 "" "Hell land"
 hex 0201 1 "" "Hell land"
diff --git a/megamek/data/boards/unofficial/Cartes/25x25 Plages.board b/megamek/data/boards/unofficial/Cartes/25x25 Plages.board
index 9d145e10321..064127ce455 100644
--- a/megamek/data/boards/unofficial/Cartes/25x25 Plages.board	
+++ b/megamek/data/boards/unofficial/Cartes/25x25 Plages.board	
@@ -1,9 +1,11 @@
 size 25 25
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 -2 "water:1" ""
 hex 0201 -2 "water:1" ""
diff --git a/megamek/data/boards/unofficial/Cartes/25x25 la reine des glace.board b/megamek/data/boards/unofficial/Cartes/25x25 la reine des glace.board
index ed0cf1abe89..bc19a43867a 100644
--- a/megamek/data/boards/unofficial/Cartes/25x25 la reine des glace.board	
+++ b/megamek/data/boards/unofficial/Cartes/25x25 la reine des glace.board	
@@ -1,6 +1,7 @@
 size 25 25
 tag "Water (Auto)"
 tag "IceTerrain (Auto)"
+tag "Impassable (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 0 "impassable:1" "Plaine 4"
 hex 0201 0 "impassable:1" "Plaine 4"
diff --git a/megamek/data/boards/unofficial/Cartes/30x30 GP1.board b/megamek/data/boards/unofficial/Cartes/30x30 GP1.board
index 7b05bf75b0b..214b002778c 100644
--- a/megamek/data/boards/unofficial/Cartes/30x30 GP1.board	
+++ b/megamek/data/boards/unofficial/Cartes/30x30 GP1.board	
@@ -1,9 +1,10 @@
 size 30 30
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 1 "" ""
diff --git a/megamek/data/boards/unofficial/Cartes/30x30 Ici city.board b/megamek/data/boards/unofficial/Cartes/30x30 Ici city.board
index 5f4b1b3f9bf..27e82451663 100644
--- a/megamek/data/boards/unofficial/Cartes/30x30 Ici city.board	
+++ b/megamek/data/boards/unofficial/Cartes/30x30 Ici city.board	
@@ -1,12 +1,13 @@
 size 30 30
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 -2 "" ""
 hex 0201 -2 "" ""
diff --git a/megamek/data/boards/unofficial/Cartes/35x35 Hell Land.board b/megamek/data/boards/unofficial/Cartes/35x35 Hell Land.board
index f76cab4a9fb..e5ab2c38366 100644
--- a/megamek/data/boards/unofficial/Cartes/35x35 Hell Land.board	
+++ b/megamek/data/boards/unofficial/Cartes/35x35 Hell Land.board	
@@ -1,7 +1,8 @@
 size 35 35
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "LightForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Cartes/35x35 Port Arhtur.board b/megamek/data/boards/unofficial/Cartes/35x35 Port Arhtur.board
index 20f72de7554..41b6417d9f6 100644
--- a/megamek/data/boards/unofficial/Cartes/35x35 Port Arhtur.board	
+++ b/megamek/data/boards/unofficial/Cartes/35x35 Port Arhtur.board	
@@ -1,9 +1,11 @@
 size 35 35
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1:36" ""
 hex 0201 0 "pavement:1:36" ""
diff --git a/megamek/data/boards/unofficial/Chappy/100x100 Battle.board b/megamek/data/boards/unofficial/Chappy/100x100 Battle.board
index 175ede89169..d767fb247ec 100644
--- a/megamek/data/boards/unofficial/Chappy/100x100 Battle.board	
+++ b/megamek/data/boards/unofficial/Chappy/100x100 Battle.board	
@@ -1,9 +1,14 @@
 size 100 100
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Impassable (Auto)"
+tag "Elevator (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "Fortress (Auto)"
 hex 0101 9 "impassable:3" ""
 hex 0201 9 "impassable:3" ""
 hex 0301 9 "impassable:3" ""
diff --git a/megamek/data/boards/unofficial/Chappy/50x50 Three Bridges.board b/megamek/data/boards/unofficial/Chappy/50x50 Three Bridges.board
index 007bf8b1f5a..3c6763c2884 100644
--- a/megamek/data/boards/unofficial/Chappy/50x50 Three Bridges.board	
+++ b/megamek/data/boards/unofficial/Chappy/50x50 Three Bridges.board	
@@ -1,11 +1,14 @@
 size 50 50
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
 hex 0101 -1 "" "grass"
 hex 0201 -1 "" "grass"
 hex 0301 -1 "" "grass"
diff --git a/megamek/data/boards/unofficial/Chappy/80x80 Castle Base.board b/megamek/data/boards/unofficial/Chappy/80x80 Castle Base.board
index bc7bb79ec42..be045518508 100644
--- a/megamek/data/boards/unofficial/Chappy/80x80 Castle Base.board	
+++ b/megamek/data/boards/unofficial/Chappy/80x80 Castle Base.board	
@@ -1,14 +1,17 @@
 size 80 80
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
 hex 0201 0 "woods:1;foliage_elev:2" "grass"
 hex 0301 0 "woods:2;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Chappy/80x80 Castle Town.board b/megamek/data/boards/unofficial/Chappy/80x80 Castle Town.board
index 54f5f9ee7bf..e1902cf463c 100644
--- a/megamek/data/boards/unofficial/Chappy/80x80 Castle Town.board	
+++ b/megamek/data/boards/unofficial/Chappy/80x80 Castle Town.board	
@@ -1,14 +1,17 @@
 size 80 80
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
 hex 0201 0 "woods:1;foliage_elev:2" "grass"
 hex 0301 0 "woods:2;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Church/Tukayyid - Ghost Bear.board b/megamek/data/boards/unofficial/Church/Tukayyid - Ghost Bear.board
index 881d8e0f89e..a7c65657817 100644
--- a/megamek/data/boards/unofficial/Church/Tukayyid - Ghost Bear.board	
+++ b/megamek/data/boards/unofficial/Church/Tukayyid - Ghost Bear.board	
@@ -2,9 +2,10 @@ size 32 17
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
 hex 0201 0 "woods:1;foliage_elev:2" "grass"
 hex 0301 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Church/Tukayyid - Landing Zone.board b/megamek/data/boards/unofficial/Church/Tukayyid - Landing Zone.board
index 983fe189a41..36eb5b6a3ea 100644
--- a/megamek/data/boards/unofficial/Church/Tukayyid - Landing Zone.board	
+++ b/megamek/data/boards/unofficial/Church/Tukayyid - Landing Zone.board	
@@ -1,6 +1,7 @@
 size 32 17
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
diff --git a/megamek/data/boards/unofficial/Church/Tukayyid - Smoke Jaguar.board b/megamek/data/boards/unofficial/Church/Tukayyid - Smoke Jaguar.board
index 9977da3f530..84ed9e01574 100644
--- a/megamek/data/boards/unofficial/Church/Tukayyid - Smoke Jaguar.board	
+++ b/megamek/data/boards/unofficial/Church/Tukayyid - Smoke Jaguar.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Jungle (Auto)"
 hex 0101 1 "" "tropical"
diff --git a/megamek/data/boards/unofficial/DarkISI/16x17 Flughafen 4.board b/megamek/data/boards/unofficial/DarkISI/16x17 Flughafen 4.board
index 53065208a58..02216238b49 100644
--- a/megamek/data/boards/unofficial/DarkISI/16x17 Flughafen 4.board	
+++ b/megamek/data/boards/unofficial/DarkISI/16x17 Flughafen 4.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/DarkISI/16x17 Flughafen 6.board b/megamek/data/boards/unofficial/DarkISI/16x17 Flughafen 6.board
index d8568523546..ff45b18e784 100644
--- a/megamek/data/boards/unofficial/DarkISI/16x17 Flughafen 6.board	
+++ b/megamek/data/boards/unofficial/DarkISI/16x17 Flughafen 6.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
 tag "Jungle (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/DarkISI/16x17 Industry 1.board b/megamek/data/boards/unofficial/DarkISI/16x17 Industry 1.board
index 66d10ec50bb..6efb9714214 100644
--- a/megamek/data/boards/unofficial/DarkISI/16x17 Industry 1.board	
+++ b/megamek/data/boards/unofficial/DarkISI/16x17 Industry 1.board	
@@ -3,6 +3,7 @@ tag "LightUrban (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:2;pavement:1;building:3:6;bldg_cf:90" ""
 hex 0301 0 "bldg_elev:2;pavement:1;building:3:28;bldg_cf:90" ""
diff --git a/megamek/data/boards/unofficial/DarkISI/16x17 Industry 2.board b/megamek/data/boards/unofficial/DarkISI/16x17 Industry 2.board
index 9fdd9331d3d..e26ded4d5c7 100644
--- a/megamek/data/boards/unofficial/DarkISI/16x17 Industry 2.board	
+++ b/megamek/data/boards/unofficial/DarkISI/16x17 Industry 2.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/DarkISI/16x17 Munitionsfabrik 1.board b/megamek/data/boards/unofficial/DarkISI/16x17 Munitionsfabrik 1.board
index 87a923b9345..3e00a07941e 100644
--- a/megamek/data/boards/unofficial/DarkISI/16x17 Munitionsfabrik 1.board	
+++ b/megamek/data/boards/unofficial/DarkISI/16x17 Munitionsfabrik 1.board	
@@ -4,6 +4,8 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "arms:2" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/DarkISI/16x17 Munitionsfabrik 2.board b/megamek/data/boards/unofficial/DarkISI/16x17 Munitionsfabrik 2.board
index fef16fec84f..ba1109bd227 100644
--- a/megamek/data/boards/unofficial/DarkISI/16x17 Munitionsfabrik 2.board	
+++ b/megamek/data/boards/unofficial/DarkISI/16x17 Munitionsfabrik 2.board	
@@ -4,6 +4,8 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1;road:1:9" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/DarkISI/16x17 Stadtgebiet 1.board b/megamek/data/boards/unofficial/DarkISI/16x17 Stadtgebiet 1.board
index e211bec0662..bd62059c2ba 100644
--- a/megamek/data/boards/unofficial/DarkISI/16x17 Stadtgebiet 1.board	
+++ b/megamek/data/boards/unofficial/DarkISI/16x17 Stadtgebiet 1.board	
@@ -3,7 +3,11 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1;road:1:9" ""
 hex 0201 0 "bldg_elev:3;bldg_class:1;pavement:1;building:1:14;bldg_cf:15" ""
 hex 0301 0 "bldg_elev:3;bldg_class:1;pavement:1;building:1:24;bldg_cf:15" ""
diff --git a/megamek/data/boards/unofficial/DarkISI/16x17 Stadtgebiet 2.board b/megamek/data/boards/unofficial/DarkISI/16x17 Stadtgebiet 2.board
index 620778333b5..b1c5c0e1eb9 100644
--- a/megamek/data/boards/unofficial/DarkISI/16x17 Stadtgebiet 2.board	
+++ b/megamek/data/boards/unofficial/DarkISI/16x17 Stadtgebiet 2.board	
@@ -3,6 +3,8 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:2;bldg_class:2;pavement:1;building:2:16;bldg_cf:40" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Ancient City.board b/megamek/data/boards/unofficial/Deadborder/35x35 Ancient City.board
index 12c2fd92b66..73d28a1128e 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Ancient City.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Ancient City.board	
@@ -5,6 +5,7 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 -1 "" ""
 hex 0301 -1 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Butros Line Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Butros Line Princess Edition.board
index 45e6976771f..69f8554c26e 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Butros Line Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Butros Line Princess Edition.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:100" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Butros Town Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Butros Town Princess Edition.board
index b9edb78c13c..0c526f38c9c 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Butros Town Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Butros Town Princess Edition.board	
@@ -1,9 +1,10 @@
 size 35 35
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:150" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Butros Town.board b/megamek/data/boards/unofficial/Deadborder/35x35 Butros Town.board
index 55e51a74ea4..2d3e00cddc1 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Butros Town.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Butros Town.board	
@@ -2,8 +2,9 @@ size 35 35
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Capitol Hill Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Capitol Hill Princess Edition.board
index 7e6f60182b9..c5e7e85cfa8 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Capitol Hill Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Capitol Hill Princess Edition.board	
@@ -1,10 +1,12 @@
 size 35 35
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:150" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "road:1:36" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Capitol Hill.board b/megamek/data/boards/unofficial/Deadborder/35x35 Capitol Hill.board
index 917510d1f1f..18feb927565 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Capitol Hill.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Capitol Hill.board	
@@ -3,8 +3,10 @@ tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "woods:1:45;foliage_elev:2" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "road:1:36" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Dry Creek.board b/megamek/data/boards/unofficial/Deadborder/35x35 Dry Creek.board
index 917b4553dd6..b030442f6ea 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Dry Creek.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Dry Creek.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 tag "MediumUrban (Auto)"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Dystopia River.board b/megamek/data/boards/unofficial/Deadborder/35x35 Dystopia River.board
index a135d02c34b..39db9791f9f 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Dystopia River.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Dystopia River.board	
@@ -6,6 +6,8 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" ""
 hex 0201 0 "road:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Endo Steel City Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Endo Steel City Princess Edition.board
index 1b34044b34a..196256b2a74 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Endo Steel City Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Endo Steel City Princess Edition.board	
@@ -1,11 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "LowHills (Auto)"
+tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "bldg_elev:1;building:4:0;bldg_cf:100" ""
 hex 0201 1 "" ""
 hex 0301 1 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Endo Steel City.board b/megamek/data/boards/unofficial/Deadborder/35x35 Endo Steel City.board
index 4f6096d3daf..34c253a6bfd 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Endo Steel City.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Endo Steel City.board	
@@ -4,8 +4,10 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
 hex 0301 1 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Fort Boutros Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Fort Boutros Princess Edition.board
index f13cd1fdb6d..6d5d68e4d5a 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Fort Boutros Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Fort Boutros Princess Edition.board	
@@ -1,7 +1,9 @@
 size 35 35
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:150" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Fort Boutros.board b/megamek/data/boards/unofficial/Deadborder/35x35 Fort Boutros.board
index aac6c721231..1c1a0160014 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Fort Boutros.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Fort Boutros.board	
@@ -1,7 +1,9 @@
 size 35 35
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Frozen City Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Frozen City Princess Edition.board
index d88ddee2829..34ef5b738e1 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Frozen City Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Frozen City Princess Edition.board	
@@ -1,13 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "IceTerrain (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 5 "bldg_elev:1;snow:1;building:4:0;bldg_cf:100" ""
 hex 0201 6 "snow:1" ""
 hex 0301 3 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Frozen City.board b/megamek/data/boards/unofficial/Deadborder/35x35 Frozen City.board
index 62890c5e982..0234537b716 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Frozen City.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Frozen City.board	
@@ -1,13 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "IceTerrain (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 6 "snow:1" ""
 hex 0201 6 "snow:1" ""
 hex 0301 3 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Ghost Town Rubble.board b/megamek/data/boards/unofficial/Deadborder/35x35 Ghost Town Rubble.board
index 794cbbcf3f6..493fb471912 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Ghost Town Rubble.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Ghost Town Rubble.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "DesertTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "" "desert"
 hex 0201 2 "" "desert"
 hex 0301 2 "" "desert"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Hubland.board b/megamek/data/boards/unofficial/Deadborder/35x35 Hubland.board
index 0726382b2f7..10cc255ff70 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Hubland.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Hubland.board	
@@ -4,7 +4,9 @@ tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;pavement:1;building:1:0;bldg_cf:20" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Industrial Thingamajig.board b/megamek/data/boards/unofficial/Deadborder/35x35 Industrial Thingamajig.board
index 01aa88dc1c2..93e6d227c1a 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Industrial Thingamajig.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Industrial Thingamajig.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Konkerdong Memorial Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Konkerdong Memorial Princess Edition.board
index 2a7f0d10aa8..a1961c1b1e8 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Konkerdong Memorial Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Konkerdong Memorial Princess Edition.board	
@@ -2,8 +2,9 @@ size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:100" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Konkerdong Memorial.board b/megamek/data/boards/unofficial/Deadborder/35x35 Konkerdong Memorial.board
index 35348c39dae..05b9fbe48f4 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Konkerdong Memorial.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Konkerdong Memorial.board	
@@ -2,8 +2,9 @@ size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Lost City Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Lost City Princess Edition.board
index ca3cc47f39e..df16a46e900 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Lost City Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Lost City Princess Edition.board	
@@ -1,11 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:5;pavement:1;building:4:0;bldg_cf:100" ""
 hex 0201 0 "water:1" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Lost City.board b/megamek/data/boards/unofficial/Deadborder/35x35 Lost City.board
index af6f5bbb4f8..438a1ea4dec 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Lost City.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Lost City.board	
@@ -4,8 +4,10 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "water:1" ""
 hex 0201 0 "water:1" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Lost Colony Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Lost Colony Princess Edition.board
index 0bffad3a09b..563098eccf9 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Lost Colony Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Lost Colony Princess Edition.board	
@@ -1,8 +1,9 @@
 size 35 35
 tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:150" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Lost Colony.board b/megamek/data/boards/unofficial/Deadborder/35x35 Lost Colony.board
index 9f92494a858..8515bdba3c6 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Lost Colony.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Lost Colony.board	
@@ -3,6 +3,7 @@ tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Madmans Manor Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Madmans Manor Princess Edition.board
index 00be6473cdf..38bd0f900a0 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Madmans Manor Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Madmans Manor Princess Edition.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:150" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Madmans Manor.board b/megamek/data/boards/unofficial/Deadborder/35x35 Madmans Manor.board
index 37934edeac6..c0d09c8e09d 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Madmans Manor.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Madmans Manor.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Metropia Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Metropia Princess Edition.board
index 1a23ee31d04..a6b854267d5 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Metropia Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Metropia Princess Edition.board	
@@ -5,6 +5,7 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:1;pavement:1;building:4:0;bldg_cf:150" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Occupy Paragon City.board b/megamek/data/boards/unofficial/Deadborder/35x35 Occupy Paragon City.board
index 6e9c00641c3..13fd267e0c1 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Occupy Paragon City.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Occupy Paragon City.board	
@@ -6,6 +6,7 @@ tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;none:1;pavement:1;building:4:8;bldg_cf:150" "grass"
 hex 0201 0 "pavement:1;road:1:9" "grass"
 hex 0301 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Proving Grounds King of the Hill.board b/megamek/data/boards/unofficial/Deadborder/35x35 Proving Grounds King of the Hill.board
index cf1d323bc40..571ad13053d 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Proving Grounds King of the Hill.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Proving Grounds King of the Hill.board	
@@ -3,7 +3,9 @@ tag "LightUrban (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" "grass"
 hex 0201 0 "road:1" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Proving Grounds.board b/megamek/data/boards/unofficial/Deadborder/35x35 Proving Grounds.board
index 7f87e189548..7decca5e8de 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Proving Grounds.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Proving Grounds.board	
@@ -3,7 +3,9 @@ tag "LightUrban (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" "grass"
 hex 0201 0 "road:1" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 RenCen.board b/megamek/data/boards/unofficial/Deadborder/35x35 RenCen.board
index be9bc7c8531..878fcd52d19 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 RenCen.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 RenCen.board	
@@ -4,8 +4,9 @@ tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "LightForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "bldg_elev:3;pavement:1;building:2:4;bldg_cf:50" "grass"
 hex 0201 1 "bldg_elev:3;pavement:1;building:2:32;bldg_cf:50" "grass"
 hex 0301 1 "pavement:1;road:1:36" "grass"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Ruins of the Space Age.board b/megamek/data/boards/unofficial/Deadborder/35x35 Ruins of the Space Age.board
index ef66e8e86bd..85db5440498 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Ruins of the Space Age.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Ruins of the Space Age.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 2 "" ""
 hex 0201 2 "" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Rust Yards Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Rust Yards Princess Edition.board
index 9fd6bd7207a..cf37238c65c 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Rust Yards Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Rust Yards Princess Edition.board	
@@ -2,7 +2,10 @@ size 35 35
 option exit_roads_to_pavement false
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:150" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Rust Yards.board b/megamek/data/boards/unofficial/Deadborder/35x35 Rust Yards.board
index 23c4adb42f6..317f1e99962 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Rust Yards.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Rust Yards.board	
@@ -1,7 +1,10 @@
 size 35 35
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Salty Shores.board b/megamek/data/boards/unofficial/Deadborder/35x35 Salty Shores.board
index c331238844d..9b319608653 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Salty Shores.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Salty Shores.board	
@@ -4,6 +4,7 @@ tag "LightUrban (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:3" "desert"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Taphaultlandia.board b/megamek/data/boards/unofficial/Deadborder/35x35 Taphaultlandia.board
index 299a9dc8e75..302f9b0a3ac 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Taphaultlandia.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Taphaultlandia.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 The Cauldron Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 The Cauldron Princess Edition.board
index 5a29c7f3160..2bd8cc90b5a 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 The Cauldron Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 The Cauldron Princess Edition.board	
@@ -2,6 +2,7 @@ size 35 35
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "bldg_elev:1;building:4:0;bldg_cf:150" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 The Cauldron.board b/megamek/data/boards/unofficial/Deadborder/35x35 The Cauldron.board
index 985c9cfec03..9da3e4c103b 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 The Cauldron.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 The Cauldron.board	
@@ -2,6 +2,7 @@ size 35 35
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Tin City.board b/megamek/data/boards/unofficial/Deadborder/35x35 Tin City.board
index 1f40933c966..da29c9004a7 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Tin City.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Tin City.board	
@@ -1,8 +1,10 @@
 size 35 35
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "pavement:1" "desert"
 hex 0201 4 "pavement:1" "desert"
 hex 0301 4 "pavement:1" "desert"
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Traffic Mountain Princess Edition.board b/megamek/data/boards/unofficial/Deadborder/35x35 Traffic Mountain Princess Edition.board
index 645eff90f86..ae459ab0ecb 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Traffic Mountain Princess Edition.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Traffic Mountain Princess Edition.board	
@@ -1,11 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 -5 "bldg_elev:1;building:4:0;bldg_cf:150" ""
 hex 0201 -5 "road:1:5" ""
diff --git a/megamek/data/boards/unofficial/Deadborder/35x35 Traffic Mountain.board b/megamek/data/boards/unofficial/Deadborder/35x35 Traffic Mountain.board
index 88f8f993626..9e876489e56 100644
--- a/megamek/data/boards/unofficial/Deadborder/35x35 Traffic Mountain.board	
+++ b/megamek/data/boards/unofficial/Deadborder/35x35 Traffic Mountain.board	
@@ -1,11 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 -5 "" ""
 hex 0201 -5 "road:1:5" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/16x68 Chemical Rush.board b/megamek/data/boards/unofficial/Derv_Maps/16x68 Chemical Rush.board
index 78e0fc23378..e213ebdb854 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/16x68 Chemical Rush.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/16x68 Chemical Rush.board	
@@ -1,13 +1,19 @@
 size 16 68
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 5 "woods:3:36;foliage_elev:3" "grass"
 hex 0201 4 "woods:3:36;foliage_elev:3" "grass"
 hex 0301 3 "woods:2:36;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/16x68 Urban Decay.board b/megamek/data/boards/unofficial/Derv_Maps/16x68 Urban Decay.board
index 24512c40aad..35fafd50d8b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/16x68 Urban Decay.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/16x68 Urban Decay.board	
@@ -2,13 +2,19 @@ size 16 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Roads (Auto)"
-tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 5 "woods:3:36;foliage_elev:3" "grass"
 hex 0201 4 "woods:3:36;foliage_elev:3" "grass"
 hex 0301 3 "woods:2:36;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/21x21 Defiance Interior.board b/megamek/data/boards/unofficial/Derv_Maps/21x21 Defiance Interior.board
index 60eb7d0230b..fa6984df08b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/21x21 Defiance Interior.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/21x21 Defiance Interior.board	
@@ -1,9 +1,14 @@
 size 21 21
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 9 "impassable:1" ""
 hex 0201 9 "impassable:1" ""
 hex 0301 9 "impassable:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Airport 3000 Classic.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Airport 3000 Classic.board
index 94de4cd0ec2..c366f60f9a6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Airport 3000 Classic.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Airport 3000 Classic.board	
@@ -2,6 +2,7 @@ size 25 25
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Airport 3000.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Airport 3000.board
index 3bd8c0c33d0..56725423e63 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Airport 3000.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Airport 3000.board	
@@ -2,6 +2,8 @@ size 25 25
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "fuel_tank_cf:40;fuel_tank_elev:2;fuel_tank_magn:100;pavement:1;fuel_tank:2:0" ""
 hex 0201 0 "bldg_elev:3;bldg_class:1;pavement:1;building:4:30;bldg_cf:75" ""
 hex 0301 0 "bldg_elev:3;bldg_class:1;pavement:1;building:4:28;bldg_cf:75" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Dead Marshes.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Dead Marshes.board
index 862e9fdc677..1b49971f123 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Dead Marshes.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Dead Marshes.board	
@@ -1,10 +1,11 @@
 size 25 25
 option exit_roads_to_pavement false
-tag "Swamp (Auto)"
-tag "LightForest (Auto)"
-tag "DesertTheme (Auto)"
 tag "Water (Auto)"
+tag "Swamp (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
+tag "DesertTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "swamp:1" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Flooded City.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Flooded City.board
index cc805d9ba20..cec399c426c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Flooded City.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Flooded City.board	
@@ -1,13 +1,15 @@
 size 25 25
 option exit_roads_to_pavement false
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "GrassTheme (Auto)"
 tag "Ocean (Auto)"
-tag "MediumUrban (Auto)"
-tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 0 "road:1:36;water:0" "grass"
 hex 0201 0 "road:1:36;water:0" "grass"
 hex 0301 0 "bldg_elev:1;water:0;building:4:0;bldg_cf:75" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Freezer.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Freezer.board
index aeb0d759a53..ee7c2f4335d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Freezer.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Freezer.board	
@@ -1,9 +1,10 @@
 size 25 25
 option exit_roads_to_pavement false
-tag "SnowTerrain (Auto)"
 tag "SnowTheme (Auto)"
-tag "IceTerrain (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
+tag "IceTerrain (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" "snow"
 hex 0201 0 "snow:1" "snow"
 hex 0301 0 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Hpg Hill.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Hpg Hill.board
index d8fe034581d..2c85461cfea 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Hpg Hill.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Hpg Hill.board	
@@ -1,10 +1,14 @@
 size 25 25
 option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -5 "bldg_elev:2;bldg_class:1:0;pavement:1;building:1:15;bldg_cf:60" ""
 hex 0201 -5 "bldg_elev:2;bldg_class:1:0;pavement:1;building:1:57;bldg_cf:60" ""
 hex 0301 -5 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Joy.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Joy.board
index a929e6fa1fe..fbc55531097 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Joy.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Joy.board	
@@ -1,5 +1,6 @@
 size 25 25
 tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Lava (Auto)"
 hex 0101 1 "" "lunar"
 hex 0201 1 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Red Pillers.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Red Pillers.board
index a3ed1a54685..a4f0b8654be 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Red Pillers.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Red Pillers.board	
@@ -2,6 +2,7 @@ size 25 25
 tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 9 "impassable:1" "mars"
 hex 0201 9 "impassable:1" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Tomato Plains.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Tomato Plains.board
index de4b89e085a..a370388ac21 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Tomato Plains.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Tomato Plains.board	
@@ -2,6 +2,7 @@ size 25 25
 option exit_roads_to_pavement false
 tag "MarsTheme (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Lava (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Triforce.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Triforce.board
index 5d8433b9348..71b930571f5 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Triforce.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Triforce.board	
@@ -1,8 +1,9 @@
 size 25 25
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x25 Twin Mesa.board b/megamek/data/boards/unofficial/Derv_Maps/25x25 Twin Mesa.board
index e269f1b663b..69ddc05fdbf 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x25 Twin Mesa.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x25 Twin Mesa.board	
@@ -2,8 +2,9 @@ size 25 25
 option exit_roads_to_pavement false
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
-tag "MediumUrban (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 1 "" "mars"
 hex 0201 2 "" "mars"
 hex 0301 1 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/25x45 New Hoover.board b/megamek/data/boards/unofficial/Derv_Maps/25x45 New Hoover.board
index b58668579dd..b689619fe11 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/25x45 New Hoover.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/25x45 New Hoover.board	
@@ -1,10 +1,11 @@
 size 25 45
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "Elevator (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Dunes of Doom.board b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Dunes of Doom.board
index 1de255dbeaa..36079042c98 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Dunes of Doom.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Dunes of Doom.board	
@@ -1,9 +1,11 @@
 size 30 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "DesertTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
 tag "Jungle (Auto)"
 hex 0101 2 "impassable:1" "desert"
 hex 0201 2 "impassable:1" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Fire Mountain.board b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Fire Mountain.board
index 77d038cc073..cd49834792c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Fire Mountain.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Fire Mountain.board	
@@ -1,6 +1,8 @@
 size 30 34
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "impassable:3:0" ""
 hex 0201 0 "impassable:3:0" ""
 hex 0301 0 "impassable:3:0" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Hot and Cold.board b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Hot and Cold.board
index 5355a42c2fe..05bc1a8b129 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Hot and Cold.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Hot and Cold.board	
@@ -1,7 +1,8 @@
 size 30 34
 option exit_roads_to_pavement false
-tag "IceTerrain (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "impassable:1" "volcano"
 hex 0201 0 "impassable:1" "volcano"
 hex 0301 0 "impassable:1" "volcano"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Ice Age Glacier.board b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Ice Age Glacier.board
index 9108ad6dfca..f4751333264 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Ice Age Glacier.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Ice Age Glacier.board	
@@ -1,11 +1,12 @@
 size 30 34
 option exit_roads_to_pavement false
-tag "IceTerrain (Auto)"
-tag "SnowTerrain (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" "snow"
 hex 0201 0 "ice:1" "snow"
 hex 0301 0 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Mud Pit.board b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Mud Pit.board
index fe3b03c8d01..26ae3d09fd7 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Mud Pit.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/30x34 Solaris Mud Pit.board	
@@ -1,6 +1,7 @@
 size 30 34
 tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Impassable (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "impassable:1:0" ""
 hex 0201 0 "impassable:1:0" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/30x55 Gates of Hesperus.board b/megamek/data/boards/unofficial/Derv_Maps/30x55 Gates of Hesperus.board
index 4dee7939113..b770ca1c917 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/30x55 Gates of Hesperus.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/30x55 Gates of Hesperus.board	
@@ -1,9 +1,10 @@
 size 30 55
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 10 "" ""
 hex 0201 10 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/32x17 Mars Melt.board b/megamek/data/boards/unofficial/Derv_Maps/32x17 Mars Melt.board
index 4734ddb885a..78bdef272e8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/32x17 Mars Melt.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/32x17 Mars Melt.board	
@@ -2,6 +2,7 @@ size 32 17
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/32x34 Solaris Frozen Hell.board b/megamek/data/boards/unofficial/Derv_Maps/32x34 Solaris Frozen Hell.board
index 4a60bc28241..3ac5d8f52bb 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/32x34 Solaris Frozen Hell.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/32x34 Solaris Frozen Hell.board	
@@ -2,9 +2,10 @@ size 32 34
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "IceTerrain (Auto)"
+tag "Impassable (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
-tag "LightForest (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 0 "impassable:2" ""
 hex 0201 0 "impassable:2" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/32x34 Solaris Lava Caves.board b/megamek/data/boards/unofficial/Derv_Maps/32x34 Solaris Lava Caves.board
index 15fe70b17b2..1fadc0497c2 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/32x34 Solaris Lava Caves.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/32x34 Solaris Lava Caves.board	
@@ -1,11 +1,12 @@
 size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "Impassable (Auto)"
 hex 0101 9 "impassable:1" ""
 hex 0201 9 "impassable:1" ""
 hex 0301 9 "impassable:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/34x35 Colosseum.board b/megamek/data/boards/unofficial/Derv_Maps/34x35 Colosseum.board
index 1245bd096d9..5641b8b4e9d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/34x35 Colosseum.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/34x35 Colosseum.board	
@@ -1,8 +1,9 @@
 size 34 35
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 tag "Woods (Auto)"
 hex 0101 12 "impassable:1" ""
 hex 0201 12 "impassable:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/34x35 Factory.board b/megamek/data/boards/unofficial/Derv_Maps/34x35 Factory.board
index 980275d069b..d651b69e28f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/34x35 Factory.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/34x35 Factory.board	
@@ -1,8 +1,9 @@
 size 34 35
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 12 "impassable:0" ""
 hex 0201 12 "impassable:0" ""
 hex 0301 12 "impassable:0" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 2Fort.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 2Fort.board
index 3818e790433..46c99a3c7b9 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 2Fort.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 2Fort.board	
@@ -1,9 +1,12 @@
 size 35 35
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1;road:1:9" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 A Bridge 2 Far Beta.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 A Bridge 2 Far Beta.board
index c95eab2ede8..7551405c6f1 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 A Bridge 2 Far Beta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 A Bridge 2 Far Beta.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 4 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath Beta.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath Beta.board
index 6cc08930426..cf1d0089dd8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath Beta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath Beta.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath Classic.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath Classic.board
index 6cc08930426..cf1d0089dd8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath Classic.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath Classic.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath.board
index 1f371927cf4..52547338b0c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aftermath.board	
@@ -1,12 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 3 "woods:1;foliage_elev:2" "grass"
 hex 0301 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aim Nine Classic.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aim Nine Classic.board
index c779c582545..c525245adb9 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aim Nine Classic.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aim Nine Classic.board	
@@ -1,9 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 5 "snow:1" ""
 hex 0201 5 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aim Nine.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aim Nine.board
index 5f1a25ee0f8..b67740ed70a 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Aim Nine.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Aim Nine.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "IceTerrain (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 6 "ice:1;snow:2" ""
 hex 0201 6 "ice:1;snow:2" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Applegate.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Applegate.board
index 104c8fb02e8..982734cc902 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Applegate.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Applegate.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 1 "snow:1" ""
 hex 0201 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Archipelago.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Archipelago.board
index 54e9d1f2638..5d1291776e9 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Archipelago.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Archipelago.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Arctic Wasteland.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Arctic Wasteland.board
index 5461e660304..8ccc41480ca 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Arctic Wasteland.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Arctic Wasteland.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 1 "woods:1;snow:1;foliage_elev:2" "snow"
 hex 0201 1 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Atreus Classic.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Atreus Classic.board
index 73a71ce7dae..4e9d239c8bc 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Atreus Classic.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Atreus Classic.board	
@@ -4,7 +4,9 @@ tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:6;pavement:1;building:3:12;bldg_cf:250" ""
 hex 0201 0 "bldg_elev:6;pavement:1;building:3:62;bldg_cf:250" ""
 hex 0301 0 "bldg_elev:7;pavement:1;building:3:28;bldg_cf:300" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Atreus.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Atreus.board
index eb83bbd948d..1f28ee47189 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Atreus.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Atreus.board	
@@ -1,12 +1,15 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:11;pavement:1;building:3:12;bldg_cf:120" ""
 hex 0201 0 "bldg_elev:11;pavement:1;building:3:56;bldg_cf:120" ""
 hex 0301 0 "road:2:9" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Avalon City 2.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Avalon City 2.board
index e2247830fed..6bdf2af2500 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Avalon City 2.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Avalon City 2.board	
@@ -1,10 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Avalon City.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Avalon City.board
index 0a73e6e8a7d..b4b997d52e4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Avalon City.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Avalon City.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "MediumUrban (Auto)"
 tag "GrassTheme (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Bear Trap.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Bear Trap.board
index 2c6e17867c3..27e1aa8bac7 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Bear Trap.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Bear Trap.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "Impassable (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 0 "woods:2;snow:1;foliage_elev:2" ""
 hex 0201 0 "woods:1;snow:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Blakes Atreus.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Blakes Atreus.board
index af6cc7bc0a1..58a3b582eda 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Blakes Atreus.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Blakes Atreus.board	
@@ -4,7 +4,10 @@ tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:6;pavement:1;building:3:12;bldg_cf:250" ""
 hex 0201 0 "bldg_elev:6;pavement:1;building:3:62;bldg_cf:250" ""
 hex 0301 0 "bldg_elev:7;pavement:1;building:3:28;bldg_cf:300" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Blood on the Snow.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Blood on the Snow.board
index c9f605bcd0d..006cc3484b2 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Blood on the Snow.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Blood on the Snow.board	
@@ -1,11 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" ""
 hex 0201 0 "snow:1" ""
 hex 0301 1 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Booster's Tower.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Booster's Tower.board
index 314f559385b..7c852268c38 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Booster's Tower.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Booster's Tower.board	
@@ -4,9 +4,10 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
-tag "LightForest (Auto)"
 hex 0101 -2 "water:0" ""
 hex 0201 -2 "water:0" ""
 hex 0301 -2 "water:0" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Bowie.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Bowie.board
index 070ad976d7d..f3b6c4f758b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Bowie.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Bowie.board	
@@ -1,8 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Busy City 2.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Busy City 2.board
index 2c14a6aab7f..a4cb5052d1f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Busy City 2.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Busy City 2.board	
@@ -1,13 +1,15 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:1" "grass"
 hex 0201 0 "sand:1" "grass"
 hex 0301 0 "sand:1" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Castle Hill.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Castle Hill.board
index 7ad3269a6b0..b7673879579 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Castle Hill.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Castle Hill.board	
@@ -1,11 +1,15 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "bldg_elev:1:0;pavement:1;building:1:0;bldg_cf:10" "grass"
 hex 0201 0 "road:1" "grass"
 hex 0301 0 "road:1" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 City of Angles.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 City of Angles.board
index 7fb76ffb895..efd240edcf8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 City of Angles.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 City of Angles.board	
@@ -3,8 +3,10 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (City).board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (City).board
index c2c0e6d08cd..e193a1ffe8d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (City).board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (City).board	
@@ -1,10 +1,12 @@
 size 35 35
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:5;pavement:1;building:4:12;bldg_cf:200" ""
 hex 0201 0 "bldg_elev:5;pavement:1;building:4:62;bldg_cf:200" ""
 hex 0301 0 "bldg_elev:5;pavement:1;building:4:28;bldg_cf:200" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Empty).board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Empty).board
index ca2770ef47a..c4d560c352f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Empty).board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Empty).board	
@@ -1,9 +1,11 @@
 size 35 35
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:5;pavement:1;building:4:12;bldg_cf:200" ""
 hex 0201 0 "bldg_elev:5;pavement:1;building:4:62;bldg_cf:200" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Lava).board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Lava).board
index 79185939fe4..0aeea5c93ec 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Lava).board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Lava).board	
@@ -1,12 +1,15 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
-tag "MediumUrban (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:5;pavement:1;building:4:12;bldg_cf:200" ""
 hex 0201 0 "bldg_elev:5;pavement:1;building:4:62;bldg_cf:200" ""
 hex 0301 0 "bldg_elev:5;pavement:1;building:4:28;bldg_cf:200" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Meadow).board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Meadow).board
index def9e702a0a..9d376a2e174 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Meadow).board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games (Meadow).board	
@@ -1,11 +1,13 @@
 size 35 35
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:5;pavement:1;building:4:12;bldg_cf:200" ""
 hex 0201 0 "bldg_elev:5;pavement:1;building:4:62;bldg_cf:200" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games.board
index bdff9bf44eb..47fe9290cde 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Deadly Games.board	
@@ -1,15 +1,17 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Lava (Auto)"
 tag "IceTerrain (Auto)"
-tag "MediumUrban (Auto)"
-tag "Water (Auto)"
+tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:5;pavement:1;building:4:12;bldg_cf:200" ""
 hex 0201 0 "bldg_elev:5;pavement:1;building:4:62;bldg_cf:200" ""
 hex 0301 0 "bldg_elev:5;pavement:1;building:4:28;bldg_cf:200" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Defiance Industries Exterior.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Defiance Industries Exterior.board
index 0c4e88f8cf2..178033b214d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Defiance Industries Exterior.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Defiance Industries Exterior.board	
@@ -2,9 +2,10 @@ size 35 35
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 6 "" ""
 hex 0201 6 "" ""
 hex 0301 6 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Desert Castle.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Desert Castle.board
index 0acc29ae9f4..fed10d3aa95 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Desert Castle.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Desert Castle.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
 tag "Cliffs (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 -1 "sand:0;rough:1" "desert"
 hex 0201 -1 "sand:0;rough:1" "desert"
 hex 0301 -1 "sand:0;rough:1" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Desert Mesa Base.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Desert Mesa Base.board
index f6849d26d5b..254bc83eb6d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Desert Mesa Base.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Desert Mesa Base.board	
@@ -1,9 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "Elevator (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Destruction.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Destruction.board
index 9dd54624f18..60ed4ebc8dc 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Destruction.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Destruction.board	
@@ -4,8 +4,11 @@ tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "rough:1:9" "snow"
 hex 0201 0 "woods:1;foliage_elev:2" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Dezolis Alpha.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Dezolis Alpha.board
index ddf72909ee0..9bd542506f4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Dezolis Alpha.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Dezolis Alpha.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "SnowTerrain (Auto)"
 tag "SnowTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" "snow"
 hex 0201 0 "snow:1" "snow"
 hex 0301 0 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Diver's Grotto.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Diver's Grotto.board
index 69daad1250a..bae9912ab22 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Diver's Grotto.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Diver's Grotto.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "TropicalTheme (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
 hex 0101 3 "" "tropical"
 hex 0201 3 "" "tropical"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Domed.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Domed.board
index 24de1507132..3c8146d55f4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Domed.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Domed.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Dormancy.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Dormancy.board
index 46caabd4688..4a7d6326c29 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Dormancy.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Dormancy.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 hex 0101 1 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Double City.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Double City.board
index 05148e560f6..bb5600a3802 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Double City.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Double City.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "bldg_elev:2;pavement:1;building:2:28;bldg_cf:75" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Dropship Hub.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Dropship Hub.board
index 06025334639..cc0b3b1485e 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Dropship Hub.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Dropship Hub.board	
@@ -3,6 +3,8 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Dustball.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Dustball.board
index 2dc1d58a943..7a103d64d84 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Dustball.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Dustball.board	
@@ -4,6 +4,8 @@ tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Eagle's Nest.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Eagle's Nest.board
index 35a4cf8e7ac..0268a25c342 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Eagle's Nest.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Eagle's Nest.board	
@@ -1,13 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "snow:1" ""
 hex 0201 1 "woods:1:0;snow:1;foliage_elev:2" ""
 hex 0301 1 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Eisenjaeger.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Eisenjaeger.board
index b653bcfde0b..df5f20f2a61 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Eisenjaeger.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Eisenjaeger.board	
@@ -1,13 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 3 "snow:2" "snow"
 hex 0201 3 "snow:2" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Fields of Isis.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Fields of Isis.board
index 621f72936ca..85f06758fd8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Fields of Isis.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Fields of Isis.board	
@@ -1,7 +1,8 @@
 size 35 35
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 2 "" ""
 hex 0201 2 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Firebase Gamma.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Firebase Gamma.board
index de2541acd5e..06f291ff5f6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Firebase Gamma.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Firebase Gamma.board	
@@ -1,10 +1,12 @@
 size 35 35
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Five O.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Five O.board
index 7f57e4e0be2..d1a2930816f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Five O.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Five O.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Ocean (Auto)"
 tag "Water (Auto)"
+tag "Ocean (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:0" "tropical"
 hex 0201 0 "water:0" "tropical"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Fort Sumter.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Fort Sumter.board
index 579ba2e08e9..8ecd601c786 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Fort Sumter.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Fort Sumter.board	
@@ -1,13 +1,16 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "woods:1:4;foliage_elev:2" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "road:1:13" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 General Motors.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 General Motors.board
index 4dcd902f88a..3042c51c0c5 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 General Motors.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 General Motors.board	
@@ -2,7 +2,10 @@ size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Highway.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Highway.board
index 1a9a3758bc9..f972175f217 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Highway.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Highway.board	
@@ -2,8 +2,9 @@ size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Hildco Industries.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Hildco Industries.board
index 89a0b251e79..888e1ca8fd3 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Hildco Industries.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Hildco Industries.board	
@@ -1,9 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "woods:1:9;foliage_elev:2" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Hot Water.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Hot Water.board
index 8e75d3f7de2..8767f49d6ad 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Hot Water.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Hot Water.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "water:2:33" "mars"
 hex 0201 0 "water:1:23" ""
 hex 0301 0 "water:1:23" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Hoth.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Hoth.board
index e2604710ada..84f9de08dc9 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Hoth.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Hoth.board	
@@ -1,8 +1,9 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" ""
 hex 0201 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Hub Retracted.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Hub Retracted.board
index 3edf0129c50..3ec59eeb97e 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Hub Retracted.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Hub Retracted.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Il Tramonto.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Il Tramonto.board
index 7346fa1e7f6..717f5563209 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Il Tramonto.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Il Tramonto.board	
@@ -1,6 +1,7 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Imperial Sewers.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Imperial Sewers.board
index 4677396df79..f8de84ce2ca 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Imperial Sewers.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Imperial Sewers.board	
@@ -3,8 +3,12 @@ option exit_roads_to_pavement false
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 hex 0101 9 "impassable:0" "desert"
 hex 0201 9 "impassable:0" "desert"
 hex 0301 9 "impassable:0" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Iron Swamp.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Iron Swamp.board
index 3f481fb64a2..888483a6018 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Iron Swamp.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Iron Swamp.board	
@@ -1,11 +1,12 @@
 size 35 35
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Ishikawajima.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Ishikawajima.board
index 2d0b56e9487..612a129afc4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Ishikawajima.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Ishikawajima.board	
@@ -1,9 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "tundra:1" ""
 hex 0201 0 "tundra:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Karkand.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Karkand.board
index 25d51d7d77c..f0fb9813bb7 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Karkand.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Karkand.board	
@@ -5,7 +5,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" ""
 hex 0201 3 "" ""
 hex 0301 1 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Kervil Islands.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Kervil Islands.board
index 286309287c5..f730ebc4f3f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Kervil Islands.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Kervil Islands.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Koryo.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Koryo.board
index b217c0cca54..98508ff8b5b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Koryo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Koryo.board	
@@ -1,15 +1,20 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "HighHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "SnowTerrain (Auto)"
 tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -2 "rough:1" "mars"
 hex 0201 -2 "" "mars"
 hex 0301 -2 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Lonely Mountain.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Lonely Mountain.board
index 957d9b67058..82d5859c1bf 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Lonely Mountain.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Lonely Mountain.board	
@@ -3,9 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
 hex 0201 0 "woods:1;foliage_elev:2" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Lost and Gone.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Lost and Gone.board
index 87debb30c67..94bfa5f0544 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Lost and Gone.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Lost and Gone.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LowHills (Auto)"
 hex 0101 2 "" "mars"
 hex 0201 2 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Lostech.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Lostech.board
index 814a5f1e172..bb036cfdff8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Lostech.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Lostech.board	
@@ -2,6 +2,7 @@ size 35 35
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Lunar Surface.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Lunar Surface.board
index 8276d72aa3f..e0615bf0207 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Lunar Surface.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Lunar Surface.board	
@@ -1,9 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mannedorf 2.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mannedorf 2.board
index 3400da25915..fd615c3fdbc 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mannedorf 2.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mannedorf 2.board	
@@ -3,7 +3,9 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 1 "snow:1" "Snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mars Surface.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mars Surface.board
index 5a30bacd4c7..6bf408d95b6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mars Surface.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mars Surface.board	
@@ -1,8 +1,9 @@
 size 35 35
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 4 "" "mars"
 hex 0201 4 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mash Drift.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mash Drift.board
index f59719b648c..a45f4958664 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mash Drift.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mash Drift.board	
@@ -2,9 +2,11 @@ size 35 35
 option exit_roads_to_pavement false
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" "snow"
 hex 0201 0 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mash.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mash.board
index 8cb992a1f99..88b3d9b4e06 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mash.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mash.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Miami Beach Beta.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Miami Beach Beta.board
index 826842172dc..e241959998d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Miami Beach Beta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Miami Beach Beta.board	
@@ -1,11 +1,12 @@
 size 35 35
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:3:34;woods:1:0;building:1:0;foliage_elev:2;bldg_cf:20:34" "grass"
 hex 0201 0 "water:2" "grass"
 hex 0301 0 "water:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Miami Beach.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Miami Beach.board
index 6d2a8f96a6f..183ec9a6a3c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Miami Beach.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Miami Beach.board	
@@ -1,12 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:3:34;woods:1:0;building:1:0;foliage_elev:2;bldg_cf:20:34" "grass"
 hex 0201 0 "water:2" "grass"
 hex 0301 0 "water:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mini City.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mini City.board
index 9db9bf32c35..28c0e1bd9d5 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mini City.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mini City.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:1;building:1:0;bldg_cf:10" "grass"
 hex 0201 0 "road:1" "grass"
 hex 0301 0 "road:1" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mountain Rush.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mountain Rush.board
index b4dcb203071..862cc815651 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mountain Rush.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mountain Rush.board	
@@ -1,12 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "woods:1;foliage_elev:2" ""
 hex 0301 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mt. Olympus.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mt. Olympus.board
index a0a4d6aab81..09949c84aaa 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Mt. Olympus.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Mt. Olympus.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 3 "" "mars"
 hex 0201 4 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 New Avalon 3070.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 New Avalon 3070.board
index e7fda34922a..375d2af3b6a 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 New Avalon 3070.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 New Avalon 3070.board	
@@ -1,11 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
+tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:6:26;building:2:12;bldg_cf:200:26" "desert"
 hex 0201 0 "bldg_elev:6:26;building:2:60;bldg_cf:200:26" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Newton Township.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Newton Township.board
index c7bd401ec2d..def8d4ad5dd 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Newton Township.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Newton Township.board	
@@ -3,8 +3,10 @@ option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Oasis.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Oasis.board
index 745fe49e30b..61a0377ceaa 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Oasis.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Oasis.board	
@@ -1,6 +1,7 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Oilspill Drained.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Oilspill Drained.board
index cef75c5b567..e77d97765cf 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Oilspill Drained.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Oilspill Drained.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "SnowTerrain (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 2 "snow:1" ""
 hex 0201 2 "snow:1" ""
 hex 0301 2 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Oilspill.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Oilspill.board
index ddef25b1b00..8ee609a00a4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Oilspill.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Oilspill.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "SnowTerrain (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 2 "snow:1" ""
 hex 0201 2 "snow:1" ""
 hex 0301 2 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Palace Gates.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Palace Gates.board
index 991a53a72b1..0b806e04c4d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Palace Gates.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Palace Gates.board	
@@ -1,8 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 1 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Pitt Fight.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Pitt Fight.board
index 112f54e0028..1b45b7a485d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Pitt Fight.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Pitt Fight.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 9 "" "desert"
 hex 0201 9 "" "desert"
 hex 0301 9 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Port Kallin.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Port Kallin.board
index a6ee8379c4b..dd53e8f960b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Port Kallin.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Port Kallin.board	
@@ -1,11 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Pyre Light.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Pyre Light.board
index 0f5d27e8fa5..b766333a558 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Pyre Light.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Pyre Light.board	
@@ -1,6 +1,7 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "DesertTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "" "desert"
 hex 0301 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Quatre Belle.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Quatre Belle.board
index 733a02d4b15..872b7dce5c5 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Quatre Belle.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Quatre Belle.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 tag "Jungle (Auto)"
 hex 0101 -2 "space:1" ""
 hex 0201 -2 "space:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Rectortown Reloaded.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Rectortown Reloaded.board
index 8228e80a4b3..1cf9a732fe4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Rectortown Reloaded.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Rectortown Reloaded.board	
@@ -1,11 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "bldg_elev:5:36;building:4:14;bldg_cf:200:36" ""
 hex 0301 0 "bldg_elev:5:36;building:4:28;bldg_cf:200:36" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Rectortown.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Rectortown.board
index 52c5bf6cca5..d0f92ce2c0c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Rectortown.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Rectortown.board	
@@ -1,10 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "bldg_elev:5:36;building:4:14;bldg_cf:200:36" ""
 hex 0301 0 "bldg_elev:5:36;building:4:28;bldg_cf:200:36" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Red Base.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Red Base.board
index ef35156eab9..f4aa000aec2 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Red Base.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Red Base.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Reefer.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Reefer.board
index dac596cefba..48ce082956e 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Reefer.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Reefer.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:0" "tropical"
 hex 0201 0 "water:0" "tropical"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Refit Yard.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Refit Yard.board
index a424146da87..6db239dfba6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Refit Yard.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Refit Yard.board	
@@ -1,9 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "snow:1" ""
 hex 0201 1 "snow:1" ""
 hex 0301 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Road to Madre.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Road to Madre.board
index f569332b040..9651b498b9a 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Road to Madre.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Road to Madre.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 4 "" "desert"
 hex 0201 4 "" "desert"
 hex 0301 4 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Royal Guard.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Royal Guard.board
index cf5ec56ec5e..de1299e25b8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Royal Guard.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Royal Guard.board	
@@ -1,13 +1,15 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
-tag "MediumUrban (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 0 "woods:1;snow:1;foliage_elev:2" "snow"
 hex 0201 0 "woods:1;snow:1;foliage_elev:2" "snow"
 hex 0301 0 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Silver Cliffs.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Silver Cliffs.board
index 5d5b59895bf..07d05aaf62f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Silver Cliffs.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Silver Cliffs.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:300" "Lunar"
 hex 0201 20 "impassable:300" "Lunar"
 hex 0301 20 "impassable:300" "Lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Sim City.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Sim City.board
index 505c0557e29..b6f6515daa6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Sim City.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Sim City.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Sirius V.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Sirius V.board
index b10b08770b6..51751cf59c0 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Sirius V.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Sirius V.board	
@@ -1,12 +1,19 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -2 "" "Lunar"
 hex 0201 -2 "" "Lunar"
 hex 0301 -2 "rough:1" "Lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Sirius.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Sirius.board
index d06b9c3ecfe..9e993291e66 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Sirius.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Sirius.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 hex 0101 -2 "" "Lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Snake River.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Snake River.board
index 26662501f35..720fe2cb5b1 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Snake River.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Snake River.board	
@@ -1,8 +1,9 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 3 "" "mars"
 hex 0201 3 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Snow Capped.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Snow Capped.board
index 98a11c48803..2721f5d0a44 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Snow Capped.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Snow Capped.board	
@@ -1,5 +1,6 @@
 size 35 35
 tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Snowfox.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Snowfox.board
index dc04b396a73..56874b061ab 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Snowfox.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Snowfox.board	
@@ -2,10 +2,12 @@ size 35 35
 option exit_roads_to_pavement false
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "snow:1" ""
 hex 0201 1 "snow:1" ""
 hex 0301 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Solaris City.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Solaris City.board
index 91781ba4e2b..d57807d7fd2 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Solaris City.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Solaris City.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Space Conflict.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Space Conflict.board
index 0c5a4f74739..139b85a944f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Space Conflict.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Space Conflict.board	
@@ -1,7 +1,8 @@
 size 35 35
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 2 "pavement:1" ""
 hex 0201 2 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Spice.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Spice.board
index 16d8f93d796..efbe2046839 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Spice.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Spice.board	
@@ -1,6 +1,7 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 1 "" "Mars"
 hex 0201 1 "" "Mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Sprawl.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Sprawl.board
index 0bb3efd8575..8ae7a87263d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Sprawl.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Sprawl.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:45" "Grass"
 hex 0201 0 "bldg_elev:2;pavement:1;building:1:0;bldg_cf:11" "Grass"
 hex 0301 0 "pavement:1;road:1:9" "Grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Stamford.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Stamford.board
index d4967c9f39a..5ace5c9f76b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Stamford.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Stamford.board	
@@ -6,6 +6,7 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "woods:1:25;foliage_elev:2" "grass"
 hex 0201 1 "woods:1:25;foliage_elev:2" "grass"
 hex 0301 0 "road:2:36" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Toad Pools.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Toad Pools.board
index 1e4214265d8..5f29f4aad4f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Toad Pools.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Toad Pools.board	
@@ -1,8 +1,9 @@
 size 35 35
 option exit_roads_to_pavement false
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
 hex 0101 0 "" "tropical"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Twin Oasis.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Twin Oasis.board
index 556274423b6..f3c71b440b6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Twin Oasis.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Twin Oasis.board	
@@ -1,5 +1,6 @@
 size 35 35
 option exit_roads_to_pavement false
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Veil Surface.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Veil Surface.board
index 73f6848c1da..749222c9c7f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Veil Surface.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Veil Surface.board	
@@ -1,8 +1,9 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "SnowTerrain (Auto)"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Wet Pincussion.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Wet Pincussion.board
index 51fee6e79e0..e06f0f1c284 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Wet Pincussion.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Wet Pincussion.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 Yen-Lo-Tse Pass.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 Yen-Lo-Tse Pass.board
index c8f79e1ca76..a9613ebece8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 Yen-Lo-Tse Pass.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 Yen-Lo-Tse Pass.board	
@@ -1,13 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
+tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
-tag "Water (Auto)"
-tag "SnowTheme (Auto)"
-tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" "snow"
 hex 0201 0 "snow:1" "snow"
 hex 0301 0 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 the Barrens.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 the Barrens.board
index f1fd9fca7c2..5678509448f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 the Barrens.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 the Barrens.board	
@@ -1,6 +1,7 @@
 size 35 35
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x35 the High Ground.board b/megamek/data/boards/unofficial/Derv_Maps/35x35 the High Ground.board
index fef3b8fdd24..a5fdc6ad17b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x35 the High Ground.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x35 the High Ground.board	
@@ -1,8 +1,9 @@
 size 35 35
 option exit_roads_to_pavement false
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
-tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 hex 0101 7 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x38 Solaris Badlands.board b/megamek/data/boards/unofficial/Derv_Maps/35x38 Solaris Badlands.board
index 3c60e1ac75b..f7fd564632e 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x38 Solaris Badlands.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x38 Solaris Badlands.board	
@@ -1,9 +1,10 @@
 size 35 38
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "impassable:0" ""
 hex 0201 0 "impassable:0" ""
 hex 0301 0 "impassable:0" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x45 Liberty.board b/megamek/data/boards/unofficial/Derv_Maps/35x45 Liberty.board
index e72bad97d92..2bcb9d7bbe2 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x45 Liberty.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x45 Liberty.board	
@@ -3,7 +3,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:2" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/35x75 Revival Conquest.board b/megamek/data/boards/unofficial/Derv_Maps/35x75 Revival Conquest.board
index 7104fcf4809..2e3c6d47082 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/35x75 Revival Conquest.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/35x75 Revival Conquest.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/39x59 Macduff River.board b/megamek/data/boards/unofficial/Derv_Maps/39x59 Macduff River.board
index 735d0ae45d3..5407e819048 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/39x59 Macduff River.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/39x59 Macduff River.board	
@@ -1,11 +1,12 @@
 size 39 59
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "Lava (Auto)"
 hex 0101 -5 "rough:1" "lunar"
 hex 0201 -4 "rough:2" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x30 Factory_Complex_A.board b/megamek/data/boards/unofficial/Derv_Maps/40x30 Factory_Complex_A.board
index d31c1674469..9f322745a01 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x30 Factory_Complex_A.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x30 Factory_Complex_A.board	
@@ -3,6 +3,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Industrial Facility Delta.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Industrial Facility Delta.board
index bf944259f47..dc94a1e2c61 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Industrial Facility Delta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Industrial Facility Delta.board	
@@ -1,11 +1,15 @@
 size 40 40
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "snow:2" ""
 hex 0201 0 "snow:2" ""
 hex 0301 0 "snow:2" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Industrial Facility Tango.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Industrial Facility Tango.board
index 36cd4846f45..2276b786e3f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Industrial Facility Tango.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Industrial Facility Tango.board	
@@ -2,8 +2,11 @@ size 40 40
 option exit_roads_to_pavement false
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1:16" "snow"
 hex 0201 0 "snow:1:16" "snow"
 hex 0301 0 "snow:1:16" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Star Port Bravo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Star Port Bravo.board
index b862b795c3b..c87953d8139 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Star Port Bravo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Arctic Star Port Bravo.board	
@@ -1,12 +1,13 @@
 size 40 40
 option exit_roads_to_pavement false
-tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
 tag "GrassTheme (Auto)"
-tag "IceTerrain (Auto)"
 tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" ""
 hex 0201 0 "snow:1" ""
 hex 0301 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Auxiliary Starport.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Auxiliary Starport.board
index 8b3b7d7c51a..f5ada3c02a6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Auxiliary Starport.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Auxiliary Starport.board	
@@ -1,8 +1,10 @@
 size 40 40
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Defiance Hesperus.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Defiance Hesperus.board
index b0b943f8851..2be36e3765f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Defiance Hesperus.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Defiance Hesperus.board	
@@ -1,9 +1,11 @@
 size 40 40
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
 tag "GrassTheme (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "" ""
 hex 0201 2 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Industrial Facility Bravo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Industrial Facility Bravo.board
index f01d7bb739f..7c5637b32c7 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Industrial Facility Bravo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Industrial Facility Bravo.board	
@@ -1,6 +1,8 @@
 size 40 40
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Industrial Facility Delta.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Industrial Facility Delta.board
index b08250b74f8..91355da9d19 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Industrial Facility Delta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Industrial Facility Delta.board	
@@ -1,10 +1,12 @@
 size 40 40
 option exit_roads_to_pavement false
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Jungle (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "Water (Auto)"
 tag "LowHills (Auto)"
+tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "" "desert"
 hex 0301 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Space Port Bravo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Space Port Bravo.board
index 8897a78ce9d..75ff5dbdfff 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Space Port Bravo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Space Port Bravo.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "Roads (Auto)"
 tag "DesertTheme (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Space Port Tango.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Space Port Tango.board
index 5b3d57009a5..301ad11b691 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Space Port Tango.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Desert Space Port Tango.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Roads (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Factory_Complex_B.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Factory_Complex_B.board
index 1eedafdb69f..3872442369f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Factory_Complex_B.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Factory_Complex_B.board	
@@ -3,6 +3,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 1 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Greenfield Firebase.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Greenfield Firebase.board
index 9cb86a6a6d5..77fe54bfd1f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Greenfield Firebase.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Greenfield Firebase.board	
@@ -3,8 +3,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 -1 "" "grass"
 hex 0201 -1 "woods:1;foliage_elev:2" "grass"
 hex 0301 -1 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Hpg2.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Hpg2.board
index 259206eb786..8ecce798144 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Hpg2.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Hpg2.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Delta.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Delta.board
index de74fb37d2b..c277996afe1 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Delta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Delta.board	
@@ -1,8 +1,10 @@
 size 40 40
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
 tag "GrassTheme (Auto)"
+tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Echo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Echo.board
index 259206eb786..8ecce798144 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Echo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Echo.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Tango.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Tango.board
index 426cc3e9497..08c5f0ad3bf 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Tango.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Industrial Facility Tango.board	
@@ -3,7 +3,9 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Bravo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Bravo.board
index 5108195b6b1..92fb4f1560c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Bravo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Bravo.board	
@@ -2,6 +2,8 @@ size 40 40
 tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" "Lunar"
 hex 0201 0 "" "Lunar"
 hex 0301 0 "" "Lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Delta.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Delta.board
index 432bb88d3b8..85f049c8311 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Delta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Delta.board	
@@ -2,6 +2,7 @@ size 40 40
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Echo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Echo.board
index 651f41bb8f7..a3ad7a974d4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Echo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Industrial Facility Echo.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Bravo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Bravo.board
index aae28aaf1b6..825432dc55b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Bravo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Bravo.board	
@@ -1,6 +1,7 @@
 size 40 40
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Delta.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Delta.board
index da3f85a3999..8c236382eff 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Delta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Delta.board	
@@ -2,6 +2,7 @@ size 40 40
 tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LowHills (Auto)"
 hex 0101 1 "" "lunar"
 hex 0201 1 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Tango.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Tango.board
index aa8f22d085d..aa3b10487e6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Tango.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Lunar Star Port Tango.board	
@@ -2,6 +2,8 @@ size 40 40
 option exit_roads_to_pavement false
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" "lunar"
 hex 0201 1 "" "lunar"
 hex 0301 1 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Marik Estates.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Marik Estates.board
index 7a995491607..1579d0b3be3 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Marik Estates.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Marik Estates.board	
@@ -3,6 +3,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Nagelring Summer.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Nagelring Summer.board
index a82171439e9..21db9919a74 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Nagelring Summer.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Nagelring Summer.board	
@@ -3,8 +3,9 @@ tag "Rough (Auto)"
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "woods:1;foliage_elev:2" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 New Kroy.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 New Kroy.board
index 044eeda6470..f403e188d1d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 New Kroy.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 New Kroy.board	
@@ -4,6 +4,8 @@ tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2:18;pavement:1;building:4:0;bldg_cf:50:18" ""
 hex 0201 0 "pavement:1;road:1:18" ""
 hex 0301 0 "pavement:1;road:1:18" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Norse Battlemech Works.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Norse Battlemech Works.board
index 07e623d3f5a..3cd80886cf6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Norse Battlemech Works.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Norse Battlemech Works.board	
@@ -3,6 +3,7 @@ tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grasslands"
 hex 0201 0 "" "grasslands"
 hex 0301 0 "" "grasslands"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Orbital Facility Tango.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Orbital Facility Tango.board
index 794199bf5d9..478b72d08ee 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Orbital Facility Tango.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Orbital Facility Tango.board	
@@ -2,6 +2,8 @@ size 40 40
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;pavement:1;building:3:12;bldg_cf:50" ""
 hex 0201 0 "bldg_elev:2;pavement:1;building:3:62;bldg_cf:50" ""
 hex 0301 0 "bldg_elev:2;pavement:1;building:3:28;bldg_cf:50" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Star Port Bravo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Star Port Bravo.board
index c2f4ad2f3dd..39eec4a6fb8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Star Port Bravo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Star Port Bravo.board	
@@ -2,8 +2,9 @@ size 40 40
 option exit_roads_to_pavement false
 tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "Starport"
 hex 0201 0 "woods:1;foliage_elev:2" "Starport"
 hex 0301 0 "" "Starport"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Bravo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Bravo.board
index 958f584a6c0..c739e8a4d2c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Bravo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Bravo.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" "Volcanic Factory"
 hex 0201 0 "" "Volcanic Factory"
 hex 0301 1 "" "Volcanic Factory"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Delta.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Delta.board
index fec51284693..fe551da6ece 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Delta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Delta.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 -1 "" ""
 hex 0201 -1 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Echo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Echo.board
index 86ff03bf757..4c4e0dd9c62 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Echo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Echo.board	
@@ -3,8 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 1 "" "mars"
 hex 0201 2 "" "mars"
 hex 0301 2 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Tango.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Tango.board
index 60d9794dce5..a4416a5da2f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Tango.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Industrial Tango.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Bravo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Bravo.board
index c0dbf88ae49..be232465f7f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Bravo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Bravo.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "Roads (Auto)"
 tag "Lava (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "magma:1:36" ""
 hex 0201 0 "magma:1:36" ""
 hex 0301 0 "magma:1:36" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Delta.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Delta.board
index fad1bc32e08..1a4e4e5d9cb 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Delta.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Delta.board	
@@ -1,10 +1,13 @@
 size 40 40
 option exit_roads_to_pavement false
 tag "LunarTheme (Auto)"
-tag "Roads (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" "lunar"
 hex 0201 1 "" "lunar"
 hex 0301 1 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Echo.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Echo.board
index fbccd31faea..45b918d2a9c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Echo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Echo.board	
@@ -2,6 +2,7 @@ size 40 40
 option exit_roads_to_pavement false
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 hex 0101 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Tango.board b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Tango.board
index 3a2e5460f67..b51c708c12c 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Tango.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x40 Volcanic Star Port Tango.board	
@@ -1,8 +1,10 @@
 size 40 40
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/40x45 Desert Space Port Echo.board b/megamek/data/boards/unofficial/Derv_Maps/40x45 Desert Space Port Echo.board
index 545ca966849..5b38d8c199a 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/40x45 Desert Space Port Echo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/40x45 Desert Space Port Echo.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Roads (Auto)"
 tag "DesertTheme (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/41x41 Galaxy Split.board b/megamek/data/boards/unofficial/Derv_Maps/41x41 Galaxy Split.board
index 3629200d9cc..aae00724d9b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/41x41 Galaxy Split.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/41x41 Galaxy Split.board	
@@ -1,11 +1,12 @@
 size 41 41
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/41x41 Jade Falcon Trial.board b/megamek/data/boards/unofficial/Derv_Maps/41x41 Jade Falcon Trial.board
index ae33cb53949..a389f832a58 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/41x41 Jade Falcon Trial.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/41x41 Jade Falcon Trial.board	
@@ -1,8 +1,10 @@
 size 41 41
 option exit_roads_to_pavement false
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "Impassable (Auto)"
 tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "pavement:2:1" "lunar"
 hex 0201 3 "pavement:2:1" "lunar"
 hex 0301 3 "pavement:2:1" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Airfield.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Airfield.board
index 2bed6dec6e7..d6010227673 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Airfield.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Airfield.board	
@@ -3,8 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "woods:1;foliage_elev:2" "grass"
 hex 0301 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Alexander Valley.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Alexander Valley.board
index a1c5052c84b..dcd86ae9fe1 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Alexander Valley.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Alexander Valley.board	
@@ -1,14 +1,15 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:3:9;building:1:12;bldg_cf:20:9" "grass"
 hex 0201 0 "bldg_elev:3:9;building:1:56;bldg_cf:20:9" "grass"
 hex 0301 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Alpine.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Alpine.board
index 7924eeb42f7..094e590cded 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Alpine.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Alpine.board	
@@ -1,11 +1,12 @@
 size 45 45
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Dead City.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Dead City.board
index fade67a6f96..98edefb3ee0 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Dead City.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Dead City.board	
@@ -3,6 +3,9 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Roads (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" "desert"
 hex 0201 0 "pavement:1;road:1:9" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Deadoralive.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Deadoralive.board
index 9203df9e21c..8f8fc47b4dc 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Deadoralive.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Deadoralive.board	
@@ -1,10 +1,11 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Dixon.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Dixon.board
index cb5d627b412..eb9295af0f5 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Dixon.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Dixon.board	
@@ -1,13 +1,14 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
 tag "GrassTheme (Auto)"
-tag "Fields (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "Fields (Auto)"
 tag "Flat (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Eden Heights.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Eden Heights.board
index e1347ccd491..bba3d8722aa 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Eden Heights.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Eden Heights.board	
@@ -1,13 +1,14 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LightForest (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "LightForest (Auto)"
 tag "Jungle (Auto)"
-tag "Water (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Fires of Industry.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Fires of Industry.board
index a0339388dfa..96148977ea8 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Fires of Industry.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Fires of Industry.board	
@@ -1,13 +1,17 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
 tag "Cliffs (Auto)"
-tag "HighHills (Auto)"
-tag "Lava (Auto)"
-tag "DesertTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "Lava (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "rubble:3:9;pavement:1:9" "desert"
 hex 0201 0 "rubble:3:9;pavement:1:9" "desert"
 hex 0301 0 "pavement:1:9" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Geneva.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Geneva.board
index 6c28f60966b..5d4a1d4c393 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Geneva.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Geneva.board	
@@ -1,10 +1,12 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" "grass"
 hex 0201 0 "road:1:36" "grass"
 hex 0301 0 "bldg_elev:3;pavement:1;building:3:4;bldg_cf:80" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Geyser.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Geyser.board
index b63b9e7fcb4..593f72c558a 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Geyser.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Geyser.board	
@@ -1,10 +1,11 @@
 size 45 45
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Gilroys Harbor.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Gilroys Harbor.board
index 6e9cdad2e89..294f974c738 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Gilroys Harbor.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Gilroys Harbor.board	
@@ -1,11 +1,15 @@
 size 45 45
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "bldg_elev:3;pavement:1:63;building:2:8;bldg_cf:75" "grass"
 hex 0201 2 "road:1:9" "grass"
 hex 0301 2 "bldg_elev:5;pavement:1:63;building:4:12;bldg_cf:100" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Khan.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Khan.board
index d0ad0aa8282..c03fc9c820b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Khan.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Khan.board	
@@ -5,8 +5,10 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "snow:1" ""
 hex 0201 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Ks_Hellcity.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Ks_Hellcity.board
index e4667d6402e..06a9965e749 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Ks_Hellcity.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Ks_Hellcity.board	
@@ -1,11 +1,12 @@
 size 45 45
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -2 "magma:2:9" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Lyon 2.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Lyon 2.board
index dfb6ac67b68..a3cad5d437d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Lyon 2.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Lyon 2.board	
@@ -1,11 +1,13 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "woods:1:36;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Lyon.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Lyon.board
index 8cb39dcb174..d13e9a553c4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Lyon.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Lyon.board	
@@ -5,8 +5,10 @@ tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "woods:1:36;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Mad Moon.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Mad Moon.board
index 090c13715d5..34715b223ae 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Mad Moon.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Mad Moon.board	
@@ -1,5 +1,6 @@
 size 45 45
 tag "LunarTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LowHills (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Missilebase.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Missilebase.board
index c2718fb93af..64a9c47b7d3 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Missilebase.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Missilebase.board	
@@ -1,6 +1,7 @@
 size 45 45
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LowHills (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Rubber Boots.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Rubber Boots.board
index 65459ec5d87..843ce8de846 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Rubber Boots.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Rubber Boots.board	
@@ -1,9 +1,10 @@
 size 45 45
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "water:0" "tropical"
 hex 0201 0 "water:0" "tropical"
 hex 0301 0 "water:0" "tropical"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Sea Peaks.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Sea Peaks.board
index 6a4ce7a656b..31c33950e6b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Sea Peaks.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Sea Peaks.board	
@@ -1,8 +1,9 @@
 size 45 45
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "water:1" "lunar"
 hex 0201 0 "water:1" "lunar"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Silverrock Hatchet Bridge.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Silverrock Hatchet Bridge.board
index 8a593152a7a..83621f2ffea 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Silverrock Hatchet Bridge.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Silverrock Hatchet Bridge.board	
@@ -1,10 +1,11 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Jungle (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/45x45 Two Towers.board b/megamek/data/boards/unofficial/Derv_Maps/45x45 Two Towers.board
index 1914420734b..d177fe6a01d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/45x45 Two Towers.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/45x45 Two Towers.board	
@@ -3,7 +3,9 @@ tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:2:0;road:2:9" "grass"
 hex 0201 0 "pavement:1:0;woods:1:0;foliage_elev:2" "grass"
 hex 0301 0 "pavement:1:0;woods:1:0;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/48x34 Oanhu.board b/megamek/data/boards/unofficial/Derv_Maps/48x34 Oanhu.board
index bbd9624437a..de6b49e68cd 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/48x34 Oanhu.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/48x34 Oanhu.board	
@@ -1,11 +1,15 @@
 size 48 34
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "water:2" "grass"
 hex 0201 0 "water:1" "grass"
 hex 0301 0 "water:1" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/50x35 Lost Treasure.board b/megamek/data/boards/unofficial/Derv_Maps/50x35 Lost Treasure.board
index 5794beeb891..2a5dd6fffbf 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/50x35 Lost Treasure.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/50x35 Lost Treasure.board	
@@ -1,9 +1,10 @@
 size 50 35
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/50x40 Caustic Valley.board b/megamek/data/boards/unofficial/Derv_Maps/50x40 Caustic Valley.board
index fb32693ead3..6d457e7cd36 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/50x40 Caustic Valley.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/50x40 Caustic Valley.board	
@@ -1,9 +1,10 @@
 size 50 40
 option exit_roads_to_pavement false
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
 hex 0101 5 "" "desert"
 hex 0201 5 "" "desert"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/50x50 Boreal Town 2.board b/megamek/data/boards/unofficial/Derv_Maps/50x50 Boreal Town 2.board
index abfc3f997b9..3587cd8d32a 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/50x50 Boreal Town 2.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/50x50 Boreal Town 2.board	
@@ -1,12 +1,15 @@
 size 50 50
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/50x50 Borealtown.board b/megamek/data/boards/unofficial/Derv_Maps/50x50 Borealtown.board
index fdc023effe5..1909a49759a 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/50x50 Borealtown.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/50x50 Borealtown.board	
@@ -1,12 +1,15 @@
 size 50 50
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/55x45 Brigadier Blues.board b/megamek/data/boards/unofficial/Derv_Maps/55x45 Brigadier Blues.board
index 8db7b08cce6..f38f7fefbef 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/55x45 Brigadier Blues.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/55x45 Brigadier Blues.board	
@@ -2,7 +2,9 @@ size 55 45
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/55x45 New Wuhan Hpg.board b/megamek/data/boards/unofficial/Derv_Maps/55x45 New Wuhan Hpg.board
index 89f3be19d3a..dc5691d052e 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/55x45 New Wuhan Hpg.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/55x45 New Wuhan Hpg.board	
@@ -1,12 +1,14 @@
 size 55 45
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1;road:1:18" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "bldg_elev:2;pavement:1;building:4:8;bldg_cf:100" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/60x60 Crucible.board b/megamek/data/boards/unofficial/Derv_Maps/60x60 Crucible.board
index 9f3813948b6..0e5694b5726 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/60x60 Crucible.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/60x60 Crucible.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/60x60 Lost Monolith.board b/megamek/data/boards/unofficial/Derv_Maps/60x60 Lost Monolith.board
index bbb22ac0b47..a9964e3ab52 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/60x60 Lost Monolith.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/60x60 Lost Monolith.board	
@@ -1,7 +1,8 @@
 size 60 60
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/60x60 Sandhurst.board b/megamek/data/boards/unofficial/Derv_Maps/60x60 Sandhurst.board
index 23ebb5ae4a7..d5fc350ed63 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/60x60 Sandhurst.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/60x60 Sandhurst.board	
@@ -1,11 +1,16 @@
 size 60 60
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
 hex 0201 0 "bldg_elev:3;building:3:0;bldg_cf:60" "grass"
 hex 0301 0 "bldg_elev:3;building:2:0;bldg_cf:50" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/60x60 Sudeten.board b/megamek/data/boards/unofficial/Derv_Maps/60x60 Sudeten.board
index 1793b393f88..ebb9ea21a1b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/60x60 Sudeten.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/60x60 Sudeten.board	
@@ -1,8 +1,9 @@
 size 60 60
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 -1 "" "grass"
 hex 0201 -1 "" "grass"
 hex 0301 -1 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/60x60 Torrington.board b/megamek/data/boards/unofficial/Derv_Maps/60x60 Torrington.board
index b6784879fa1..6a905c257a1 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/60x60 Torrington.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/60x60 Torrington.board	
@@ -1,9 +1,10 @@
 size 60 60
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 1 "" "grass"
 hex 0201 1 "" "grass"
 hex 0301 1 "" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/61x30 Bearly Ridge.board b/megamek/data/boards/unofficial/Derv_Maps/61x30 Bearly Ridge.board
index 597063ee53a..262f4699e35 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/61x30 Bearly Ridge.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/61x30 Bearly Ridge.board	
@@ -3,9 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "woods:1;foliage_elev:2" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/62x62 Operation Homecoming.board b/megamek/data/boards/unofficial/Derv_Maps/62x62 Operation Homecoming.board
index 45730f68b99..9229db30bb6 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/62x62 Operation Homecoming.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/62x62 Operation Homecoming.board	
@@ -1,15 +1,22 @@
 size 62 62
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "SnowTheme (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -1 "ice:1;water:2" "snow"
 hex 0201 -1 "ice:1;water:2" "snow"
 hex 0301 -1 "ice:1;water:2" "snow"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/75x25 Yucatan.board b/megamek/data/boards/unofficial/Derv_Maps/75x25 Yucatan.board
index 979c81f446b..0b885cfc227 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/75x25 Yucatan.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/75x25 Yucatan.board	
@@ -1,12 +1,13 @@
 size 75 25
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:3" "grass"
 hex 0201 0 "water:3" "grass"
 hex 0301 0 "water:3" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower2014.board b/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower2014.board
index 33c95295c45..c0d3d3554ce 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower2014.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower2014.board	
@@ -1,9 +1,10 @@
 size 80 80
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower3078 Final Assault.board b/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower3078 Final Assault.board
index c917adea449..be38a7c0a96 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower3078 Final Assault.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower3078 Final Assault.board	
@@ -1,12 +1,17 @@
 size 80 80
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "" ""
 hex 0201 5 "" ""
 hex 0301 6 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower3078.board b/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower3078.board
index ae6ea62ea97..e6c3af1a8eb 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower3078.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/80x80 Devilstower3078.board	
@@ -1,12 +1,18 @@
 size 80 80
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "" ""
 hex 0201 5 "" ""
 hex 0301 6 "" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/90x41 Whats Done Behind.board b/megamek/data/boards/unofficial/Derv_Maps/90x41 Whats Done Behind.board
index 30a3b0322ca..3d81763a841 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/90x41 Whats Done Behind.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/90x41 Whats Done Behind.board	
@@ -1,12 +1,17 @@
 size 90 41
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Jungle (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "planted_fields:2" "grass"
 hex 0201 3 "planted_fields:2;road:1:9" "grass"
 hex 0301 3 "planted_fields:2" "grass"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Cobra/35x35 Cobras Campain.board b/megamek/data/boards/unofficial/Derv_Maps/Cobra/35x35 Cobras Campain.board
index af86f411796..9ac82c0ca11 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Cobra/35x35 Cobras Campain.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Cobra/35x35 Cobras Campain.board	
@@ -1,9 +1,11 @@
 size 35 35
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Cobra/45x45 Cobras Fastaid.board b/megamek/data/boards/unofficial/Derv_Maps/Cobra/45x45 Cobras Fastaid.board
index ce149cb8604..dd7a0a81e2f 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Cobra/45x45 Cobras Fastaid.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Cobra/45x45 Cobras Fastaid.board	
@@ -1,6 +1,7 @@
 size 45 45
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "white"
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 1.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 1.board
index b7de87ed2a8..176050ce259 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 1.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 1.board	
@@ -1,5 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 2.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 2.board
index ba876b63710..23474e252ee 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 2.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 2.board	
@@ -1,6 +1,8 @@
 size 11 11
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 3.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 3.board
index a3c2df143eb..ede2c09352b 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 3.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Assembly Line 3.board	
@@ -1,5 +1,8 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Defense Station.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Defense Station.board
index 28bb4737195..00829e406d7 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Defense Station.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Defense Station.board	
@@ -1,5 +1,6 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Dynamo.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Dynamo.board
index f04152e8275..9fe2f7a3365 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Dynamo.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Dynamo.board	
@@ -1,5 +1,6 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 1 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Employee Housing 1.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Employee Housing 1.board
index df22ad69377..522eaf27c75 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Employee Housing 1.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Employee Housing 1.board	
@@ -1,6 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "Impassable (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Empty.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Empty.board
index 370e03b2b70..ed18fb646bf 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Empty.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Empty.board	
@@ -1,5 +1,6 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Loading Station.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Loading Station.board
index 83f82aad7b4..dbc59135be1 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Loading Station.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Loading Station.board	
@@ -1,6 +1,7 @@
 size 11 11
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 4 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Mechbay.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Mechbay.board
index 0ac860e95f9..140d353fad5 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Mechbay.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Mechbay.board	
@@ -1,5 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "bldg_elev:5;pavement:1;building:4:8;bldg_cf:125" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Munitions Storehouse.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Munitions Storehouse.board
index 30d515f5fee..5f7c3388a9d 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Munitions Storehouse.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Munitions Storehouse.board	
@@ -1,5 +1,6 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "fuel_tank_cf:20;fuel_tank_elev:2;fuel_tank_magn:50;pavement:1;fuel_tank:1:0" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Ore Processing.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Ore Processing.board
index 11ddb9ea7a0..7f881aee757 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Ore Processing.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Ore Processing.board	
@@ -1,6 +1,8 @@
 size 11 11
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 1 "bldg_elev:1;pavement:1;building:2:8;bldg_cf:35" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Puddling Furnace.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Puddling Furnace.board
index b622865ee46..7e5d2960fe4 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Puddling Furnace.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Puddling Furnace.board	
@@ -1,6 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
 tag "Lava (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Testing Pit.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Testing Pit.board
index e4e04d8867b..43da0da6b84 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Testing Pit.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Testing Pit.board	
@@ -1,7 +1,8 @@
 size 11 11
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Warehouse.board b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Warehouse.board
index 0193c2cdf16..2f7500c7b87 100644
--- a/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Warehouse.board	
+++ b/megamek/data/boards/unofficial/Derv_Maps/Defiance/11x11 Defiance Industries Warehouse.board	
@@ -1,5 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/100x100 Before Isengard.board b/megamek/data/boards/unofficial/Dervs/100x100 Before Isengard.board
index 356e50e9235..a1dbcfaf419 100644
--- a/megamek/data/boards/unofficial/Dervs/100x100 Before Isengard.board	
+++ b/megamek/data/boards/unofficial/Dervs/100x100 Before Isengard.board	
@@ -1,5 +1,6 @@
 size 100 100
 tag "Rough (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Dervs/21x21 Defiance Interior.board b/megamek/data/boards/unofficial/Dervs/21x21 Defiance Interior.board
index 60eb7d0230b..fa6984df08b 100644
--- a/megamek/data/boards/unofficial/Dervs/21x21 Defiance Interior.board	
+++ b/megamek/data/boards/unofficial/Dervs/21x21 Defiance Interior.board	
@@ -1,9 +1,14 @@
 size 21 21
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 9 "impassable:1" ""
 hex 0201 9 "impassable:1" ""
 hex 0301 9 "impassable:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/25x25 Airport 3000.board b/megamek/data/boards/unofficial/Dervs/25x25 Airport 3000.board
index 3bd8c0c33d0..56725423e63 100644
--- a/megamek/data/boards/unofficial/Dervs/25x25 Airport 3000.board	
+++ b/megamek/data/boards/unofficial/Dervs/25x25 Airport 3000.board	
@@ -2,6 +2,8 @@ size 25 25
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "fuel_tank_cf:40;fuel_tank_elev:2;fuel_tank_magn:100;pavement:1;fuel_tank:2:0" ""
 hex 0201 0 "bldg_elev:3;bldg_class:1;pavement:1;building:4:30;bldg_cf:75" ""
 hex 0301 0 "bldg_elev:3;bldg_class:1;pavement:1;building:4:28;bldg_cf:75" ""
diff --git a/megamek/data/boards/unofficial/Dervs/30x55 Gates of Hesperus.board b/megamek/data/boards/unofficial/Dervs/30x55 Gates of Hesperus.board
index 4dee7939113..b770ca1c917 100644
--- a/megamek/data/boards/unofficial/Dervs/30x55 Gates of Hesperus.board	
+++ b/megamek/data/boards/unofficial/Dervs/30x55 Gates of Hesperus.board	
@@ -1,9 +1,10 @@
 size 30 55
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 10 "" ""
 hex 0201 10 "" ""
diff --git a/megamek/data/boards/unofficial/Dervs/32x17 Mars Melt.board b/megamek/data/boards/unofficial/Dervs/32x17 Mars Melt.board
index 4734ddb885a..78bdef272e8 100644
--- a/megamek/data/boards/unofficial/Dervs/32x17 Mars Melt.board	
+++ b/megamek/data/boards/unofficial/Dervs/32x17 Mars Melt.board	
@@ -2,6 +2,7 @@ size 32 17
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 2fort.board b/megamek/data/boards/unofficial/Dervs/35x35 2fort.board
index 3818e790433..46c99a3c7b9 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 2fort.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 2fort.board	
@@ -1,9 +1,12 @@
 size 35 35
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1;road:1:9" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Aftermath.board b/megamek/data/boards/unofficial/Dervs/35x35 Aftermath.board
index 1f371927cf4..52547338b0c 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Aftermath.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Aftermath.board	
@@ -1,12 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 3 "woods:1;foliage_elev:2" "grass"
 hex 0301 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Aim Nine.board b/megamek/data/boards/unofficial/Dervs/35x35 Aim Nine.board
index 5f1a25ee0f8..b67740ed70a 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Aim Nine.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Aim Nine.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "IceTerrain (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 6 "ice:1;snow:2" ""
 hex 0201 6 "ice:1;snow:2" ""
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Applegate.board b/megamek/data/boards/unofficial/Dervs/35x35 Applegate.board
index 104c8fb02e8..982734cc902 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Applegate.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Applegate.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 1 "snow:1" ""
 hex 0201 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Archipelago.board b/megamek/data/boards/unofficial/Dervs/35x35 Archipelago.board
index 54e9d1f2638..5d1291776e9 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Archipelago.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Archipelago.board	
@@ -2,6 +2,7 @@ size 35 35
 option exit_roads_to_pavement false
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Arctic Wasteland.board b/megamek/data/boards/unofficial/Dervs/35x35 Arctic Wasteland.board
index 5461e660304..8ccc41480ca 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Arctic Wasteland.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Arctic Wasteland.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 1 "woods:1;snow:1;foliage_elev:2" "snow"
 hex 0201 1 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Atreus.board b/megamek/data/boards/unofficial/Dervs/35x35 Atreus.board
index eb83bbd948d..1f28ee47189 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Atreus.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Atreus.board	
@@ -1,12 +1,15 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:11;pavement:1;building:3:12;bldg_cf:120" ""
 hex 0201 0 "bldg_elev:11;pavement:1;building:3:56;bldg_cf:120" ""
 hex 0301 0 "road:2:9" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Busy City 2.board b/megamek/data/boards/unofficial/Dervs/35x35 Busy City 2.board
index 6d11e3fb31a..501283cb105 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Busy City 2.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Busy City 2.board	
@@ -1,13 +1,15 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:1" "grass"
 hex 0201 0 "sand:1" "grass"
 hex 0301 0 "sand:1" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Castle Hill.board b/megamek/data/boards/unofficial/Dervs/35x35 Castle Hill.board
index 7ad3269a6b0..b7673879579 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Castle Hill.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Castle Hill.board	
@@ -1,11 +1,15 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "bldg_elev:1:0;pavement:1;building:1:0;bldg_cf:10" "grass"
 hex 0201 0 "road:1" "grass"
 hex 0301 0 "road:1" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Double City.board b/megamek/data/boards/unofficial/Dervs/35x35 Double City.board
index 05148e560f6..bb5600a3802 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Double City.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Double City.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "bldg_elev:2;pavement:1;building:2:28;bldg_cf:75" ""
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Eisenjaeger.board b/megamek/data/boards/unofficial/Dervs/35x35 Eisenjaeger.board
index b653bcfde0b..df5f20f2a61 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Eisenjaeger.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Eisenjaeger.board	
@@ -1,13 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 3 "snow:2" "snow"
 hex 0201 3 "snow:2" "snow"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Fort Sumter.board b/megamek/data/boards/unofficial/Dervs/35x35 Fort Sumter.board
index 579ba2e08e9..8ecd601c786 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Fort Sumter.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Fort Sumter.board	
@@ -1,13 +1,16 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "woods:1:4;foliage_elev:2" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "road:1:13" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Koryo.board b/megamek/data/boards/unofficial/Dervs/35x35 Koryo.board
index 8f239c12112..f15ebf4af8c 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Koryo.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Koryo.board	
@@ -1,15 +1,20 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "SnowTerrain (Auto)"
 tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -2 "rough:1" "mars"
 hex 0201 -2 "" "mars"
 hex 0301 -2 "" "mars"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Mannedorf 2.board b/megamek/data/boards/unofficial/Dervs/35x35 Mannedorf 2.board
index 3400da25915..fd615c3fdbc 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Mannedorf 2.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Mannedorf 2.board	
@@ -3,7 +3,9 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 1 "snow:1" "Snow"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Mars Surface.board b/megamek/data/boards/unofficial/Dervs/35x35 Mars Surface.board
index 5a30bacd4c7..6bf408d95b6 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Mars Surface.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Mars Surface.board	
@@ -1,8 +1,9 @@
 size 35 35
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 4 "" "mars"
 hex 0201 4 "" "mars"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Mt Cho.board b/megamek/data/boards/unofficial/Dervs/35x35 Mt Cho.board
index c33765804a0..34d7fca5c8c 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Mt Cho.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Mt Cho.board	
@@ -1,12 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 hex 0101 0 "water:1" "desert"
 hex 0201 0 "water:1" "desert"
 hex 0301 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Port Kallin.board b/megamek/data/boards/unofficial/Dervs/35x35 Port Kallin.board
index a6ee8379c4b..dd53e8f960b 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Port Kallin.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Port Kallin.board	
@@ -1,11 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Refit Yard.board b/megamek/data/boards/unofficial/Dervs/35x35 Refit Yard.board
index a424146da87..6db239dfba6 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Refit Yard.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Refit Yard.board	
@@ -1,9 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "snow:1" ""
 hex 0201 1 "snow:1" ""
 hex 0301 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/35x35 Veil Surface.board b/megamek/data/boards/unofficial/Dervs/35x35 Veil Surface.board
index 73f6848c1da..749222c9c7f 100644
--- a/megamek/data/boards/unofficial/Dervs/35x35 Veil Surface.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x35 Veil Surface.board	
@@ -1,8 +1,9 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "SnowTerrain (Auto)"
diff --git a/megamek/data/boards/unofficial/Dervs/35x45 Liberty.board b/megamek/data/boards/unofficial/Dervs/35x45 Liberty.board
index d2c066b072d..2bcb9d7bbe2 100644
--- a/megamek/data/boards/unofficial/Dervs/35x45 Liberty.board	
+++ b/megamek/data/boards/unofficial/Dervs/35x45 Liberty.board	
@@ -1,9 +1,11 @@
 size 35 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:2" ""
diff --git a/megamek/data/boards/unofficial/Dervs/39x59 MacDuff River.board b/megamek/data/boards/unofficial/Dervs/39x59 MacDuff River.board
index 735d0ae45d3..5407e819048 100644
--- a/megamek/data/boards/unofficial/Dervs/39x59 MacDuff River.board	
+++ b/megamek/data/boards/unofficial/Dervs/39x59 MacDuff River.board	
@@ -1,11 +1,12 @@
 size 39 59
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "Lava (Auto)"
 hex 0101 -5 "rough:1" "lunar"
 hex 0201 -4 "rough:2" "lunar"
diff --git a/megamek/data/boards/unofficial/Dervs/40x40 Arctic Industrial Facility Delta.board b/megamek/data/boards/unofficial/Dervs/40x40 Arctic Industrial Facility Delta.board
index bf944259f47..dc94a1e2c61 100644
--- a/megamek/data/boards/unofficial/Dervs/40x40 Arctic Industrial Facility Delta.board	
+++ b/megamek/data/boards/unofficial/Dervs/40x40 Arctic Industrial Facility Delta.board	
@@ -1,11 +1,15 @@
 size 40 40
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "snow:2" ""
 hex 0201 0 "snow:2" ""
 hex 0301 0 "snow:2" ""
diff --git a/megamek/data/boards/unofficial/Dervs/40x40 Arctic Industrial Facility Tango.board b/megamek/data/boards/unofficial/Dervs/40x40 Arctic Industrial Facility Tango.board
index 36cd4846f45..2276b786e3f 100644
--- a/megamek/data/boards/unofficial/Dervs/40x40 Arctic Industrial Facility Tango.board	
+++ b/megamek/data/boards/unofficial/Dervs/40x40 Arctic Industrial Facility Tango.board	
@@ -2,8 +2,11 @@ size 40 40
 option exit_roads_to_pavement false
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1:16" "snow"
 hex 0201 0 "snow:1:16" "snow"
 hex 0301 0 "snow:1:16" "snow"
diff --git a/megamek/data/boards/unofficial/Dervs/41x41 Galaxy Split.board b/megamek/data/boards/unofficial/Dervs/41x41 Galaxy Split.board
index 3629200d9cc..aae00724d9b 100644
--- a/megamek/data/boards/unofficial/Dervs/41x41 Galaxy Split.board	
+++ b/megamek/data/boards/unofficial/Dervs/41x41 Galaxy Split.board	
@@ -1,11 +1,12 @@
 size 41 41
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/45x45 Airfield.board b/megamek/data/boards/unofficial/Dervs/45x45 Airfield.board
index 2bed6dec6e7..d6010227673 100644
--- a/megamek/data/boards/unofficial/Dervs/45x45 Airfield.board	
+++ b/megamek/data/boards/unofficial/Dervs/45x45 Airfield.board	
@@ -3,8 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "woods:1;foliage_elev:2" "grass"
 hex 0301 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/45x45 Alexander Valley.board b/megamek/data/boards/unofficial/Dervs/45x45 Alexander Valley.board
index a1c5052c84b..dcd86ae9fe1 100644
--- a/megamek/data/boards/unofficial/Dervs/45x45 Alexander Valley.board	
+++ b/megamek/data/boards/unofficial/Dervs/45x45 Alexander Valley.board	
@@ -1,14 +1,15 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:3:9;building:1:12;bldg_cf:20:9" "grass"
 hex 0201 0 "bldg_elev:3:9;building:1:56;bldg_cf:20:9" "grass"
 hex 0301 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/45x45 Alpine.board b/megamek/data/boards/unofficial/Dervs/45x45 Alpine.board
index 7924eeb42f7..094e590cded 100644
--- a/megamek/data/boards/unofficial/Dervs/45x45 Alpine.board	
+++ b/megamek/data/boards/unofficial/Dervs/45x45 Alpine.board	
@@ -1,11 +1,12 @@
 size 45 45
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Dervs/45x45 Lyon 2.board b/megamek/data/boards/unofficial/Dervs/45x45 Lyon 2.board
index dfb6ac67b68..a3cad5d437d 100644
--- a/megamek/data/boards/unofficial/Dervs/45x45 Lyon 2.board	
+++ b/megamek/data/boards/unofficial/Dervs/45x45 Lyon 2.board	
@@ -1,11 +1,13 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "woods:1:36;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/45x45 Silverrock Hatchet Bridge.board b/megamek/data/boards/unofficial/Dervs/45x45 Silverrock Hatchet Bridge.board
index 8a593152a7a..83621f2ffea 100644
--- a/megamek/data/boards/unofficial/Dervs/45x45 Silverrock Hatchet Bridge.board	
+++ b/megamek/data/boards/unofficial/Dervs/45x45 Silverrock Hatchet Bridge.board	
@@ -1,10 +1,11 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Jungle (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Dervs/48x34 Oanhu.board b/megamek/data/boards/unofficial/Dervs/48x34 Oanhu.board
index bbd9624437a..de6b49e68cd 100644
--- a/megamek/data/boards/unofficial/Dervs/48x34 Oanhu.board	
+++ b/megamek/data/boards/unofficial/Dervs/48x34 Oanhu.board	
@@ -1,11 +1,15 @@
 size 48 34
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "water:2" "grass"
 hex 0201 0 "water:1" "grass"
 hex 0301 0 "water:1" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/50x140 Coyote Valley.board b/megamek/data/boards/unofficial/Dervs/50x140 Coyote Valley.board
index e21ca2d649e..6e3e93a65d7 100644
--- a/megamek/data/boards/unofficial/Dervs/50x140 Coyote Valley.board	
+++ b/megamek/data/boards/unofficial/Dervs/50x140 Coyote Valley.board	
@@ -2,13 +2,15 @@ size 50 140
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "MediumUrban (Auto)"
-tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 4 "woods:1;foliage_elev:2" "volcano"
 hex 0201 4 "" "volcano"
 hex 0301 4 "" "volcano"
diff --git a/megamek/data/boards/unofficial/Dervs/50x35 Lost Treasure.board b/megamek/data/boards/unofficial/Dervs/50x35 Lost Treasure.board
index 5794beeb891..2a5dd6fffbf 100644
--- a/megamek/data/boards/unofficial/Dervs/50x35 Lost Treasure.board	
+++ b/megamek/data/boards/unofficial/Dervs/50x35 Lost Treasure.board	
@@ -1,9 +1,10 @@
 size 50 35
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Dervs/50x50 Boreal Town 2.board b/megamek/data/boards/unofficial/Dervs/50x50 Boreal Town 2.board
index abfc3f997b9..3587cd8d32a 100644
--- a/megamek/data/boards/unofficial/Dervs/50x50 Boreal Town 2.board	
+++ b/megamek/data/boards/unofficial/Dervs/50x50 Boreal Town 2.board	
@@ -1,12 +1,15 @@
 size 50 50
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/50x50 Nowhere to Turn.board b/megamek/data/boards/unofficial/Dervs/50x50 Nowhere to Turn.board
index b5b531c5503..49604bbcb5d 100644
--- a/megamek/data/boards/unofficial/Dervs/50x50 Nowhere to Turn.board	
+++ b/megamek/data/boards/unofficial/Dervs/50x50 Nowhere to Turn.board	
@@ -1,6 +1,7 @@
 size 50 50
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/Dervs/55x45 New Wuhan HPG.board b/megamek/data/boards/unofficial/Dervs/55x45 New Wuhan HPG.board
index 89f3be19d3a..dc5691d052e 100644
--- a/megamek/data/boards/unofficial/Dervs/55x45 New Wuhan HPG.board	
+++ b/megamek/data/boards/unofficial/Dervs/55x45 New Wuhan HPG.board	
@@ -1,12 +1,14 @@
 size 55 45
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1;road:1:18" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "bldg_elev:2;pavement:1;building:4:8;bldg_cf:100" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/56x37 Avalon City Conquest.board b/megamek/data/boards/unofficial/Dervs/56x37 Avalon City Conquest.board
index 58930908578..d24ac0afba8 100644
--- a/megamek/data/boards/unofficial/Dervs/56x37 Avalon City Conquest.board	
+++ b/megamek/data/boards/unofficial/Dervs/56x37 Avalon City Conquest.board	
@@ -2,6 +2,7 @@ size 56 37
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "road:2:36" "grass"
 hex 0201 0 "road:2:36" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/60x60 Sandhurst.board b/megamek/data/boards/unofficial/Dervs/60x60 Sandhurst.board
index 23ebb5ae4a7..d5fc350ed63 100644
--- a/megamek/data/boards/unofficial/Dervs/60x60 Sandhurst.board	
+++ b/megamek/data/boards/unofficial/Dervs/60x60 Sandhurst.board	
@@ -1,11 +1,16 @@
 size 60 60
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
 hex 0201 0 "bldg_elev:3;building:3:0;bldg_cf:60" "grass"
 hex 0301 0 "bldg_elev:3;building:2:0;bldg_cf:50" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/60x60 Torrington.board b/megamek/data/boards/unofficial/Dervs/60x60 Torrington.board
index b6784879fa1..6a905c257a1 100644
--- a/megamek/data/boards/unofficial/Dervs/60x60 Torrington.board	
+++ b/megamek/data/boards/unofficial/Dervs/60x60 Torrington.board	
@@ -1,9 +1,10 @@
 size 60 60
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 1 "" "grass"
 hex 0201 1 "" "grass"
 hex 0301 1 "" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/61x30 Bearly Ridge.board b/megamek/data/boards/unofficial/Dervs/61x30 Bearly Ridge.board
index be9c34ad89b..acda209dfe2 100644
--- a/megamek/data/boards/unofficial/Dervs/61x30 Bearly Ridge.board	
+++ b/megamek/data/boards/unofficial/Dervs/61x30 Bearly Ridge.board	
@@ -1,10 +1,11 @@
 size 61 30
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
-tag "IceTerrain (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "woods:1;foliage_elev:2" "snow"
diff --git a/megamek/data/boards/unofficial/Dervs/62x62 Operation Homecoming.board b/megamek/data/boards/unofficial/Dervs/62x62 Operation Homecoming.board
index 45730f68b99..9229db30bb6 100644
--- a/megamek/data/boards/unofficial/Dervs/62x62 Operation Homecoming.board	
+++ b/megamek/data/boards/unofficial/Dervs/62x62 Operation Homecoming.board	
@@ -1,15 +1,22 @@
 size 62 62
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "SnowTheme (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -1 "ice:1;water:2" "snow"
 hex 0201 -1 "ice:1;water:2" "snow"
 hex 0301 -1 "ice:1;water:2" "snow"
diff --git a/megamek/data/boards/unofficial/Dervs/75x25 Yucatan.board b/megamek/data/boards/unofficial/Dervs/75x25 Yucatan.board
index 979c81f446b..0b885cfc227 100644
--- a/megamek/data/boards/unofficial/Dervs/75x25 Yucatan.board	
+++ b/megamek/data/boards/unofficial/Dervs/75x25 Yucatan.board	
@@ -1,12 +1,13 @@
 size 75 25
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:3" "grass"
 hex 0201 0 "water:3" "grass"
 hex 0301 0 "water:3" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa (Full).board b/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa (Full).board
index f4598782b99..771d66ef218 100644
--- a/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa (Full).board	
+++ b/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa (Full).board	
@@ -1,11 +1,14 @@
 size 78 78
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa Dry.board b/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa Dry.board
index c0ae2060faf..20e4c589991 100644
--- a/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa Dry.board	
+++ b/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa Dry.board	
@@ -1,12 +1,14 @@
 size 78 78
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
-tag "Cliffs (Auto)"
-tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa.board b/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa.board
index bf1ce8d7d5a..3280073ba83 100644
--- a/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa.board	
+++ b/megamek/data/boards/unofficial/Dervs/78x78 Lake Africa.board	
@@ -1,12 +1,15 @@
 size 78 78
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/Dervs/90x41 Whats done behind.board b/megamek/data/boards/unofficial/Dervs/90x41 Whats done behind.board
index 30a3b0322ca..3d81763a841 100644
--- a/megamek/data/boards/unofficial/Dervs/90x41 Whats done behind.board	
+++ b/megamek/data/boards/unofficial/Dervs/90x41 Whats done behind.board	
@@ -1,12 +1,17 @@
 size 90 41
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Jungle (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "planted_fields:2" "grass"
 hex 0201 3 "planted_fields:2;road:1:9" "grass"
 hex 0301 3 "planted_fields:2" "grass"
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 1.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 1.board
index b7de87ed2a8..176050ce259 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 1.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 1.board	
@@ -1,5 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 2.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 2.board
index ba876b63710..23474e252ee 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 2.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 2.board	
@@ -1,6 +1,8 @@
 size 11 11
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 3.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 3.board
index a3c2df143eb..ede2c09352b 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 3.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Assembly Line 3.board	
@@ -1,5 +1,8 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Defense Station.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Defense Station.board
index 28bb4737195..00829e406d7 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Defense Station.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Defense Station.board	
@@ -1,5 +1,6 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Dynamo.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Dynamo.board
index f04152e8275..9fe2f7a3365 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Dynamo.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Dynamo.board	
@@ -1,5 +1,6 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 1 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Employee Housing 1.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Employee Housing 1.board
index df22ad69377..522eaf27c75 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Employee Housing 1.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Employee Housing 1.board	
@@ -1,6 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "Impassable (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Empty.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Empty.board
index 370e03b2b70..ed18fb646bf 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Empty.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Empty.board	
@@ -1,5 +1,6 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Loading Station.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Loading Station.board
index 83f82aad7b4..dbc59135be1 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Loading Station.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Loading Station.board	
@@ -1,6 +1,7 @@
 size 11 11
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 4 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Mechbay.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Mechbay.board
index 0ac860e95f9..140d353fad5 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Mechbay.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Mechbay.board	
@@ -1,5 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "bldg_elev:5;pavement:1;building:4:8;bldg_cf:125" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Munitions Storehouse.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Munitions Storehouse.board
index 30d515f5fee..5f7c3388a9d 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Munitions Storehouse.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Munitions Storehouse.board	
@@ -1,5 +1,6 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "fuel_tank_cf:20;fuel_tank_elev:2;fuel_tank_magn:50;pavement:1;fuel_tank:1:0" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Ore Processing.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Ore Processing.board
index 11ddb9ea7a0..7f881aee757 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Ore Processing.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Ore Processing.board	
@@ -1,6 +1,8 @@
 size 11 11
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 1 "bldg_elev:1;pavement:1;building:2:8;bldg_cf:35" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Puddling Furnace.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Puddling Furnace.board
index b622865ee46..7e5d2960fe4 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Puddling Furnace.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Puddling Furnace.board	
@@ -1,6 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
 tag "Lava (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Testing Pit.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Testing Pit.board
index e4e04d8867b..43da0da6b84 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Testing Pit.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Testing Pit.board	
@@ -1,7 +1,8 @@
 size 11 11
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Warehouse.board b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Warehouse.board
index 0193c2cdf16..2f7500c7b87 100644
--- a/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Warehouse.board	
+++ b/megamek/data/boards/unofficial/Dervs/Defiance/11x11 Defiance Industries Warehouse.board	
@@ -1,5 +1,7 @@
 size 11 11
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Drewbacca/16x17 The Long Run 3.board b/megamek/data/boards/unofficial/Drewbacca/16x17 The Long Run 3.board
index 83a9cedce12..13263c2bac5 100644
--- a/megamek/data/boards/unofficial/Drewbacca/16x17 The Long Run 3.board	
+++ b/megamek/data/boards/unofficial/Drewbacca/16x17 The Long Run 3.board	
@@ -2,6 +2,8 @@ size 16 17
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Drewbacca/16x17 Under Siege 1.board b/megamek/data/boards/unofficial/Drewbacca/16x17 Under Siege 1.board
index b856c3090a7..6ae0fc4febf 100644
--- a/megamek/data/boards/unofficial/Drewbacca/16x17 Under Siege 1.board	
+++ b/megamek/data/boards/unofficial/Drewbacca/16x17 Under Siege 1.board	
@@ -2,6 +2,7 @@ size 16 17
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Drewbacca/16x17 Under Siege 2.board b/megamek/data/boards/unofficial/Drewbacca/16x17 Under Siege 2.board
index 2f88513424d..d28187c6982 100644
--- a/megamek/data/boards/unofficial/Drewbacca/16x17 Under Siege 2.board	
+++ b/megamek/data/boards/unofficial/Drewbacca/16x17 Under Siege 2.board	
@@ -2,6 +2,7 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/EVS/100x80 Battlescarred Fort.board b/megamek/data/boards/unofficial/EVS/100x80 Battlescarred Fort.board
index 4115942b933..c99ee596205 100644
--- a/megamek/data/boards/unofficial/EVS/100x80 Battlescarred Fort.board	
+++ b/megamek/data/boards/unofficial/EVS/100x80 Battlescarred Fort.board	
@@ -1,10 +1,14 @@
 size 100 80
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 14 "woods:2;foliage_elev:2" ""
 hex 0201 14 "woods:2;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/EVS/105x100 Pirate Lagoon.board b/megamek/data/boards/unofficial/EVS/105x100 Pirate Lagoon.board
index d29a3074f90..bbbb40a38c5 100644
--- a/megamek/data/boards/unofficial/EVS/105x100 Pirate Lagoon.board	
+++ b/megamek/data/boards/unofficial/EVS/105x100 Pirate Lagoon.board	
@@ -1,11 +1,17 @@
 size 105 100
 tag "Rough (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "water:4" ""
 hex 0201 0 "water:4" ""
 hex 0301 0 "water:4" ""
diff --git a/megamek/data/boards/unofficial/EVS/110x80 Port Scaramuch.board b/megamek/data/boards/unofficial/EVS/110x80 Port Scaramuch.board
index 54043ffcd10..108fa651d40 100644
--- a/megamek/data/boards/unofficial/EVS/110x80 Port Scaramuch.board	
+++ b/megamek/data/boards/unofficial/EVS/110x80 Port Scaramuch.board	
@@ -1,14 +1,18 @@
 size 110 80
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "" ""
 hex 0201 4 "" ""
 hex 0301 4 "" ""
diff --git a/megamek/data/boards/unofficial/EVS/115x90 I-81.board b/megamek/data/boards/unofficial/EVS/115x90 I-81.board
index 0af8331e30f..286a53514d4 100644
--- a/megamek/data/boards/unofficial/EVS/115x90 I-81.board	
+++ b/megamek/data/boards/unofficial/EVS/115x90 I-81.board	
@@ -1,12 +1,13 @@
 size 115 90
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 1 "planted_fields:1" "grass"
 hex 0201 1 "planted_fields:1" "grass"
diff --git a/megamek/data/boards/unofficial/EVS/115x90 Lunar Crater - Mining colony.board b/megamek/data/boards/unofficial/EVS/115x90 Lunar Crater - Mining colony.board
index d89900bd426..cf95f587bab 100644
--- a/megamek/data/boards/unofficial/EVS/115x90 Lunar Crater - Mining colony.board	
+++ b/megamek/data/boards/unofficial/EVS/115x90 Lunar Crater - Mining colony.board	
@@ -1,11 +1,14 @@
 size 115 90
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "Lunar"
 hex 0201 3 "" "Lunar"
 hex 0301 3 "" "Lunar"
diff --git a/megamek/data/boards/unofficial/EVS/115x90 Martian spaceport.board b/megamek/data/boards/unofficial/EVS/115x90 Martian spaceport.board
index 12b9a879d38..bfce3fd8b23 100644
--- a/megamek/data/boards/unofficial/EVS/115x90 Martian spaceport.board	
+++ b/megamek/data/boards/unofficial/EVS/115x90 Martian spaceport.board	
@@ -1,9 +1,13 @@
 size 115 90
 option exit_roads_to_pavement false
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -3 "" "lunar"
 hex 0201 -3 "" "lunar"
 hex 0301 -3 "" "lunar"
diff --git a/megamek/data/boards/unofficial/EVS/130x100 Wildcat Mine.board b/megamek/data/boards/unofficial/EVS/130x100 Wildcat Mine.board
index f86740ff002..3be86184146 100644
--- a/megamek/data/boards/unofficial/EVS/130x100 Wildcat Mine.board	
+++ b/megamek/data/boards/unofficial/EVS/130x100 Wildcat Mine.board	
@@ -3,7 +3,9 @@ option exit_roads_to_pavement false
 tag "Cliffs (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/EVS/155x90 Desert Coalition Airbase.board b/megamek/data/boards/unofficial/EVS/155x90 Desert Coalition Airbase.board
index 6d328e9f425..918ede4dfba 100644
--- a/megamek/data/boards/unofficial/EVS/155x90 Desert Coalition Airbase.board	
+++ b/megamek/data/boards/unofficial/EVS/155x90 Desert Coalition Airbase.board	
@@ -1,9 +1,13 @@
 size 155 90
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -3 "" "mars"
 hex 0201 -3 "" "mars"
 hex 0301 -3 "" "mars"
diff --git a/megamek/data/boards/unofficial/EVS/160x40 Tidewater Highway.board b/megamek/data/boards/unofficial/EVS/160x40 Tidewater Highway.board
index 72eec10f973..b237248904c 100644
--- a/megamek/data/boards/unofficial/EVS/160x40 Tidewater Highway.board	
+++ b/megamek/data/boards/unofficial/EVS/160x40 Tidewater Highway.board	
@@ -1,14 +1,16 @@
 size 160 140
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 1 "" "grass"
 hex 0201 1 "" "grass"
 hex 0301 1 "" "grass"
diff --git a/megamek/data/boards/unofficial/EVS/225x145 Kyrankoi.board b/megamek/data/boards/unofficial/EVS/225x145 Kyrankoi.board
index dde88a9d861..ccec7a4bff1 100644
--- a/megamek/data/boards/unofficial/EVS/225x145 Kyrankoi.board	
+++ b/megamek/data/boards/unofficial/EVS/225x145 Kyrankoi.board	
@@ -1,15 +1,19 @@
 size 225 145
 tag "Rough (Auto)"
+tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "Fields (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Swamp (Auto)"
-tag "Fields (Auto)"
-tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "planted_fields:3" ""
 hex 0201 2 "planted_fields:3" ""
 hex 0301 2 "planted_fields:3" ""
diff --git a/megamek/data/boards/unofficial/EVS/45x70 Deep Cave Showdown.board b/megamek/data/boards/unofficial/EVS/45x70 Deep Cave Showdown.board
index 56fd3e1616d..bba610ec6b4 100644
--- a/megamek/data/boards/unofficial/EVS/45x70 Deep Cave Showdown.board	
+++ b/megamek/data/boards/unofficial/EVS/45x70 Deep Cave Showdown.board	
@@ -2,7 +2,9 @@ size 45 70
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 20 "" "volcano"
 hex 0201 20 "" "volcano"
 hex 0301 20 "" "volcano"
diff --git a/megamek/data/boards/unofficial/EVS/48x51 Jungle Lowlands.board b/megamek/data/boards/unofficial/EVS/48x51 Jungle Lowlands.board
index 66d6ef4d933..99fd8cf1602 100644
--- a/megamek/data/boards/unofficial/EVS/48x51 Jungle Lowlands.board	
+++ b/megamek/data/boards/unofficial/EVS/48x51 Jungle Lowlands.board	
@@ -1,9 +1,11 @@
 size 48 51
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 tag "Jungle (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 1 "" "mars"
diff --git a/megamek/data/boards/unofficial/EVS/50x50 Field repair outpost.board b/megamek/data/boards/unofficial/EVS/50x50 Field repair outpost.board
index 4be76b6ff81..a21aceac500 100644
--- a/megamek/data/boards/unofficial/EVS/50x50 Field repair outpost.board	
+++ b/megamek/data/boards/unofficial/EVS/50x50 Field repair outpost.board	
@@ -1,12 +1,14 @@
 size 50 50
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 16 "snow:2" ""
 hex 0201 16 "snow:2" ""
diff --git a/megamek/data/boards/unofficial/EVS/80x150 Mission Y.board b/megamek/data/boards/unofficial/EVS/80x150 Mission Y.board
index bf2e1d80e58..202aac74162 100644
--- a/megamek/data/boards/unofficial/EVS/80x150 Mission Y.board	
+++ b/megamek/data/boards/unofficial/EVS/80x150 Mission Y.board	
@@ -5,14 +5,17 @@ tag "Foliage (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
 tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "SnowTerrain (Auto)"
 tag "MediumUrban (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 20 "snow:2" "grass"
 hex 0201 24 "snow:2" "grass"
 hex 0301 24 "snow:2" "grass"
diff --git a/megamek/data/boards/unofficial/EVS/80x80 Glacial valley.board b/megamek/data/boards/unofficial/EVS/80x80 Glacial valley.board
index 0dfcf470c27..4bd1a3cd822 100644
--- a/megamek/data/boards/unofficial/EVS/80x80 Glacial valley.board	
+++ b/megamek/data/boards/unofficial/EVS/80x80 Glacial valley.board	
@@ -1,11 +1,12 @@
 size 80 80
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
+tag "Impassable (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/EVS/85x80 Operation Avalanche Assault.board b/megamek/data/boards/unofficial/EVS/85x80 Operation Avalanche Assault.board
index eac0460f317..55e6128421c 100644
--- a/megamek/data/boards/unofficial/EVS/85x80 Operation Avalanche Assault.board	
+++ b/megamek/data/boards/unofficial/EVS/85x80 Operation Avalanche Assault.board	
@@ -1,14 +1,18 @@
 size 85 80
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "IceTerrain (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "SnowTerrain (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
-tag "IceTerrain (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
-tag "SnowTerrain (Auto)"
+tag "Fortress (Auto)"
 hex 0101 28 "snow:2" ""
 hex 0201 28 "snow:2" ""
 hex 0301 28 "snow:2" ""
diff --git a/megamek/data/boards/unofficial/EVS/86x51 Rail Crossing.board b/megamek/data/boards/unofficial/EVS/86x51 Rail Crossing.board
index de23080840f..8820ffdb676 100644
--- a/megamek/data/boards/unofficial/EVS/86x51 Rail Crossing.board	
+++ b/megamek/data/boards/unofficial/EVS/86x51 Rail Crossing.board	
@@ -1,10 +1,12 @@
 size 86 51
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/EVS/90x70 AgriDistrict.board b/megamek/data/boards/unofficial/EVS/90x70 AgriDistrict.board
index c9abef75740..6a6fa655d9b 100644
--- a/megamek/data/boards/unofficial/EVS/90x70 AgriDistrict.board	
+++ b/megamek/data/boards/unofficial/EVS/90x70 AgriDistrict.board	
@@ -5,6 +5,7 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "woods:2;foliage_elev:2" ""
 hex 0201 0 "woods:2;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Easy/camp-wilderness.board b/megamek/data/boards/unofficial/Easy/camp-wilderness.board
index 07950a46158..36a0094d671 100644
--- a/megamek/data/boards/unofficial/Easy/camp-wilderness.board
+++ b/megamek/data/boards/unofficial/Easy/camp-wilderness.board
@@ -1,10 +1,12 @@
 size 40 40
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 3 "snow:2;rough:2" ""
diff --git a/megamek/data/boards/unofficial/Flynn/16x17 KlingenCon - Winteriscomming1.board b/megamek/data/boards/unofficial/Flynn/16x17 KlingenCon - Winteriscomming1.board
index 9208f1ad883..e0f5337ca6c 100644
--- a/megamek/data/boards/unofficial/Flynn/16x17 KlingenCon - Winteriscomming1.board	
+++ b/megamek/data/boards/unofficial/Flynn/16x17 KlingenCon - Winteriscomming1.board	
@@ -1,7 +1,8 @@
 size 16 17
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/16x17 KlingenCon - Winteriscomming2.board b/megamek/data/boards/unofficial/Flynn/16x17 KlingenCon - Winteriscomming2.board
index 3ce451e35c4..b81b543b58e 100644
--- a/megamek/data/boards/unofficial/Flynn/16x17 KlingenCon - Winteriscomming2.board	
+++ b/megamek/data/boards/unofficial/Flynn/16x17 KlingenCon - Winteriscomming2.board	
@@ -1,7 +1,8 @@
 size 16 17
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 1 NW.board b/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 1 NW.board
index b1966231892..41b428ab15f 100644
--- a/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 1 NW.board	
+++ b/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 1 NW.board	
@@ -1,4 +1,5 @@
 size 16 17
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 3 SW.board b/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 3 SW.board
index 331192a3e36..0824c470194 100644
--- a/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 3 SW.board	
+++ b/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 3 SW.board	
@@ -1,4 +1,5 @@
 size 16 17
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 4 SE.board b/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 4 SE.board
index e7802d7b8b2..92f81f428a4 100644
--- a/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 4 SE.board	
+++ b/megamek/data/boards/unofficial/Flynn/16x17 WWE2020 Map 4 SE.board	
@@ -1,5 +1,6 @@
 size 16 17
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/32x34 WWE2020 AndHellFollowedWithHim.board b/megamek/data/boards/unofficial/Flynn/32x34 WWE2020 AndHellFollowedWithHim.board
index 6131f764106..fe7d97f1b8f 100644
--- a/megamek/data/boards/unofficial/Flynn/32x34 WWE2020 AndHellFollowedWithHim.board	
+++ b/megamek/data/boards/unofficial/Flynn/32x34 WWE2020 AndHellFollowedWithHim.board	
@@ -1,6 +1,7 @@
 size 32 34
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2019.board b/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2019.board
index d357fa8675e..331e4ed877e 100644
--- a/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2019.board	
+++ b/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2019.board	
@@ -1,8 +1,9 @@
 size 33 35
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2020.board b/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2020.board
index 77600142b77..580e62a09a6 100644
--- a/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2020.board	
+++ b/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2020.board	
@@ -1,8 +1,9 @@
 size 33 35
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "Lava (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2021.board b/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2021.board
index 499f627fc24..4518b16c492 100644
--- a/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2021.board	
+++ b/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2021.board	
@@ -1,7 +1,8 @@
 size 33 35
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "SnowTerrain (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2022.board b/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2022.board
index 85d0ce4d265..fb7a1045411 100644
--- a/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2022.board	
+++ b/megamek/data/boards/unofficial/Flynn/33x35 Weihnachten2022.board	
@@ -1,11 +1,12 @@
 size 33 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "IceTerrain (Auto)"
-tag "SnowTerrain (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
+tag "IceTerrain (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot01 Small Lakes.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot01 Small Lakes.board
index 0c062a42f92..92417e7e1cc 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot01 Small Lakes.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot01 Small Lakes.board	
@@ -1,11 +1,12 @@
 size 34 34
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot05 Luna.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot05 Luna.board
index 70518713cf9..58e6f65e448 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot05 Luna.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot05 Luna.board	
@@ -2,8 +2,9 @@ size 34 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
-tag "Roads (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot08 Schlamschlacht.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot08 Schlamschlacht.board
index ccf82e5af76..48136d21991 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot08 Schlamschlacht.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot08 Schlamschlacht.board	
@@ -1,10 +1,11 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LightForest (Auto)"
-tag "Water (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
 hex 0101 0 "" "tropical"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot1 Small Lakes.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot1 Small Lakes.board
index 3718a752183..075ccd31584 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot1 Small Lakes.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot1 Small Lakes.board	
@@ -1,11 +1,12 @@
 size 34 34
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot10 Winter.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot10 Winter.board
index e99be425e12..580047c7f10 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot10 Winter.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot10 Winter.board	
@@ -1,14 +1,15 @@
 size 34 34
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
-tag "SnowTerrain (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
+tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot11 River.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot11 River.board
index 0ecdfc988ce..51d58920a8f 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot11 River.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot11 River.board	
@@ -3,13 +3,14 @@ option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 8 "snow:2" ""
 hex 0201 8 "snow:2" ""
 hex 0301 8 "snow:2" ""
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot14 shattered town.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot14 shattered town.board
index 241b267854c..8bf384ca22d 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot14 shattered town.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot14 shattered town.board	
@@ -1,11 +1,12 @@
 size 34 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
-tag "Water (Auto)"
-tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 2 "" "desert"
 hex 0201 2 "" "desert"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot15 Jungle Party.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot15 Jungle Party.board
index a0ff8f716be..e447acae054 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot15 Jungle Party.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot15 Jungle Party.board	
@@ -1,12 +1,13 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "Swamp (Auto)"
-tag "TropicalTheme (Auto)"
-tag "LightForest (Auto)"
 tag "Water (Auto)"
+tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "TropicalTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Jungle (Auto)"
 hex 0101 0 "road:1:13" "tropical"
 hex 0201 0 "road:1" "tropical"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot16 Citygrid.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot16 Citygrid.board
index 7f30d939f18..3dbc8691d25 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot16 Citygrid.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot16 Citygrid.board	
@@ -1,12 +1,14 @@
 size 34 34
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
 hex 0201 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot20 DesetStorm.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot20 DesetStorm.board
index 54307e38717..209c5de08a4 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot20 DesetStorm.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot20 DesetStorm.board	
@@ -1,10 +1,11 @@
 size 34 34
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "DesertTheme (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
 hex 0101 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot32 mars.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot32 mars.board
index cacf7122bd3..4f35c1c437d 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot32 mars.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot32 mars.board	
@@ -1,9 +1,10 @@
 size 34 34
 option exit_roads_to_pavement false
 tag "MarsTheme (Auto)"
-tag "Roads (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot33 Hell on Mars.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot33 Hell on Mars.board
index c79739d2c85..cf173db57c9 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot33 Hell on Mars.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot33 Hell on Mars.board	
@@ -1,9 +1,10 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "MarsTheme (Auto)"
-tag "Roads (Auto)"
 tag "Cliffs (Auto)"
+tag "MarsTheme (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot36 TwinMountain.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot36 TwinMountain.board
index a0d9b456bd1..39299bc80d3 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot36 TwinMountain.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot36 TwinMountain.board	
@@ -1,10 +1,11 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "" "transparent"
 hex 0201 1 "" "transparent"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot37 iceicebaby.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot37 iceicebaby.board
index 9f9e84602df..0fdd18de425 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot37 iceicebaby.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot37 iceicebaby.board	
@@ -1,14 +1,15 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
-tag "SnowTerrain (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot39 Airfieldin the dessert.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot39 Airfieldin the dessert.board
index 222c5e4b10e..72d01c00096 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot39 Airfieldin the dessert.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot39 Airfieldin the dessert.board	
@@ -1,6 +1,7 @@
 size 34 34
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot40 FortressHexagon.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot40 FortressHexagon.board
index 538104cb71c..4cd0ff21a32 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot40 FortressHexagon.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot40 FortressHexagon.board	
@@ -1,12 +1,13 @@
 size 34 34
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "LightForest (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot41 DersertValley.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot41 DersertValley.board
index 5f7b79913de..71851a334fd 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot41 DersertValley.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot41 DersertValley.board	
@@ -1,10 +1,11 @@
 size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 2 "" "desert"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot43 MoonCave.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot43 MoonCave.board
index 4c058a1def0..ada1511128e 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot43 MoonCave.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot43 MoonCave.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
-tag "LightForest (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot45 MudJungle.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot45 MudJungle.board
index 41c1824d804..74fa2c48f28 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot45 MudJungle.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot45 MudJungle.board	
@@ -1,10 +1,11 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "TropicalTheme (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "TropicalTheme (Auto)"
 tag "Jungle (Auto)"
 hex 0101 3 "" "tropical"
 hex 0201 3 "" "tropical"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot5 Luna.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot5 Luna.board
index 3cfb1f405af..bb1665ad88f 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot5 Luna.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot5 Luna.board	
@@ -1,8 +1,9 @@
 size 34 34
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "LunarTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot55 CityRuins.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot55 CityRuins.board
index 3113d3927c5..ed4c660f977 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot55 CityRuins.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot55 CityRuins.board	
@@ -1,9 +1,14 @@
 size 34 34
-tag "Water (Auto)"
 tag "LunarTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "Lunar"
 hex 0201 0 "" "Lunar"
 hex 0301 0 "" "Lunar"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot56 HeavyIndstrie.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot56 HeavyIndstrie.board
index 3b44f3ab36d..7c04514803b 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot56 HeavyIndstrie.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot56 HeavyIndstrie.board	
@@ -1,12 +1,14 @@
 size 34 34
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot58 MarsRiver.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot58 MarsRiver.board
index 77325907289..b93c09a7c71 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot58 MarsRiver.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot58 MarsRiver.board	
@@ -1,7 +1,8 @@
 size 34 34
-tag "Water (Auto)"
 tag "MarsTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "" "mars"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot59 Wintermountain.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot59 Wintermountain.board
index 7b4e1244a44..59749a9faf7 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot59 Wintermountain.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot59 Wintermountain.board	
@@ -1,14 +1,16 @@
 size 34 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Roads (Auto)"
-tag "LightForest (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "snow"
 hex 0201 3 "" "snow"
 hex 0301 3 "" "snow"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot60 SwampsintheJungel.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot60 SwampsintheJungel.board
index 5974a41d75e..892c8d2ada6 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot60 SwampsintheJungel.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot60 SwampsintheJungel.board	
@@ -1,11 +1,13 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LightForest (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 1 "" "tropical"
 hex 0201 1 "swamp:1" "tropical"
 hex 0301 1 "" "tropical"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot61 winteriscomming.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot61 winteriscomming.board
index 0c609ceef2d..daf3fae2df3 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot61 winteriscomming.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot61 winteriscomming.board	
@@ -1,12 +1,13 @@
 size 34 34
 option exit_roads_to_pavement false
+tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
-tag "Water (Auto)"
-tag "SnowTheme (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot62 SteinerCity.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot62 SteinerCity.board
index 335208bcbd4..2fa3aafb55d 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot62 SteinerCity.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot62 SteinerCity.board	
@@ -5,6 +5,9 @@ tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "bldg_elev:1;bldg_class:1;building:2:12;bldg_cf:40" ""
 hex 0201 0 "bldg_elev:1;bldg_class:1;building:2:56;bldg_cf:40" ""
 hex 0301 0 "road:1:10" ""
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot63 CapellaJungel.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot63 CapellaJungel.board
index 8f66df66411..508b64f3554 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot63 CapellaJungel.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot63 CapellaJungel.board	
@@ -2,8 +2,9 @@ size 34 34
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LightForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot64 SandintheGear.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot64 SandintheGear.board
index a4220d0a4ac..6e7beb4675f 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot64 SandintheGear.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot64 SandintheGear.board	
@@ -1,9 +1,10 @@
 size 34 34
 option exit_roads_to_pavement false
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
-tag "Water (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "sand:1" "desert"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot66 HeavyJungel.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot66 HeavyJungel.board
index a3db5bedf1e..b60facc590a 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot66 HeavyJungel.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot66 HeavyJungel.board	
@@ -1,10 +1,11 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LightForest (Auto)"
-tag "Water (Auto)"
 tag "Jungle (Auto)"
 hex 0101 0 "" "tropical"
 hex 0201 0 "" "tropical"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot70 Kiudufortress.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot70 Kiudufortress.board
index 658e6e72327..cfdefe72ca1 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot70 Kiudufortress.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot70 Kiudufortress.board	
@@ -1,12 +1,14 @@
 size 34 34
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot71 OasisFortress.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot71 OasisFortress.board
index 9a47ca99300..35d6d561080 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot71 OasisFortress.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot71 OasisFortress.board	
@@ -2,6 +2,7 @@ size 34 34
 tag "Foliage (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot72 BackSideoftheMoon.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot72 BackSideoftheMoon.board
index 088ee7af8f7..791d6b13148 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot72 BackSideoftheMoon.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot72 BackSideoftheMoon.board	
@@ -3,8 +3,10 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 1 "" "lunar"
 hex 0201 1 "" "lunar"
 hex 0301 1 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot73 GreenHell.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot73 GreenHell.board
index 207e9064264..cdb1f1e7cdc 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot73 GreenHell.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot73 GreenHell.board	
@@ -1,12 +1,13 @@
 size 34 34
 option exit_roads_to_pavement false
-tag "Roads (Auto)"
-tag "Swamp (Auto)"
-tag "TropicalTheme (Auto)"
-tag "LightForest (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "TropicalTheme (Auto)"
+tag "LightForest (Auto)"
 tag "Jungle (Auto)"
 hex 0101 1 "" "tropical"
 hex 0201 0 "road:1:9" "tropical"
diff --git a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot74 SesamFortress.board b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot74 SesamFortress.board
index 3f938f1ac75..a5f60517d60 100644
--- a/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot74 SesamFortress.board	
+++ b/megamek/data/boards/unofficial/Flynn/34x34 Starleague Depot74 SesamFortress.board	
@@ -1,11 +1,12 @@
 size 34 34
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/Flynn/35x35 MechRace.board b/megamek/data/boards/unofficial/Flynn/35x35 MechRace.board
index 86d5bebba62..1d87e8007a6 100644
--- a/megamek/data/boards/unofficial/Flynn/35x35 MechRace.board	
+++ b/megamek/data/boards/unofficial/Flynn/35x35 MechRace.board	
@@ -1,9 +1,10 @@
 size 35 35
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "LunarTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "LightForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Jackanapes/40x29 Op2M4.board b/megamek/data/boards/unofficial/Jackanapes/40x29 Op2M4.board
index 2759ff21acd..ed71c5f0d64 100644
--- a/megamek/data/boards/unofficial/Jackanapes/40x29 Op2M4.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/40x29 Op2M4.board	
@@ -2,8 +2,10 @@ size 40 29
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "impassable:0" ""
 hex 0201 0 "impassable:0" ""
 hex 0301 0 "impassable:0" ""
diff --git a/megamek/data/boards/unofficial/Jackanapes/40x33 Op1M3.board b/megamek/data/boards/unofficial/Jackanapes/40x33 Op1M3.board
index fec8c40fdf7..4909fa40345 100644
--- a/megamek/data/boards/unofficial/Jackanapes/40x33 Op1M3.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/40x33 Op1M3.board	
@@ -3,6 +3,7 @@ tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Jackanapes/42x27 Op1M1.board b/megamek/data/boards/unofficial/Jackanapes/42x27 Op1M1.board
index deed0d8f863..0683118dd28 100644
--- a/megamek/data/boards/unofficial/Jackanapes/42x27 Op1M1.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/42x27 Op1M1.board	
@@ -3,6 +3,7 @@ tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Jackanapes/52x42 Op2M1.board b/megamek/data/boards/unofficial/Jackanapes/52x42 Op2M1.board
index f8ecee0b226..503f4cbc32e 100644
--- a/megamek/data/boards/unofficial/Jackanapes/52x42 Op2M1.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/52x42 Op2M1.board	
@@ -3,6 +3,7 @@ tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:4" "desert"
diff --git a/megamek/data/boards/unofficial/Jackanapes/54x27 Op2M2.board b/megamek/data/boards/unofficial/Jackanapes/54x27 Op2M2.board
index 2595f8154e5..c5d688f187f 100644
--- a/megamek/data/boards/unofficial/Jackanapes/54x27 Op2M2.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/54x27 Op2M2.board	
@@ -2,8 +2,11 @@ size 54 27
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "impassable:0" ""
 hex 0201 0 "impassable:0" ""
 hex 0301 0 "impassable:0" ""
diff --git a/megamek/data/boards/unofficial/Jackanapes/56x36 Op1M4.board b/megamek/data/boards/unofficial/Jackanapes/56x36 Op1M4.board
index b9d627a3155..c5feaa0fd5b 100644
--- a/megamek/data/boards/unofficial/Jackanapes/56x36 Op1M4.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/56x36 Op1M4.board	
@@ -4,8 +4,11 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "water:5" "desert"
 hex 0201 0 "water:5" "desert"
 hex 0301 0 "water:5" "desert"
diff --git a/megamek/data/boards/unofficial/Jackanapes/58x34 Op1M2.board b/megamek/data/boards/unofficial/Jackanapes/58x34 Op1M2.board
index fa457b20ba6..6db0eec7ad9 100644
--- a/megamek/data/boards/unofficial/Jackanapes/58x34 Op1M2.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/58x34 Op1M2.board	
@@ -2,6 +2,7 @@ size 58 34
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Jackanapes/58x54 OP2Mescape.board b/megamek/data/boards/unofficial/Jackanapes/58x54 OP2Mescape.board
index b1e5a0189fe..8207f7869f4 100644
--- a/megamek/data/boards/unofficial/Jackanapes/58x54 OP2Mescape.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/58x54 OP2Mescape.board	
@@ -3,6 +3,7 @@ tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 7 "" "desert"
diff --git a/megamek/data/boards/unofficial/Jackanapes/66x48 Op1Mbonus.board b/megamek/data/boards/unofficial/Jackanapes/66x48 Op1Mbonus.board
index 8924b4d3fcd..2dc5eb50fea 100644
--- a/megamek/data/boards/unofficial/Jackanapes/66x48 Op1Mbonus.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/66x48 Op1Mbonus.board	
@@ -3,7 +3,9 @@ tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "impassable:1" "grass"
 hex 0201 0 "impassable:1" "grass"
diff --git a/megamek/data/boards/unofficial/Jackanapes/96x42 Op2M3.board b/megamek/data/boards/unofficial/Jackanapes/96x42 Op2M3.board
index 6fb91d6af90..f4c421c2435 100644
--- a/megamek/data/boards/unofficial/Jackanapes/96x42 Op2M3.board	
+++ b/megamek/data/boards/unofficial/Jackanapes/96x42 Op2M3.board	
@@ -3,6 +3,7 @@ tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "water:1" ""
diff --git a/megamek/data/boards/unofficial/Jackanapes/op1m1.board b/megamek/data/boards/unofficial/Jackanapes/op1m1.board
index deed0d8f863..0683118dd28 100644
--- a/megamek/data/boards/unofficial/Jackanapes/op1m1.board
+++ b/megamek/data/boards/unofficial/Jackanapes/op1m1.board
@@ -3,6 +3,7 @@ tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Jackanapes/op1m2.board b/megamek/data/boards/unofficial/Jackanapes/op1m2.board
index 082af52c240..8bfa73b130c 100644
--- a/megamek/data/boards/unofficial/Jackanapes/op1m2.board
+++ b/megamek/data/boards/unofficial/Jackanapes/op1m2.board
@@ -2,6 +2,7 @@ size 59 34
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Jackanapes/op1m3.board b/megamek/data/boards/unofficial/Jackanapes/op1m3.board
index 4bfaf836dc1..300473ab0d2 100644
--- a/megamek/data/boards/unofficial/Jackanapes/op1m3.board
+++ b/megamek/data/boards/unofficial/Jackanapes/op1m3.board
@@ -3,9 +3,11 @@ tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "" "desert"
 hex 0301 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/Jackanapes/op1m4.board b/megamek/data/boards/unofficial/Jackanapes/op1m4.board
index 764ce7d85d8..5fefc3e0b11 100644
--- a/megamek/data/boards/unofficial/Jackanapes/op1m4.board
+++ b/megamek/data/boards/unofficial/Jackanapes/op1m4.board
@@ -4,8 +4,11 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "water:5" "desert"
 hex 0201 0 "water:5" "desert"
 hex 0301 0 "water:5" "desert"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/12x12 Olympus H.board b/megamek/data/boards/unofficial/Jakes Map Pack/12x12 Olympus H.board
index 108817e39fe..60cf5c037fc 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/12x12 Olympus H.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/12x12 Olympus H.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "rough:1" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia A.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia A.board
index 97524321d03..73ed032f3f6 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia A.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia A.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia C.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia C.board
index facf1ecf851..6aa871bee6e 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia C.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia C.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia D.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia D.board
index 46989bd9368..1aaae19eced 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia D.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Ewoklandia D.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo A.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo A.board
index c25bdde927f..33b0c702dce 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo A.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo A.board	
@@ -3,7 +3,9 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:3;bldg_basement_type:0;pavement:1;building:2:8;bldg_cf:60" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo B.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo B.board
index b1dc9601ec0..91326eb99d9 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo B.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo B.board	
@@ -3,7 +3,9 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo C.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo C.board
index b3f54cfb86e..58cf0f96b5d 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo C.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo C.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:2:28;bldg_cf:60" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo D.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo D.board
index de71d2b2fcb..f1f1526c577 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo D.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo D.board	
@@ -2,6 +2,8 @@ size 16 17
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:3;bldg_basement_type:0;pavement:1;building:2:4;bldg_cf:60" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo E.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo E.board
index 80ca9c37ffd..93f81fe9eff 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo E.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 New Oslo E.board	
@@ -3,6 +3,8 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:3;pavement:1;building:2:28;bldg_cf:60" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Pagoda Fort.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Pagoda Fort.board
index 7460467f6b1..e96a45777f9 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Pagoda Fort.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Pagoda Fort.board	
@@ -1,11 +1,13 @@
 size 16 17
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Poppyseed A.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Poppyseed A.board
index ea2d5656c07..fb3ccc109fb 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Poppyseed A.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Poppyseed A.board	
@@ -1,8 +1,10 @@
 size 16 17
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "road:1" ""
 hex 0201 0 "road:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Poppyseed B.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Poppyseed B.board
index 3317d1a1da9..7a4391b83a9 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Poppyseed B.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Poppyseed B.board	
@@ -3,6 +3,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "road:1" ""
 hex 0201 0 "road:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City A.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City A.board
index 464a45f8357..bf891534097 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City A.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City A.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1;road:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City B.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City B.board
index c9cf26bc37e..764af4cd603 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City B.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City B.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1;road:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City C.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City C.board
index 784f293742d..cec97d4dcaf 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City C.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Rhodes City C.board	
@@ -4,6 +4,8 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1;road:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Sands Fort.board b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Sands Fort.board
index c5d714c1caa..8bf58bd12b7 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Sands Fort.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/16x17 Sands Fort.board	
@@ -1,7 +1,8 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 2 "" ""
 hex 0201 2 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Glacier Grievance.board b/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Glacier Grievance.board
index 9fe4ac34d8e..9491713e755 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Glacier Grievance.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Glacier Grievance.board	
@@ -1,7 +1,8 @@
 size 25 25
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 9 "" ""
 hex 0201 9 "" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Ice Arena.board b/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Ice Arena.board
index f3342a2423b..c4cbc2c0fff 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Ice Arena.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Ice Arena.board	
@@ -2,6 +2,7 @@ size 25 25
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 2 "pavement:1" ""
 hex 0201 2 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Tilting Grounds.board b/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Tilting Grounds.board
index 8b34b9a497f..cba96f7ede7 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Tilting Grounds.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/25x25 Tilting Grounds.board	
@@ -1,8 +1,9 @@
 size 25 25
 tag "GrassTheme (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 4 "pavement:1" "grass"
 hex 0201 4 "pavement:1" "grass"
 hex 0301 4 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 A Bridge Too Far.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 A Bridge Too Far.board
index 5f1f2f1b6bb..8b4936ac23f 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 A Bridge Too Far.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 A Bridge Too Far.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 4 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Graus.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Graus.board
index 66592857e57..a0338358ced 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Graus.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Graus.board	
@@ -1,6 +1,7 @@
 size 35 35
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 100 "pavement:1" ""
 hex 0201 100 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Icy Rift.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Icy Rift.board
index 22435ae28f0..430c2b841ab 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Icy Rift.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Icy Rift.board	
@@ -1,8 +1,9 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 9 "rough:1" "lunar"
 hex 0201 9 "rough:1" "lunar"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 North Scar.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 North Scar.board
index 2b0e66dba15..0a3ea8f83d0 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 North Scar.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 North Scar.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Painted Desert.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Painted Desert.board
index f7e8c6d378c..aa0053f0a5d 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Painted Desert.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Painted Desert.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Polar Wastes.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Polar Wastes.board
index d154f8a8507..decdcc62afd 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Polar Wastes.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Polar Wastes.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Reykjavik.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Reykjavik.board
index e81f3f08979..0036826d041 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Reykjavik.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Reykjavik.board	
@@ -1,10 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:5;pavement:1;building:3:12;bldg_cf:150" ""
 hex 0301 0 "pavement:1;road:1:36" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Syreen Ice.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Syreen Ice.board
index 8287a6d9416..d7f9f7822cb 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Syreen Ice.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Syreen Ice.board	
@@ -1,6 +1,7 @@
 size 35 35
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 2 "pavement:1" "snow"
 hex 0201 2 "pavement:1" "snow"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Wide Blue River.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Wide Blue River.board
index 8cdafc995ec..b3cf4ceab89 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Wide Blue River.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Wide Blue River.board	
@@ -1,9 +1,11 @@
 size 35 35
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 -1 "water:2" ""
 hex 0201 -1 "water:2" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Wide Green Spires.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Wide Green Spires.board
index cd54a56a77e..c0e21f7d285 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Wide Green Spires.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x35 Wide Green Spires.board	
@@ -1,8 +1,9 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/35x45 Defend The Base.board b/megamek/data/boards/unofficial/Jakes Map Pack/35x45 Defend The Base.board
index 76ca259da0c..2abf25136f7 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/35x45 Defend The Base.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/35x45 Defend The Base.board	
@@ -1,9 +1,10 @@
 size 35 45
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:5" ""
 hex 0201 0 "water:5" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Bain's Impass.board b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Bain's Impass.board
index bc388171362..2b914a77d83 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Bain's Impass.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Bain's Impass.board	
@@ -1,8 +1,9 @@
 size 45 45
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Swamp (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Beach Bum.board b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Beach Bum.board
index 17fa82502da..6fe4ffa75ab 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Beach Bum.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Beach Bum.board	
@@ -1,11 +1,12 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "water:2" ""
 hex 0201 0 "water:2" ""
 hex 0301 0 "water:2" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Crater Rock.board b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Crater Rock.board
index a53f449f64e..fe0a5affa6f 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Crater Rock.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Crater Rock.board	
@@ -1,9 +1,10 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 3 "" ""
 hex 0201 3 "" ""
 hex 0301 3 "" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Lena Station.board b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Lena Station.board
index 88b9d94e1d3..644b62c8ff4 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Lena Station.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Lena Station.board	
@@ -2,6 +2,7 @@ size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 4 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Mountain.board b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Mountain.board
index ae6c7904c81..e300616f27f 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Mountain.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Mountain.board	
@@ -2,6 +2,7 @@ size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Rick Dom Dam.board b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Rick Dom Dam.board
index c05f6b8e209..83cb77b14db 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Rick Dom Dam.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Rick Dom Dam.board	
@@ -1,12 +1,13 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 6 "water:7" ""
 hex 0201 6 "water:7" ""
 hex 0301 6 "water:7" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Swiss Moon.board b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Swiss Moon.board
index 24e2e679559..112dbdf1f9a 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Swiss Moon.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/45x45 Swiss Moon.board	
@@ -1,9 +1,11 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 -3 "" "lunar"
 hex 0201 -3 "" "lunar"
 hex 0301 -4 "rough:1" "lunar"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/55x55 Hemlock Pass.board b/megamek/data/boards/unofficial/Jakes Map Pack/55x55 Hemlock Pass.board
index 59504dd99b7..a68d8edb420 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/55x55 Hemlock Pass.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/55x55 Hemlock Pass.board	
@@ -1,7 +1,8 @@
 size 55 55
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City C.board b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City C.board
index 931d427a055..7a1fd15aaa7 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City C.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City C.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:3;pavement:1;building:2:12;bldg_cf:50" ""
 hex 0201 0 "bldg_elev:3;building:2:56;bldg_cf:50" "grass"
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City E.board b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City E.board
index 7573a09c6e4..868524ce4c1 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City E.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City E.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "rubble:3" ""
 hex 0201 0 "rubble:2" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City F.board b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City F.board
index ece11cf2984..a4d55ec7612 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City F.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City F.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 -2 "fluff:9:0" "lunar"
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City G.board b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City G.board
index c7a381e116d..ccd32f46b3e 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City G.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City G.board	
@@ -3,6 +3,8 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City I.board b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City I.board
index 5fc8d4d74d4..e6fc01e0794 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City I.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City I.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:4;pavement:1;building:2:30;bldg_cf:50" ""
diff --git a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City J.board b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City J.board
index 8e7be864c9f..0d4826b5283 100644
--- a/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City J.board	
+++ b/megamek/data/boards/unofficial/Jakes Map Pack/8x8 Volga City J.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "bldg_elev:5;pavement:1;building:2:28;bldg_cf:50" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/16x17 Airfield.board b/megamek/data/boards/unofficial/Jayof9s/16x17 Airfield.board
index a3ecb1cab46..1400384a039 100644
--- a/megamek/data/boards/unofficial/Jayof9s/16x17 Airfield.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/16x17 Airfield.board	
@@ -3,7 +3,9 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" ""
 hex 0201 0 "woods:1;foliage_elev:2" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/16x17 City Downtown Custom.board b/megamek/data/boards/unofficial/Jayof9s/16x17 City Downtown Custom.board
index 3c37d29ee03..dca230726a7 100644
--- a/megamek/data/boards/unofficial/Jayof9s/16x17 City Downtown Custom.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/16x17 City Downtown Custom.board	
@@ -1,9 +1,11 @@
 size 16 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;building:1:8;bldg_cf:15" ""
 hex 0201 0 "" ""
 hex 0301 0 "bldg_elev:2;building:1:0;bldg_cf:15" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/16x17 City Niops Ivory Tower.board b/megamek/data/boards/unofficial/Jayof9s/16x17 City Niops Ivory Tower.board
index 10faecc1e87..39881c39437 100644
--- a/megamek/data/boards/unofficial/Jayof9s/16x17 City Niops Ivory Tower.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/16x17 City Niops Ivory Tower.board	
@@ -1,9 +1,12 @@
 size 16 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "bldg_elev:2;building:1:8;bldg_cf:15" ""
 hex 0201 0 "" ""
 hex 0301 0 "bldg_elev:2;building:1:0;bldg_cf:15" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/16x17 City Street Grid Park 2 - Buildings.board b/megamek/data/boards/unofficial/Jayof9s/16x17 City Street Grid Park 2 - Buildings.board
index ee35a5aaf24..7eadee7ee47 100644
--- a/megamek/data/boards/unofficial/Jayof9s/16x17 City Street Grid Park 2 - Buildings.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/16x17 City Street Grid Park 2 - Buildings.board	
@@ -3,6 +3,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "road:1:20" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 1.board b/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 1.board
index 7debecb87d2..81642229b24 100644
--- a/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 1.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 1.board	
@@ -1,6 +1,7 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "ArmoredBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 2.board b/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 2.board
index 98ae447830f..d6b7de51712 100644
--- a/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 2.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 2.board	
@@ -1,8 +1,10 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 3.board b/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 3.board
index c9ba27ec5df..336d96c5827 100644
--- a/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 3.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/16x17 Fort 3.board	
@@ -2,7 +2,9 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/30x50 Canyons06.board b/megamek/data/boards/unofficial/Jayof9s/30x50 Canyons06.board
index 5cda3e7b585..08970d972db 100644
--- a/megamek/data/boards/unofficial/Jayof9s/30x50 Canyons06.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/30x50 Canyons06.board	
@@ -1,10 +1,11 @@
 size 30 50
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 -3 "" ""
 hex 0201 -3 "" ""
 hex 0301 -3 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Grasslands 2 base.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Grasslands 2 base.board
index 98b07f4229c..26bf3476f3e 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Grasslands 2 base.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Grasslands 2 base.board	
@@ -1,8 +1,9 @@
 size 32 33
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Woods (Auto)"
+tag "Water (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 1 "" "grass"
 hex 0201 1 "" "grass"
 hex 0301 1 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Damaged.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Damaged.board
index ed88373e180..ef3822ad44e 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Damaged.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Damaged.board	
@@ -3,8 +3,13 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Left Damaged.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Left Damaged.board
index 0811735b42e..1b166edf130 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Left Damaged.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Left Damaged.board	
@@ -2,7 +2,12 @@ size 32 33
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Left.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Left.board
index 4711bf0a9ca..58834a18b6f 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Left.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Left.board	
@@ -2,7 +2,12 @@ size 32 33
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Right Damaged.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Right Damaged.board
index 10bfd6b54c5..8d3b8cea745 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Right Damaged.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Right Damaged.board	
@@ -1,10 +1,12 @@
 size 32 33
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Right.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Right.board
index baa766dea19..f5d35c64a49 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Right.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport Right.board	
@@ -1,10 +1,12 @@
 size 32 33
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South Damaged.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South Damaged.board
index 329d6cde007..67278d6a71f 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South Damaged.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South Damaged.board	
@@ -1,11 +1,12 @@
 size 32 33
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South East Damaged.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South East Damaged.board
index a37e80b0a7a..2bae6328ec4 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South East Damaged.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South East Damaged.board	
@@ -1,10 +1,15 @@
 size 32 33
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "bldg_elev:3;pavement:1;building:2:12;bldg_cf:55" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South East.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South East.board
index a1d4f5e9992..3874259fa9c 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South East.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South East.board	
@@ -1,10 +1,15 @@
 size 32 33
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "bldg_elev:3;pavement:1;building:2:12;bldg_cf:55" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South.board
index 7e3a7815150..03b1286850b 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport South.board	
@@ -1,11 +1,12 @@
 size 32 33
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport.board b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport.board
index 9b8c6ad716d..f79a8cb3338 100644
--- a/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/32x33 Spaceport.board	
@@ -3,8 +3,13 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/35x35 Alrakis Recon.board b/megamek/data/boards/unofficial/Jayof9s/35x35 Alrakis Recon.board
index 94b8a8078b2..86ffef5a9a1 100644
--- a/megamek/data/boards/unofficial/Jayof9s/35x35 Alrakis Recon.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/35x35 Alrakis Recon.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 1 "" "grass"
 hex 0301 1 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/35x35 Tigerlands Processing Plant.board b/megamek/data/boards/unofficial/Jayof9s/35x35 Tigerlands Processing Plant.board
index 7dced83857f..7a21a1fb5bd 100644
--- a/megamek/data/boards/unofficial/Jayof9s/35x35 Tigerlands Processing Plant.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/35x35 Tigerlands Processing Plant.board	
@@ -1,12 +1,13 @@
 size 35 35
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "woods:1;foliage_elev:2" "grass"
 hex 0301 1 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/35x45 Defend the Base Mk II.board b/megamek/data/boards/unofficial/Jayof9s/35x45 Defend the Base Mk II.board
index 6b43e56e0a3..becd9903e1a 100644
--- a/megamek/data/boards/unofficial/Jayof9s/35x45 Defend the Base Mk II.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/35x45 Defend the Base Mk II.board	
@@ -1,10 +1,11 @@
 size 35 45
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:4" ""
 hex 0201 0 "water:4" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/44x45 Fortress.board b/megamek/data/boards/unofficial/Jayof9s/44x45 Fortress.board
index 1da56e2ade4..6eb8c44a98f 100644
--- a/megamek/data/boards/unofficial/Jayof9s/44x45 Fortress.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/44x45 Fortress.board	
@@ -1,10 +1,14 @@
 size 44 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 7 "" ""
 hex 0201 7 "" ""
 hex 0301 7 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/45x45 Grasslands Mfg Plant.board b/megamek/data/boards/unofficial/Jayof9s/45x45 Grasslands Mfg Plant.board
index 1bfb007fb62..4a076f8029c 100644
--- a/megamek/data/boards/unofficial/Jayof9s/45x45 Grasslands Mfg Plant.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/45x45 Grasslands Mfg Plant.board	
@@ -2,8 +2,10 @@ size 45 45
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/45x45 Militia HQ v2.board b/megamek/data/boards/unofficial/Jayof9s/45x45 Militia HQ v2.board
index 062906f4702..86310457fcc 100644
--- a/megamek/data/boards/unofficial/Jayof9s/45x45 Militia HQ v2.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/45x45 Militia HQ v2.board	
@@ -1,9 +1,14 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/45x45 Militia HQ.board b/megamek/data/boards/unofficial/Jayof9s/45x45 Militia HQ.board
index b1702d466a7..6726d042a67 100644
--- a/megamek/data/boards/unofficial/Jayof9s/45x45 Militia HQ.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/45x45 Militia HQ.board	
@@ -1,9 +1,14 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/45x45 Moore Rainy Woods.board b/megamek/data/boards/unofficial/Jayof9s/45x45 Moore Rainy Woods.board
index 88dcff6a15f..c1cb0d92743 100644
--- a/megamek/data/boards/unofficial/Jayof9s/45x45 Moore Rainy Woods.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/45x45 Moore Rainy Woods.board	
@@ -1,10 +1,11 @@
 size 45 45
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/45x45 River Valley Factory.board b/megamek/data/boards/unofficial/Jayof9s/45x45 River Valley Factory.board
index 62455117a89..cf6adb4f6a7 100644
--- a/megamek/data/boards/unofficial/Jayof9s/45x45 River Valley Factory.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/45x45 River Valley Factory.board	
@@ -1,9 +1,10 @@
 size 45 45
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/45x46 Research Facility.board b/megamek/data/boards/unofficial/Jayof9s/45x46 Research Facility.board
index 14b78430d77..582a952b1a4 100644
--- a/megamek/data/boards/unofficial/Jayof9s/45x46 Research Facility.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/45x46 Research Facility.board	
@@ -1,10 +1,11 @@
 size 45 46
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/55x55 Foot Fall Small Town v2.board b/megamek/data/boards/unofficial/Jayof9s/55x55 Foot Fall Small Town v2.board
index ded6a51d10f..592509bbcd8 100644
--- a/megamek/data/boards/unofficial/Jayof9s/55x55 Foot Fall Small Town v2.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/55x55 Foot Fall Small Town v2.board	
@@ -1,12 +1,14 @@
 size 55 55
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 2 "" ""
 hex 0201 4 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/55x55 Foot Fall Small Town.board b/megamek/data/boards/unofficial/Jayof9s/55x55 Foot Fall Small Town.board
index b92e630c7c6..642e9000d7c 100644
--- a/megamek/data/boards/unofficial/Jayof9s/55x55 Foot Fall Small Town.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/55x55 Foot Fall Small Town.board	
@@ -1,11 +1,13 @@
 size 55 55
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 1 "" ""
 hex 0201 2 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/55x55 Main Factory C.board b/megamek/data/boards/unofficial/Jayof9s/55x55 Main Factory C.board
index 69d4a22cdf2..273b3f651ed 100644
--- a/megamek/data/boards/unofficial/Jayof9s/55x55 Main Factory C.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/55x55 Main Factory C.board	
@@ -2,7 +2,10 @@ size 55 55
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "road:1:36" ""
 hex 0201 0 "road:1:36" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/55x55 Rural vs Urban Mountains.board b/megamek/data/boards/unofficial/Jayof9s/55x55 Rural vs Urban Mountains.board
index 654c43e39a9..33d149c950d 100644
--- a/megamek/data/boards/unofficial/Jayof9s/55x55 Rural vs Urban Mountains.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/55x55 Rural vs Urban Mountains.board	
@@ -1,13 +1,17 @@
 size 55 55
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/55x55 Rural vs Urban.board b/megamek/data/boards/unofficial/Jayof9s/55x55 Rural vs Urban.board
index 1bbb8b73587..c96efef7c32 100644
--- a/megamek/data/boards/unofficial/Jayof9s/55x55 Rural vs Urban.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/55x55 Rural vs Urban.board	
@@ -1,14 +1,18 @@
 size 55 55
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
-tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "HighHills (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/55x55 Shipka Wilderness Outpost v2.board b/megamek/data/boards/unofficial/Jayof9s/55x55 Shipka Wilderness Outpost v2.board
index 645eb7db98a..074a9899376 100644
--- a/megamek/data/boards/unofficial/Jayof9s/55x55 Shipka Wilderness Outpost v2.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/55x55 Shipka Wilderness Outpost v2.board	
@@ -1,10 +1,11 @@
 size 55 55
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/55x55 Shipka Wilderness Outpost.board b/megamek/data/boards/unofficial/Jayof9s/55x55 Shipka Wilderness Outpost.board
index 014bb9b086d..472c09936cd 100644
--- a/megamek/data/boards/unofficial/Jayof9s/55x55 Shipka Wilderness Outpost.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/55x55 Shipka Wilderness Outpost.board	
@@ -1,9 +1,10 @@
 size 55 55
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/64x65 Ancient Factory.board b/megamek/data/boards/unofficial/Jayof9s/64x65 Ancient Factory.board
index a772f1f8e7a..a3cb5561720 100644
--- a/megamek/data/boards/unofficial/Jayof9s/64x65 Ancient Factory.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/64x65 Ancient Factory.board	
@@ -1,10 +1,12 @@
 size 64 65
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/64x65 Modern Factory.board b/megamek/data/boards/unofficial/Jayof9s/64x65 Modern Factory.board
index f0e76a67052..fe23a918fc4 100644
--- a/megamek/data/boards/unofficial/Jayof9s/64x65 Modern Factory.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/64x65 Modern Factory.board	
@@ -1,12 +1,15 @@
 size 64 65
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
 hex 0301 1 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/64x68 Pirate Base.board b/megamek/data/boards/unofficial/Jayof9s/64x68 Pirate Base.board
index 6c251d815ea..c494548442a 100644
--- a/megamek/data/boards/unofficial/Jayof9s/64x68 Pirate Base.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/64x68 Pirate Base.board	
@@ -1,8 +1,9 @@
 size 64 68
 tag "Rough (Auto)"
-tag "MarsTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "MarsTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 5 "" "mars"
 hex 0201 5 "" "mars"
 hex 0301 5 "" "mars"
diff --git a/megamek/data/boards/unofficial/Jayof9s/64x68 Rocky Battlefield.board b/megamek/data/boards/unofficial/Jayof9s/64x68 Rocky Battlefield.board
index 3849df75d64..d9ca043f34b 100644
--- a/megamek/data/boards/unofficial/Jayof9s/64x68 Rocky Battlefield.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/64x68 Rocky Battlefield.board	
@@ -1,9 +1,10 @@
 size 64 68
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 2 "" ""
 hex 0201 2 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/Jayof9s/64x68 Rural vs Urban Mountains large.board b/megamek/data/boards/unofficial/Jayof9s/64x68 Rural vs Urban Mountains large.board
index 9ec7fd4e17a..c0f91f1996f 100644
--- a/megamek/data/boards/unofficial/Jayof9s/64x68 Rural vs Urban Mountains large.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/64x68 Rural vs Urban Mountains large.board	
@@ -1,13 +1,16 @@
 size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/64x68 Temperate Factory 2.board b/megamek/data/boards/unofficial/Jayof9s/64x68 Temperate Factory 2.board
index 7956edcc40d..52539938ae0 100644
--- a/megamek/data/boards/unofficial/Jayof9s/64x68 Temperate Factory 2.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/64x68 Temperate Factory 2.board	
@@ -1,12 +1,13 @@
 size 64 68
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
 hex 0301 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jayof9s/64x68 Temperate Factory.board b/megamek/data/boards/unofficial/Jayof9s/64x68 Temperate Factory.board
index 3d99189f224..01b3f8b576b 100644
--- a/megamek/data/boards/unofficial/Jayof9s/64x68 Temperate Factory.board	
+++ b/megamek/data/boards/unofficial/Jayof9s/64x68 Temperate Factory.board	
@@ -1,12 +1,13 @@
 size 64 68
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
 hex 0301 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/16x64 Chemical Rush.board b/megamek/data/boards/unofficial/Jihad Mappack/16x64 Chemical Rush.board
index 78e0fc23378..e213ebdb854 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/16x64 Chemical Rush.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/16x64 Chemical Rush.board	
@@ -1,13 +1,19 @@
 size 16 68
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 5 "woods:3:36;foliage_elev:3" "grass"
 hex 0201 4 "woods:3:36;foliage_elev:3" "grass"
 hex 0301 3 "woods:2:36;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/25x45 New Hoover.board b/megamek/data/boards/unofficial/Jihad Mappack/25x45 New Hoover.board
index b58668579dd..b689619fe11 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/25x45 New Hoover.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/25x45 New Hoover.board	
@@ -1,10 +1,11 @@
 size 25 45
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "Elevator (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Avalon Revised.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Avalon Revised.board
index e2247830fed..6bdf2af2500 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Avalon Revised.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Avalon Revised.board	
@@ -1,10 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Desert Castle.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Desert Castle.board
index 29d55176d23..d6796c2245b 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Desert Castle.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Desert Castle.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 -1 "sand:0;rough:1" ""
 hex 0201 -1 "sand:0;rough:1" ""
 hex 0301 -1 "sand:0;rough:1" ""
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Highway.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Highway.board
index 1a9a3758bc9..f972175f217 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Highway.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Highway.board	
@@ -2,8 +2,9 @@ size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Imperial Sewers.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Imperial Sewers.board
index f8a9e8f1cf1..7625eb75ae2 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Imperial Sewers.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Imperial Sewers.board	
@@ -1,10 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 hex 0101 9 "impassable:0" "snow"
 hex 0201 9 "impassable:0" "snow"
 hex 0301 9 "impassable:0" "snow"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Ishikawajima.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Ishikawajima.board
index 2d0b56e9487..612a129afc4 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Ishikawajima.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Ishikawajima.board	
@@ -1,9 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "tundra:1" ""
 hex 0201 0 "tundra:1" ""
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Miami Beach.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Miami Beach.board
index 6d2a8f96a6f..183ec9a6a3c 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Miami Beach.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Miami Beach.board	
@@ -1,12 +1,14 @@
 size 35 35
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:3:34;woods:1:0;building:1:0;foliage_elev:2;bldg_cf:20:34" "grass"
 hex 0201 0 "water:2" "grass"
 hex 0301 0 "water:2" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Sirius V.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Sirius V.board
index b10b08770b6..51751cf59c0 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Sirius V.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Sirius V.board	
@@ -1,12 +1,19 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -2 "" "Lunar"
 hex 0201 -2 "" "Lunar"
 hex 0301 -2 "rough:1" "Lunar"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Solaris City.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Solaris City.board
index 91781ba4e2b..d57807d7fd2 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Solaris City.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Solaris City.board	
@@ -1,10 +1,12 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Wet Pincussion.board b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Wet Pincussion.board
index 51fee6e79e0..e06f0f1c284 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/35x35 Wet Pincussion.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/35x35 Wet Pincussion.board	
@@ -1,9 +1,10 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/45x45 Alexander Valley.board b/megamek/data/boards/unofficial/Jihad Mappack/45x45 Alexander Valley.board
index cc880ebd9f6..c46144ce9a3 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/45x45 Alexander Valley.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/45x45 Alexander Valley.board	
@@ -1,12 +1,13 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:3:9;building:1:12;bldg_cf:20:9" "grass"
 hex 0201 0 "bldg_elev:3:9;building:1:56;bldg_cf:20:9" "grass"
 hex 0301 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/45x45 Dead or Alive.board b/megamek/data/boards/unofficial/Jihad Mappack/45x45 Dead or Alive.board
index 9203df9e21c..8f8fc47b4dc 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/45x45 Dead or Alive.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/45x45 Dead or Alive.board	
@@ -1,10 +1,11 @@
 size 45 45
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/45x45 Geneva.board b/megamek/data/boards/unofficial/Jihad Mappack/45x45 Geneva.board
index 6c28f60966b..5d4a1d4c393 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/45x45 Geneva.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/45x45 Geneva.board	
@@ -1,10 +1,12 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "road:1:36" "grass"
 hex 0201 0 "road:1:36" "grass"
 hex 0301 0 "bldg_elev:3;pavement:1;building:3:4;bldg_cf:80" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/45x55 Brigadier Blues.board b/megamek/data/boards/unofficial/Jihad Mappack/45x55 Brigadier Blues.board
index 8db7b08cce6..f38f7fefbef 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/45x55 Brigadier Blues.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/45x55 Brigadier Blues.board	
@@ -2,7 +2,9 @@ size 55 45
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/50x40 Caustic Valley.board b/megamek/data/boards/unofficial/Jihad Mappack/50x40 Caustic Valley.board
index 91576d146c2..4bcdb1b6180 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/50x40 Caustic Valley.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/50x40 Caustic Valley.board	
@@ -1,7 +1,8 @@
 size 50 40
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 5 "" ""
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/50x50 Boreal Town.board b/megamek/data/boards/unofficial/Jihad Mappack/50x50 Boreal Town.board
index fdc023effe5..1909a49759a 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/50x50 Boreal Town.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/50x50 Boreal Town.board	
@@ -1,12 +1,15 @@
 size 50 50
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 0 "pavement:1" "grass"
 hex 0301 0 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/80x80 Devilstower 2014.board b/megamek/data/boards/unofficial/Jihad Mappack/80x80 Devilstower 2014.board
index 33c95295c45..c0d3d3554ce 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/80x80 Devilstower 2014.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/80x80 Devilstower 2014.board	
@@ -1,9 +1,10 @@
 size 80 80
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/80x80 Devilstower 3078.board b/megamek/data/boards/unofficial/Jihad Mappack/80x80 Devilstower 3078.board
index ae6ea62ea97..e6c3af1a8eb 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/80x80 Devilstower 3078.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/80x80 Devilstower 3078.board	
@@ -1,12 +1,18 @@
 size 80 80
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "" ""
 hex 0201 5 "" ""
 hex 0301 6 "" ""
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/A Bridge 2 Far.board b/megamek/data/boards/unofficial/Jihad Mappack/A Bridge 2 Far.board
index 5125bb0e60c..ca88013e78d 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/A Bridge 2 Far.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/A Bridge 2 Far.board	
@@ -1,10 +1,11 @@
 size 35 35
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 4 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Jihad Mappack/miami beach.board b/megamek/data/boards/unofficial/Jihad Mappack/miami beach.board
index dae3b500a41..2713e042c15 100644
--- a/megamek/data/boards/unofficial/Jihad Mappack/miami beach.board	
+++ b/megamek/data/boards/unofficial/Jihad Mappack/miami beach.board	
@@ -1,11 +1,12 @@
 size 35 35
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:3:34;woods:1:0;building:1:0;foliage_elev:2;bldg_cf:20:34" "grass"
 hex 0201 0 "water:2" "grass"
 hex 0301 0 "water:2" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/16x17 Colson Hills Outskirts 0 North.board b/megamek/data/boards/unofficial/Kajis/16x17 Colson Hills Outskirts 0 North.board
index b3cdc754ddf..ad9e001e972 100644
--- a/megamek/data/boards/unofficial/Kajis/16x17 Colson Hills Outskirts 0 North.board	
+++ b/megamek/data/boards/unofficial/Kajis/16x17 Colson Hills Outskirts 0 North.board	
@@ -1,9 +1,10 @@
 size 16 17
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 1 "water:2" "snow"
 hex 0201 1 "water:2" "snow"
diff --git a/megamek/data/boards/unofficial/Kajis/16x17 Colson Hills Outskirts 1 South.board b/megamek/data/boards/unofficial/Kajis/16x17 Colson Hills Outskirts 1 South.board
index f88be3d0268..acbce3c8ba5 100644
--- a/megamek/data/boards/unofficial/Kajis/16x17 Colson Hills Outskirts 1 South.board	
+++ b/megamek/data/boards/unofficial/Kajis/16x17 Colson Hills Outskirts 1 South.board	
@@ -1,9 +1,10 @@
 size 16 17
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 2 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Kajis/16x17 Mines.board b/megamek/data/boards/unofficial/Kajis/16x17 Mines.board
index fcc596e0aaf..31198876022 100644
--- a/megamek/data/boards/unofficial/Kajis/16x17 Mines.board	
+++ b/megamek/data/boards/unofficial/Kajis/16x17 Mines.board	
@@ -1,12 +1,13 @@
 size 16 17
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
 hex 0201 0 "woods:1;foliage_elev:2" "grass"
 hex 0301 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/16x17 Outpost.board b/megamek/data/boards/unofficial/Kajis/16x17 Outpost.board
index df6cb256635..d3f2d7f6f31 100644
--- a/megamek/data/boards/unofficial/Kajis/16x17 Outpost.board	
+++ b/megamek/data/boards/unofficial/Kajis/16x17 Outpost.board	
@@ -3,9 +3,13 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Kajis/16x17 Rough Snow.board b/megamek/data/boards/unofficial/Kajis/16x17 Rough Snow.board
index 01758a2b0e8..fd4fdd1cc37 100644
--- a/megamek/data/boards/unofficial/Kajis/16x17 Rough Snow.board	
+++ b/megamek/data/boards/unofficial/Kajis/16x17 Rough Snow.board	
@@ -2,12 +2,13 @@ size 16 17
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" ""
 hex 0201 0 "snow:1" ""
diff --git a/megamek/data/boards/unofficial/Kajis/16x34 Coson Hill Outskirts.board b/megamek/data/boards/unofficial/Kajis/16x34 Coson Hill Outskirts.board
index 9f7abe19a10..5fc133c05d5 100644
--- a/megamek/data/boards/unofficial/Kajis/16x34 Coson Hill Outskirts.board	
+++ b/megamek/data/boards/unofficial/Kajis/16x34 Coson Hill Outskirts.board	
@@ -1,10 +1,11 @@
 size 16 34
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
 tag "SnowTerrain (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 1 "water:2" "snow"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Alpine.board b/megamek/data/boards/unofficial/Kajis/30x17 The Alpine.board
index 8670c739a4b..862516c6185 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Alpine.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Alpine.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Castle Underground.board b/megamek/data/boards/unofficial/Kajis/30x17 The Castle Underground.board
index e4fe31ca8dd..17750f90990 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Castle Underground.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Castle Underground.board	
@@ -1,13 +1,15 @@
 size 30 17
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "impassable:1" "grass"
 hex 0201 2 "impassable:1" "grass"
 hex 0301 2 "rough:1;impassable:1" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The City.board b/megamek/data/boards/unofficial/Kajis/30x17 The City.board
index 82a25d6e093..902e860d3cb 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The City.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The City.board	
@@ -1,10 +1,11 @@
 size 30 17
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 1 "bldg_elev:3;pavement:1;building:1:0;bldg_cf:15" "grass"
 hex 0201 1 "pavement:1;road:1:9" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Country 6.board b/megamek/data/boards/unofficial/Kajis/30x17 The Country 6.board
index fc6b15984e1..fecb8e0afaa 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Country 6.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Country 6.board	
@@ -1,10 +1,11 @@
 size 30 17
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Country 8.board b/megamek/data/boards/unofficial/Kajis/30x17 The Country 8.board
index 61383f0109e..fbf81a4dd1b 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Country 8.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Country 8.board	
@@ -1,12 +1,13 @@
 size 30 17
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 0 North-Northwest.board b/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 0 North-Northwest.board
index f9662835089..2d7cd11a1cc 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 0 North-Northwest.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 0 North-Northwest.board	
@@ -1,9 +1,10 @@
 size 30 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "MediumForest (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "jungle:2;foliage_elev:2" "grass"
 hex 0201 1 "water:0" "grass"
 hex 0301 1 "water:0" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 1 Far North.board b/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 1 Far North.board
index af9202bc69d..e5e82f9b2fc 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 1 Far North.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 1 Far North.board	
@@ -1,11 +1,12 @@
 size 30 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "MediumForest (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1;road:1:20" "grass"
 hex 0201 0 "pavement:1;road:1:36" "grass"
 hex 0301 0 "bldg_elev:3;pavement:1;building:2:0;bldg_cf:40" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 2 North-Northeast.board b/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 2 North-Northeast.board
index c958b42d982..8e41f6d4788 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 2 North-Northeast.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 2 North-Northeast.board	
@@ -1,10 +1,11 @@
 size 30 17
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "MediumForest (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "bldg_elev:3;pavement:1;building:1:0;bldg_cf:15" "grass"
 hex 0201 1 "jungle:1;foliage_elev:2" "grass"
 hex 0301 1 "jungle:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 8 East.board b/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 8 East.board
index 1695bcb5dcf..1dd7e1ee9f9 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 8 East.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Jungle 8 East.board	
@@ -1,8 +1,9 @@
 size 30 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "jungle:1;foliage_elev:2" "grass"
 hex 0201 0 "jungle:2;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Martian Plains.board b/megamek/data/boards/unofficial/Kajis/30x17 The Martian Plains.board
index df4c8b4d59b..ba8b95cf618 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Martian Plains.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Martian Plains.board	
@@ -2,6 +2,7 @@ size 30 17
 tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "" "mars"
 hex 0201 1 "" "mars"
 hex 0301 1 "" "mars"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Moon 4 Southwest.board b/megamek/data/boards/unofficial/Kajis/30x17 The Moon 4 Southwest.board
index e954849d52d..f03f76221ed 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Moon 4 Southwest.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Moon 4 Southwest.board	
@@ -1,9 +1,11 @@
 size 30 17
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 2 "" "lunar"
 hex 0201 2 "rough:1" "lunar"
 hex 0301 1 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Moon 5 Southeast.board b/megamek/data/boards/unofficial/Kajis/30x17 The Moon 5 Southeast.board
index 12f50ee5ef2..e7d3c0e29ac 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Moon 5 Southeast.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Moon 5 Southeast.board	
@@ -4,6 +4,8 @@ tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 1 "" "lunar"
 hex 0201 1 "rough:1" "lunar"
 hex 0301 1 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The Mountains.board b/megamek/data/boards/unofficial/Kajis/30x17 The Mountains.board
index ee51fef311c..21fb32b16dc 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The Mountains.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The Mountains.board	
@@ -2,13 +2,14 @@ size 30 17
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "IceTerrain (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 1 "snow:1" "grass"
 hex 0201 1 "woods:1;snow:1;foliage_elev:2" "snow"
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The River Outpost.board b/megamek/data/boards/unofficial/Kajis/30x17 The River Outpost.board
index 008de813e6e..dfd562506c0 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The River Outpost.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The River Outpost.board	
@@ -1,11 +1,16 @@
 size 30 17
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "woods:1;foliage_elev:1" ""
 hex 0201 0 "woods:1;foliage_elev:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Kajis/30x17 The River Town.board b/megamek/data/boards/unofficial/Kajis/30x17 The River Town.board
index c591e1765b8..899a57f4b95 100644
--- a/megamek/data/boards/unofficial/Kajis/30x17 The River Town.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x17 The River Town.board	
@@ -1,12 +1,13 @@
 size 30 17
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "pavement:1" "grass"
 hex 0201 1 "pavement:1" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/30x34 The Alpine Mountains.board b/megamek/data/boards/unofficial/Kajis/30x34 The Alpine Mountains.board
index ec080d1042c..7fdad3d8b6c 100644
--- a/megamek/data/boards/unofficial/Kajis/30x34 The Alpine Mountains.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x34 The Alpine Mountains.board	
@@ -2,11 +2,12 @@ size 30 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "IceTerrain (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
diff --git a/megamek/data/boards/unofficial/Kajis/30x34 The River City.board b/megamek/data/boards/unofficial/Kajis/30x34 The River City.board
index 2eae2e58356..7639f09f5d4 100644
--- a/megamek/data/boards/unofficial/Kajis/30x34 The River City.board	
+++ b/megamek/data/boards/unofficial/Kajis/30x34 The River City.board	
@@ -1,12 +1,13 @@
 size 30 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "bldg_elev:3;pavement:1;building:1:0;bldg_cf:15" "grass"
 hex 0201 1 "pavement:1;road:1:9" "grass"
 hex 0301 1 "pavement:1;road:1:9" "grass"
diff --git a/megamek/data/boards/unofficial/Kajis/60x51 The Whole Moon.board b/megamek/data/boards/unofficial/Kajis/60x51 The Whole Moon.board
index cd0f702a375..72f2efecac3 100644
--- a/megamek/data/boards/unofficial/Kajis/60x51 The Whole Moon.board	
+++ b/megamek/data/boards/unofficial/Kajis/60x51 The Whole Moon.board	
@@ -1,10 +1,13 @@
 size 60 51
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "GunEmplacement (Auto)"
 hex 0101 2 "" "lunar"
 hex 0201 2 "" "lunar"
 hex 0301 2 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Kajis/90x85 The Whole Jungle.board b/megamek/data/boards/unofficial/Kajis/90x85 The Whole Jungle.board
index b486188c24d..c95ebba39b2 100644
--- a/megamek/data/boards/unofficial/Kajis/90x85 The Whole Jungle.board	
+++ b/megamek/data/boards/unofficial/Kajis/90x85 The Whole Jungle.board	
@@ -1,12 +1,13 @@
 size 90 85
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Jungle (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "MediumUrban (Auto)"
 hex 0101 1 "jungle:2;foliage_elev:2" "grass"
 hex 0201 1 "water:0" "grass"
 hex 0301 1 "water:0" "grass"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 City Ruins With Rubble - Grass 13.board b/megamek/data/boards/unofficial/Lanceman/16x17 City Ruins With Rubble - Grass 13.board
index 01161e32dd1..d4b823c534c 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 City Ruins With Rubble - Grass 13.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 City Ruins With Rubble - Grass 13.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls - Desert 18.board b/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls - Desert 18.board
index c8e6a5c53d4..40cacdb8e7e 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls - Desert 18.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls - Desert 18.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "Flat (Auto)"
 tag "DesertTheme (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls - Grass 19.board b/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls - Grass 19.board
index a231db6d338..04daa7451fb 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls - Grass 19.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls - Grass 19.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls Defended - Desert 20.board b/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls Defended - Desert 20.board
index 02fa2b0a0e6..896d1ba9fbe 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls Defended - Desert 20.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls Defended - Desert 20.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "Flat (Auto)"
 tag "DesertTheme (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls Defended - Grass 21.board b/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls Defended - Grass 21.board
index 219c038fcf9..184b7b3ef34 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls Defended - Grass 21.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 Medium Bunker With Walls Defended - Grass 21.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "GrassTheme (Auto)"
 tag "Flat (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 Strike - Desert 22.board b/megamek/data/boards/unofficial/Lanceman/16x17 Strike - Desert 22.board
index f4e530c7a1c..4f86bfd7e09 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 Strike - Desert 22.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 Strike - Desert 22.board	
@@ -1,5 +1,6 @@
 size 16 17
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 Strike - Fortress - Desert 23.board b/megamek/data/boards/unofficial/Lanceman/16x17 Strike - Fortress - Desert 23.board
index 5ccdf5708f8..da4177decc0 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 Strike - Fortress - Desert 23.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 Strike - Fortress - Desert 23.board	
@@ -1,5 +1,6 @@
 size 16 17
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 Substation - Grass 27.board b/megamek/data/boards/unofficial/Lanceman/16x17 Substation - Grass 27.board
index 85b3ecbb40f..cfd29d2dd64 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 Substation - Grass 27.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 Substation - Grass 27.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 Supply - Desert 28.board b/megamek/data/boards/unofficial/Lanceman/16x17 Supply - Desert 28.board
index f78b977ddc4..68defd48e57 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 Supply - Desert 28.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 Supply - Desert 28.board	
@@ -1,5 +1,6 @@
 size 16 17
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 1 Alternate.board b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 1 Alternate.board
index fee13038ffb..8b2145f3bd3 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 1 Alternate.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 1 Alternate.board	
@@ -2,6 +2,7 @@ size 16 17
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 1.board b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 1.board
index 669d53a08e9..8bf9d53e4e8 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 1.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 1.board	
@@ -2,6 +2,7 @@ size 16 17
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 2 Alternate.board b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 2 Alternate.board
index c920e527c1f..095c728da77 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 2 Alternate.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 2 Alternate.board	
@@ -2,6 +2,7 @@ size 16 17
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 2.board b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 2.board
index c900f67c3ec..d5acf8dea0a 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 2.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 2.board	
@@ -2,6 +2,7 @@ size 16 17
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 3 Alternate.board b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 3 Alternate.board
index 91109e94cd0..b7c0e139c25 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 3 Alternate.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 3 Alternate.board	
@@ -2,6 +2,7 @@ size 16 17
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 3.board b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 3.board
index 804121ad387..60394831a61 100644
--- a/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 3.board	
+++ b/megamek/data/boards/unofficial/Lanceman/16x17 The Channels 3.board	
@@ -2,6 +2,7 @@ size 16 17
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/Lanceman/50x700 Ocoee 11.board b/megamek/data/boards/unofficial/Lanceman/50x700 Ocoee 11.board
index d21a2362788..12c9993c0ad 100644
--- a/megamek/data/boards/unofficial/Lanceman/50x700 Ocoee 11.board	
+++ b/megamek/data/boards/unofficial/Lanceman/50x700 Ocoee 11.board	
@@ -1,11 +1,12 @@
 size 50 700
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 9 "woods:2;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Lucho/10x10 Ishiyamaspecial.board b/megamek/data/boards/unofficial/Lucho/10x10 Ishiyamaspecial.board
index 2b2de67de78..7223cbb9bf8 100644
--- a/megamek/data/boards/unofficial/Lucho/10x10 Ishiyamaspecial.board	
+++ b/megamek/data/boards/unofficial/Lucho/10x10 Ishiyamaspecial.board	
@@ -1,8 +1,9 @@
 size 10 10
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:20" ""
 hex 0201 20 "impassable:20" ""
 hex 0301 20 "impassable:20" ""
diff --git a/megamek/data/boards/unofficial/Lucho/10x10 Ishiyamaspecial2.board b/megamek/data/boards/unofficial/Lucho/10x10 Ishiyamaspecial2.board
index b7cc27f7aeb..3ccc8d7bc04 100644
--- a/megamek/data/boards/unofficial/Lucho/10x10 Ishiyamaspecial2.board	
+++ b/megamek/data/boards/unofficial/Lucho/10x10 Ishiyamaspecial2.board	
@@ -1,8 +1,9 @@
 size 10 10
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 hex 0101 20 "impassable:1" ""
 hex 0201 20 "impassable:1" ""
 hex 0301 20 "impassable:1" ""
diff --git a/megamek/data/boards/unofficial/Lucho/16x17 Last Stand.board b/megamek/data/boards/unofficial/Lucho/16x17 Last Stand.board
index 0ea8095f858..58c33a04e27 100644
--- a/megamek/data/boards/unofficial/Lucho/16x17 Last Stand.board	
+++ b/megamek/data/boards/unofficial/Lucho/16x17 Last Stand.board	
@@ -1,5 +1,6 @@
 size 16 17
 tag "GrassTheme (Auto)"
+tag "Impassable (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Lucho/50x50  Citadel.board b/megamek/data/boards/unofficial/Lucho/50x50  Citadel.board
index 9d426901be9..41f555c617e 100644
--- a/megamek/data/boards/unofficial/Lucho/50x50  Citadel.board	
+++ b/megamek/data/boards/unofficial/Lucho/50x50  Citadel.board	
@@ -1,10 +1,12 @@
 size 50 50
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Jungle (Auto)"
 hex 0101 0 "water:5" ""
diff --git a/megamek/data/boards/unofficial/Lucho/50x50  Marapendi Bogs.board b/megamek/data/boards/unofficial/Lucho/50x50  Marapendi Bogs.board
index d3e5648b0c9..56f13e650ea 100644
--- a/megamek/data/boards/unofficial/Lucho/50x50  Marapendi Bogs.board	
+++ b/megamek/data/boards/unofficial/Lucho/50x50  Marapendi Bogs.board	
@@ -1,9 +1,10 @@
 size 50 50
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Impassable (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Lucho/50x50  Oasis.board b/megamek/data/boards/unofficial/Lucho/50x50  Oasis.board
index add15441c59..273fdcbef13 100644
--- a/megamek/data/boards/unofficial/Lucho/50x50  Oasis.board	
+++ b/megamek/data/boards/unofficial/Lucho/50x50  Oasis.board	
@@ -1,11 +1,13 @@
 size 50 50
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
diff --git a/megamek/data/boards/unofficial/Lucho/50x50  Stronghold.board b/megamek/data/boards/unofficial/Lucho/50x50  Stronghold.board
index 897dba696ba..27466251830 100644
--- a/megamek/data/boards/unofficial/Lucho/50x50  Stronghold.board	
+++ b/megamek/data/boards/unofficial/Lucho/50x50  Stronghold.board	
@@ -1,11 +1,12 @@
 size 50 50
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
 hex 0301 1 "" ""
diff --git a/megamek/data/boards/unofficial/Lucho/50x50  Urbanruins.board b/megamek/data/boards/unofficial/Lucho/50x50  Urbanruins.board
index 5eca12e3d62..a8352fece45 100644
--- a/megamek/data/boards/unofficial/Lucho/50x50  Urbanruins.board	
+++ b/megamek/data/boards/unofficial/Lucho/50x50  Urbanruins.board	
@@ -1,13 +1,15 @@
 size 50 50
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
-tag "Swamp (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 1 "" ""
 hex 0201 1 "" ""
diff --git a/megamek/data/boards/unofficial/MadCartographer/15x18 Hartford Gardens Jungle.board b/megamek/data/boards/unofficial/MadCartographer/15x18 Hartford Gardens Jungle.board
index 39e731e4eae..62bc867b51d 100644
--- a/megamek/data/boards/unofficial/MadCartographer/15x18 Hartford Gardens Jungle.board	
+++ b/megamek/data/boards/unofficial/MadCartographer/15x18 Hartford Gardens Jungle.board	
@@ -1,7 +1,9 @@
 size 15 18
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Jungle (Auto)"
 hex 0101 5 "impassable:1" "tropical"
diff --git a/megamek/data/boards/unofficial/MadCartographer/15x18 Hartford Gardens Woods.board b/megamek/data/boards/unofficial/MadCartographer/15x18 Hartford Gardens Woods.board
index 7f28d99ec1e..97e961f6661 100644
--- a/megamek/data/boards/unofficial/MadCartographer/15x18 Hartford Gardens Woods.board	
+++ b/megamek/data/boards/unofficial/MadCartographer/15x18 Hartford Gardens Woods.board	
@@ -1,9 +1,11 @@
 size 15 18
 option exit_roads_to_pavement false
-tag "TropicalTheme (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
+tag "TropicalTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 5 "impassable:1" "tropical"
 hex 0201 5 "impassable:1" "tropical"
diff --git a/megamek/data/boards/unofficial/ModCan/16x17 ModCan06.board b/megamek/data/boards/unofficial/ModCan/16x17 ModCan06.board
index d85414e7df3..bdd7b1e86df 100644
--- a/megamek/data/boards/unofficial/ModCan/16x17 ModCan06.board	
+++ b/megamek/data/boards/unofficial/ModCan/16x17 ModCan06.board	
@@ -1,8 +1,10 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 4 "" ""
 hex 0201 4 "woods:1;foliage_elev:2" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/ModCan/16x17 ModCan19.board b/megamek/data/boards/unofficial/ModCan/16x17 ModCan19.board
index 413e2dabeed..2634575b48e 100644
--- a/megamek/data/boards/unofficial/ModCan/16x17 ModCan19.board	
+++ b/megamek/data/boards/unofficial/ModCan/16x17 ModCan19.board	
@@ -1,8 +1,9 @@
 size 16 17
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "" ""
 hex 0201 4 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/Morkath/100x78_Shipyard.board b/megamek/data/boards/unofficial/Morkath/100x78_Shipyard.board
index 3d96ec052b2..e641912aa01 100644
--- a/megamek/data/boards/unofficial/Morkath/100x78_Shipyard.board
+++ b/megamek/data/boards/unofficial/Morkath/100x78_Shipyard.board
@@ -1,10 +1,16 @@
 size 100 78
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:30;building:5:8;bldg_cf:10" "lunar"
 hex 0201 -100 "" "lunar"
 hex 0301 -100 "" "lunar"
diff --git a/megamek/data/boards/unofficial/Morkath/100x78_Shipyard_Entrance.board b/megamek/data/boards/unofficial/Morkath/100x78_Shipyard_Entrance.board
index 9e1aff3df4a..5e64952b98b 100644
--- a/megamek/data/boards/unofficial/Morkath/100x78_Shipyard_Entrance.board
+++ b/megamek/data/boards/unofficial/Morkath/100x78_Shipyard_Entrance.board
@@ -1,9 +1,14 @@
 size 100 78
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:30;bldg_armor:100;building:5:12;bldg_cf:150" "lunar"
 hex 0201 0 "bldg_elev:30;bldg_armor:100;building:5:50;bldg_cf:150" "lunar"
diff --git a/megamek/data/boards/unofficial/Morkath/64x64_Ragnarok_PortCity.board b/megamek/data/boards/unofficial/Morkath/64x64_Ragnarok_PortCity.board
index 2f5b15e964b..59fe9d8f4d1 100644
--- a/megamek/data/boards/unofficial/Morkath/64x64_Ragnarok_PortCity.board
+++ b/megamek/data/boards/unofficial/Morkath/64x64_Ragnarok_PortCity.board
@@ -1,13 +1,16 @@
 size 64 64
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "HeavyUrban (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 5 "woods:2;foliage_elev:2" ""
 hex 0201 5 "woods:2;foliage_elev:2" ""
 hex 0301 5 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Morkath/64x64_Ragnarok_PortCity_Destroyed.board b/megamek/data/boards/unofficial/Morkath/64x64_Ragnarok_PortCity_Destroyed.board
index 800b7a66ad6..0bb50f19479 100644
--- a/megamek/data/boards/unofficial/Morkath/64x64_Ragnarok_PortCity_Destroyed.board
+++ b/megamek/data/boards/unofficial/Morkath/64x64_Ragnarok_PortCity_Destroyed.board
@@ -1,13 +1,16 @@
 size 64 64
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "HeavyUrban (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 5 "woods:2;foliage_elev:2" ""
 hex 0201 5 "woods:2;foliage_elev:2" ""
 hex 0301 5 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/NerdyTB/54x27 BinaryIsles.board b/megamek/data/boards/unofficial/NerdyTB/54x27 BinaryIsles.board
index 827efd0f480..ee5748d76b7 100644
--- a/megamek/data/boards/unofficial/NerdyTB/54x27 BinaryIsles.board	
+++ b/megamek/data/boards/unofficial/NerdyTB/54x27 BinaryIsles.board	
@@ -1,13 +1,14 @@
 size 54 27
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "water:5" "tropical"
 hex 0201 0 "water:5" "tropical"
 hex 0301 0 "water:5" "tropical"
diff --git a/megamek/data/boards/unofficial/Nightsky/16x17 Village 1.board b/megamek/data/boards/unofficial/Nightsky/16x17 Village 1.board
index 4da50756c55..4bf3824a88d 100644
--- a/megamek/data/boards/unofficial/Nightsky/16x17 Village 1.board	
+++ b/megamek/data/boards/unofficial/Nightsky/16x17 Village 1.board	
@@ -2,7 +2,9 @@ size 16 17
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Ratach Maps/100x100 TheEnclave.board b/megamek/data/boards/unofficial/Ratach Maps/100x100 TheEnclave.board
index 8d0a3e5643a..0b9ab4781b5 100644
--- a/megamek/data/boards/unofficial/Ratach Maps/100x100 TheEnclave.board	
+++ b/megamek/data/boards/unofficial/Ratach Maps/100x100 TheEnclave.board	
@@ -1,10 +1,14 @@
 size 100 100
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "GunEmplacement (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 3 "woods:2;foliage_elev:2" ""
 hex 0201 3 "woods:2;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Ratach Maps/41x51 Highway.board b/megamek/data/boards/unofficial/Ratach Maps/41x51 Highway.board
index f23fa74597b..da7be699341 100644
--- a/megamek/data/boards/unofficial/Ratach Maps/41x51 Highway.board	
+++ b/megamek/data/boards/unofficial/Ratach Maps/41x51 Highway.board	
@@ -1,11 +1,12 @@
 size 41 51
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 1 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Razorback/16x17 City Park.board b/megamek/data/boards/unofficial/Razorback/16x17 City Park.board
index 7dd654016c6..c0ab75221fc 100644
--- a/megamek/data/boards/unofficial/Razorback/16x17 City Park.board	
+++ b/megamek/data/boards/unofficial/Razorback/16x17 City Park.board	
@@ -1,9 +1,11 @@
 size 16 17
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "" ""
 hex 0201 2 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/RossMaps/40x40 Blue Creek CORW13.board b/megamek/data/boards/unofficial/RossMaps/40x40 Blue Creek CORW13.board
index cafc195cd3d..a8be91b37cd 100644
--- a/megamek/data/boards/unofficial/RossMaps/40x40 Blue Creek CORW13.board	
+++ b/megamek/data/boards/unofficial/RossMaps/40x40 Blue Creek CORW13.board	
@@ -1,10 +1,11 @@
 size 40 40
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 9 "rough:1" ""
 hex 0201 9 "" ""
 hex 0301 9 "" ""
diff --git a/megamek/data/boards/unofficial/RossMaps/40x40 Circe Plantation13.board b/megamek/data/boards/unofficial/RossMaps/40x40 Circe Plantation13.board
index b187be3c135..dab27ba4370 100644
--- a/megamek/data/boards/unofficial/RossMaps/40x40 Circe Plantation13.board	
+++ b/megamek/data/boards/unofficial/RossMaps/40x40 Circe Plantation13.board	
@@ -1,9 +1,10 @@
 size 40 40
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "swamp:2" ""
 hex 0201 0 "swamp:2" ""
diff --git a/megamek/data/boards/unofficial/RossMaps/40x40 Desert River13.board b/megamek/data/boards/unofficial/RossMaps/40x40 Desert River13.board
index 7e7c622f4f5..3d487343340 100644
--- a/megamek/data/boards/unofficial/RossMaps/40x40 Desert River13.board	
+++ b/megamek/data/boards/unofficial/RossMaps/40x40 Desert River13.board	
@@ -1,8 +1,9 @@
 size 40 40
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "rough:1" "grass"
diff --git a/megamek/data/boards/unofficial/RossMaps/40x40 Riverbed 13.board b/megamek/data/boards/unofficial/RossMaps/40x40 Riverbed 13.board
index 50837ad5b33..2aa850535fa 100644
--- a/megamek/data/boards/unofficial/RossMaps/40x40 Riverbed 13.board	
+++ b/megamek/data/boards/unofficial/RossMaps/40x40 Riverbed 13.board	
@@ -1,7 +1,8 @@
 size 40 40
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "rough:1" "desert"
diff --git a/megamek/data/boards/unofficial/SeeM/160x170 Cmentarz.board b/megamek/data/boards/unofficial/SeeM/160x170 Cmentarz.board
index b5227d9dc44..d0f7766b5a0 100644
--- a/megamek/data/boards/unofficial/SeeM/160x170 Cmentarz.board	
+++ b/megamek/data/boards/unofficial/SeeM/160x170 Cmentarz.board	
@@ -1,12 +1,14 @@
 size 160 170
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "" ""
 hex 0201 2 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/SeeM/160x170 Zlotarzeka.board b/megamek/data/boards/unofficial/SeeM/160x170 Zlotarzeka.board
index 3be5194d868..1b56967c32c 100644
--- a/megamek/data/boards/unofficial/SeeM/160x170 Zlotarzeka.board	
+++ b/megamek/data/boards/unofficial/SeeM/160x170 Zlotarzeka.board	
@@ -1,12 +1,14 @@
 size 160 170
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Desert.board b/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Desert.board
index ce7ef666511..f4776b8bcff 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Desert.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Desert.board	
@@ -1,11 +1,17 @@
 size 128 102
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Grass.board b/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Grass.board
index 80758d85e09..a9274598365 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Grass.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Grass.board	
@@ -1,11 +1,16 @@
 size 128 102
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Snow.board b/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Snow.board
index d2fb162621b..62be0fd21a8 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Snow.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 FortGribbly-Snow.board	
@@ -1,11 +1,17 @@
 size 128 102
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "SnowTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
+tag "SnowTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 Headland Battery.board b/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 Headland Battery.board
index 19aefaca3d9..a3281542606 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 Headland Battery.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/128x102/128x102 Headland Battery.board	
@@ -1,14 +1,20 @@
 size 128 102
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "Fields (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "Fields (Auto)"
-tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x17/32x17 Holth Forest - before fire.board b/megamek/data/boards/unofficial/SimonLandmine/32x17/32x17 Holth Forest - before fire.board
index 050e4843acd..b2fecf1c450 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x17/32x17 Holth Forest - before fire.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x17/32x17 Holth Forest - before fire.board	
@@ -1,9 +1,10 @@
 size 32 17
 tag "Rough (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "tropical"
 hex 0201 0 "woods:1;foliage_elev:2" "tropical"
 hex 0301 0 "woods:1;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 BridgeTown1.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 BridgeTown1.board
index 1bef5d1225c..4131dc5585c 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 BridgeTown1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 BridgeTown1.board	
@@ -3,8 +3,9 @@ tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Cfarms.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Cfarms.board
index 75107bcf32e..2456795eb05 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Cfarms.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Cfarms.board	
@@ -2,8 +2,9 @@ size 32 34
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bay-Sandbar.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bay-Sandbar.board
index 8da8a63a9d2..ba6e65e87b6 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bay-Sandbar.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bay-Sandbar.board	
@@ -1,14 +1,15 @@
 size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 3 "woods:2;foliage_elev:2" "grass"
 hex 0301 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bay.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bay.board
index 8da7c2f49d1..0477d6b561e 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bay.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bay.board	
@@ -1,14 +1,15 @@
 size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 3 "woods:2;foliage_elev:2" "grass"
 hex 0301 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bays1.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bays1.board
index 68e4aa5d848..1d6af4b1793 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bays1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Bays1.board	
@@ -2,11 +2,12 @@ size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Prom.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Prom.board
index 33aa7ac874e..0b5a2c20a6a 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Prom.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Prom.board	
@@ -4,9 +4,10 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 3 "woods:2;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Swamp.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Swamp.board
index aea361a404b..e07be8bc8ae 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Swamp.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal A Swamp.board	
@@ -5,9 +5,10 @@ tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 3 "woods:2;foliage_elev:2" "grass"
 hex 0301 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal B Cliffs1.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal B Cliffs1.board
index 52e0baf3411..63b36a2aa9b 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal B Cliffs1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal B Cliffs1.board	
@@ -1,11 +1,12 @@
 size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal B Cliffs2.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal B Cliffs2.board
index 283f6efe917..ec17ecc9094 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal B Cliffs2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal B Cliffs2.board	
@@ -1,11 +1,12 @@
 size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal In Shore Fort.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal In Shore Fort.board
index 993fb8f3886..8e7afd6895a 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal In Shore Fort.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal In Shore Fort.board	
@@ -2,6 +2,7 @@ size 32 34
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal In Shore Runway.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal In Shore Runway.board
index 4841806d3a4..779d04e0347 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal In Shore Runway.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Coastal In Shore Runway.board	
@@ -3,9 +3,12 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreFarms.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreFarms.board
index e40ea5500ec..f0e02353dfd 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreFarms.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreFarms.board	
@@ -1,10 +1,11 @@
 size 32 34
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Fields (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "Fields (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreFort.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreFort.board
index 792135a3434..9e8f91b95ce 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreFort.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreFort.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreRunway.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreRunway.board
index e34b0070c59..9681b9a65a9 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreRunway.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 CoastalInshoreRunway.board	
@@ -3,9 +3,12 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 NE.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 NE.board
index cc76b203810..9bb0dcd071d 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 NE.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 NE.board	
@@ -1,12 +1,16 @@
 size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -1 "water:1" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 NW.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 NW.board
index 3d033f73bd8..d3b5eebe4d0 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 NW.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 NW.board	
@@ -1,11 +1,13 @@
 size 32 34
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 SE.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 SE.board
index d1645668b88..13f0d304139 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 SE.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 SE.board	
@@ -2,8 +2,10 @@ size 32 34
 tag "Cliffs (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 SW.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 SW.board
index 32a14c592e5..d11ff852563 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 SW.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertCity1 SW.board	
@@ -4,6 +4,8 @@ tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertTown.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertTown.board
index 5333687ce44..90c151dd243 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertTown.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 DesertTown.board	
@@ -2,6 +2,7 @@ size 32 34
 option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Fenland A2.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Fenland A2.board
index fd3450e425a..dc340e00f8d 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Fenland A2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Fenland A2.board	
@@ -2,9 +2,11 @@ size 32 34
 tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Fields (Auto)"
 tag "Roads (Auto)"
+tag "Fields (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "mud:1" "grass"
 hex 0201 0 "mud:1" "grass"
 hex 0301 0 "mud:1" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Fenland B2.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Fenland B2.board
index bb2352df1c2..71f52655d66 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Fenland B2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Fenland B2.board	
@@ -2,11 +2,13 @@ size 32 34
 tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Fields (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "Fields (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "woods:1;foliage_elev:1" "grass"
 hex 0201 1 "" "grass"
 hex 0301 1 "road:1:38" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 FrozenValley1.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 FrozenValley1.board
index c797830fd01..c4ac15bf13d 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 FrozenValley1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 FrozenValley1.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "SnowTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 2 "woods:1;foliage_elev:2" "snow"
 hex 0201 2 "" "snow"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 FrozenValley2.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 FrozenValley2.board
index da0fadbee8f..39a5eaf8ec6 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 FrozenValley2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 FrozenValley2.board	
@@ -3,8 +3,9 @@ option exit_roads_to_pavement false
 tag "SnowTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 3 "" "snow"
 hex 0201 2 "" "snow"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 JapaneseMansion.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 JapaneseMansion.board
index 6a5243fda57..5b95fc26bcc 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 JapaneseMansion.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 JapaneseMansion.board	
@@ -2,9 +2,11 @@ size 32 34
 option exit_roads_to_pavement false
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Lumpy.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Lumpy.board
index ca8f1c85f30..58e734f993b 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Lumpy.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Lumpy.board	
@@ -1,5 +1,6 @@
 size 32 34
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 LumpyWoods.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 LumpyWoods.board
index 98097402174..f8dbf676bac 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 LumpyWoods.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 LumpyWoods.board	
@@ -1,9 +1,10 @@
 size 32 34
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 MarshallCity1-HighBridges.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 MarshallCity1-HighBridges.board
index 7753c8d1ad9..84dedee09d7 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 MarshallCity1-HighBridges.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 MarshallCity1-HighBridges.board	
@@ -3,8 +3,11 @@ option exit_roads_to_pavement false
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "bldg_elev:3;building:2:0;bldg_cf:40" "desert"
 hex 0201 3 "road:1:18" "desert"
 hex 0301 3 "road:1:21" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 MarshallCity1.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 MarshallCity1.board
index 1061062ae19..06f72afe035 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 MarshallCity1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 MarshallCity1.board	
@@ -3,8 +3,11 @@ option exit_roads_to_pavement false
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "bldg_elev:3;building:2:0;bldg_cf:40" "desert"
 hex 0201 3 "road:1:18" "desert"
 hex 0301 3 "road:1:21" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Oasis1.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Oasis1.board
index c4b3b478396..0065df43a2b 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Oasis1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Oasis1.board	
@@ -1,5 +1,6 @@
 size 32 34
 tag "Rough (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMine.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMine.board
index 97c7fafa32d..220d8896721 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMine.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMine.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMineAbandoned.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMineAbandoned.board
index 31f74dd83a7..9677111df6b 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMineAbandoned.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMineAbandoned.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMineFlooded.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMineFlooded.board
index 49df2c82b00..bc63636381b 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMineFlooded.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 OpenCastMineFlooded.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 PirateCamp-LowerWalls.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 PirateCamp-LowerWalls.board
index cc771c8f45a..9188eb21667 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 PirateCamp-LowerWalls.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 PirateCamp-LowerWalls.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Thermopylae Minor.board b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Thermopylae Minor.board
index 750d93f1393..7f29b78445e 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Thermopylae Minor.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/32x34/32x34 Thermopylae Minor.board	
@@ -2,13 +2,14 @@ size 32 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "woods:1;foliage_elev:1" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 02-HighGroundDefence.board b/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 02-HighGroundDefence.board
index a8678c4b867..be1bd3c0b79 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 02-HighGroundDefence.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 02-HighGroundDefence.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "" "grass"
 hex 0201 4 "" "grass"
 hex 0301 4 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 DesertCanyonRiver1.board b/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 DesertCanyonRiver1.board
index 95bf3bdd4b0..e738925f601 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 DesertCanyonRiver1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 DesertCanyonRiver1.board	
@@ -2,11 +2,12 @@ size 48 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 6 "" "desert"
 hex 0201 6 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 DesertCanyonRiver2.board b/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 DesertCanyonRiver2.board
index e3ba94c5b2e..28d98af8e87 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 DesertCanyonRiver2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x34/48x34 DesertCanyonRiver2.board	
@@ -2,11 +2,12 @@ size 48 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 7 "" "desert"
 hex 0201 6 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 BridgeTown1.board b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 BridgeTown1.board
index a036ee4df97..00ee16833e2 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 BridgeTown1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 BridgeTown1.board	
@@ -3,8 +3,9 @@ tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "road:1:36" ""
 hex 0201 0 "road:1:36" ""
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Jungle Research Base.board b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Jungle Research Base.board
index a8abe619b29..82d99bf3e38 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Jungle Research Base.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Jungle Research Base.board	
@@ -4,10 +4,13 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "Jungle (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 1 "jungle:1;foliage_elev:2" "tropical"
 hex 0201 1 "jungle:1;foliage_elev:2" "tropical"
 hex 0301 0 "jungle:1;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 MvM01.board b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 MvM01.board
index 22292c57228..16c6018add9 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 MvM01.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 MvM01.board	
@@ -1,11 +1,13 @@
 size 48 51
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 3 "" ""
 hex 0201 3 "" ""
 hex 0301 1 "road:1:9" ""
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 RavineCoast.board b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 RavineCoast.board
index 59941a06c53..d3e02b9b726 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 RavineCoast.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 RavineCoast.board	
@@ -1,13 +1,16 @@
 size 48 51
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 2 "rough:1" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Sandbar Fort.board b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Sandbar Fort.board
index e23dc1a7910..4bc87c467a0 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Sandbar Fort.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Sandbar Fort.board	
@@ -1,13 +1,17 @@
 size 48 51
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Woodland Base.board b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Woodland Base.board
index 8dd23e194e7..70b13cdccd4 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Woodland Base.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x51/48x51 Woodland Base.board	
@@ -3,9 +3,12 @@ tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 1 "woods:1;foliage_elev:2" "grass"
 hex 0201 1 "woods:1;foliage_elev:2" "grass"
 hex 0301 1 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x53/48x53 Aurigan Directorate v1.board b/megamek/data/boards/unofficial/SimonLandmine/48x53/48x53 Aurigan Directorate v1.board
index bee50b8571e..97bb9355722 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x53/48x53 Aurigan Directorate v1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x53/48x53 Aurigan Directorate v1.board	
@@ -2,6 +2,7 @@ size 48 53
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/48x53/48x53 Aurigan Directorate v2.board b/megamek/data/boards/unofficial/SimonLandmine/48x53/48x53 Aurigan Directorate v2.board
index a3849dbd024..25a285842a4 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/48x53/48x53 Aurigan Directorate v2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/48x53/48x53 Aurigan Directorate v2.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 DesertCanyonRiver1.board b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 DesertCanyonRiver1.board
index 049875e83af..70f3ffa16c3 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 DesertCanyonRiver1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 DesertCanyonRiver1.board	
@@ -2,11 +2,12 @@ size 64 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 6 "" "desert"
 hex 0201 6 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 DesertCanyonRiver2.board b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 DesertCanyonRiver2.board
index 5ed8d017013..6b4a6a0f2e7 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 DesertCanyonRiver2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 DesertCanyonRiver2.board	
@@ -2,11 +2,12 @@ size 64 34
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 6 "" "desert"
 hex 0201 6 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare-DarykEdition1.board b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare-DarykEdition1.board
index 12f816b25c9..8eca174c218 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare-DarykEdition1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare-DarykEdition1.board	
@@ -1,6 +1,7 @@
 size 64 34
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare-DarykEdition2.board b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare-DarykEdition2.board
index e09a546d575..41a20cc4f68 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare-DarykEdition2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare-DarykEdition2.board	
@@ -1,8 +1,9 @@
 size 64 34
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 2 "mud:1" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare.board b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare.board
index 2c57ae30aa9..97c1d124442 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x34/64x34 TrenchWarfare.board	
@@ -1,6 +1,7 @@
 size 64 34
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "LowHills (Auto)"
 hex 0101 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x51/64x51 MesaCity1 N - Mesas.board b/megamek/data/boards/unofficial/SimonLandmine/64x51/64x51 MesaCity1 N - Mesas.board
index 401cbbd3053..74f050b051f 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x51/64x51 MesaCity1 N - Mesas.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x51/64x51 MesaCity1 N - Mesas.board	
@@ -3,11 +3,14 @@ tag "LightUrban (Auto)"
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Fields (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "Fields (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x51/64x51 Ostia Base v1.board b/megamek/data/boards/unofficial/SimonLandmine/64x51/64x51 Ostia Base v1.board
index d318d133bfd..20afdcd6b1a 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x51/64x51 Ostia Base v1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x51/64x51 Ostia Base v1.board	
@@ -2,6 +2,7 @@ size 64 51
 tag "Rough (Auto)"
 tag "LunarTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -1 "" "lunar"
 hex 0201 -1 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1 Inshore.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1 Inshore.board
index 72f338b842c..6ed8e1b95dd 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1 Inshore.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1 Inshore.board	
@@ -4,10 +4,13 @@ tag "Rough (Auto)"
 tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 5 "" "desert"
 hex 0201 5 "" "desert"
 hex 0301 5 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1 Offshore.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1 Offshore.board
index b9a4715ed58..e496438c0c0 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1 Offshore.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1 Offshore.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:2" "desert"
 hex 0201 0 "water:2" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1.board
index 0a6ea9bcede..087823a8ccc 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity1.board	
@@ -1,14 +1,18 @@
 size 64 68
 option exit_roads_to_pavement false
+tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "LightForest (Auto)"
+tag "Hangar (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
-tag "Swamp (Auto)"
-tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
-tag "LightForest (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "" "desert"
 hex 0201 4 "" "desert"
 hex 0301 4 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity2.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity2.board
index ea0d7adfd32..59180f56ec6 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 CanalCity2.board	
@@ -3,9 +3,13 @@ option exit_roads_to_pavement false
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 1 "bldg_elev:3;pavement:1;building:2:4;bldg_cf:40" "desert"
 hex 0201 1 "bldg_elev:3;pavement:1;building:2:32;bldg_cf:40" "desert"
 hex 0301 1 "bldg_elev:3;pavement:1;building:1:8;bldg_cf:15" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Colt Ward Pass.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Colt Ward Pass.board
index 0545dfc5a4d..8e3778bccae 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Colt Ward Pass.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Colt Ward Pass.board	
@@ -1,9 +1,10 @@
 size 64 68
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam Valley - Breached.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam Valley - Breached.board
index f8eb02e5cfb..9118f374648 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam Valley - Breached.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam Valley - Breached.board	
@@ -6,6 +6,8 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 1 "woods:1:9;foliage_elev:2" "grass"
 hex 0201 0 "woods:1:9;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam Valley.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam Valley.board
index 91ce8a25872..2cf76b15ca0 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam Valley.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam Valley.board	
@@ -6,6 +6,8 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "woods:1:9;foliage_elev:2" "grass"
 hex 0201 0 "woods:1:9;foliage_elev:2" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam and Lake - Breached.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam and Lake - Breached.board
index fc6ff985236..5ce41be65f3 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam and Lake - Breached.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Dam and Lake - Breached.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCanyonRiver - Iceweb Edition.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCanyonRiver - Iceweb Edition.board
index a13c50356c9..92267c6bc95 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCanyonRiver - Iceweb Edition.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCanyonRiver - Iceweb Edition.board	
@@ -2,11 +2,12 @@ size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 6 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCanyonRiver.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCanyonRiver.board
index 403f1e40c26..86ceb396f33 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCanyonRiver.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCanyonRiver.board	
@@ -2,11 +2,12 @@ size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 6 "" "desert"
 hex 0201 6 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCity1.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCity1.board
index 7805b2672fa..e05576dc148 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCity1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 DesertCity1.board	
@@ -1,12 +1,16 @@
 size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Drop-port.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Drop-port.board
index 11dd20c1a59..b6ad932cdd6 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Drop-port.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Drop-port.board	
@@ -3,9 +3,12 @@ option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
 tag "Rough (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -3 "" "desert"
 hex 0201 -3 "" "desert"
 hex 0301 -3 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Fenland.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Fenland.board
index fdc796a3ed5..614a5fb2256 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Fenland.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Fenland.board	
@@ -2,11 +2,13 @@ size 64 68
 tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Fields (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "Fields (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "planted_fields:5" "grass"
 hex 0201 0 "planted_fields:5" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Headland Battery.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Headland Battery.board
index df3491748bb..a7cb1c47570 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Headland Battery.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Headland Battery.board	
@@ -1,14 +1,20 @@
 size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 1 "" "grass"
 hex 0201 1 "cliff_top:1:12" "grass"
 hex 0301 1 "cliff_top:1:8" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Isthmus1.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Isthmus1.board
index b5c94b2ba82..74755917d4d 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Isthmus1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Isthmus1.board	
@@ -1,10 +1,11 @@
 size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 JapaneseMansion.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 JapaneseMansion.board
index d9aea7f8d0f..7554d80ada5 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 JapaneseMansion.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 JapaneseMansion.board	
@@ -1,12 +1,14 @@
 size 64 68
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Jungle Research Base - Trail Version.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Jungle Research Base - Trail Version.board
index 9a6ab389b02..ce9026391e2 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Jungle Research Base - Trail Version.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Jungle Research Base - Trail Version.board	
@@ -2,13 +2,16 @@ size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "Jungle (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "jungle:1;foliage_elev:2" "tropical"
 hex 0201 2 "jungle:1;foliage_elev:2" "tropical"
 hex 0301 2 "jungle:1;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Jungle Research Base.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Jungle Research Base.board
index 14651620fc4..b0eedc92159 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Jungle Research Base.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Jungle Research Base.board	
@@ -2,13 +2,16 @@ size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 tag "Jungle (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "jungle:1;foliage_elev:2" "tropical"
 hex 0201 2 "jungle:1;foliage_elev:2" "tropical"
 hex 0301 2 "jungle:1;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Motorway-M1-1.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Motorway-M1-1.board
index f0aa59f1ee8..3df03858958 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Motorway-M1-1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Motorway-M1-1.board	
@@ -5,6 +5,7 @@ tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 4 "" "grass"
 hex 0201 4 "" "grass"
 hex 0301 4 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Mount Massino.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Mount Massino.board
index a90be615028..6d0c4d8e4ef 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Mount Massino.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Mount Massino.board	
@@ -1,12 +1,15 @@
 size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 9 "" "grass"
 hex 0201 8 "" "grass"
 hex 0301 8 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 RavineCoast.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 RavineCoast.board
index 978ce057825..641b3e1f408 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 RavineCoast.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 RavineCoast.board	
@@ -1,14 +1,17 @@
 size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 9 "" "desert"
 hex 0201 9 "" "desert"
 hex 0301 8 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Sandbar Fort.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Sandbar Fort.board
index c2a0bacb855..96c332d5b90 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Sandbar Fort.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Sandbar Fort.board	
@@ -1,14 +1,18 @@
 size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "LightForest (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
-tag "LightForest (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 3 "" ""
 hex 0201 3 "" ""
 hex 0301 3 "" ""
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Desert.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Desert.board
index 85132b1fa2d..747b1fdc76e 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Desert.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Desert.board	
@@ -1,10 +1,13 @@
 size 64 68
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Grass.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Grass.board
index 06b5fb3b34b..b69ab80e2e9 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Grass.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Grass.board	
@@ -1,10 +1,12 @@
 size 64 68
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Snow.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Snow.board
index cbb2185ae78..85a2c977b21 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Snow.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Star Fort - Snow.board	
@@ -1,10 +1,13 @@
 size 64 68
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Winter Factory.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Winter Factory.board
index f23e754c3c6..caabc83fa65 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Winter Factory.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Winter Factory.board	
@@ -1,13 +1,16 @@
 size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "" "snow"
 hex 0201 4 "woods:1;foliage_elev:2" "snow"
 hex 0301 5 "woods:1;foliage_elev:2" "snow"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Woodland Base.board b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Woodland Base.board
index 99c238713e6..2fc93103dd5 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Woodland Base.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/64x68/64x68 Woodland Base.board	
@@ -4,9 +4,12 @@ tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "grass"
 hex 0201 3 "woods:1;foliage_elev:2" "grass"
 hex 0301 3 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/80x68/80x68 Star Fort - Grass.board b/megamek/data/boards/unofficial/SimonLandmine/80x68/80x68 Star Fort - Grass.board
index 0b06a6bc794..3054b09eb9e 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/80x68/80x68 Star Fort - Grass.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/80x68/80x68 Star Fort - Grass.board	
@@ -1,10 +1,12 @@
 size 80 68
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 DesertCity1.board b/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 DesertCity1.board
index ba409843d94..428eed01555 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 DesertCity1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 DesertCity1.board	
@@ -1,14 +1,18 @@
 size 96 102
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
+tag "Water (Auto)"
+tag "HeavyUrban (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "" "desert"
 hex 0201 2 "" "desert"
 hex 0301 2 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 Headland Battery.board b/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 Headland Battery.board
index 8091c4f291a..799096ddc2e 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 Headland Battery.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 Headland Battery.board	
@@ -1,14 +1,20 @@
 size 96 102
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "Fields (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "Fields (Auto)"
-tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 MesaCity1.board b/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 MesaCity1.board
index 3b7eaae291d..1ca7d012029 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 MesaCity1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/96x102/96x102 MesaCity1.board	
@@ -1,12 +1,15 @@
 size 96 102
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "Fortress (Auto)"
 hex 0101 6 "" "desert"
 hex 0201 6 "" "desert"
 hex 0301 6 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/96x51/96x51 MesaCity1 N - Mesas.board b/megamek/data/boards/unofficial/SimonLandmine/96x51/96x51 MesaCity1 N - Mesas.board
index 0750a692f30..1fc1af1e471 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/96x51/96x51 MesaCity1 N - Mesas.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/96x51/96x51 MesaCity1 N - Mesas.board	
@@ -2,12 +2,15 @@ size 96 51
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
-tag "Fields (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "Fields (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
+tag "Fortress (Auto)"
 hex 0101 6 "" "desert"
 hex 0201 6 "" "desert"
 hex 0301 6 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/96x51/96x51 MesaCity1 S - DropPort.board b/megamek/data/boards/unofficial/SimonLandmine/96x51/96x51 MesaCity1 S - DropPort.board
index 52121d3d68a..c62ca7a8db0 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/96x51/96x51 MesaCity1 S - DropPort.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/96x51/96x51 MesaCity1 S - DropPort.board	
@@ -1,12 +1,14 @@
 size 96 51
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/96x68/96x68 Headland Battery.board b/megamek/data/boards/unofficial/SimonLandmine/96x68/96x68 Headland Battery.board
index 94ee3fb8978..7104bdc397c 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/96x68/96x68 Headland Battery.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/96x68/96x68 Headland Battery.board	
@@ -1,14 +1,20 @@
 size 96 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "Fields (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
-tag "Fields (Auto)"
-tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "" "grass"
 hex 0201 2 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-1.board b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-1.board
index 65a80e65d40..835721cbbcd 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-1.board	
@@ -3,9 +3,10 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 2 "" "Grass"
 hex 0201 2 "" "Grass"
 hex 0301 2 "road:1:9" "Grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-2.board b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-2.board
index 52fe7febb09..8f1200772ee 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-2.board	
@@ -3,8 +3,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 2 "" "Grass"
 hex 0201 2 "" "Grass"
 hex 0301 2 "road:1:9" "Grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-3.board b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-3.board
index 0c48fb7049b..77b62ff0bb2 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-3.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-3.board	
@@ -4,8 +4,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 2 "" "Grass"
 hex 0201 2 "woods:1;road:1:10;foliage_elev:2" "Grass"
 hex 0301 2 "woods:1;road:1:17;foliage_elev:2" "Grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-4.board b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-4.board
index 3624f9b6f53..be158462b01 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-4.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-4.board	
@@ -4,8 +4,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 2 "" "Grass"
 hex 0201 2 "woods:1;road:1:10;foliage_elev:2" "Grass"
 hex 0301 2 "woods:1;road:1:17;foliage_elev:2" "Grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-5.board b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-5.board
index 321d846d4ae..849b962be5f 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-5.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-5.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 2 "" "Grass"
 hex 0201 2 "" "Grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-seabridge.board b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-seabridge.board
index a20dfe8e743..e32aacea6d9 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-seabridge.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/River+Coast/16x17 River+Coast-river+coast-seabridge.board	
@@ -4,6 +4,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:2" "Grass"
 hex 0201 0 "water:2" "Grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Base1.board b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Base1.board
index 8da116a6ef2..0ef2a65ec2e 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Base1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Base1.board	
@@ -1,12 +1,13 @@
 size 30 15
 option exit_roads_to_pavement false
+tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Earthworks1.board b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Earthworks1.board
index fc4486dfba8..4f9528834d1 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Earthworks1.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Earthworks1.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 hex 0101 3 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Earthworks2.board b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Earthworks2.board
index 0cb2fd89008..128eec80b58 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Earthworks2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Earthworks2.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Quarry.board b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Quarry.board
index d40694d1d35..c8b5e6fd67a 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Quarry.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Quarry.board	
@@ -3,9 +3,10 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Wall2.board b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Wall2.board
index a734a303094..9ba00229c52 100644
--- a/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Wall2.board	
+++ b/megamek/data/boards/unofficial/SimonLandmine/TheValley/30x15 TheValley-Wall2.board	
@@ -1,11 +1,14 @@
 size 30 15
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/16x34 (CW) Grand Valley Bri.board b/megamek/data/boards/unofficial/Strategoslevel3/16x34 (CW) Grand Valley Bri.board
index 81031164cd5..ce7369d19ed 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/16x34 (CW) Grand Valley Bri.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/16x34 (CW) Grand Valley Bri.board	
@@ -1,11 +1,12 @@
 size 16 34
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "woods:1:20;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CDS) Kozice Valley Grain Mills.board b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CDS) Kozice Valley Grain Mills.board
index 7d047099982..8c765e27879 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CDS) Kozice Valley Grain Mills.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CDS) Kozice Valley Grain Mills.board	
@@ -1,11 +1,12 @@
 size 32 17
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "road:1:9" ""
 hex 0301 0 "water:1" "grass"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CGB) Dvigrad Forrest Sunj Bay.board b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CGB) Dvigrad Forrest Sunj Bay.board
index 0577dc5e6bb..4d0da5ecb1f 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CGB) Dvigrad Forrest Sunj Bay.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CGB) Dvigrad Forrest Sunj Bay.board	
@@ -1,10 +1,12 @@
 size 32 17
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:1" ""
 hex 0201 0 "water:1" ""
 hex 0301 0 "sand:0;water:1" ""
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CGB) Luk.board b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CGB) Luk.board
index faa71746b23..b4f160eef5d 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CGB) Luk.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CGB) Luk.board	
@@ -1,8 +1,9 @@
 size 32 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 tag "MediumUrban (Auto)"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CJF) Humptullips.board b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CJF) Humptullips.board
index 22f21eb46cf..d4e36f651c3 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CJF) Humptullips.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CJF) Humptullips.board	
@@ -1,9 +1,10 @@
 size 32 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CJF) Olalla (Fake).board b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CJF) Olalla (Fake).board
index 04b0c51ca0f..58ea6fb0b0a 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CJF) Olalla (Fake).board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CJF) Olalla (Fake).board	
@@ -1,10 +1,11 @@
 size 32 20
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "woods:2;foliage_elev:2" ""
 hex 0201 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CNC) North Losiije Broken Landings.board b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CNC) North Losiije Broken Landings.board
index 75d9e252690..35a21668649 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CNC) North Losiije Broken Landings.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CNC) North Losiije Broken Landings.board	
@@ -1,9 +1,10 @@
 size 32 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "MultipleTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CNC) North Losiije Park and Ride.board b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CNC) North Losiije Park and Ride.board
index 7c94693c898..7b4ca4c7cdb 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CNC) North Losiije Park and Ride.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CNC) North Losiije Park and Ride.board	
@@ -1,11 +1,12 @@
 size 32 17
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CSJ) Tamo Mountains Bunker.board b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CSJ) Tamo Mountains Bunker.board
index 68a23bad072..68d96a68cdd 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CSJ) Tamo Mountains Bunker.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x17 (CSJ) Tamo Mountains Bunker.board	
@@ -1,10 +1,11 @@
 size 32 17
 tag "Rough (Auto)"
 tag "Water (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x34 MountainSwoop.board b/megamek/data/boards/unofficial/Strategoslevel3/32x34 MountainSwoop.board
index 27c17db12d6..3e3bc7239f9 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x34 MountainSwoop.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x34 MountainSwoop.board	
@@ -1,13 +1,14 @@
 size 32 34
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
-tag "IceTerrain (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 2 "snow:1" "snow"
 hex 0201 3 "snow:1" "snow"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x34 TalonStrike.board b/megamek/data/boards/unofficial/Strategoslevel3/32x34 TalonStrike.board
index 1aa95a270e9..1fa9e46da81 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x34 TalonStrike.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x34 TalonStrike.board	
@@ -1,11 +1,12 @@
 size 32 34
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x51 GenevaT50.board b/megamek/data/boards/unofficial/Strategoslevel3/32x51 GenevaT50.board
index 066afee2506..03344a18743 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x51 GenevaT50.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x51 GenevaT50.board	
@@ -5,6 +5,7 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "bldg_elev:4;building:2:8;bldg_cf:40" "grass"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x51 GenevaT53.board b/megamek/data/boards/unofficial/Strategoslevel3/32x51 GenevaT53.board
index 25889f49f90..037987cdcc1 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x51 GenevaT53.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x51 GenevaT53.board	
@@ -6,7 +6,9 @@ tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:4;bldg_basement_type:0;building:4:57;bldg_cf:200" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "volcano"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/32x51 RenderingClaw.board b/megamek/data/boards/unofficial/Strategoslevel3/32x51 RenderingClaw.board
index 7dc88c75035..1cb0f68219a 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/32x51 RenderingClaw.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/32x51 RenderingClaw.board	
@@ -1,9 +1,12 @@
 size 32 51
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 1 "" "Grass"
 hex 0301 1 "" "Grass"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/64x34 Geneva.board b/megamek/data/boards/unofficial/Strategoslevel3/64x34 Geneva.board
index aa0f6d281ea..e22db14dd76 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/64x34 Geneva.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/64x34 Geneva.board	
@@ -5,8 +5,11 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/64x34 GenevaT49.board b/megamek/data/boards/unofficial/Strategoslevel3/64x34 GenevaT49.board
index b80ba6fe99b..6486702f7bc 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/64x34 GenevaT49.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/64x34 GenevaT49.board	
@@ -5,8 +5,11 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/Strategoslevel3/64x68 Desert Airfiled No Water.board b/megamek/data/boards/unofficial/Strategoslevel3/64x68 Desert Airfiled No Water.board
index 61f7f7d9bf0..6b6033fddb8 100644
--- a/megamek/data/boards/unofficial/Strategoslevel3/64x68 Desert Airfiled No Water.board	
+++ b/megamek/data/boards/unofficial/Strategoslevel3/64x68 Desert Airfiled No Water.board	
@@ -3,10 +3,14 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/100x100 - Butte Hold - Big Fullas Supply Base.board b/megamek/data/boards/unofficial/UlyssesMaps/100x100 - Butte Hold - Big Fullas Supply Base.board
index dd9316531fe..321167defdb 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/100x100 - Butte Hold - Big Fullas Supply Base.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/100x100 - Butte Hold - Big Fullas Supply Base.board	
@@ -5,9 +5,11 @@ tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/100x80 - Desert Fortress - Alamo.board b/megamek/data/boards/unofficial/UlyssesMaps/100x80 - Desert Fortress - Alamo.board
index 200b18a269c..5d10d924d50 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/100x80 - Desert Fortress - Alamo.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/100x80 - Desert Fortress - Alamo.board	
@@ -4,10 +4,12 @@ tag "LightUrban (Auto)"
 tag "Rough (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "" "desert"
 hex 0301 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/128x68 - New Exford - Beach Fight.board b/megamek/data/boards/unofficial/UlyssesMaps/128x68 - New Exford - Beach Fight.board
index f272d8de520..7a12211381b 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/128x68 - New Exford - Beach Fight.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/128x68 - New Exford - Beach Fight.board	
@@ -4,6 +4,7 @@ tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "TropicalTheme (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/140x80 - Butte Hold - Mater Defence Lines.board b/megamek/data/boards/unofficial/UlyssesMaps/140x80 - Butte Hold - Mater Defence Lines.board
index de11e79fe08..96634bf0ee0 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/140x80 - Butte Hold - Mater Defence Lines.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/140x80 - Butte Hold - Mater Defence Lines.board	
@@ -5,9 +5,11 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/170x130 - Butte Hold - Singlestown.board b/megamek/data/boards/unofficial/UlyssesMaps/170x130 - Butte Hold - Singlestown.board
index 55f0530e6ad..e80cc4df091 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/170x130 - Butte Hold - Singlestown.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/170x130 - Butte Hold - Singlestown.board	
@@ -4,10 +4,14 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 1 "" "desert"
 hex 0201 1 "" "desert"
 hex 0301 1 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/32x108 - Stewart - Hills Chase.board b/megamek/data/boards/unofficial/UlyssesMaps/32x108 - Stewart - Hills Chase.board
index 616f91b85a7..45868992c8d 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/32x108 - Stewart - Hills Chase.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/32x108 - Stewart - Hills Chase.board	
@@ -2,8 +2,9 @@ size 32 102
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 2 "" "desert"
 hex 0201 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/35x35 - Desert - Mountain Valley Village.board b/megamek/data/boards/unofficial/UlyssesMaps/35x35 - Desert - Mountain Valley Village.board
index 16a105738c1..1792f28af34 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/35x35 - Desert - Mountain Valley Village.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/35x35 - Desert - Mountain Valley Village.board	
@@ -1,5 +1,13 @@
 size 35 35
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "Woods (Auto)"
 hex 0101 6 "rough:2" "desert"
 hex 0201 5 "rough:1" "desert"
 hex 0301 5 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/40x40 - Jungle - Logistics Trail.board b/megamek/data/boards/unofficial/UlyssesMaps/40x40 - Jungle - Logistics Trail.board
index 7533334189b..d10c354cd3d 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/40x40 - Jungle - Logistics Trail.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/40x40 - Jungle - Logistics Trail.board	
@@ -1,4 +1,12 @@
 size 40 40
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
+tag "TropicalTheme (Auto)"
+tag "LowHills (Auto)"
+tag "Jungle (Auto)"
+tag "DenseForest (Auto)"
 hex 0101 0 "jungle:1;foliage_elev:2" "tropical"
 hex 0201 0 "jungle:1;foliage_elev:2" "tropical"
 hex 0301 0 "jungle:1;foliage_elev:2" "tropical"
@@ -823,7 +831,7 @@ hex 2121 0 "" "desert"
 hex 2221 0 "jungle:1;foliage_elev:2" "tropical"
 hex 2321 0 "" "desert"
 hex 2421 0 "" "desert"
-hex 2521 0 "bldg_elev:1;building:1;bldg_cf:15" "desert"
+hex 2521 0 "bldg_elev:1;building:1:0;bldg_cf:15" "desert"
 hex 2621 1 "jungle:1;foliage_elev:2" "tropical"
 hex 2721 1 "woods:1;foliage_elev:1" "tropical"
 hex 2821 1 "jungle:2;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/45x45 - Desert - Badlands - Canyon Reeducation Camp.board b/megamek/data/boards/unofficial/UlyssesMaps/45x45 - Desert - Badlands - Canyon Reeducation Camp.board
index 93d3ae12092..f8adfc68e8c 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/45x45 - Desert - Badlands - Canyon Reeducation Camp.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/45x45 - Desert - Badlands - Canyon Reeducation Camp.board	
@@ -1,5 +1,12 @@
 size 45 45
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
+tag "Roads (Auto)"
+tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "Woods (Auto)"
 hex 0101 -2 "woods:1;foliage_elev:1" "desert"
 hex 0201 -1 "" "desert"
 hex 0301 -1 "rough:1" "desert"
@@ -787,7 +794,7 @@ hex 1918 0 "" "desert"
 hex 2018 -1 "" "desert"
 hex 2118 0 "rough:1;fluff:1" "desert"
 hex 2218 1 "" "desert"
-hex 2318 1 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:15" "desert"
+hex 2318 1 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:15" "desert"
 hex 2418 1 "" "desert"
 hex 2518 0 "rough:1;fluff:1" "desert"
 hex 2618 0 "rough:1;fluff:1" "desert"
@@ -882,7 +889,7 @@ hex 2420 0 "bldg_elev:1;building:1:12;bldg_cf:15" "desert"
 hex 2520 0 "" "desert"
 hex 2620 0 "" "desert"
 hex 2720 1 "" "desert"
-hex 2820 1 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:15" "desert"
+hex 2820 1 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:15" "desert"
 hex 2920 0 "rough:1;fluff:1" "desert"
 hex 3020 0 "road:1;road_fluff:1" "desert"
 hex 3120 0 "" "desert"
@@ -915,7 +922,7 @@ hex 1221 0 "" "desert"
 hex 1321 -2 "" "desert"
 hex 1421 0 "" "desert"
 hex 1521 0 "rough:1;fluff:1" "desert"
-hex 1621 1 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:15" "desert"
+hex 1621 1 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:15" "desert"
 hex 1721 1 "" "desert"
 hex 1821 0 "" "desert"
 hex 1921 0 "" "desert"
@@ -929,7 +936,7 @@ hex 2621 0 "" "desert"
 hex 2721 0 "" "desert"
 hex 2821 0 "road:1;road_fluff:1" "desert"
 hex 2921 0 "road:1;road_fluff:1" "desert"
-hex 3021 0 "bldg_elev:1;bldg_class:2;building:1;bldg_cf:10" "desert"
+hex 3021 0 "bldg_elev:1;bldg_class:2;building:1:0;bldg_cf:10" "desert"
 hex 3121 0 "" "desert"
 hex 3221 0 "" "desert"
 hex 3321 5 "" "desert"
@@ -972,7 +979,7 @@ hex 2422 0 "road:1;road_fluff:1" "desert"
 hex 2522 0 "bldg_elev:1;building:1:33;bldg_cf:15" "desert"
 hex 2622 0 "road:1;road_fluff:1" "desert"
 hex 2722 0 "road:1;road_fluff:1" "desert"
-hex 2822 1 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:15" "desert"
+hex 2822 1 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:15" "desert"
 hex 2922 0 "road:1;road_fluff:1" "desert"
 hex 3022 0 "road:1;road_fluff:1" "desert"
 hex 3122 0 "" "desert"
@@ -1107,7 +1114,7 @@ hex 2425 0 "road:1;road_fluff:1" "desert"
 hex 2525 0 "road:1;road_fluff:1" "desert"
 hex 2625 0 "" "desert"
 hex 2725 0 "" "desert"
-hex 2825 1 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:15" "desert"
+hex 2825 1 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:15" "desert"
 hex 2925 0 "rough:1;fluff:1" "desert"
 hex 3025 0 "" "desert"
 hex 3125 0 "" "desert"
@@ -1142,7 +1149,7 @@ hex 1426 -2 "" "desert"
 hex 1526 0 "rough:1;fluff:1" "desert"
 hex 1626 0 "rough:1;fluff:1" "desert"
 hex 1726 1 "" "desert"
-hex 1826 1 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:15" "desert"
+hex 1826 1 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:15" "desert"
 hex 1926 0 "" "desert"
 hex 2026 0 "pavement:1" "desert"
 hex 2126 0 "pavement:1" "desert"
@@ -1280,7 +1287,7 @@ hex 1729 0 "" "desert"
 hex 1829 0 "" "desert"
 hex 1929 0 "rough:1;fluff:1" "desert"
 hex 2029 0 "rough:1;fluff:1" "desert"
-hex 2129 1 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:15" "desert"
+hex 2129 1 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:15" "desert"
 hex 2229 0 "rough:1;fluff:1" "desert"
 hex 2329 0 "rough:1;fluff:1" "desert"
 hex 2429 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/48x51 Water Pure Industries - Factory Port.board b/megamek/data/boards/unofficial/UlyssesMaps/48x51 Water Pure Industries - Factory Port.board
index da1c0da6621..5709b3ab44f 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/48x51 Water Pure Industries - Factory Port.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/48x51 Water Pure Industries - Factory Port.board	
@@ -1,14 +1,16 @@
 size 48 51
 option exit_roads_to_pavement false
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 1 "" "snow"
 hex 0201 1 "" "snow"
 hex 0301 1 "" "snow"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/48x68 - Red Research.board b/megamek/data/boards/unofficial/UlyssesMaps/48x68 - Red Research.board
index 1977e8165ca..8472a8a454c 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/48x68 - Red Research.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/48x68 - Red Research.board	
@@ -6,6 +6,8 @@ tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/48x68 Red Research.board b/megamek/data/boards/unofficial/UlyssesMaps/48x68 Red Research.board
index 9e075be16e9..051c2fffe52 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/48x68 Red Research.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/48x68 Red Research.board	
@@ -6,6 +6,8 @@ tag "MarsTheme (Auto)"
 tag "Roads (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "" "mars"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/50x35 - Grass - East-West Crossing.board b/megamek/data/boards/unofficial/UlyssesMaps/50x35 - Grass - East-West Crossing.board
index 8eb1bac0dce..5f6eb0bb534 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/50x35 - Grass - East-West Crossing.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/50x35 - Grass - East-West Crossing.board	
@@ -6,8 +6,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 2 "woods:1;foliage_elev:2" ""
 hex 0201 2 "woods:2;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/50x40 - Desert - Sand - Highway Service Station.board b/megamek/data/boards/unofficial/UlyssesMaps/50x40 - Desert - Sand - Highway Service Station.board
index 629f3e08112..cdf24f1fc8d 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/50x40 - Desert - Sand - Highway Service Station.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/50x40 - Desert - Sand - Highway Service Station.board	
@@ -1,5 +1,11 @@
 size 50 40
 option exit_roads_to_pavement false
+tag "LightUrban (Auto)"
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "DesertTheme (Auto)"
+tag "Woods (Auto)"
 hex 0101 0 "sand:1" "desert"
 hex 0201 0 "sand:1" "desert"
 hex 0301 0 "sand:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Checkpoint Ridge.board b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Checkpoint Ridge.board
index 93f49c15579..168fdc503e2 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Checkpoint Ridge.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Checkpoint Ridge.board	
@@ -2,10 +2,12 @@ size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Roads (Auto)"
 tag "GrassTheme (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Jungle Landing Site.board b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Jungle Landing Site.board
index fdbb0a60f33..31838885d7c 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Jungle Landing Site.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Jungle Landing Site.board	
@@ -2,6 +2,7 @@ size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Lava River Lair.board b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Lava River Lair.board
index a4aee502bd3..9259be693b4 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Lava River Lair.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Lava River Lair.board	
@@ -7,6 +7,7 @@ tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 1 "" "volcano"
 hex 0201 1 "" "volcano"
 hex 0301 1 "" "volcano"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Phecda - Pirate Landing Zone.board b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Phecda - Pirate Landing Zone.board
index 510005c6816..c4d2627eb5c 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Phecda - Pirate Landing Zone.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Phecda - Pirate Landing Zone.board	
@@ -2,9 +2,10 @@ size 64 68
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "SnowTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 2 "woods:2;foliage_elev:2" "snow"
 hex 0201 2 "woods:2;foliage_elev:2" "snow"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Snow - Hill Fort Logistics Hub.board b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Snow - Hill Fort Logistics Hub.board
index 9bee633d584..47ff321a6be 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Snow - Hill Fort Logistics Hub.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/64x68 - Snow - Hill Fort Logistics Hub.board	
@@ -4,8 +4,9 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 2 "" "snow"
 hex 0201 2 "woods:1;foliage_elev:2" "snow"
 hex 0301 2 "" "snow"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/64x85 - Phecda - Snow Beach.board b/megamek/data/boards/unofficial/UlyssesMaps/64x85 - Phecda - Snow Beach.board
index ad8a6834477..a756b8c422e 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/64x85 - Phecda - Snow Beach.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/64x85 - Phecda - Snow Beach.board	
@@ -1,9 +1,10 @@
 size 64 85
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "SnowTheme (Auto)"
+tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/80x60 - Fulda Gap 1.board b/megamek/data/boards/unofficial/UlyssesMaps/80x60 - Fulda Gap 1.board
index 2c01f450a09..70560b4a8df 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/80x60 - Fulda Gap 1.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/80x60 - Fulda Gap 1.board	
@@ -2,12 +2,13 @@ size 80 60
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 1 "" "grass"
 hex 0201 1 "" "grass"
 hex 0301 1 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Corean Mechworks - Damaged.board b/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Corean Mechworks - Damaged.board
index de6b1e943e5..6ea241ba30c 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Corean Mechworks - Damaged.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Corean Mechworks - Damaged.board	
@@ -5,10 +5,13 @@ tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 6 "" "desert"
 hex 0201 6 "" "desert"
 hex 0301 5 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Corean Mechworks.board b/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Corean Mechworks.board
index dc8ffe668de..f3b0d524a09 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Corean Mechworks.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Corean Mechworks.board	
@@ -5,10 +5,13 @@ tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 6 "" "desert"
 hex 0201 6 "" "desert"
 hex 0301 5 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Hydropower.board b/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Hydropower.board
index 7f2894ce3d4..9d0ca0986dd 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Hydropower.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/80x85 - Stewart - Hydropower.board	
@@ -5,8 +5,9 @@ tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 4 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Capture the Flag/31x31 - CTF - Factory - Flagstorm Industries.board b/megamek/data/boards/unofficial/UlyssesMaps/Capture the Flag/31x31 - CTF - Factory - Flagstorm Industries.board
index 3e5449cf838..c437d5d1b83 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Capture the Flag/31x31 - CTF - Factory - Flagstorm Industries.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Capture the Flag/31x31 - CTF - Factory - Flagstorm Industries.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "HighHills (Auto)"
+tag "Impassable (Auto)"
 tag "Woods (Auto)"
 hex 0101 5 "impassable:0" ""
 hex 0201 5 "impassable:0" ""
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x20 - Liao Arena - Jungle.board b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x20 - Liao Arena - Jungle.board
index 15277232914..60bc63e0bc4 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x20 - Liao Arena - Jungle.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x20 - Liao Arena - Jungle.board	
@@ -2,6 +2,7 @@ size 30 20
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Caldera Clash.board b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Caldera Clash.board
index 9327039df86..536e99c2cf2 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Caldera Clash.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Caldera Clash.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" "volcano"
 hex 0201 0 "pavement:1" "volcano"
 hex 0301 0 "pavement:1" "volcano"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Island Intercept.board b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Island Intercept.board
index 51e7e5afaed..fa92e5d544c 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Island Intercept.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Island Intercept.board	
@@ -3,6 +3,7 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Mudpit Murder.board b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Mudpit Murder.board
index 936eb7ec657..db0b2374273 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Mudpit Murder.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Mudpit Murder.board	
@@ -1,7 +1,9 @@
 size 30 30
 tag "Water (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "pavement:1" "desert"
 hex 0201 0 "pavement:1" "desert"
 hex 0301 0 "pavement:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Urban Combat Zone.board b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Urban Combat Zone.board
index 0c3c1b48139..40e60c5b644 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Urban Combat Zone.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Independent - Urban Combat Zone.board	
@@ -5,8 +5,10 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Kurita - Ishiyama Caves.board b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Kurita - Ishiyama Caves.board
index 58ed7ab9c53..b2dc92dccdd 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Kurita - Ishiyama Caves.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/30x30 - Kurita - Ishiyama Caves.board	
@@ -2,7 +2,9 @@ size 30 30
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
 tag "LowHills (Auto)"
 hex 0101 3 "impassable:54:1" "desert"
 hex 0201 3 "impassable:54:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/40x20 - Steiner Arena - Colosseum Alt Config A.board b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/40x20 - Steiner Arena - Colosseum Alt Config A.board
index 514575c1916..0437c6c0a6e 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/40x20 - Steiner Arena - Colosseum Alt Config A.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/40x20 - Steiner Arena - Colosseum Alt Config A.board	
@@ -3,6 +3,7 @@ option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "impassable:1" "desert"
 hex 0201 0 "impassable:1" "desert"
 hex 0301 0 "impassable:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/40x20 - Steiner Arena - Colosseum.board b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/40x20 - Steiner Arena - Colosseum.board
index 2e9e23e7d1f..de48a9e470e 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/40x20 - Steiner Arena - Colosseum.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/MegaMek Invitational Map Pack/40x20 - Steiner Arena - Colosseum.board	
@@ -2,6 +2,7 @@ size 40 20
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "DesertTheme (Auto)"
+tag "Impassable (Auto)"
 hex 0101 0 "impassable:1" "desert"
 hex 0201 0 "impassable:1" "desert"
 hex 0301 0 "impassable:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/100x80 - Desert - Urban - Data Centre Large.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/100x80 - Desert - Urban - Data Centre Large.board
index c5809f1a9fa..decf21c2eec 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/100x80 - Desert - Urban - Data Centre Large.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/100x80 - Desert - Urban - Data Centre Large.board	
@@ -1,5 +1,18 @@
 size 100 80
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "DesertTheme (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
+tag "Water (Auto)"
+tag "HeavyUrban (Auto)"
+tag "Ocean (Auto)"
+tag "HighHills (Auto)"
+tag "MediumForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 4 "" "desert"
 hex 0201 4 "" "desert"
 hex 0301 3 "rough:1" "desert"
@@ -693,11 +706,11 @@ hex 9007 -2 "water:4" "desert"
 hex 9107 -2 "water:4" "desert"
 hex 9207 -2 "water:4" "desert"
 hex 9307 -2 "water:4" "desert"
-hex 9407 2 "heavy_industrial:2;pavement:1" "desert"
+hex 9407 2 "pavement:1;heavy_industrial:2" "desert"
 hex 9507 -2 "water:4" "desert"
 hex 9607 -2 "water:4" "desert"
 hex 9707 -2 "water:4" "desert"
-hex 9807 2 "heavy_industrial:2;pavement:1" "desert"
+hex 9807 2 "pavement:1;heavy_industrial:2" "desert"
 hex 9907 -2 "water:4" "desert"
 hex 10007 -2 "water:4" "desert"
 hex 0108 3 "rough:1" "desert"
@@ -793,11 +806,11 @@ hex 9008 -2 "water:4" "desert"
 hex 9108 -2 "water:4" "desert"
 hex 9208 -2 "water:4" "desert"
 hex 9308 -2 "water:4" "desert"
-hex 9408 2 "heavy_industrial:2;pavement:1" "desert"
+hex 9408 2 "pavement:1;heavy_industrial:2" "desert"
 hex 9508 -2 "water:4" "desert"
 hex 9608 -2 "water:4" "desert"
 hex 9708 -2 "water:4" "desert"
-hex 9808 2 "heavy_industrial:2;pavement:1" "desert"
+hex 9808 2 "pavement:1;heavy_industrial:2" "desert"
 hex 9908 -2 "water:4" "desert"
 hex 10008 -2 "water:4" "desert"
 hex 0109 2 "" "desert"
@@ -893,11 +906,11 @@ hex 9009 -2 "water:4" "desert"
 hex 9109 -2 "water:4" "desert"
 hex 9209 -2 "water:4" "desert"
 hex 9309 -2 "water:4" "desert"
-hex 9409 2 "heavy_industrial:2;pavement:1" "desert"
+hex 9409 2 "pavement:1;heavy_industrial:2" "desert"
 hex 9509 -2 "water:4" "desert"
 hex 9609 -2 "water:4" "desert"
 hex 9709 -2 "water:4" "desert"
-hex 9809 2 "heavy_industrial:2;pavement:1" "desert"
+hex 9809 2 "pavement:1;heavy_industrial:2" "desert"
 hex 9909 -2 "water:4" "desert"
 hex 10009 -2 "water:4" "desert"
 hex 0110 1 "" "desert"
@@ -993,7 +1006,7 @@ hex 9010 -2 "water:4" "desert"
 hex 9110 -2 "water:4" "desert"
 hex 9210 -2 "water:4" "desert"
 hex 9310 -2 "water:4" "desert"
-hex 9410 2 "heavy_industrial:2;pavement:1" "desert"
+hex 9410 2 "pavement:1;heavy_industrial:2" "desert"
 hex 9510 -2 "water:4" "desert"
 hex 9610 2 "heavy_industrial:2;pavement:1" "desert"
 hex 9710 -2 "water:4" "desert"
@@ -3510,7 +3523,7 @@ hex 0736 7 "" "desert"
 hex 0836 7 "" "desert"
 hex 0936 7 "bldg_elev:1;pavement:1;building:1:8;bldg_cf:15" "desert"
 hex 1036 7 "pavement:1" "desert"
-hex 1136 7 "bldg_elev:1;pavement:1;building:3;bldg_cf:65" "desert"
+hex 1136 7 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 1236 7 "pavement:1;road:1;road_fluff:1" "desert"
 hex 1336 7 "bldg_elev:1;pavement:1;building:1:4;bldg_cf:15" "desert"
 hex 1436 7 "bldg_elev:1;pavement:1;building:1:32;bldg_cf:15" "desert"
@@ -5519,7 +5532,7 @@ hex 1656 4 "" "desert"
 hex 1756 5 "" "desert"
 hex 1856 4 "" "desert"
 hex 1956 4 "" "desert"
-hex 2056 3 "bldg_elev:1;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2056 3 "bldg_elev:1;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2156 4 "" "desert"
 hex 2256 3 "road:1;road_fluff:1" "desert"
 hex 2356 3 "road:1;road_fluff:1" "desert"
@@ -5617,7 +5630,7 @@ hex 1457 5 "" "desert"
 hex 1557 5 "rough:1" "desert"
 hex 1657 4 "" "desert"
 hex 1757 4 "" "desert"
-hex 1857 3 "bldg_elev:1;pavement:1;building:1;bldg_cf:15" "desert"
+hex 1857 3 "bldg_elev:1;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 1957 3 "fluff:93:12" "grass"
 hex 2057 3 "road:1;road_fluff:1" "desert"
 hex 2157 3 "road:1;road_fluff:1" "desert"
@@ -5715,7 +5728,7 @@ hex 1258 4 "" "desert"
 hex 1358 4 "" "desert"
 hex 1458 4 "" "desert"
 hex 1558 4 "" "desert"
-hex 1658 3 "bldg_elev:1;pavement:1;building:1;bldg_cf:15" "desert"
+hex 1658 3 "bldg_elev:1;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 1758 3 "fluff:93:12" "grass"
 hex 1858 3 "road:1;road_fluff:1" "desert"
 hex 1958 3 "road:1;road_fluff:1" "desert"
@@ -6481,7 +6494,7 @@ hex 7865 0 "road:1;road_fluff:1" "desert"
 hex 7965 0 "road:1;road_fluff:1" "desert"
 hex 8065 1 "pavement:1" "desert"
 hex 8165 1 "pavement:1" "desert"
-hex 8265 0 "building:1:16;bldg_cf:15;bldg_elev:1;bldg_class:1;pavement:1" "desert"
+hex 8265 0 "bldg_elev:1;bldg_class:1;pavement:1;building:1:16;bldg_cf:15" "desert"
 hex 8365 1 "pavement:1" "desert"
 hex 8465 1 "pavement:1" "desert"
 hex 8565 0 "road:1;road_fluff:1" "desert"
@@ -6729,7 +6742,7 @@ hex 2668 2 "" "desert"
 hex 2768 2 "" "desert"
 hex 2868 3 "" "desert"
 hex 2968 3 "woods:1;foliage_elev:1" "desert"
-hex 3068 3 "bldg_elev:1;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3068 3 "bldg_elev:1;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3168 3 "" "desert"
 hex 3268 3 "" "desert"
 hex 3368 3 "" "desert"
@@ -6926,7 +6939,7 @@ hex 2370 2 "" "desert"
 hex 2470 3 "fluff:93:9" "desert"
 hex 2570 3 "woods:1;foliage_elev:1" "desert"
 hex 2670 3 "" "desert"
-hex 2770 3 "bldg_elev:1;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2770 3 "bldg_elev:1;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2870 3 "pavement:1;fluff:93:12" "desert"
 hex 2970 3 "woods:1;foliage_elev:1" "desert"
 hex 3070 3 "road:1;road_fluff:1" "desert"
@@ -7774,7 +7787,7 @@ hex 7178 0 "bldg_elev:4;pavement:1;building:1:7;bldg_cf:15" "desert"
 hex 7278 0 "bldg_elev:4;pavement:1;building:1:35;bldg_cf:15" "desert"
 hex 7378 0 "bldg_elev:4;pavement:1;building:1:48;bldg_cf:15" "desert"
 hex 7478 0 "road:1;road_fluff:1" "desert"
-hex 7578 0 "bldg_elev:4;pavement:1;building:1;bldg_cf:15" "desert"
+hex 7578 0 "bldg_elev:4;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 7678 0 "pavement:1" "desert"
 hex 7778 0 "bldg_elev:4;pavement:1;building:1:3;bldg_cf:15" "desert"
 hex 7878 0 "pavement:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/30x30 - Snow - MaxSec Prison Small.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/30x30 - Snow - MaxSec Prison Small.board
index 65062191ef9..74229b5e3f0 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/30x30 - Snow - MaxSec Prison Small.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/30x30 - Snow - MaxSec Prison Small.board	
@@ -7,7 +7,9 @@ tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 2 "woods:1;foliage_elev:2" "snow"
 hex 0201 2 "woods:1;foliage_elev:2" "snow"
 hex 0301 1 "woods:1;foliage_elev:1" "snow"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Hills - Early Warning Centre Small.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Hills - Early Warning Centre Small.board
index 85a2cbc46a7..760aee1eece 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Hills - Early Warning Centre Small.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Hills - Early Warning Centre Small.board	
@@ -1,5 +1,12 @@
 size 40 40
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
+tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 -1 "" "desert"
 hex 0201 -1 "mud:1" "desert"
 hex 0301 -1 "" "desert"
@@ -779,7 +786,7 @@ hex 1620 0 "sand:1" "desert"
 hex 1720 0 "" "desert"
 hex 1820 4 "rough:1" "desert"
 hex 1920 4 "pavement:1;road:1;road_fluff:1" "desert"
-hex 2020 4 "bldg_elev:1;pavement:1;building:3;bldg_cf:65" "desert"
+hex 2020 4 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 2120 4 "pavement:1;road:1;road_fluff:1" "desert"
 hex 2220 4 "pavement:1" "desert"
 hex 2320 4 "pavement:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Sand - Generic Facility Small.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Sand - Generic Facility Small.board
index eb3d7078b59..cf439a523d0 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Sand - Generic Facility Small.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Sand - Generic Facility Small.board	
@@ -1,5 +1,11 @@
 size 40 40
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "DesertTheme (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 2 "sand:1" "desert"
 hex 0201 2 "sand:1" "desert"
 hex 0301 1 "sand:1" "desert"
@@ -575,13 +581,13 @@ hex 1215 0 "sand:1" "desert"
 hex 1315 0 "sand:1" "desert"
 hex 1415 0 "sand:1" "desert"
 hex 1515 0 "sand:1" "desert"
-hex 1615 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2;bldg_cf:20" "desert"
+hex 1615 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2:0;bldg_cf:20" "desert"
 hex 1715 0 "sand:1" "desert"
 hex 1815 1 "" "desert"
 hex 1915 0 "sand:1" "desert"
 hex 2015 1 "" "desert"
 hex 2115 0 "sand:1" "desert"
-hex 2215 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2;bldg_cf:20" "desert"
+hex 2215 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2:0;bldg_cf:20" "desert"
 hex 2315 0 "sand:1" "desert"
 hex 2415 0 "sand:1" "desert"
 hex 2515 0 "sand:1" "desert"
@@ -651,7 +657,7 @@ hex 0817 0 "sand:1" "desert"
 hex 0917 0 "sand:1" "desert"
 hex 1017 0 "sand:1" "desert"
 hex 1117 0 "sand:1" "desert"
-hex 1217 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2;bldg_cf:20" "desert"
+hex 1217 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2:0;bldg_cf:20" "desert"
 hex 1317 1 "" "desert"
 hex 1417 0 "pavement:1;sand:1" "desert"
 hex 1517 0 "pavement:1" "desert"
@@ -665,7 +671,7 @@ hex 2217 0 "bldg_elev:2;pavement:1;building:1:52;bldg_cf:15" "desert"
 hex 2317 0 "pavement:1" "desert"
 hex 2417 0 "pavement:1;sand:1" "desert"
 hex 2517 1 "" "desert"
-hex 2617 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2;bldg_cf:20" "desert"
+hex 2617 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2:0;bldg_cf:20" "desert"
 hex 2717 0 "sand:1" "desert"
 hex 2817 0 "sand:1" "desert"
 hex 2917 0 "pavement:1" "desert"
@@ -931,7 +937,7 @@ hex 0824 0 "sand:1" "desert"
 hex 0924 -1 "sand:1" "desert"
 hex 1024 0 "sand:1" "desert"
 hex 1124 0 "sand:1" "desert"
-hex 1224 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2;bldg_cf:20" "desert"
+hex 1224 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2:0;bldg_cf:20" "desert"
 hex 1324 0 "pavement:1;sand:1" "desert"
 hex 1424 0 "pavement:1;sand:1" "desert"
 hex 1524 0 "bldg_elev:1;pavement:1;building:1:36;bldg_cf:15" "desert"
@@ -945,7 +951,7 @@ hex 2224 0 "bldg_elev:1;pavement:1;building:1:2;bldg_cf:15" "desert"
 hex 2324 0 "bldg_elev:1;pavement:1;building:1:18;bldg_cf:15" "desert"
 hex 2424 0 "pavement:1;sand:1" "desert"
 hex 2524 0 "pavement:1;sand:1" "desert"
-hex 2624 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2;bldg_cf:20" "desert"
+hex 2624 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2:0;bldg_cf:20" "desert"
 hex 2724 0 "sand:1" "desert"
 hex 2824 -1 "sand:1" "desert"
 hex 2924 -1 "sand:1" "desert"
@@ -1057,9 +1063,9 @@ hex 1427 0 "sand:1" "desert"
 hex 1527 0 "sand:1" "desert"
 hex 1627 0 "sand:1" "desert"
 hex 1727 1 "" "desert"
-hex 1827 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2;bldg_cf:20" "desert"
+hex 1827 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2:0;bldg_cf:20" "desert"
 hex 1927 0 "pavement:1;road:1;road_fluff:1" "desert"
-hex 2027 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2;bldg_cf:20" "desert"
+hex 2027 1 "bldg_elev:1;bldg_class:3;pavement:1;building:2:0;bldg_cf:20" "desert"
 hex 2127 1 "" "desert"
 hex 2227 0 "sand:1" "desert"
 hex 2327 0 "sand:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Urban - Data Centre Small.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Urban - Data Centre Small.board
index f46b5ec11d9..462247690c3 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Urban - Data Centre Small.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Desert - Urban - Data Centre Small.board	
@@ -1,5 +1,12 @@
 size 40 40
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "DesertTheme (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "road:1:36;road_fluff:1" "desert"
 hex 0201 0 "road:1;road_fluff:1" "desert"
 hex 0301 1 "rough:1" "desert"
@@ -618,9 +625,9 @@ hex 1516 0 "bldg_elev:3;pavement:1;building:1:3;bldg_cf:15" "desert"
 hex 1616 0 "road:1;road_fluff:1" "desert"
 hex 1716 0 "road:1;road_fluff:1" "desert"
 hex 1816 0 "woods:1;foliage_elev:1" "desert"
-hex 1916 0 "bldg_elev:1;bldg_class:2;building:1;bldg_cf:5" "desert"
+hex 1916 0 "bldg_elev:1;bldg_class:2;building:1:0;bldg_cf:5" "desert"
 hex 2016 0 "road:1;road_fluff:1" "desert"
-hex 2116 0 "bldg_elev:1;bldg_class:2;building:1;bldg_cf:5" "desert"
+hex 2116 0 "bldg_elev:1;bldg_class:2;building:1:0;bldg_cf:5" "desert"
 hex 2216 0 "woods:1;foliage_elev:1" "desert"
 hex 2316 0 "" "desert"
 hex 2416 0 "" "desert"
@@ -658,9 +665,9 @@ hex 1517 0 "road:1;road_fluff:1" "desert"
 hex 1617 0 "" "desert"
 hex 1717 0 "" "desert"
 hex 1817 1 "pavement:1" "desert"
-hex 1917 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "desert"
+hex 1917 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "desert"
 hex 2017 0 "pavement:1;road:1;road_fluff:1" "desert"
-hex 2117 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "desert"
+hex 2117 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "desert"
 hex 2217 1 "pavement:1" "desert"
 hex 2317 0 "" "desert"
 hex 2417 0 "" "desert"
@@ -734,7 +741,7 @@ hex 1119 0 "bldg_elev:3;pavement:1;building:1:12;bldg_cf:15" "desert"
 hex 1219 0 "bldg_elev:3;pavement:1;building:1:60;bldg_cf:15" "desert"
 hex 1319 0 "pavement:1" "desert"
 hex 1419 0 "road:1;road_fluff:1" "desert"
-hex 1519 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "desert"
+hex 1519 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "desert"
 hex 1619 0 "pavement:1" "desert"
 hex 1719 0 "pavement:1" "desert"
 hex 1819 0 "pavement:1" "desert"
@@ -744,7 +751,7 @@ hex 2119 0 "bldg_elev:2;pavement:1;building:2:8;bldg_cf:45" "desert"
 hex 2219 0 "pavement:1" "desert"
 hex 2319 0 "pavement:1" "desert"
 hex 2419 0 "pavement:1" "desert"
-hex 2519 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "desert"
+hex 2519 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "desert"
 hex 2619 0 "" "desert"
 hex 2719 0 "" "desert"
 hex 2819 0 "woods:1;foliage_elev:1" "desert"
@@ -854,7 +861,7 @@ hex 1122 0 "pavement:1" "desert"
 hex 1222 0 "bldg_elev:3;pavement:1;building:1:12;bldg_cf:15" "desert"
 hex 1322 0 "road:1;road_fluff:1" "desert"
 hex 1422 0 "road:1;road_fluff:1" "desert"
-hex 1522 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "desert"
+hex 1522 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "desert"
 hex 1622 1 "pavement:1" "desert"
 hex 1722 0 "pavement:1" "desert"
 hex 1822 0 "bldg_elev:2;pavement:1;building:2:6;bldg_cf:45" "desert"
@@ -864,7 +871,7 @@ hex 2122 0 "bldg_elev:2;pavement:1;building:2:60;bldg_cf:45" "desert"
 hex 2222 0 "bldg_elev:2;pavement:1;building:2:48;bldg_cf:45" "desert"
 hex 2322 0 "pavement:1" "desert"
 hex 2422 1 "pavement:1" "desert"
-hex 2522 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "desert"
+hex 2522 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "desert"
 hex 2622 0 "road:1;road_fluff:1" "desert"
 hex 2722 0 "road:1;road_fluff:1" "desert"
 hex 2822 0 "bldg_elev:4;pavement:1;building:1:16;bldg_cf:15" "desert"
@@ -939,7 +946,7 @@ hex 1624 0 "pavement:1" "desert"
 hex 1724 0 "pavement:1" "desert"
 hex 1824 0 "bldg_elev:3;pavement:1;building:1:12;bldg_cf:15" "desert"
 hex 1924 1 "pavement:1" "desert"
-hex 2024 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "desert"
+hex 2024 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "desert"
 hex 2124 1 "pavement:1" "desert"
 hex 2224 0 "road:1;road_fluff:1" "desert"
 hex 2324 0 "road:1;road_fluff:1" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Air Base Small 2.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Air Base Small 2.board
index 5fa2f4a85e5..6d8020cd272 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Air Base Small 2.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Air Base Small 2.board	
@@ -6,6 +6,7 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
 hex 0101 2 "woods:1;foliage_elev:2" "grass"
 hex 0201 2 "woods:1;foliage_elev:2" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Comms Centre Small.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Comms Centre Small.board
index 39116a0ac39..7c8c5a299ee 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Comms Centre Small.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Comms Centre Small.board	
@@ -5,9 +5,10 @@ tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 1 "" "grass"
 hex 0201 1 "woods:1;foliage_elev:2" "grass"
 hex 0301 1 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Industrial Centre Small 2.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Industrial Centre Small 2.board
index aef3118190d..dd0d8f08921 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Industrial Centre Small 2.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Industrial Centre Small 2.board	
@@ -5,8 +5,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "woods:1;foliage_elev:2" "grass"
 hex 0301 2 "" "grass"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Industrial Centre Small.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Industrial Centre Small.board
index 5b3cfe3dbd6..078a98c3236 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Industrial Centre Small.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Grass - Industrial Centre Small.board	
@@ -3,8 +3,11 @@ option exit_roads_to_pavement false
 tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Jungle - Logistics Trail.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Jungle - Logistics Trail.board
index aac6abb21d7..d10c354cd3d 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Jungle - Logistics Trail.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Jungle - Logistics Trail.board	
@@ -2,6 +2,7 @@ size 40 40
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Tropical - Jungle - Mountainside Comms-Data Centre.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Tropical - Jungle - Mountainside Comms-Data Centre.board
index a692e418bc1..4634f38d75c 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Tropical - Jungle - Mountainside Comms-Data Centre.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x40 - Tropical - Jungle - Mountainside Comms-Data Centre.board	
@@ -1,5 +1,15 @@
 size 40 40
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Cliffs (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HighHills (Auto)"
+tag "TropicalTheme (Auto)"
+tag "Jungle (Auto)"
+tag "DenseForest (Auto)"
 hex 0101 11 "rough:1" "tropical"
 hex 0201 11 "rough:2" "tropical"
 hex 0301 10 "" "tropical"
@@ -623,7 +633,7 @@ hex 2016 6 "jungle:1;foliage_elev:2" "tropical"
 hex 2116 5 "jungle:1;foliage_elev:2" "tropical"
 hex 2216 3 "woods:1;foliage_elev:1" "tropical"
 hex 2316 3 "woods:1;foliage_elev:1" "tropical"
-hex 2416 2 "bldg_elev:1;bldg_class:2;building:1;bldg_cf:5" "tropical"
+hex 2416 2 "bldg_elev:1;bldg_class:2;building:1:0;bldg_cf:5" "tropical"
 hex 2516 2 "road:1;road_fluff:1" "tropical"
 hex 2616 2 "" "tropical"
 hex 2716 2 "" "tropical"
@@ -663,9 +673,9 @@ hex 2017 7 "rough:1" "tropical"
 hex 2117 5 "jungle:1;foliage_elev:2" "tropical"
 hex 2217 2 "pavement:1" "tropical"
 hex 2317 3 "pavement:1" "tropical"
-hex 2417 3 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 2417 3 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 2517 2 "road:1;road_fluff:1" "tropical"
-hex 2617 2 "bldg_elev:1;bldg_class:2;building:1;bldg_cf:5" "tropical"
+hex 2617 2 "bldg_elev:1;bldg_class:2;building:1:0;bldg_cf:5" "tropical"
 hex 2717 2 "" "tropical"
 hex 2817 2 "rough:1" "tropical"
 hex 2917 2 "woods:1;foliage_elev:1" "tropical"
@@ -702,7 +712,7 @@ hex 1918 8 "rough:1" "tropical"
 hex 2018 2 "bldg_elev:3;pavement:1;building:3:2;bldg_cf:65" "tropical"
 hex 2118 2 "bldg_elev:3;pavement:1;building:3:16;bldg_cf:65" "tropical"
 hex 2218 2 "pavement:1" "tropical"
-hex 2318 2 "bldg_elev:1;pavement:1;building:2;bldg_cf:45" "tropical"
+hex 2318 2 "bldg_elev:1;pavement:1;building:2:0;bldg_cf:45" "tropical"
 hex 2418 2 "pavement:1;road:1;road_fluff:1" "tropical"
 hex 2518 2 "road:1;road_fluff:1" "tropical"
 hex 2618 2 "road:1;road_fluff:1" "tropical"
@@ -778,11 +788,11 @@ hex 1520 4 "jungle:1;foliage_elev:2" "tropical"
 hex 1620 3 "pavement:1" "tropical"
 hex 1720 2 "bldg_elev:1;pavement:1;building:2:8;bldg_cf:45" "tropical"
 hex 1820 2 "pavement:1" "tropical"
-hex 1920 2 "bldg_elev:1;pavement:1;building:3;bldg_cf:65" "tropical"
+hex 1920 2 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:65" "tropical"
 hex 2020 2 "pavement:1;road:1;road_fluff:1" "tropical"
 hex 2120 2 "pavement:1;road:1;road_fluff:1" "tropical"
 hex 2220 2 "pavement:1" "tropical"
-hex 2320 2 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 2320 2 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 2420 -1 "jungle:1;foliage_elev:2" "tropical"
 hex 2520 2 "bldg_elev:1;pavement:1;building:2:2;bldg_cf:45" "tropical"
 hex 2620 -1 "jungle:1;foliage_elev:2" "tropical"
@@ -815,7 +825,7 @@ hex 1221 4 "woods:1;foliage_elev:1" "tropical"
 hex 1321 4 "jungle:1;foliage_elev:2" "tropical"
 hex 1421 3 "" "tropical"
 hex 1521 3 "woods:1;foliage_elev:1" "tropical"
-hex 1621 3 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 1621 3 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 1721 2 "bldg_elev:1;pavement:1;building:2:1;bldg_cf:45" "tropical"
 hex 1821 2 "pavement:1;road:1;road_fluff:1" "tropical"
 hex 1921 2 "pavement:1;road:1;road_fluff:1" "tropical"
@@ -857,7 +867,7 @@ hex 1422 3 "" "tropical"
 hex 1522 3 "woods:1;foliage_elev:1" "tropical"
 hex 1622 2 "road:1;road_fluff:1" "tropical"
 hex 1722 2 "pavement:1;road:1;road_fluff:1" "tropical"
-hex 1822 2 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 1822 2 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 1922 2 "pavement:1" "tropical"
 hex 2022 0 "woods:1;foliage_elev:1" "tropical"
 hex 2122 -1 "jungle:1;foliage_elev:2" "tropical"
@@ -934,7 +944,7 @@ hex 1124 3 "jungle:1;foliage_elev:2" "tropical"
 hex 1224 2 "road:1;road_fluff:1" "tropical"
 hex 1324 2 "road:1;road_fluff:1" "tropical"
 hex 1424 1 "jungle:1;foliage_elev:2" "tropical"
-hex 1524 2 "building:1;bldg_cf:5;bldg_elev:1;bldg_class:2;pavement:1" "tropical"
+hex 1524 2 "building:1:0;bldg_cf:5;bldg_elev:1;bldg_class:2;pavement:1" "tropical"
 hex 1624 -1 "jungle:1;foliage_elev:2" "tropical"
 hex 1724 -1 "jungle:1;foliage_elev:2" "tropical"
 hex 1824 -1 "jungle:1;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x50 - Tropical - Jungle Hills Village - Early Warning Centre Medium.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x50 - Tropical - Jungle Hills Village - Early Warning Centre Medium.board
index 2526465b9bf..4e9aeaa767f 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x50 - Tropical - Jungle Hills Village - Early Warning Centre Medium.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/40x50 - Tropical - Jungle Hills Village - Early Warning Centre Medium.board	
@@ -1,5 +1,14 @@
 size 40 50
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "TropicalTheme (Auto)"
+tag "LowHills (Auto)"
+tag "Jungle (Auto)"
+tag "DenseForest (Auto)"
 hex 0101 3 "jungle:1;foliage_elev:2" "tropical"
 hex 0201 3 "jungle:1;foliage_elev:2" "tropical"
 hex 0301 3 "jungle:1;foliage_elev:2" "tropical"
@@ -143,7 +152,7 @@ hex 2004 1 "woods:1;foliage_elev:2" "tropical"
 hex 2104 1 "woods:1;foliage_elev:1" "tropical"
 hex 2204 1 "woods:1;foliage_elev:1" "tropical"
 hex 2304 1 "road:1;road_fluff:1" "tropical"
-hex 2404 1 "bldg_elev:2;building:1;bldg_cf:15" "tropical"
+hex 2404 1 "bldg_elev:2;building:1:0;bldg_cf:15" "tropical"
 hex 2504 1 "planted_fields:2" "tropical"
 hex 2604 1 "planted_fields:2" "tropical"
 hex 2704 1 "woods:1;foliage_elev:1" "tropical"
@@ -181,7 +190,7 @@ hex 1805 2 "woods:1;foliage_elev:2" "tropical"
 hex 1905 2 "woods:1;foliage_elev:2" "tropical"
 hex 2005 1 "planted_fields:1" "tropical"
 hex 2105 1 "planted_fields:1" "tropical"
-hex 2205 1 "bldg_elev:1;building:1;bldg_cf:15" "tropical"
+hex 2205 1 "bldg_elev:1;building:1:0;bldg_cf:15" "tropical"
 hex 2305 1 "road:1;road_fluff:1" "tropical"
 hex 2405 1 "planted_fields:2" "tropical"
 hex 2505 1 "planted_fields:2" "tropical"
@@ -660,7 +669,7 @@ hex 1717 1 "planted_fields:2" "tropical"
 hex 1817 1 "planted_fields:2" "tropical"
 hex 1917 1 "road:1;road_fluff:1" "tropical"
 hex 2017 1 "road:1;road_fluff:1" "tropical"
-hex 2117 1 "bldg_elev:2;building:1;bldg_cf:15" "tropical"
+hex 2117 1 "bldg_elev:2;building:1:0;bldg_cf:15" "tropical"
 hex 2217 1 "road:1;road_fluff:1" "tropical"
 hex 2317 2 "woods:1;foliage_elev:2" "tropical"
 hex 2417 2 "jungle:1;foliage_elev:2" "tropical"
@@ -769,13 +778,13 @@ hex 0620 2 "planted_fields:1" "tropical"
 hex 0720 2 "planted_fields:1" "tropical"
 hex 0820 2 "planted_fields:1" "tropical"
 hex 0920 2 "woods:1;foliage_elev:1" "tropical"
-hex 1020 2 "bldg_elev:2;building:1;bldg_cf:15" "tropical"
+hex 1020 2 "bldg_elev:2;building:1:0;bldg_cf:15" "tropical"
 hex 1120 2 "road:1;road_fluff:1" "tropical"
 hex 1220 2 "woods:1;foliage_elev:1" "tropical"
 hex 1320 2 "woods:1;foliage_elev:1" "tropical"
 hex 1420 3 "woods:1;foliage_elev:1" "tropical"
 hex 1520 3 "rough:1" "tropical"
-hex 1620 4 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:5" "tropical"
+hex 1620 4 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:5" "tropical"
 hex 1720 1 "woods:1;foliage_elev:2" "tropical"
 hex 1820 1 "woods:1;foliage_elev:2" "tropical"
 hex 1920 1 "woods:1;foliage_elev:1" "tropical"
@@ -820,12 +829,12 @@ hex 1721 4 "pavement:1" "tropical"
 hex 1821 4 "pavement:1" "tropical"
 hex 1921 2 "rough:1" "tropical"
 hex 2021 4 "pavement:1" "tropical"
-hex 2121 4 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:5" "tropical"
+hex 2121 4 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:5" "tropical"
 hex 2221 4 "pavement:1" "tropical"
 hex 2321 4 "pavement:1" "tropical"
 hex 2421 4 "pavement:1" "tropical"
 hex 2521 4 "pavement:1" "tropical"
-hex 2621 4 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:5" "tropical"
+hex 2621 4 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:5" "tropical"
 hex 2721 1 "road:1;road_fluff:1" "tropical"
 hex 2821 1 "road:1;road_fluff:1" "tropical"
 hex 2921 0 "water:0" "tropical"
@@ -893,7 +902,7 @@ hex 1023 2 "woods:1;foliage_elev:1" "tropical"
 hex 1123 2 "road:1;road_fluff:1" "tropical"
 hex 1223 3 "road:1;road_fluff:1" "tropical"
 hex 1323 3 "woods:1;foliage_elev:1" "tropical"
-hex 1423 4 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:5" "tropical"
+hex 1423 4 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:5" "tropical"
 hex 1523 3 "pavement:1" "tropical"
 hex 1623 3 "bldg_elev:2;pavement:1;building:2:1;bldg_cf:45" "tropical"
 hex 1723 3 "pavement:1" "tropical"
@@ -902,7 +911,7 @@ hex 1923 3 "bldg_elev:2;pavement:1;building:2:56;bldg_cf:45" "tropical"
 hex 2023 3 "pavement:1" "tropical"
 hex 2123 3 "pavement:1" "tropical"
 hex 2223 3 "pavement:1" "tropical"
-hex 2323 3 "bldg_elev:1;pavement:1;building:3;bldg_cf:65" "tropical"
+hex 2323 3 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:65" "tropical"
 hex 2423 3 "pavement:1" "tropical"
 hex 2523 3 "pavement:1" "tropical"
 hex 2623 4 "pavement:1" "tropical"
@@ -925,7 +934,7 @@ hex 0224 2 "jungle:1;foliage_elev:2" "tropical"
 hex 0324 2 "jungle:1;foliage_elev:2" "tropical"
 hex 0424 2 "road:1;road_fluff:1" "tropical"
 hex 0524 2 "road:1;road_fluff:1" "tropical"
-hex 0624 2 "bldg_elev:1;building:1;bldg_cf:15" "tropical"
+hex 0624 2 "bldg_elev:1;building:1:0;bldg_cf:15" "tropical"
 hex 0724 2 "road:1;road_fluff:1" "tropical"
 hex 0824 2 "" "tropical"
 hex 0924 2 "" "tropical"
@@ -972,8 +981,8 @@ hex 0925 2 "" "tropical"
 hex 1025 2 "" "tropical"
 hex 1125 2 "" "tropical"
 hex 1225 2 "woods:1;foliage_elev:1" "tropical"
-hex 1325 3 "bldg_elev:1;bldg_class:2;building:1;bldg_cf:5" "tropical"
-hex 1425 4 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:5" "tropical"
+hex 1325 3 "bldg_elev:1;bldg_class:2;building:1:0;bldg_cf:5" "tropical"
+hex 1425 4 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:5" "tropical"
 hex 1525 3 "pavement:1;road:1;road_fluff:1" "tropical"
 hex 1625 3 "bldg_elev:2;pavement:1;building:2:8;bldg_cf:45" "tropical"
 hex 1725 3 "pavement:1" "tropical"
@@ -1022,7 +1031,7 @@ hex 1926 3 "bldg_elev:2;pavement:1;building:2:48;bldg_cf:45" "tropical"
 hex 2026 3 "pavement:1" "tropical"
 hex 2126 3 "bldg_elev:2;pavement:1;building:2:1;bldg_cf:45" "tropical"
 hex 2226 3 "pavement:1" "tropical"
-hex 2326 3 "bldg_elev:1;pavement:1;building:3;bldg_cf:65" "tropical"
+hex 2326 3 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:65" "tropical"
 hex 2426 3 "pavement:1" "tropical"
 hex 2526 3 "pavement:1" "tropical"
 hex 2626 4 "pavement:1" "tropical"
@@ -1065,7 +1074,7 @@ hex 2227 4 "pavement:1" "tropical"
 hex 2327 3 "pavement:1" "tropical"
 hex 2427 4 "pavement:1" "tropical"
 hex 2527 3 "pavement:1" "tropical"
-hex 2627 4 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:5" "tropical"
+hex 2627 4 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:5" "tropical"
 hex 2727 1 "woods:1;foliage_elev:2" "tropical"
 hex 2827 1 "woods:1;foliage_elev:2" "tropical"
 hex 2927 1 "road:1;road_fluff:1" "tropical"
@@ -1095,12 +1104,12 @@ hex 1228 3 "" "tropical"
 hex 1328 3 "woods:1;foliage_elev:1" "tropical"
 hex 1428 3 "" "tropical"
 hex 1528 4 "pavement:1" "tropical"
-hex 1628 4 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:5" "tropical"
+hex 1628 4 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:5" "tropical"
 hex 1728 4 "pavement:1" "tropical"
 hex 1828 3 "" "tropical"
 hex 1928 3 "woods:1;foliage_elev:1" "tropical"
 hex 2028 2 "" "tropical"
-hex 2128 4 "bldg_elev:1;bldg_class:3;building:1;bldg_cf:5" "tropical"
+hex 2128 4 "bldg_elev:1;bldg_class:3;building:1:0;bldg_cf:5" "tropical"
 hex 2228 2 "" "tropical"
 hex 2328 4 "pavement:1" "tropical"
 hex 2428 2 "woods:1;foliage_elev:1" "tropical"
@@ -1260,7 +1269,7 @@ hex 1732 1 "road:1;road_fluff:1" "tropical"
 hex 1832 1 "planted_fields:2" "tropical"
 hex 1932 1 "road:1;road_fluff:1" "tropical"
 hex 2032 1 "road:1;road_fluff:1" "tropical"
-hex 2132 1 "bldg_elev:1;building:1;bldg_cf:15" "tropical"
+hex 2132 1 "bldg_elev:1;building:1:0;bldg_cf:15" "tropical"
 hex 2232 1 "road:1;road_fluff:1" "tropical"
 hex 2332 1 "road:1;road_fluff:1" "tropical"
 hex 2432 1 "planted_fields:4" "tropical"
@@ -1302,7 +1311,7 @@ hex 1933 1 "planted_fields:2" "tropical"
 hex 2033 1 "planted_fields:2" "tropical"
 hex 2133 1 "road:1;road_fluff:1" "tropical"
 hex 2233 1 "road:1;road_fluff:1" "tropical"
-hex 2333 1 "bldg_elev:2;building:1;bldg_cf:15" "tropical"
+hex 2333 1 "bldg_elev:2;building:1:0;bldg_cf:15" "tropical"
 hex 2433 1 "planted_fields:4" "tropical"
 hex 2533 1 "planted_fields:4" "tropical"
 hex 2633 1 "planted_fields:4" "tropical"
@@ -1455,7 +1464,7 @@ hex 1237 3 "jungle:1;foliage_elev:2" "tropical"
 hex 1337 3 "jungle:1;foliage_elev:2" "tropical"
 hex 1437 3 "woods:1;foliage_elev:1" "tropical"
 hex 1537 2 "woods:1;foliage_elev:2" "tropical"
-hex 1637 2 "bldg_elev:1;building:1;bldg_cf:15" "tropical"
+hex 1637 2 "bldg_elev:1;building:1:0;bldg_cf:15" "tropical"
 hex 1737 2 "road:1;road_fluff:1" "tropical"
 hex 1837 2 "woods:1;foliage_elev:2" "tropical"
 hex 1937 2 "woods:1;foliage_elev:1" "tropical"
@@ -1538,13 +1547,13 @@ hex 1539 2 "planted_fields:4" "tropical"
 hex 1639 2 "woods:1;foliage_elev:1" "tropical"
 hex 1739 2 "road:1;road_fluff:1" "tropical"
 hex 1839 2 "" "tropical"
-hex 1939 2 "bldg_elev:1;building:1;bldg_cf:15" "tropical"
+hex 1939 2 "bldg_elev:1;building:1:0;bldg_cf:15" "tropical"
 hex 2039 2 "woods:1;foliage_elev:2" "tropical"
 hex 2139 2 "planted_fields:1" "tropical"
 hex 2239 2 "woods:1;foliage_elev:1" "tropical"
 hex 2339 2 "woods:1;foliage_elev:1" "tropical"
 hex 2439 2 "jungle:1;foliage_elev:2" "tropical"
-hex 2539 1 "bldg_elev:1;building:1;bldg_cf:15" "tropical"
+hex 2539 1 "bldg_elev:1;building:1:0;bldg_cf:15" "tropical"
 hex 2639 1 "planted_fields:4" "tropical"
 hex 2739 1 "woods:1;foliage_elev:1" "tropical"
 hex 2839 0 "swamp:1" "tropical"
@@ -1714,7 +1723,7 @@ hex 3143 1 "woods:1;foliage_elev:1" "tropical"
 hex 3243 1 "jungle:1;foliage_elev:2" "tropical"
 hex 3343 1 "jungle:1;foliage_elev:2" "tropical"
 hex 3443 1 "planted_fields:3" "tropical"
-hex 3543 1 "bldg_elev:2;building:1;bldg_cf:15" "tropical"
+hex 3543 1 "bldg_elev:2;building:1:0;bldg_cf:15" "tropical"
 hex 3643 1 "road:1;road_fluff:1" "tropical"
 hex 3743 1 "jungle:1;foliage_elev:2" "tropical"
 hex 3843 1 "jungle:1;foliage_elev:2" "tropical"
@@ -1895,7 +1904,7 @@ hex 1248 1 "jungle:1;foliage_elev:2" "tropical"
 hex 1348 1 "jungle:1;foliage_elev:2" "tropical"
 hex 1448 1 "jungle:1;foliage_elev:2" "tropical"
 hex 1548 1 "woods:1;foliage_elev:1" "tropical"
-hex 1648 1 "bldg_elev:1;building:1;bldg_cf:15" "tropical"
+hex 1648 1 "bldg_elev:1;building:1:0;bldg_cf:15" "tropical"
 hex 1748 1 "road:1:9;road_fluff:1" "tropical"
 hex 1848 1 "jungle:1;foliage_elev:2" "tropical"
 hex 1948 0 "swamp:1" "tropical"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x40 - Tropical - Urban - Paradise City Airport.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x40 - Tropical - Urban - Paradise City Airport.board
index cd2d5f1e1d8..6b8f10dd310 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x40 - Tropical - Urban - Paradise City Airport.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x40 - Tropical - Urban - Paradise City Airport.board	
@@ -1,5 +1,16 @@
 size 50 40
 option exit_roads_to_pavement false
+tag "Foliage (Auto)"
+tag "Water (Auto)"
+tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
+tag "MediumForest (Auto)"
+tag "TropicalTheme (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "tropical"
 hex 0201 0 "woods:1;foliage_elev:2" "tropical"
 hex 0301 0 "pavement:1;bridge:1:9;bridge_cf:100;bridge_elev:1" "tropical"
@@ -1020,7 +1031,7 @@ hex 1721 0 "pavement:1" "tropical"
 hex 1821 0 "pavement:1" "tropical"
 hex 1921 0 "pavement:1" "tropical"
 hex 2021 0 "bldg_elev:1;bldg_class:1;pavement:1;building:1:28;bldg_cf:15" "tropical"
-hex 2121 0 "fuel_tank_cf:25;fuel_tank_elev:1;fuel_tank_magn:60;pavement:1;fuel_tank:1" "tropical"
+hex 2121 0 "fuel_tank_cf:25;fuel_tank_elev:1;fuel_tank_magn:60;pavement:1;fuel_tank:1:0" "tropical"
 hex 2221 0 "bldg_elev:3;pavement:1;building:1:7;bldg_cf:25" "tropical"
 hex 2321 0 "bldg_elev:3;pavement:1;building:1:57;bldg_cf:25" "tropical"
 hex 2421 0 "pavement:1" "tropical"
@@ -1565,7 +1576,7 @@ hex 1232 0 "road:2;road_fluff:1" "tropical"
 hex 1332 0 "woods:1;foliage_elev:1" "tropical"
 hex 1432 0 "road:2;road_fluff:1" "tropical"
 hex 1532 0 "woods:1;road:2;road_fluff:1;foliage_elev:2" "tropical"
-hex 1632 0 "bldg_elev:1;road:2;road_fluff:1;building:1;bldg_cf:15" "tropical"
+hex 1632 0 "bldg_elev:1;road:2;road_fluff:1;building:1:0;bldg_cf:15" "tropical"
 hex 1732 0 "sand:0" "tropical"
 hex 1832 0 "sand:0" "tropical"
 hex 1932 1 "pavement:1" "tropical"
@@ -1714,7 +1725,7 @@ hex 1135 0 "road:2;road_fluff:1" "tropical"
 hex 1235 0 "" "tropical"
 hex 1335 0 "" "tropical"
 hex 1435 0 "woods:1;foliage_elev:2" "tropical"
-hex 1535 0 "bldg_elev:1;road:2;road_fluff:1;building:1;bldg_cf:15" "tropical"
+hex 1535 0 "bldg_elev:1;road:2;road_fluff:1;building:1:0;bldg_cf:15" "tropical"
 hex 1635 0 "sand:0" "tropical"
 hex 1735 0 "sand:0" "tropical"
 hex 1835 0 "sand:0;water:0" "tropical"
@@ -1862,7 +1873,7 @@ hex 0938 0 "bldg_elev:2;building:1:25;bldg_cf:25" "tropical"
 hex 1038 0 "road:2;road_fluff:1" "tropical"
 hex 1138 0 "road:2;road_fluff:1" "tropical"
 hex 1238 0 "woods:1;road:2;road_fluff:1;foliage_elev:2" "tropical"
-hex 1338 0 "bldg_elev:1;road:1;road_fluff:1;building:1;bldg_cf:15" "tropical"
+hex 1338 0 "bldg_elev:1;road:1;road_fluff:1;building:1:0;bldg_cf:15" "tropical"
 hex 1438 0 "sand:0" "tropical"
 hex 1538 0 "sand:0;water:0" "tropical"
 hex 1638 0 "sand:0;water:0" "tropical"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x40 - Tropical-Jungle - Artillery Base Medium.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x40 - Tropical-Jungle - Artillery Base Medium.board
index fced986a387..5bbcb16cbfb 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x40 - Tropical-Jungle - Artillery Base Medium.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x40 - Tropical-Jungle - Artillery Base Medium.board	
@@ -1,5 +1,15 @@
 size 50 40
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Water (Auto)"
+tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HighHills (Auto)"
+tag "TropicalTheme (Auto)"
+tag "Jungle (Auto)"
+tag "DenseForest (Auto)"
 hex 0101 0 "jungle:1;foliage_elev:2" "tropical"
 hex 0201 0 "road:1:9;road_fluff:1" "tropical"
 hex 0301 0 "woods:1;foliage_elev:1" "tropical"
@@ -423,11 +433,11 @@ hex 2009 2 "" "tropical"
 hex 2109 2 "rough:1;fluff:2" "tropical"
 hex 2209 2 "woods:1;foliage_elev:1" "tropical"
 hex 2309 2 "rough:1;fluff:2" "tropical"
-hex 2409 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 2409 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 2509 4 "pavement:1" "tropical"
 hex 2609 4 "pavement:1" "tropical"
 hex 2709 4 "pavement:1" "tropical"
-hex 2809 5 "building:1;bldg_cf:5;bldg_elev:1;bldg_class:3;pavement:1" "tropical"
+hex 2809 5 "building:1:0;bldg_cf:5;bldg_elev:1;bldg_class:3;pavement:1" "tropical"
 hex 2909 2 "woods:1;foliage_elev:1" "tropical"
 hex 3009 2 "woods:1;foliage_elev:1" "tropical"
 hex 3109 2 "woods:1;foliage_elev:1" "tropical"
@@ -519,7 +529,7 @@ hex 1611 2 "" "tropical"
 hex 1711 2 "woods:1;foliage_elev:1" "tropical"
 hex 1811 2 "" "tropical"
 hex 1911 2 "" "tropical"
-hex 2011 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 2011 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 2111 4 "pavement:1" "tropical"
 hex 2211 3 "" "desert"
 hex 2311 3 "" "desert"
@@ -581,7 +591,7 @@ hex 2812 3 "road:1" "desert"
 hex 2912 3 "bldg_elev:1;bldg_class:1;road:1;building:1:2;bldg_cf:15" "desert"
 hex 3012 5 "pavement:1" "tropical"
 hex 3112 5 "pavement:1" "tropical"
-hex 3212 5 "building:1;bldg_cf:5;bldg_elev:1;bldg_class:3;pavement:1" "tropical"
+hex 3212 5 "building:1:0;bldg_cf:5;bldg_elev:1;bldg_class:3;pavement:1" "tropical"
 hex 3312 2 "woods:1;foliage_elev:1" "tropical"
 hex 3412 2 "rough:1;fluff:2" "tropical"
 hex 3512 1 "" "tropical"
@@ -659,7 +669,7 @@ hex 0614 0 "water:0" "tropical"
 hex 0714 0 "planted_fields:4;water:0" "tropical"
 hex 0814 0 "planted_fields:4;water:0" "tropical"
 hex 0914 0 "jungle:1;foliage_elev:2" "tropical"
-hex 1014 0 "bldg_elev:2;building:1;bldg_cf:15" "tropical"
+hex 1014 0 "bldg_elev:2;building:1:0;bldg_cf:15" "tropical"
 hex 1114 0 "road:1;road_fluff:1" "tropical"
 hex 1214 0 "road:1;road_fluff:1" "tropical"
 hex 1314 0 "jungle:1;foliage_elev:2" "tropical"
@@ -668,7 +678,7 @@ hex 1514 1 "rough:1;fluff:2" "tropical"
 hex 1614 1 "" "tropical"
 hex 1714 2 "" "tropical"
 hex 1814 2 "woods:1;foliage_elev:1" "tropical"
-hex 1914 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 1914 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 2014 3 "" "desert"
 hex 2114 3 "" "desert"
 hex 2214 3 "bldg_elev:1;building:1:16;bldg_cf:15" "desert"
@@ -769,7 +779,7 @@ hex 1616 1 "" "tropical"
 hex 1716 2 "" "tropical"
 hex 1816 2 "" "tropical"
 hex 1916 2 "woods:1;foliage_elev:1" "tropical"
-hex 2016 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 2016 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 2116 3 "" "desert"
 hex 2216 3 "" "desert"
 hex 2316 3 "" "desert"
@@ -831,7 +841,7 @@ hex 2817 3 "" "desert"
 hex 2917 3 "road:1" "desert"
 hex 3017 3 "road:1" "desert"
 hex 3117 3 "" "desert"
-hex 3217 3 "bldg_elev:1;bldg_class:2;building:1;bldg_cf:5" "desert"
+hex 3217 3 "bldg_elev:1;bldg_class:2;building:1:0;bldg_cf:5" "desert"
 hex 3317 4 "pavement:1" "tropical"
 hex 3417 2 "woods:1;foliage_elev:1" "tropical"
 hex 3517 2 "rough:1;fluff:2" "tropical"
@@ -873,7 +883,7 @@ hex 2018 2 "" "tropical"
 hex 2118 2 "woods:1;foliage_elev:1" "tropical"
 hex 2218 2 "rough:1;fluff:2" "tropical"
 hex 2318 4 "pavement:1" "tropical"
-hex 2418 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 2418 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 2518 4 "pavement:1" "tropical"
 hex 2618 4 "pavement:1" "tropical"
 hex 2718 4 "pavement:1" "tropical"
@@ -882,7 +892,7 @@ hex 2918 4 "pavement:1" "tropical"
 hex 3018 4 "pavement:1" "tropical"
 hex 3118 3 "road:1" "desert"
 hex 3218 3 "road:1" "desert"
-hex 3318 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 3318 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 3418 2 "rough:1;fluff:1" "tropical"
 hex 3518 2 "woods:1;foliage_elev:1" "tropical"
 hex 3618 1 "rough:1;fluff:2" "tropical"
@@ -930,7 +940,7 @@ hex 2719 2 "woods:1;foliage_elev:1" "tropical"
 hex 2819 1 "rough:1;fluff:2" "tropical"
 hex 2919 2 "woods:1;foliage_elev:1" "tropical"
 hex 3019 2 "woods:1;foliage_elev:1" "tropical"
-hex 3119 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:5" "tropical"
+hex 3119 4 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:5" "tropical"
 hex 3219 2 "rough:1;fluff:1" "tropical"
 hex 3319 2 "road:1;road_fluff:1" "tropical"
 hex 3419 1 "road:1;road_fluff:1" "tropical"
@@ -1167,7 +1177,7 @@ hex 1424 0 "water:0" "tropical"
 hex 1524 0 "jungle:1;swamp:1;foliage_elev:2" "tropical"
 hex 1624 0 "jungle:1;foliage_elev:2" "tropical"
 hex 1724 0 "jungle:1;foliage_elev:2" "tropical"
-hex 1824 0 "bldg_elev:1;building:1;bldg_cf:15" "tropical"
+hex 1824 0 "bldg_elev:1;building:1:0;bldg_cf:15" "tropical"
 hex 1924 0 "road:1;road_fluff:1" "tropical"
 hex 2024 0 "road:1;road_fluff:1" "tropical"
 hex 2124 0 "jungle:1;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x50 - Grass-Urban - Logistics Centre Small.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x50 - Grass-Urban - Logistics Centre Small.board
index c518600d5bd..6a115c10edc 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x50 - Grass-Urban - Logistics Centre Small.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/50x50 - Grass-Urban - Logistics Centre Small.board	
@@ -2,11 +2,13 @@ size 50 50
 option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"
 hex 0301 0 "" "grass"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/60x50 - Urban - Orbital Defense.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/60x50 - Urban - Orbital Defense.board
index 7fe317edd3b..f9a7e514bbc 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/60x50 - Urban - Orbital Defense.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/60x50 - Urban - Orbital Defense.board	
@@ -2,13 +2,19 @@ size 60 50
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "GrassTheme (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
-tag "LowHills (Auto)"
-tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "bldg_elev:4;pavement:1;building:4:12;bldg_cf:90" "grass"
 hex 0201 0 "bldg_elev:4;pavement:1;building:4:62;bldg_cf:90" "grass"
 hex 0301 0 "bldg_elev:4;pavement:1;building:4:24;bldg_cf:90" "grass"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x136 - Tropical-Jungle - Comms Centre Approach Large.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x136 - Tropical-Jungle - Comms Centre Approach Large.board
index 27279e69e37..0093b592a95 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x136 - Tropical-Jungle - Comms Centre Approach Large.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x136 - Tropical-Jungle - Comms Centre Approach Large.board	
@@ -2,9 +2,10 @@ size 64 136
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "Fields (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Desert - Savannah - Command Centre Medium.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Desert - Savannah - Command Centre Medium.board
index 634efcbc4fa..3ef2a0a3bc4 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Desert - Savannah - Command Centre Medium.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Desert - Savannah - Command Centre Medium.board	
@@ -1,5 +1,16 @@
 size 64 68
 option exit_roads_to_pavement false
+tag "Rough (Auto)"
+tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "DesertTheme (Auto)"
+tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
@@ -501,7 +512,7 @@ hex 5008 1 "" "desert"
 hex 5108 1 "" "desert"
 hex 5208 2 "pavement:1" "desert"
 hex 5308 2 "pavement:1;road:1;road_fluff:1" "desert"
-hex 5408 2 "bldg_elev:1;pavement:1;building:3;bldg_cf:65" "desert"
+hex 5408 2 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 5508 2 "pavement:1;road:1;road_fluff:1" "desert"
 hex 5608 2 "pavement:1" "desert"
 hex 5708 2 "bldg_elev:1;pavement:1;building:1:32;bldg_cf:15" "desert"
@@ -561,7 +572,7 @@ hex 4609 -1 "" "desert"
 hex 4709 0 "" "desert"
 hex 4809 0 "" "desert"
 hex 4909 0 "" "desert"
-hex 5009 1 "bldg_elev:1;bldg_class:2;pavement:1;building:1;bldg_cf:15" "desert"
+hex 5009 1 "bldg_elev:1;bldg_class:2;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 5109 1 "rough:1" "desert"
 hex 5209 1 "road:1;road_fluff:1" "desert"
 hex 5309 2 "pavement:1;road:1;road_fluff:1" "desert"
@@ -1246,7 +1257,7 @@ hex 2720 0 "" "desert"
 hex 2820 0 "road:1;road_fluff:1" "desert"
 hex 2920 0 "road:1;road_fluff:1" "desert"
 hex 3020 0 "" "desert"
-hex 3120 0 "bldg_elev:1;bldg_class:2;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3120 0 "bldg_elev:1;bldg_class:2;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3220 0 "rough:1;road:1;road_fluff:1;fluff:1" "desert"
 hex 3320 0 "" "desert"
 hex 3420 0 "" "desert"
@@ -1566,9 +1577,9 @@ hex 2725 0 "fortified:1" "desert"
 hex 2825 0 "" "desert"
 hex 2925 0 "" "desert"
 hex 3025 0 "" "desert"
-hex 3125 0 "bldg_elev:1;bldg_class:2;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3125 0 "bldg_elev:1;bldg_class:2;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3225 0 "road:1;road_fluff:1" "desert"
-hex 3325 0 "bldg_elev:1;bldg_class:2;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3325 0 "bldg_elev:1;bldg_class:2;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3425 0 "" "desert"
 hex 3525 0 "fortified:1" "desert"
 hex 3625 0 "fortified:1" "desert"
@@ -1633,7 +1644,7 @@ hex 3026 0 "" "desert"
 hex 3126 0 "" "desert"
 hex 3226 0 "road:1;road_fluff:1" "desert"
 hex 3326 0 "" "desert"
-hex 3426 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3426 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3526 0 "" "desert"
 hex 3626 0 "" "desert"
 hex 3726 -1 "rough:1;fluff:1" "desert"
@@ -1699,7 +1710,7 @@ hex 3227 0 "road:1;road_fluff:1" "desert"
 hex 3327 0 "pavement:1" "desert"
 hex 3427 0 "pavement:1" "desert"
 hex 3527 1 "pavement:1" "desert"
-hex 3627 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3627 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3727 0 "" "desert"
 hex 3827 0 "" "desert"
 hex 3927 0 "" "desert"
@@ -1813,7 +1824,7 @@ hex 1829 -1 "rough:1;fluff:1" "desert"
 hex 1929 0 "fortified:1" "desert"
 hex 2029 0 "" "desert"
 hex 2129 0 "" "desert"
-hex 2229 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2229 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2329 0 "" "desert"
 hex 2429 0 "" "desert"
 hex 2529 0 "" "desert"
@@ -1875,11 +1886,11 @@ hex 1630 0 "" "desert"
 hex 1730 0 "" "desert"
 hex 1830 0 "" "desert"
 hex 1930 0 "" "desert"
-hex 2030 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2030 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2130 1 "pavement:1" "desert"
 hex 2230 0 "pavement:1" "desert"
 hex 2330 1 "pavement:1" "desert"
-hex 2430 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2430 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2530 -1 "rough:1;fluff:1" "desert"
 hex 2630 1 "pavement:1" "desert"
 hex 2730 -1 "rough:1;fluff:1" "desert"
@@ -1946,11 +1957,11 @@ hex 2331 0 "pavement:1" "desert"
 hex 2431 1 "pavement:1" "desert"
 hex 2531 0 "" "desert"
 hex 2631 0 "" "desert"
-hex 2731 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2731 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2831 1 "pavement:1" "desert"
 hex 2931 -1 "rough:1;fluff:1" "desert"
 hex 3031 0 "" "desert"
-hex 3131 0 "bldg_elev:1;bldg_class:2;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3131 0 "bldg_elev:1;bldg_class:2;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3231 0 "road:1;road_fluff:1" "desert"
 hex 3331 0 "" "desert"
 hex 3431 0 "" "desert"
@@ -1958,7 +1969,7 @@ hex 3531 1 "pavement:1" "desert"
 hex 3631 0 "" "desert"
 hex 3731 0 "woods:1;foliage_elev:1" "desert"
 hex 3831 1 "pavement:1" "desert"
-hex 3931 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3931 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 4031 1 "pavement:1" "desert"
 hex 4131 0 "" "desert"
 hex 4231 0 "" "desert"
@@ -2014,9 +2025,9 @@ hex 2732 0 "" "desert"
 hex 2832 0 "" "desert"
 hex 2932 -1 "rough:1;fluff:1" "desert"
 hex 3032 1 "pavement:1" "desert"
-hex 3132 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3132 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3232 0 "pavement:1;road:1;road_fluff:1" "desert"
-hex 3332 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3332 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3432 1 "pavement:1" "desert"
 hex 3532 0 "woods:1;foliage_elev:1" "desert"
 hex 3632 1 "pavement:1" "desert"
@@ -2024,7 +2035,7 @@ hex 3732 1 "pavement:1" "desert"
 hex 3832 0 "pavement:1" "desert"
 hex 3932 0 "pavement:1" "desert"
 hex 4032 0 "pavement:1" "desert"
-hex 4132 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 4132 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 4232 0 "" "desert"
 hex 4332 -1 "rough:1;fluff:1" "desert"
 hex 4432 0 "" "desert"
@@ -2140,17 +2151,17 @@ hex 2534 0 "bldg_elev:2;pavement:1;building:3:12;bldg_cf:65" "desert"
 hex 2634 0 "bldg_elev:2;pavement:1;building:3:48;bldg_cf:65" "desert"
 hex 2734 0 "pavement:1;road:1;road_fluff:1" "desert"
 hex 2834 0 "pavement:1;road:1;road_fluff:1" "desert"
-hex 2934 0 "bldg_elev:2;pavement:1;building:3;bldg_cf:65" "desert"
+hex 2934 0 "bldg_elev:2;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 3034 0 "pavement:1;road:1;road_fluff:1" "desert"
 hex 3134 0 "pavement:1;road:1;road_fluff:1" "desert"
 hex 3234 0 "pavement:1;road:1;road_fluff:1" "desert"
-hex 3334 0 "bldg_elev:2;pavement:1;building:3;bldg_cf:65" "desert"
+hex 3334 0 "bldg_elev:2;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 3434 0 "pavement:1" "desert"
 hex 3534 0 "bldg_elev:2;pavement:1;building:3:6;bldg_cf:65" "desert"
 hex 3634 0 "bldg_elev:2;pavement:1;building:3:35;bldg_cf:65" "desert"
 hex 3734 0 "bldg_elev:2;pavement:1;building:3:48;bldg_cf:65" "desert"
 hex 3834 0 "pavement:1" "desert"
-hex 3934 0 "bldg_elev:1;pavement:1;building:3;bldg_cf:65" "desert"
+hex 3934 0 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 4034 0 "pavement:1" "desert"
 hex 4134 1 "pavement:1" "desert"
 hex 4234 0 "" "desert"
@@ -2259,7 +2270,7 @@ hex 1636 0 "" "desert"
 hex 1736 0 "" "desert"
 hex 1836 0 "" "desert"
 hex 1936 0 "" "desert"
-hex 2036 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2036 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2136 1 "pavement:1" "desert"
 hex 2236 0 "pavement:1" "desert"
 hex 2336 1 "pavement:1" "desert"
@@ -2272,13 +2283,13 @@ hex 2936 1 "pavement:1" "desert"
 hex 3036 1 "pavement:1" "desert"
 hex 3136 0 "bldg_elev:2;pavement:1;building:3:33;bldg_cf:65" "desert"
 hex 3236 0 "pavement:1;road:1;road_fluff:1" "desert"
-hex 3336 0 "bldg_elev:2;pavement:1;building:3;bldg_cf:65" "desert"
+hex 3336 0 "bldg_elev:2;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 3436 1 "pavement:1" "desert"
 hex 3536 0 "bldg_elev:2;pavement:1;building:3:4;bldg_cf:65" "desert"
 hex 3636 0 "bldg_elev:2;pavement:1;building:3:34;bldg_cf:65" "desert"
 hex 3736 0 "bldg_elev:2;pavement:1;building:3:16;bldg_cf:65" "desert"
 hex 3836 0 "pavement:1" "desert"
-hex 3936 0 "bldg_elev:1;pavement:1;building:3;bldg_cf:65" "desert"
+hex 3936 0 "bldg_elev:1;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 4036 0 "pavement:1" "desert"
 hex 4136 1 "pavement:1" "desert"
 hex 4236 0 "" "desert"
@@ -2387,7 +2398,7 @@ hex 1638 0 "" "desert"
 hex 1738 0 "" "desert"
 hex 1838 0 "" "desert"
 hex 1938 0 "" "desert"
-hex 2038 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2038 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2138 0 "pavement:1" "desert"
 hex 2238 0 "pavement:1" "desert"
 hex 2338 0 "pavement:1" "desert"
@@ -2398,9 +2409,9 @@ hex 2738 1 "pavement:1" "desert"
 hex 2838 0 "bldg_elev:1;bldg_class:1;pavement:1;building:1:14;bldg_cf:15" "desert"
 hex 2938 0 "bldg_elev:1;bldg_class:1;pavement:1;building:1:28;bldg_cf:15" "desert"
 hex 3038 0 "building:1:56;bldg_cf:15;bldg_elev:1;bldg_class:1;pavement:1;road:1;road_fluff:1" "desert"
-hex 3138 0 "bldg_elev:2;pavement:1;building:3;bldg_cf:65" "desert"
+hex 3138 0 "bldg_elev:2;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 3238 0 "pavement:1;road:1:9;road_fluff:1" "desert"
-hex 3338 0 "bldg_elev:2;pavement:1;building:3;bldg_cf:65" "desert"
+hex 3338 0 "bldg_elev:2;pavement:1;building:3:0;bldg_cf:65" "desert"
 hex 3438 0 "bldg_elev:1;bldg_class:1;pavement:1;building:1:16;bldg_cf:15" "desert"
 hex 3538 0 "pavement:1" "desert"
 hex 3638 1 "pavement:1" "desert"
@@ -2408,7 +2419,7 @@ hex 3738 1 "pavement:1" "desert"
 hex 3838 1 "pavement:1" "desert"
 hex 3938 0 "pavement:1" "desert"
 hex 4038 1 "pavement:1" "desert"
-hex 4138 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 4138 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 4238 0 "" "desert"
 hex 4338 -1 "rough:1;fluff:1" "desert"
 hex 4438 0 "" "desert"
@@ -2453,7 +2464,7 @@ hex 1839 0 "fortified:1" "desert"
 hex 1939 0 "" "desert"
 hex 2039 0 "" "desert"
 hex 2139 1 "pavement:1" "desert"
-hex 2239 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2239 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2339 1 "pavement:1" "desert"
 hex 2439 0 "" "desert"
 hex 2539 0 "" "desert"
@@ -2470,7 +2481,7 @@ hex 3539 0 "pavement:1" "desert"
 hex 3639 1 "pavement:1" "desert"
 hex 3739 0 "woods:1;foliage_elev:1" "desert"
 hex 3839 0 "" "desert"
-hex 3939 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3939 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 4039 0 "" "desert"
 hex 4139 0 "" "desert"
 hex 4239 0 "" "desert"
@@ -2659,7 +2670,7 @@ hex 3242 1 "pavement:1" "desert"
 hex 3342 0 "pavement:1" "desert"
 hex 3442 1 "pavement:1" "desert"
 hex 3542 0 "pavement:1" "desert"
-hex 3642 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 3642 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 3742 0 "" "desert"
 hex 3842 0 "" "desert"
 hex 3942 -1 "rough:1;fluff:1" "desert"
@@ -2714,7 +2725,7 @@ hex 2343 0 "" "desert"
 hex 2443 0 "" "desert"
 hex 2543 0 "" "desert"
 hex 2643 0 "" "desert"
-hex 2743 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1;bldg_cf:15" "desert"
+hex 2743 1 "bldg_elev:1;bldg_class:3;pavement:1;building:1:0;bldg_cf:15" "desert"
 hex 2843 0 "" "desert"
 hex 2943 1 "pavement:1" "desert"
 hex 3043 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Snow - Orbital Defense Medium.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Snow - Orbital Defense Medium.board
index 1ae7d91441e..f7072246c01 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Snow - Orbital Defense Medium.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Snow - Orbital Defense Medium.board	
@@ -7,6 +7,8 @@ tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "snow"
 hex 0201 3 "woods:1;foliage_elev:2" "snow"
 hex 0301 3 "woods:1;foliage_elev:2" "snow"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Snow-Mountain - Glacier Mining and Crevasse.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Snow-Mountain - Glacier Mining and Crevasse.board
index f0a7ce519f9..9ea4c691af0 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Snow-Mountain - Glacier Mining and Crevasse.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Snow-Mountain - Glacier Mining and Crevasse.board	
@@ -8,6 +8,7 @@ tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "rough:1" "snow"
 hex 0201 0 "" "snow"
 hex 0301 0 "" "snow"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical - Industrial Facility Medium - Plantation House.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical - Industrial Facility Medium - Plantation House.board
index 10c20fbce17..f2887bffaf9 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical - Industrial Facility Medium - Plantation House.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical - Industrial Facility Medium - Plantation House.board	
@@ -4,9 +4,11 @@ tag "Foliage (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 -1 "woods:1;foliage_elev:2" "tropical"
 hex 0201 -1 "" "tropical"
 hex 0301 -1 "road:1;road_fluff:1" "tropical"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical - Industrial Facility Medium 2 - Rare Earths Mine.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical - Industrial Facility Medium 2 - Rare Earths Mine.board
index 8e7250d9d53..3b1158e4939 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical - Industrial Facility Medium 2 - Rare Earths Mine.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical - Industrial Facility Medium 2 - Rare Earths Mine.board	
@@ -4,11 +4,13 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 1 "" "tropical"
 hex 0201 1 "" "tropical"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Coast - Tank Base Medium.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Coast - Tank Base Medium.board
index 15725da4974..a071e027f06 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Coast - Tank Base Medium.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Coast - Tank Base Medium.board	
@@ -1,12 +1,14 @@
 size 64 68
 option exit_roads_to_pavement false
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 3 "woods:1;foliage_elev:2" "tropical"
 hex 0201 3 "" "tropical"
 hex 0301 3 "woods:1;foliage_elev:2" "tropical"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Jungle - Comms Centre Medium.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Jungle - Comms Centre Medium.board
index 764eadadb23..1710c5212bf 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Jungle - Comms Centre Medium.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Jungle - Comms Centre Medium.board	
@@ -4,8 +4,9 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Jungle - Convoy Route N-S Medium.board b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Jungle - Convoy Route N-S Medium.board
index 422561e3f40..e826183f19a 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Jungle - Convoy Route N-S Medium.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/StratCon Facilities/64x68 - Tropical-Jungle - Convoy Route N-S Medium.board	
@@ -3,6 +3,7 @@ tag "Foliage (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - City Ruins - Beast is Loose Scenario.board b/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - City Ruins - Beast is Loose Scenario.board
index b91a5705c34..8517dbc1cad 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - City Ruins - Beast is Loose Scenario.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - City Ruins - Beast is Loose Scenario.board	
@@ -2,8 +2,10 @@ size 16 17
 tag "Rough (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - Twycross - Desert Hills Edit.board b/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - Twycross - Desert Hills Edit.board
index 77108e55216..e6ba4257fc2 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - Twycross - Desert Hills Edit.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - Twycross - Desert Hills Edit.board	
@@ -1,6 +1,6 @@
 size 16 17
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
+tag "DesertTheme (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - Twycross - Mountain Lake Edit.board b/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - Twycross - Mountain Lake Edit.board
index fc465526493..c5be6838624 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - Twycross - Mountain Lake Edit.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Twycross FASA Book Maps/16x17 - Twycross - Mountain Lake Edit.board	
@@ -1,6 +1,5 @@
 size 16 17
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
+tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/32x51 - Tukayyid - Dinju Mountains Farm Valley.board b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/32x51 - Tukayyid - Dinju Mountains Farm Valley.board
index cd6b84d3639..44d5f766828 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/32x51 - Tukayyid - Dinju Mountains Farm Valley.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/32x51 - Tukayyid - Dinju Mountains Farm Valley.board	
@@ -3,8 +3,9 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "Cliffs (Auto)"
 tag "Roads (Auto)"
-tag "DesertTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "DesertTheme (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 hex 0101 5 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/32x51 - Tukayyid - Dinju Mountains Pass.board b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/32x51 - Tukayyid - Dinju Mountains Pass.board
index af95f21cff0..ab4081af7f1 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/32x51 - Tukayyid - Dinju Mountains Pass.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/32x51 - Tukayyid - Dinju Mountains Pass.board	
@@ -3,9 +3,11 @@ tag "Rough (Auto)"
 tag "Foliage (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "MediumForest (Auto)"
-tag "LowHills (Auto)"
+tag "Impassable (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 4 "impassable:1" "desert"
 hex 0201 3 "rough:1" "desert"
 hex 0301 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x136 - Tukayyid - Racice River Delta Large.board b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x136 - Tukayyid - Racice River Delta Large.board
index 4b90e0925df..c79493f8705 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x136 - Tukayyid - Racice River Delta Large.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x136 - Tukayyid - Racice River Delta Large.board	
@@ -2,13 +2,15 @@ size 64 136
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "woods:1;foliage_elev:2" "grass"
 hex 0201 0 "woods:1;foliage_elev:2" "grass"
 hex 0301 0 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x68 - Tukayyid - Racice River Delta 2.board b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x68 - Tukayyid - Racice River Delta 2.board
index 103221b9e35..23784d065dc 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x68 - Tukayyid - Racice River Delta 2.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x68 - Tukayyid - Racice River Delta 2.board	
@@ -2,13 +2,15 @@ size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Swamp (Auto)"
 tag "Roads (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 2 "" ""
 hex 0201 2 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x68 - Tukayyid -KoziceValley - Route16 Urcunat Bridge.board b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x68 - Tukayyid -KoziceValley - Route16 Urcunat Bridge.board
index d9d79377995..a651a151b21 100644
--- a/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x68 - Tukayyid -KoziceValley - Route16 Urcunat Bridge.board	
+++ b/megamek/data/boards/unofficial/UlyssesMaps/Ulysses Take on Tukayyid/64x68 - Tukayyid -KoziceValley - Route16 Urcunat Bridge.board	
@@ -4,8 +4,9 @@ tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
-tag "LowHills (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "Hangar (Auto)"
 hex 0101 1 "woods:1;foliage_elev:1" ""
 hex 0201 1 "woods:1;foliage_elev:1" ""
 hex 0301 0 "woods:1;foliage_elev:2" ""
diff --git a/megamek/data/boards/unofficial/Unknown/seaportwithfueltanks.board b/megamek/data/boards/unofficial/Unknown/seaportwithfueltanks.board
index dce49690ef3..372fa564f3f 100644
--- a/megamek/data/boards/unofficial/Unknown/seaportwithfueltanks.board
+++ b/megamek/data/boards/unofficial/Unknown/seaportwithfueltanks.board
@@ -1,11 +1,12 @@
 size 16 17
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/Vamp/Elevated Highway.board b/megamek/data/boards/unofficial/Vamp/Elevated Highway.board
index 131200293e4..f34e8a0e3ec 100644
--- a/megamek/data/boards/unofficial/Vamp/Elevated Highway.board	
+++ b/megamek/data/boards/unofficial/Vamp/Elevated Highway.board	
@@ -1,11 +1,14 @@
 size 48 51
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "Fortress (Auto)"
 hex 0101 -3 "" ""
 hex 0201 -3 "" ""
 hex 0301 -3 "" ""
diff --git a/megamek/data/boards/unofficial/Vamp/Fortified Beach.board b/megamek/data/boards/unofficial/Vamp/Fortified Beach.board
index 9d0f5a12b2a..2d50edccd93 100644
--- a/megamek/data/boards/unofficial/Vamp/Fortified Beach.board	
+++ b/megamek/data/boards/unofficial/Vamp/Fortified Beach.board	
@@ -1,11 +1,13 @@
 size 48 51
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
-tag "LowHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
 hex 0101 0 "sand:0" ""
 hex 0201 0 "sand:0" ""
 hex 0301 0 "sand:0" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/100x124 Asteroid Biodome.board b/megamek/data/boards/unofficial/VictorMorson/100x124 Asteroid Biodome.board
index ab0d6381820..c62a38a7dcf 100644
--- a/megamek/data/boards/unofficial/VictorMorson/100x124 Asteroid Biodome.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/100x124 Asteroid Biodome.board	
@@ -1,14 +1,19 @@
 size 100 124
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
-tag "HighHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
-tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Hangar (Auto)"
+tag "Water (Auto)"
+tag "HighHills (Auto)"
+tag "Lava (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 0 "" "lunar"
diff --git a/megamek/data/boards/unofficial/VictorMorson/100x124 Asteroid Expanse.board b/megamek/data/boards/unofficial/VictorMorson/100x124 Asteroid Expanse.board
index 37d3d631e43..63518cd02f4 100644
--- a/megamek/data/boards/unofficial/VictorMorson/100x124 Asteroid Expanse.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/100x124 Asteroid Expanse.board	
@@ -1,8 +1,9 @@
 size 100 124
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "LunarTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
diff --git a/megamek/data/boards/unofficial/VictorMorson/100x124 TC Mirfak Mudtown.board b/megamek/data/boards/unofficial/VictorMorson/100x124 TC Mirfak Mudtown.board
index 3b97da840a3..8051bbe0244 100644
--- a/megamek/data/boards/unofficial/VictorMorson/100x124 TC Mirfak Mudtown.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/100x124 TC Mirfak Mudtown.board	
@@ -5,9 +5,12 @@ tag "Rough (Auto)"
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 9 "" "desert"
 hex 0201 9 "" "desert"
 hex 0301 9 "" "desert"
diff --git a/megamek/data/boards/unofficial/VictorMorson/124x248 TC Mirfak Baudrys Delight.board b/megamek/data/boards/unofficial/VictorMorson/124x248 TC Mirfak Baudrys Delight.board
index 4ff7737ccb5..aec81c550e3 100644
--- a/megamek/data/boards/unofficial/VictorMorson/124x248 TC Mirfak Baudrys Delight.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/124x248 TC Mirfak Baudrys Delight.board	
@@ -1,12 +1,19 @@
 size 124 248
 tag "Rough (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
-tag "HighHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
-tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "road:1:36" "desert"
 hex 0201 0 "road:1" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/VictorMorson/124x248-TC-Mirfak-Baudrys_Delight.board b/megamek/data/boards/unofficial/VictorMorson/124x248-TC-Mirfak-Baudrys_Delight.board
index 4ff7737ccb5..aec81c550e3 100644
--- a/megamek/data/boards/unofficial/VictorMorson/124x248-TC-Mirfak-Baudrys_Delight.board
+++ b/megamek/data/boards/unofficial/VictorMorson/124x248-TC-Mirfak-Baudrys_Delight.board
@@ -1,12 +1,19 @@
 size 124 248
 tag "Rough (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
-tag "HighHills (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
-tag "Woods (Auto)"
+tag "Hangar (Auto)"
 tag "MediumUrban (Auto)"
+tag "Cliffs (Auto)"
+tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Woods (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "road:1:36" "desert"
 hex 0201 0 "road:1" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/VictorMorson/128x128-TC-Mirfak-Winkel.board b/megamek/data/boards/unofficial/VictorMorson/128x128-TC-Mirfak-Winkel.board
index fb24ea29afc..5a88a0be656 100644
--- a/megamek/data/boards/unofficial/VictorMorson/128x128-TC-Mirfak-Winkel.board
+++ b/megamek/data/boards/unofficial/VictorMorson/128x128-TC-Mirfak-Winkel.board
@@ -1,13 +1,18 @@
 size 128 128
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Fields (Auto)"
-tag "LowHills (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
+tag "LowHills (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
-tag "MediumUrban (Auto)"
+tag "Fortress (Auto)"
 hex 0101 3 "" "grass"
 hex 0201 3 "woods:1;foliage_elev:2" "grass"
 hex 0301 3 "woods:1;foliage_elev:2" "grass"
diff --git a/megamek/data/boards/unofficial/VictorMorson/152x176_Tian-Tan_Industrial_Center.board b/megamek/data/boards/unofficial/VictorMorson/152x176_Tian-Tan_Industrial_Center.board
index 95af3e5871e..9e0cacab006 100644
--- a/megamek/data/boards/unofficial/VictorMorson/152x176_Tian-Tan_Industrial_Center.board
+++ b/megamek/data/boards/unofficial/VictorMorson/152x176_Tian-Tan_Industrial_Center.board
@@ -1,12 +1,20 @@
 size 152 176
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "Impassable (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "LightForest (Auto)"
+tag "Hangar (Auto)"
+tag "Cliffs (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "Woods (Auto)"
-tag "LightForest (Auto)"
+tag "GunEmplacement (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 4 "rough:2;impassable:1" "volcano"
 hex 0201 4 "rough:2;impassable:1" "volcano"
 hex 0301 4 "rough:2;impassable:1" "volcano"
diff --git a/megamek/data/boards/unofficial/VictorMorson/160x96 Galatea Compound.board b/megamek/data/boards/unofficial/VictorMorson/160x96 Galatea Compound.board
index 875a769ff4b..a0fecab4332 100644
--- a/megamek/data/boards/unofficial/VictorMorson/160x96 Galatea Compound.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/160x96 Galatea Compound.board	
@@ -5,6 +5,7 @@ tag "Cliffs (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
+tag "Hangar (Auto)"
 hex 0101 3 "" "desert"
 hex 0201 3 "" "desert"
 hex 0301 3 "" "desert"
diff --git a/megamek/data/boards/unofficial/VictorMorson/192x128_Texlos_-_Livius_-_Valencia_City.board b/megamek/data/boards/unofficial/VictorMorson/192x128_Texlos_-_Livius_-_Valencia_City.board
index 7ab122fd2c4..f4d73714545 100644
--- a/megamek/data/boards/unofficial/VictorMorson/192x128_Texlos_-_Livius_-_Valencia_City.board
+++ b/megamek/data/boards/unofficial/VictorMorson/192x128_Texlos_-_Livius_-_Valencia_City.board
@@ -1,12 +1,19 @@
 size 128 192
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "HeavyUrban (Auto)"
-tag "Roads (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "TropicalTheme (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "Water (Auto)"
+tag "HeavyUrban (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "GunEmplacement (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "DenseForest (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "pavement:1:8;road:1:36" "tropical"
 hex 0201 0 "pavement:1:8;road:1" "tropical"
 hex 0301 0 "bldg_elev:2;pavement:1:36;bldg_fluff:34:0;building:2:0;bldg_cf:50" "tropical"
diff --git a/megamek/data/boards/unofficial/VictorMorson/42x92 Gauntlet.board b/megamek/data/boards/unofficial/VictorMorson/42x92 Gauntlet.board
index 4fa979e1093..6c52c48556e 100644
--- a/megamek/data/boards/unofficial/VictorMorson/42x92 Gauntlet.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/42x92 Gauntlet.board	
@@ -1,9 +1,10 @@
 size 42 92
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
diff --git a/megamek/data/boards/unofficial/VictorMorson/48x48 The Depot.board b/megamek/data/boards/unofficial/VictorMorson/48x48 The Depot.board
index 9ce3bc7c4bb..d13656ae645 100644
--- a/megamek/data/boards/unofficial/VictorMorson/48x48 The Depot.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/48x48 The Depot.board	
@@ -1,14 +1,16 @@
 size 48 48
 option exit_roads_to_pavement false
 tag "LightUrban (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 1 "water:2" "grass"
 hex 0201 1 "water:2" "grass"
 hex 0301 1 "water:2" "grass"
diff --git a/megamek/data/boards/unofficial/VictorMorson/48x48 The Trainjob.board b/megamek/data/boards/unofficial/VictorMorson/48x48 The Trainjob.board
index 2ed7431ac4c..412db403107 100644
--- a/megamek/data/boards/unofficial/VictorMorson/48x48 The Trainjob.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/48x48 The Trainjob.board	
@@ -1,12 +1,13 @@
 size 48 48
 tag "Rough (Auto)"
+tag "Cliffs (Auto)"
 tag "MarsTheme (Auto)"
 tag "Water (Auto)"
-tag "Cliffs (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 hex 0101 4 "" "mars"
 hex 0201 3 "" "mars"
 hex 0301 3 "" "mars"
diff --git a/megamek/data/boards/unofficial/VictorMorson/48x48.board b/megamek/data/boards/unofficial/VictorMorson/48x48.board
index da2b97741e6..dd3c8882d71 100644
--- a/megamek/data/boards/unofficial/VictorMorson/48x48.board
+++ b/megamek/data/boards/unofficial/VictorMorson/48x48.board
@@ -1,11 +1,14 @@
 size 48 48
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:4;pavement:1;building:3:0;bldg_cf:100" ""
 hex 0201 0 "pavement:1" ""
 hex 0301 0 "pavement:1;road:1:36" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/64x64 Lunar Raid.board b/megamek/data/boards/unofficial/VictorMorson/64x64 Lunar Raid.board
index 015632df51d..5749e07f3a3 100644
--- a/megamek/data/boards/unofficial/VictorMorson/64x64 Lunar Raid.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/64x64 Lunar Raid.board	
@@ -1,11 +1,13 @@
 size 64 64
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "LunarTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "LunarTheme (Auto)"
 tag "Roads (Auto)"
-tag "IceTerrain (Auto)"
 tag "HighHills (Auto)"
+tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" "lunar"
 hex 0201 0 "" "lunar"
 hex 0301 2 "" "lunar"
diff --git a/megamek/data/boards/unofficial/VictorMorson/64x68 Diamond River.board b/megamek/data/boards/unofficial/VictorMorson/64x68 Diamond River.board
index 8c9da2eb0fb..c0b65d3938c 100644
--- a/megamek/data/boards/unofficial/VictorMorson/64x68 Diamond River.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/64x68 Diamond River.board	
@@ -1,13 +1,15 @@
 size 64 68
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "water:6" ""
 hex 0201 0 "water:6" ""
 hex 0301 0 "water:6" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Battlespire 1.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Battlespire 1.board
index 62563f0eb23..01701e4abb0 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Battlespire 1.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Battlespire 1.board	
@@ -1,10 +1,12 @@
 size 48 48
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Gridlock v2.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Gridlock v2.board
index dc15029fb10..044daac93c7 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Gridlock v2.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Gridlock v2.board	
@@ -1,11 +1,14 @@
 size 48 48
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - HotterThanHell.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - HotterThanHell.board
index e7b9a136257..cfccd3b4f89 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - HotterThanHell.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - HotterThanHell.board	
@@ -1,12 +1,15 @@
 size 48 48
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Lava (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Jailbreak Fixed.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Jailbreak Fixed.board
index a95300b11c0..90dd1673d42 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Jailbreak Fixed.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Jailbreak Fixed.board	
@@ -1,12 +1,14 @@
 size 48 48
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "IceTerrain (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
 hex 0301 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - King Of The Hill.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - King Of The Hill.board
index 688039ae1a0..8d63bbec520 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - King Of The Hill.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - King Of The Hill.board	
@@ -3,8 +3,11 @@ tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Labryinth v4.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Labryinth v4.board
index 7c98d693eae..2df37367bff 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Labryinth v4.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Labryinth v4.board	
@@ -1,12 +1,15 @@
 size 48 48
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Pirannha Island v3.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Pirannha Island v3.board
index b781ab08755..4f2bd1c0d89 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Pirannha Island v3.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Pirannha Island v3.board	
@@ -1,11 +1,13 @@
 size 48 48
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Pirannha Island v4.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Pirannha Island v4.board
index 7709d2f3da8..5ae4827eb9e 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Pirannha Island v4.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Pirannha Island v4.board	
@@ -1,11 +1,13 @@
 size 48 48
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Racetrack 1.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Racetrack 1.board
index 964f86c9935..e9f131116c9 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Racetrack 1.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Racetrack 1.board	
@@ -1,10 +1,12 @@
 size 48 48
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
 hex 0301 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Suburbia.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Suburbia.board
index 72ceb6c99df..701140de100 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Suburbia.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Suburbia.board	
@@ -1,11 +1,13 @@
 size 48 48
 option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "Flat (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
 hex 0301 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Swamp Fever.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Swamp Fever.board
index a19efbc47e7..8a14a801166 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Swamp Fever.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - Swamp Fever.board	
@@ -1,12 +1,14 @@
 size 48 48
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
-tag "Woods (Auto)"
+tag "Roads (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Maze v2.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Maze v2.board
index dff0bf5a0a1..bd14f1f7ae6 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Maze v2.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Maze v2.board	
@@ -2,10 +2,13 @@ size 48 48
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "pavement:1" ""
 hex 0201 4 "pavement:1;fluff:2:4" ""
 hex 0301 4 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Maze.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Maze.board
index 9b436f8c64d..065541fa4d7 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Maze.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Maze.board	
@@ -2,10 +2,13 @@ size 48 48
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 4 "pavement:1" ""
 hex 0201 4 "pavement:1" ""
 hex 0301 4 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Pit v2.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Pit v2.board
index d41b05d24b4..fdb743d2a47 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Pit v2.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Pit v2.board	
@@ -1,11 +1,14 @@
 size 48 48
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Lava (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Pit.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Pit.board
index c7619bdbce4..ebaf671ccdf 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Pit.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - The Pit.board	
@@ -1,9 +1,12 @@
 size 48 48
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
diff --git a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - UpHillBattle.board b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - UpHillBattle.board
index a876f34cfcd..db47d00d0a2 100644
--- a/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - UpHillBattle.board	
+++ b/megamek/data/boards/unofficial/VictorMorson/Solaris Arena/SOLARIS ARENA - UpHillBattle.board	
@@ -1,12 +1,14 @@
 size 48 48
 option exit_roads_to_pavement false
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
-tag "Roads (Auto)"
+tag "GrassTheme (Auto)"
 tag "HeavyUrban (Auto)"
+tag "Roads (Auto)"
 tag "HighHills (Auto)"
-tag "Woods (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
 hex 0201 0 "pavement:1;road:1:9" ""
 hex 0301 0 "bldg_elev:2;bldg_basement_type:0;pavement:1;building:1:0;bldg_cf:35" ""
diff --git a/megamek/data/boards/unofficial/mikecj/48x34 Cullans Ford.board b/megamek/data/boards/unofficial/mikecj/48x34 Cullans Ford.board
index c4432a0cdbb..beaaaea6158 100644
--- a/megamek/data/boards/unofficial/mikecj/48x34 Cullans Ford.board	
+++ b/megamek/data/boards/unofficial/mikecj/48x34 Cullans Ford.board	
@@ -1,9 +1,11 @@
 size 48 34
 option exit_roads_to_pavement false
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "pavement:1" ""
 hex 0201 0 "pavement:1" ""
diff --git a/megamek/data/boards/unofficial/pokefan548/(Aero) Canyon Run.board b/megamek/data/boards/unofficial/pokefan548/(Aero) Canyon Run.board
index 8acfba21250..687a7c2f127 100644
--- a/megamek/data/boards/unofficial/pokefan548/(Aero) Canyon Run.board	
+++ b/megamek/data/boards/unofficial/pokefan548/(Aero) Canyon Run.board	
@@ -1,6 +1,7 @@
 size 32 34
 tag "Cliffs (Auto)"
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/pokefan548/(Aero) Jape Jungle.board b/megamek/data/boards/unofficial/pokefan548/(Aero) Jape Jungle.board
index 12a4bccaa4a..65b7b602652 100644
--- a/megamek/data/boards/unofficial/pokefan548/(Aero) Jape Jungle.board	
+++ b/megamek/data/boards/unofficial/pokefan548/(Aero) Jape Jungle.board	
@@ -4,6 +4,7 @@ tag "Cliffs (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "TropicalTheme (Auto)"
 tag "Jungle (Auto)"
diff --git a/megamek/data/boards/unofficial/pokefan548/(Aero) Snowy Peaks.board b/megamek/data/boards/unofficial/pokefan548/(Aero) Snowy Peaks.board
index 4d91b5f25f3..ebcaed72697 100644
--- a/megamek/data/boards/unofficial/pokefan548/(Aero) Snowy Peaks.board	
+++ b/megamek/data/boards/unofficial/pokefan548/(Aero) Snowy Peaks.board	
@@ -2,6 +2,7 @@ size 32 34
 tag "SnowTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
diff --git a/megamek/data/boards/unofficial/pokefan548/(Aero) Volcanically Formed.board b/megamek/data/boards/unofficial/pokefan548/(Aero) Volcanically Formed.board
index 465c9548e3a..4e2ddafcfcc 100644
--- a/megamek/data/boards/unofficial/pokefan548/(Aero) Volcanically Formed.board	
+++ b/megamek/data/boards/unofficial/pokefan548/(Aero) Volcanically Formed.board	
@@ -2,6 +2,7 @@ size 32 34
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Ocean (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Lava (Auto)"
 tag "SnowTerrain (Auto)"
diff --git a/megamek/data/boards/unofficial/pokefan548/48x51 Greatwater Canyon.board b/megamek/data/boards/unofficial/pokefan548/48x51 Greatwater Canyon.board
index 6b9f7577f8e..0302d6efd5d 100644
--- a/megamek/data/boards/unofficial/pokefan548/48x51 Greatwater Canyon.board	
+++ b/megamek/data/boards/unofficial/pokefan548/48x51 Greatwater Canyon.board	
@@ -2,14 +2,17 @@ size 48 51
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "LightForest (Auto)"
+tag "Hangar (Auto)"
+tag "MediumUrban (Auto)"
 tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
-tag "LightForest (Auto)"
-tag "MediumUrban (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 -2 "" "grass"
 hex 0201 -2 "" "grass"
 hex 0301 -2 "" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/80x85 Beware The Pipeline.board b/megamek/data/boards/unofficial/pokefan548/80x85 Beware The Pipeline.board
index e0472202867..1e3c613b522 100644
--- a/megamek/data/boards/unofficial/pokefan548/80x85 Beware The Pipeline.board	
+++ b/megamek/data/boards/unofficial/pokefan548/80x85 Beware The Pipeline.board	
@@ -2,11 +2,17 @@ size 80 85
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
-tag "Lava (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "LightForest (Auto)"
+tag "Hangar (Auto)"
+tag "Lava (Auto)"
+tag "ArmoredBuilding (Auto)"
 tag "LowHills (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "" "desert"
 hex 0201 0 "" "desert"
 hex 0301 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Arctic Base.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Arctic Base.board
index 6af2d34971e..b4ad2dc8511 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Arctic Base.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Arctic Base.board	
@@ -2,8 +2,9 @@ size 16 17
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "LightForest (Auto)"
-tag "SnowTerrain (Auto)"
 tag "Woods (Auto)"
+tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "road:1:5;snow:1" "grass"
 hex 0301 0 "snow:1" "grass"
@@ -71,8 +72,8 @@ hex 1604 0 "snow:1" "grass"
 hex 0105 0 "snow:1" "grass"
 hex 0205 0 "snow:1" "grass"
 hex 0305 0 "snow:1" "grass"
-hex 0405 1 "snow:1;woods:2;foliage_elev:2" "grass"
-hex 0505 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0405 1 "woods:2;snow:1;foliage_elev:2" "grass"
+hex 0505 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0605 1 "snow:1" "grass"
 hex 0705 0 "snow:1" "grass"
 hex 0805 0 "snow:1" "grass"
@@ -87,10 +88,10 @@ hex 1605 0 "snow:1" "grass"
 hex 0106 0 "snow:1" "grass"
 hex 0206 1 "snow:1" "grass"
 hex 0306 2 "snow:1" "grass"
-hex 0406 1 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0406 1 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0506 2 "snow:1" "grass"
 hex 0606 1 "snow:1" "grass"
-hex 0706 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0706 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0806 0 "snow:1" "grass"
 hex 0906 0 "snow:1" "grass"
 hex 1006 0 "road:1;snow:1" "grass"
@@ -117,7 +118,7 @@ hex 1407 0 "snow:1" "grass"
 hex 1507 0 "snow:1" "grass"
 hex 1607 0 "snow:1" "grass"
 hex 0108 0 "snow:1" "grass"
-hex 0208 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0208 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0308 0 "snow:1" "grass"
 hex 0408 0 "" "grass"
 hex 0508 0 "" "grass"
@@ -133,7 +134,7 @@ hex 1408 0 "" "grass"
 hex 1508 0 "snow:1" "grass"
 hex 1608 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0109 0 "snow:1" "grass"
-hex 0209 0 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0209 0 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0309 -1 "snow:2" "grass"
 hex 0409 0 "" "grass"
 hex 0509 0 "bldg_elev:3;pavement:1;building:3:14;bldg_cf:75" "grass"
@@ -166,7 +167,7 @@ hex 1510 0 "snow:1" "grass"
 hex 1610 0 "snow:1" "grass"
 hex 0111 0 "snow:1" "grass"
 hex 0211 -2 "snow:1" "grass"
-hex 0311 0 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0311 0 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0411 0 "" "grass"
 hex 0511 0 "bldg_elev:3;pavement:1;building:3:7;bldg_cf:75" "grass"
 hex 0611 0 "bldg_elev:3;pavement:1;building:3:35;bldg_cf:75" "grass"
@@ -180,9 +181,9 @@ hex 1311 0 "bldg_elev:3;pavement:1;building:3:49;bldg_cf:75;fluff:2" "grass"
 hex 1411 0 "" "grass"
 hex 1511 0 "snow:1" "grass"
 hex 1611 0 "snow:1" "grass"
-hex 0112 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0112 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0212 -1 "snow:1" "grass"
-hex 0312 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0312 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0412 0 "snow:1" "grass"
 hex 0512 0 "" "grass"
 hex 0612 0 "" "grass"
@@ -215,8 +216,8 @@ hex 1613 0 "snow:1" "grass"
 hex 0114 0 "snow:1" "grass"
 hex 0214 0 "snow:1" "grass"
 hex 0314 0 "snow:1" "grass"
-hex 0414 1 "snow:1;woods:1;foliage_elev:2" "grass"
-hex 0514 1 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0414 1 "woods:1;snow:1;foliage_elev:2" "grass"
+hex 0514 1 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0614 3 "snow:1" "grass"
 hex 0714 1 "snow:1" "grass"
 hex 0814 0 "snow:1" "grass"
@@ -231,9 +232,9 @@ hex 1614 0 "snow:1" "grass"
 hex 0115 0 "snow:1" "grass"
 hex 0215 0 "snow:1" "grass"
 hex 0315 0 "snow:1" "grass"
-hex 0415 1 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0415 1 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0515 2 "snow:1" "grass"
-hex 0615 2 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0615 2 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0715 0 "snow:1" "grass"
 hex 0815 0 "snow:1" "grass"
 hex 0915 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Cliffside Airfield 2.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Cliffside Airfield 2.board
index e5016609dd3..647f5e10be6 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Cliffside Airfield 2.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Cliffside Airfield 2.board	
@@ -4,6 +4,7 @@ tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 5 "snow:1" "grass"
 hex 0201 5 "snow:1" "grass"
 hex 0301 5 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Mountain Base.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Mountain Base.board
index 1e9436d23f7..978cfc4a41d 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Mountain Base.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Mountain Base.board	
@@ -3,9 +3,13 @@ tag "Cliffs (Auto)"
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "Fortress (Auto)"
 hex 0101 7 "snow:1" "grass"
 hex 0201 7 "snow:1" "grass"
 hex 0301 7 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Snowy Trench 2.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Snowy Trench 2.board
index f472ea6c9df..55c1058a388 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Snowy Trench 2.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x17/16x17 Snowy Trench 2.board	
@@ -1,6 +1,7 @@
 size 16 17
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
 hex 0101 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x34/16x34 Cliffside Airfield.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x34/16x34 Cliffside Airfield.board
index 3440b70fa79..97b583e5d07 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x34/16x34 Cliffside Airfield.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x34/16x34 Cliffside Airfield.board	
@@ -6,6 +6,7 @@ tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0301 0 "ice:1:8;road:1:8;snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x51/16x51 Cliffside Airfield.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x51/16x51 Cliffside Airfield.board
index b631b13c815..599528e2ba7 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x51/16x51 Cliffside Airfield.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x51/16x51 Cliffside Airfield.board	
@@ -6,6 +6,7 @@ tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0301 0 "ice:1:8;road:1:8;snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x51/16x51 Mountain Pass.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x51/16x51 Mountain Pass.board
index f47b7f243cd..c07a9dd4806 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x51/16x51 Mountain Pass.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/16x51/16x51 Mountain Pass.board	
@@ -1,14 +1,18 @@
 size 16 51
 tag "Rough (Auto)"
+tag "Roads (Auto)"
+tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "SnowTerrain (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
-tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "Woods (Auto)"
-tag "SnowTerrain (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "snow:1" "grass"
 hex 0301 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x17/32x17 Arctic Base.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x17/32x17 Arctic Base.board
index 11d7522c732..e5b9103a8e5 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x17/32x17 Arctic Base.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x17/32x17 Arctic Base.board	
@@ -5,6 +5,7 @@ tag "Roads (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "road:1:5;snow:1" "grass"
 hex 0301 0 "snow:1" "grass"
@@ -136,8 +137,8 @@ hex 3204 0 "snow:1" "grass"
 hex 0105 0 "snow:1" "grass"
 hex 0205 0 "snow:1" "grass"
 hex 0305 0 "snow:1" "grass"
-hex 0405 1 "snow:1;woods:2;foliage_elev:2" "grass"
-hex 0505 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0405 1 "woods:2;snow:1;foliage_elev:2" "grass"
+hex 0505 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0605 1 "snow:1" "grass"
 hex 0705 0 "snow:1" "grass"
 hex 0805 0 "snow:1" "grass"
@@ -168,10 +169,10 @@ hex 3205 0 "snow:1" "grass"
 hex 0106 0 "snow:1" "grass"
 hex 0206 1 "snow:1" "grass"
 hex 0306 2 "snow:1" "grass"
-hex 0406 1 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0406 1 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0506 2 "snow:1" "grass"
 hex 0606 1 "snow:1" "grass"
-hex 0706 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0706 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0806 0 "snow:1" "grass"
 hex 0906 0 "snow:1" "grass"
 hex 1006 0 "road:1;snow:1" "grass"
@@ -230,7 +231,7 @@ hex 3007 0 "snow:2" "grass"
 hex 3107 0 "snow:1" "grass"
 hex 3207 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0108 0 "snow:1" "grass"
-hex 0208 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0208 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0308 0 "snow:1" "grass"
 hex 0408 0 "" "grass"
 hex 0508 0 "" "grass"
@@ -262,7 +263,7 @@ hex 3008 0 "snow:1" "grass"
 hex 3108 0 "snow:1" "grass"
 hex 3208 0 "snow:1" "grass"
 hex 0109 0 "snow:1" "grass"
-hex 0209 0 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0209 0 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0309 -1 "snow:2" "grass"
 hex 0409 0 "" "grass"
 hex 0509 0 "bldg_elev:3;pavement:1;building:3:14;bldg_cf:75" "grass"
@@ -327,7 +328,7 @@ hex 3110 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3210 0 "snow:1" "grass"
 hex 0111 0 "snow:1" "grass"
 hex 0211 -2 "snow:1" "grass"
-hex 0311 0 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0311 0 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0411 0 "" "grass"
 hex 0511 0 "bldg_elev:3;pavement:1;building:3:7;bldg_cf:75" "grass"
 hex 0611 0 "bldg_elev:3;pavement:1;building:3:35;bldg_cf:75" "grass"
@@ -357,9 +358,9 @@ hex 2911 0 "snow:1" "grass"
 hex 3011 0 "snow:1" "grass"
 hex 3111 0 "snow:1" "grass"
 hex 3211 0 "snow:1" "grass"
-hex 0112 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0112 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0212 -1 "snow:1" "grass"
-hex 0312 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0312 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0412 0 "snow:1" "grass"
 hex 0512 0 "" "grass"
 hex 0612 0 "" "grass"
@@ -372,7 +373,7 @@ hex 1212 0 "" "grass"
 hex 1312 0 "" "grass"
 hex 1412 0 "snow:1" "grass"
 hex 1512 0 "snow:1" "grass"
-hex 1612 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 1612 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 1712 1 "snow:1" "grass"
 hex 1812 1 "snow:1" "grass"
 hex 1912 0 "snow:1" "grass"
@@ -424,8 +425,8 @@ hex 3213 0 "snow:1" "grass"
 hex 0114 0 "snow:1" "grass"
 hex 0214 0 "snow:1" "grass"
 hex 0314 0 "snow:1" "grass"
-hex 0414 1 "snow:1;woods:1;foliage_elev:2" "grass"
-hex 0514 1 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0414 1 "woods:1;snow:1;foliage_elev:2" "grass"
+hex 0514 1 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0614 3 "snow:1" "grass"
 hex 0714 1 "snow:1" "grass"
 hex 0814 0 "snow:1" "grass"
@@ -456,9 +457,9 @@ hex 3214 0 "snow:1" "grass"
 hex 0115 0 "snow:1" "grass"
 hex 0215 0 "snow:1" "grass"
 hex 0315 0 "snow:1" "grass"
-hex 0415 1 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0415 1 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0515 2 "snow:1" "grass"
-hex 0615 2 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0615 2 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0715 0 "snow:1" "grass"
 hex 0815 0 "snow:1" "grass"
 hex 0915 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x17/32x17 Snowy Trench.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x17/32x17 Snowy Trench.board
index 1a2a2e6ee06..399eea1704f 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x17/32x17 Snowy Trench.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x17/32x17 Snowy Trench.board	
@@ -1,8 +1,9 @@
 size 32 17
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x34/32x34 Arctic Field.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x34/32x34 Arctic Field.board
index 6854b5cb8c6..625f35764cd 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x34/32x34 Arctic Field.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x34/32x34 Arctic Field.board	
@@ -1,9 +1,10 @@
 size 32 34
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "LightForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x34/32x34 Arctic Mountain.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x34/32x34 Arctic Mountain.board
index e2a62a227e1..99166bfc82f 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x34/32x34 Arctic Mountain.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x34/32x34 Arctic Mountain.board	
@@ -1,13 +1,14 @@
 size 32 34
 tag "Rough (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "snow:1" "grass"
 hex 0301 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x51/32x51 Arctic Field.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x51/32x51 Arctic Field.board
index b81375b2c67..538622d8def 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x51/32x51 Arctic Field.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x51/32x51 Arctic Field.board	
@@ -1,13 +1,15 @@
 size 32 51
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "snow:1" "grass"
 hex 0301 0 "snow:1" "grass"
@@ -1227,8 +1229,8 @@ hex 3238 0 "snow:1" "grass"
 hex 0139 0 "snow:1" "grass"
 hex 0239 0 "snow:1" "grass"
 hex 0339 0 "snow:1" "grass"
-hex 0439 1 "snow:1;woods:2;foliage_elev:2" "grass"
-hex 0539 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0439 1 "woods:2;snow:1;foliage_elev:2" "grass"
+hex 0539 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0639 1 "snow:1" "grass"
 hex 0739 0 "snow:1" "grass"
 hex 0839 0 "snow:1" "grass"
@@ -1259,10 +1261,10 @@ hex 3239 0 "snow:1" "grass"
 hex 0140 0 "snow:1" "grass"
 hex 0240 1 "snow:1" "grass"
 hex 0340 2 "snow:1" "grass"
-hex 0440 1 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0440 1 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0540 2 "snow:1" "grass"
 hex 0640 1 "snow:1" "grass"
-hex 0740 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0740 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0840 0 "snow:1" "grass"
 hex 0940 0 "snow:1" "grass"
 hex 1040 0 "road:1;snow:1" "grass"
@@ -1321,7 +1323,7 @@ hex 3041 0 "snow:2" "grass"
 hex 3141 0 "snow:1" "grass"
 hex 3241 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0142 0 "snow:1" "grass"
-hex 0242 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0242 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0342 0 "snow:1" "grass"
 hex 0442 0 "" "grass"
 hex 0542 0 "" "grass"
@@ -1353,7 +1355,7 @@ hex 3042 0 "snow:1" "grass"
 hex 3142 0 "snow:1" "grass"
 hex 3242 0 "snow:1" "grass"
 hex 0143 0 "snow:1" "grass"
-hex 0243 0 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0243 0 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0343 -1 "snow:2" "grass"
 hex 0443 0 "" "grass"
 hex 0543 0 "bldg_elev:3;pavement:1;building:3:14;bldg_cf:75" "grass"
@@ -1418,7 +1420,7 @@ hex 3144 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3244 0 "snow:1" "grass"
 hex 0145 0 "snow:1" "grass"
 hex 0245 -2 "snow:1" "grass"
-hex 0345 0 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0345 0 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0445 0 "" "grass"
 hex 0545 0 "bldg_elev:3;pavement:1;building:3:7;bldg_cf:75" "grass"
 hex 0645 0 "bldg_elev:3;pavement:1;building:3:35;bldg_cf:75" "grass"
@@ -1448,9 +1450,9 @@ hex 2945 0 "snow:1" "grass"
 hex 3045 0 "snow:1" "grass"
 hex 3145 0 "snow:1" "grass"
 hex 3245 0 "snow:1" "grass"
-hex 0146 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0146 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0246 -1 "snow:1" "grass"
-hex 0346 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0346 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0446 0 "snow:1" "grass"
 hex 0546 0 "" "grass"
 hex 0646 0 "" "grass"
@@ -1463,7 +1465,7 @@ hex 1246 0 "" "grass"
 hex 1346 0 "" "grass"
 hex 1446 0 "snow:1" "grass"
 hex 1546 0 "snow:1" "grass"
-hex 1646 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 1646 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 1746 1 "snow:1" "grass"
 hex 1846 1 "snow:1" "grass"
 hex 1946 0 "snow:1" "grass"
@@ -1515,8 +1517,8 @@ hex 3247 0 "snow:1" "grass"
 hex 0148 0 "snow:1" "grass"
 hex 0248 0 "snow:1" "grass"
 hex 0348 0 "snow:1" "grass"
-hex 0448 1 "snow:1;woods:1;foliage_elev:2" "grass"
-hex 0548 1 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0448 1 "woods:1;snow:1;foliage_elev:2" "grass"
+hex 0548 1 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0648 3 "snow:1" "grass"
 hex 0748 1 "snow:1" "grass"
 hex 0848 0 "snow:1" "grass"
@@ -1547,9 +1549,9 @@ hex 3248 0 "snow:1" "grass"
 hex 0149 0 "snow:1" "grass"
 hex 0249 0 "snow:1" "grass"
 hex 0349 0 "snow:1" "grass"
-hex 0449 1 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 0449 1 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 0549 2 "snow:1" "grass"
-hex 0649 2 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 0649 2 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 0749 0 "snow:1" "grass"
 hex 0849 0 "snow:1" "grass"
 hex 0949 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x51/32x51 Arctic Mountain.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x51/32x51 Arctic Mountain.board
index cf9b6eb60d8..d25e3d521b2 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x51/32x51 Arctic Mountain.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/32x51/32x51 Arctic Mountain.board	
@@ -1,14 +1,20 @@
 size 32 51
 tag "Rough (Auto)"
+tag "Roads (Auto)"
+tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "SnowTerrain (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
-tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "Woods (Auto)"
-tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "snow:1" "grass"
 hex 0301 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/64x34/64x34 BFM Arctic.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/64x34/64x34 BFM Arctic.board
index d29ca14f280..98187b0b41c 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/64x34/64x34 BFM Arctic.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/64x34/64x34 BFM Arctic.board	
@@ -1,14 +1,16 @@
 size 64 34
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
 tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "snow:1" "grass"
 hex 0301 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/64x51/64x51 MOAM Arctic.board b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/64x51/64x51 MOAM Arctic.board
index 9dbfbcce2c6..2400f1bc34d 100644
--- a/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/64x51/64x51 MOAM Arctic.board	
+++ b/megamek/data/boards/unofficial/pokefan548/Fan Pack Arctic/64x51/64x51 MOAM Arctic.board	
@@ -1,15 +1,22 @@
 size 64 51
 tag "Rough (Auto)"
 tag "Foliage (Auto)"
+tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
+tag "IceTerrain (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "Hangar (Auto)"
+tag "SnowTerrain (Auto)"
 tag "Cliffs (Auto)"
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "HighHills (Auto)"
-tag "IceTerrain (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "Elevator (Auto)"
 tag "Woods (Auto)"
-tag "SnowTerrain (Auto)"
+tag "HeavyBuilding (Auto)"
+tag "Fortress (Auto)"
 hex 0101 0 "snow:1" "grass"
 hex 0201 0 "snow:1" "grass"
 hex 0301 0 "snow:1" "grass"
@@ -2477,8 +2484,8 @@ hex 3239 2 "snow:1" "grass"
 hex 3339 0 "snow:1" "grass"
 hex 3439 0 "snow:1" "grass"
 hex 3539 0 "snow:1" "grass"
-hex 3639 1 "snow:1;woods:2;foliage_elev:2" "grass"
-hex 3739 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 3639 1 "woods:2;snow:1;foliage_elev:2" "grass"
+hex 3739 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3839 1 "snow:1" "grass"
 hex 3939 0 "snow:1" "grass"
 hex 4039 0 "snow:1" "grass"
@@ -2541,10 +2548,10 @@ hex 3240 2 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3340 0 "snow:1" "grass"
 hex 3440 1 "snow:1" "grass"
 hex 3540 2 "snow:1" "grass"
-hex 3640 1 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 3640 1 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 3740 2 "snow:1" "grass"
 hex 3840 1 "snow:1" "grass"
-hex 3940 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 3940 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 4040 0 "snow:1" "grass"
 hex 4140 0 "snow:1" "grass"
 hex 4240 0 "road:1;snow:1" "grass"
@@ -2667,7 +2674,7 @@ hex 3042 3 "snow:1" "grass"
 hex 3142 2 "snow:1" "grass"
 hex 3242 2 "snow:1" "grass"
 hex 3342 0 "snow:1" "grass"
-hex 3442 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 3442 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3542 0 "snow:1" "grass"
 hex 3642 0 "" "grass"
 hex 3742 0 "" "grass"
@@ -2731,7 +2738,7 @@ hex 3043 4 "snow:1" "grass"
 hex 3143 3 "snow:1" "grass"
 hex 3243 2 "snow:1" "grass"
 hex 3343 0 "snow:1" "grass"
-hex 3443 0 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 3443 0 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 3543 -1 "snow:2" "grass"
 hex 3643 0 "" "grass"
 hex 3743 0 "bldg_elev:3;pavement:1;building:3:14;bldg_cf:75" "grass"
@@ -2860,7 +2867,7 @@ hex 3145 2 "snow:1" "grass"
 hex 3245 2 "snow:1" "grass"
 hex 3345 0 "snow:1" "grass"
 hex 3445 -2 "snow:1" "grass"
-hex 3545 0 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 3545 0 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 3645 0 "" "grass"
 hex 3745 0 "bldg_elev:3;pavement:1;building:3:7;bldg_cf:75" "grass"
 hex 3845 0 "bldg_elev:3;pavement:1;building:3:35;bldg_cf:75" "grass"
@@ -2922,9 +2929,9 @@ hex 2946 0 "snow:1" "grass"
 hex 3046 0 "snow:1" "grass"
 hex 3146 2 "snow:1" "grass"
 hex 3246 0 "snow:1" "grass"
-hex 3346 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 3346 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3446 -1 "snow:1" "grass"
-hex 3546 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 3546 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3646 0 "snow:1" "grass"
 hex 3746 0 "" "grass"
 hex 3846 0 "" "grass"
@@ -2937,7 +2944,7 @@ hex 4446 0 "" "grass"
 hex 4546 0 "" "grass"
 hex 4646 0 "snow:1" "grass"
 hex 4746 0 "snow:1" "grass"
-hex 4846 0 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 4846 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 4946 1 "snow:1" "grass"
 hex 5046 1 "snow:1" "grass"
 hex 5146 0 "snow:1" "grass"
@@ -3053,8 +3060,8 @@ hex 3248 0 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3348 0 "snow:1" "grass"
 hex 3448 0 "snow:1" "grass"
 hex 3548 0 "snow:1" "grass"
-hex 3648 1 "snow:1;woods:1;foliage_elev:2" "grass"
-hex 3748 1 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 3648 1 "woods:1;snow:1;foliage_elev:2" "grass"
+hex 3748 1 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3848 3 "snow:1" "grass"
 hex 3948 1 "snow:1" "grass"
 hex 4048 0 "snow:1" "grass"
@@ -3117,9 +3124,9 @@ hex 3249 2 "snow:1" "grass"
 hex 3349 0 "snow:1" "grass"
 hex 3449 0 "snow:1" "grass"
 hex 3549 0 "snow:1" "grass"
-hex 3649 1 "snow:1;woods:1;foliage_elev:2" "grass"
+hex 3649 1 "woods:1;snow:1;foliage_elev:2" "grass"
 hex 3749 2 "snow:1" "grass"
-hex 3849 2 "snow:1;woods:1;foliage_elev:1" "grass"
+hex 3849 2 "woods:1;snow:1;foliage_elev:1" "grass"
 hex 3949 0 "snow:1" "grass"
 hex 4049 0 "snow:1" "grass"
 hex 4149 0 "snow:1" "grass"
diff --git a/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 1 (Revised).board b/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 1 (Revised).board
index 15fc48582fa..eea82f774eb 100644
--- a/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 1 (Revised).board	
+++ b/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 1 (Revised).board	
@@ -1,8 +1,11 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 1.board b/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 1.board
index e7b6ee18486..e7ab7102cb8 100644
--- a/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 1.board	
+++ b/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 1.board	
@@ -1,8 +1,11 @@
 size 45 45
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
 hex 0301 0 "" ""
diff --git a/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 2.board b/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 2.board
index 1f8f14f0ab6..179c563e6fc 100644
--- a/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 2.board	
+++ b/megamek/data/boards/unofficial/ralgith/45x45 Dieron Small Fort 2.board	
@@ -1,12 +1,15 @@
 size 45 45
 option exit_roads_to_pavement false
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
-tag "Roads (Auto)"
+tag "Water (Auto)"
 tag "Swamp (Auto)"
+tag "Roads (Auto)"
 tag "Fields (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "planted_fields:1" ""
 hex 0301 0 "planted_fields:1" ""
diff --git a/megamek/data/boards/unofficial/ralgith/45x45 Smoke Jaguar - Huntress Field Repair Facility.board b/megamek/data/boards/unofficial/ralgith/45x45 Smoke Jaguar - Huntress Field Repair Facility.board
index 52153a33053..090bce9a2a4 100644
--- a/megamek/data/boards/unofficial/ralgith/45x45 Smoke Jaguar - Huntress Field Repair Facility.board	
+++ b/megamek/data/boards/unofficial/ralgith/45x45 Smoke Jaguar - Huntress Field Repair Facility.board	
@@ -4,6 +4,7 @@ tag "Rough (Auto)"
 tag "MarsTheme (Auto)"
 tag "HighHills (Auto)"
 tag "Woods (Auto)"
+tag "Hangar (Auto)"
 hex 0101 0 "" "mars"
 hex 0201 0 "" "mars"
 hex 0301 0 "rough:1" "mars"
diff --git a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Airfield.board b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Airfield.board
index 1a0d4bad935..68a3847c9fb 100644
--- a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Airfield.board	
+++ b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Airfield.board	
@@ -1,9 +1,11 @@
 size 55 55
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "water:1" ""
 hex 0201 0 "water:1" ""
diff --git a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 1.board b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 1.board
index cae10380526..14039cd556a 100644
--- a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 1.board	
+++ b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 1.board	
@@ -1,11 +1,14 @@
 size 55 55
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 tag "DenseForest (Auto)"
 hex 0101 0 "" ""
diff --git a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 2.board b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 2.board
index d9d501291eb..646f09ff4c0 100644
--- a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 2.board	
+++ b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 2.board	
@@ -2,7 +2,10 @@ size 55 55
 option exit_roads_to_pavement false
 tag "Rough (Auto)"
 tag "GrassTheme (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 hex 0101 -2 "" ""
 hex 0201 -2 "" ""
 hex 0301 -1 "rough:1" ""
diff --git a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 3.board b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 3.board
index 08debf9c485..35b518ddf25 100644
--- a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 3.board	
+++ b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Factory Site 3.board	
@@ -1,9 +1,12 @@
 size 55 55
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 15 "" ""
 hex 0201 14 "" ""
 hex 0301 14 "" ""
diff --git a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Large Mountain Fort 1.board b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Large Mountain Fort 1.board
index 7e1281aad37..8bbc391b84e 100644
--- a/megamek/data/boards/unofficial/ralgith/55x55 Dieron Large Mountain Fort 1.board	
+++ b/megamek/data/boards/unofficial/ralgith/55x55 Dieron Large Mountain Fort 1.board	
@@ -1,10 +1,13 @@
 size 55 55
 tag "Rough (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 2 "" ""
 hex 0201 1 "" ""
 hex 0301 2 "" ""
diff --git a/megamek/data/boards/unofficial/ralgith/58x59 Devil's Pass.board b/megamek/data/boards/unofficial/ralgith/58x59 Devil's Pass.board
index 27d31ed2da5..753fb8fb11a 100644
--- a/megamek/data/boards/unofficial/ralgith/58x59 Devil's Pass.board	
+++ b/megamek/data/boards/unofficial/ralgith/58x59 Devil's Pass.board	
@@ -1,8 +1,9 @@
 size 58 59
 tag "Rough (Auto)"
-tag "Water (Auto)"
-tag "GrassTheme (Auto)"
 tag "Cliffs (Auto)"
+tag "GrassTheme (Auto)"
+tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/ralgith/64x65 St. Loris Quarry Depot.board b/megamek/data/boards/unofficial/ralgith/64x65 St. Loris Quarry Depot.board
index 42578e61a5b..6aa510f30dd 100644
--- a/megamek/data/boards/unofficial/ralgith/64x65 St. Loris Quarry Depot.board	
+++ b/megamek/data/boards/unofficial/ralgith/64x65 St. Loris Quarry Depot.board	
@@ -3,7 +3,10 @@ tag "LightUrban (Auto)"
 tag "Cliffs (Auto)"
 tag "SnowTheme (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HeavyBuilding (Auto)"
 hex 0101 9 "" "snow"
 hex 0201 9 "" "snow"
 hex 0301 9 "" "snow"
diff --git a/megamek/data/boards/unofficial/ralgith/64x65 St. Loris South Fort.board b/megamek/data/boards/unofficial/ralgith/64x65 St. Loris South Fort.board
index 09ba1af59f6..5dcba907295 100644
--- a/megamek/data/boards/unofficial/ralgith/64x65 St. Loris South Fort.board	
+++ b/megamek/data/boards/unofficial/ralgith/64x65 St. Loris South Fort.board	
@@ -1,9 +1,11 @@
 size 64 65
-tag "Water (Auto)"
 tag "GrassTheme (Auto)"
+tag "Water (Auto)"
 tag "Roads (Auto)"
 tag "HighHills (Auto)"
 tag "MediumForest (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "" ""
diff --git a/megamek/data/boards/unofficial/ralgith/75x75 Dieron Medium Town 1.board b/megamek/data/boards/unofficial/ralgith/75x75 Dieron Medium Town 1.board
index b82cfaf1cae..0074c1fb59a 100644
--- a/megamek/data/boards/unofficial/ralgith/75x75 Dieron Medium Town 1.board	
+++ b/megamek/data/boards/unofficial/ralgith/75x75 Dieron Medium Town 1.board	
@@ -3,7 +3,10 @@ option exit_roads_to_pavement false
 tag "GrassTheme (Auto)"
 tag "Roads (Auto)"
 tag "Flat (Auto)"
+tag "ArmoredBuilding (Auto)"
+tag "HardenedBuilding (Auto)"
 tag "Jungle (Auto)"
+tag "HeavyBuilding (Auto)"
 tag "MediumUrban (Auto)"
 hex 0101 0 "" ""
 hex 0201 0 "jungle:3;foliage_elev:3" ""
diff --git a/megamek/data/boards/unofficial/txsoldier94/175x102 RL 1.board b/megamek/data/boards/unofficial/txsoldier94/175x102 RL 1.board
index 55896857ad9..a7539251526 100644
--- a/megamek/data/boards/unofficial/txsoldier94/175x102 RL 1.board	
+++ b/megamek/data/boards/unofficial/txsoldier94/175x102 RL 1.board	
@@ -1,5 +1,6 @@
 size 175 102
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/txsoldier94/175x102 RL 2.board b/megamek/data/boards/unofficial/txsoldier94/175x102 RL 2.board
index 1c59cc7b52f..1b8b97eac2c 100644
--- a/megamek/data/boards/unofficial/txsoldier94/175x102 RL 2.board	
+++ b/megamek/data/boards/unofficial/txsoldier94/175x102 RL 2.board	
@@ -1,5 +1,6 @@
 size 175 102
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/txsoldier94/175x102 RL 3.board b/megamek/data/boards/unofficial/txsoldier94/175x102 RL 3.board
index a9bafe14622..66f2fb9820f 100644
--- a/megamek/data/boards/unofficial/txsoldier94/175x102 RL 3.board	
+++ b/megamek/data/boards/unofficial/txsoldier94/175x102 RL 3.board	
@@ -1,5 +1,6 @@
 size 175 102
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 tag "LowHills (Auto)"
diff --git a/megamek/data/boards/unofficial/txsoldier94/175x102 RL 4_DevilsCrown.board b/megamek/data/boards/unofficial/txsoldier94/175x102 RL 4_DevilsCrown.board
index b30c521099c..08c139dd499 100644
--- a/megamek/data/boards/unofficial/txsoldier94/175x102 RL 4_DevilsCrown.board	
+++ b/megamek/data/boards/unofficial/txsoldier94/175x102 RL 4_DevilsCrown.board	
@@ -1,5 +1,6 @@
 size 175 102
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "HighHills (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
diff --git a/megamek/data/boards/unofficial/txsoldier94/25x14 RL 1 1to1.board b/megamek/data/boards/unofficial/txsoldier94/25x14 RL 1 1to1.board
index 2fc1ad61145..ecedb6e88d4 100644
--- a/megamek/data/boards/unofficial/txsoldier94/25x14 RL 1 1to1.board	
+++ b/megamek/data/boards/unofficial/txsoldier94/25x14 RL 1 1to1.board	
@@ -1,5 +1,6 @@
 size 25 14
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/txsoldier94/25x14 RL 2 1to1.board b/megamek/data/boards/unofficial/txsoldier94/25x14 RL 2 1to1.board
index e102b4f3d65..0ccfd6a1e75 100644
--- a/megamek/data/boards/unofficial/txsoldier94/25x14 RL 2 1to1.board	
+++ b/megamek/data/boards/unofficial/txsoldier94/25x14 RL 2 1to1.board	
@@ -1,5 +1,6 @@
 size 25 14
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/txsoldier94/25x14 RL 3 1to1.board b/megamek/data/boards/unofficial/txsoldier94/25x14 RL 3 1to1.board
index 98f93e01ad0..61d7a0a32e0 100644
--- a/megamek/data/boards/unofficial/txsoldier94/25x14 RL 3 1to1.board	
+++ b/megamek/data/boards/unofficial/txsoldier94/25x14 RL 3 1to1.board	
@@ -1,5 +1,6 @@
 size 25 14
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/txsoldier94/25x14 RL 4_DevilsCrown (1to1).board b/megamek/data/boards/unofficial/txsoldier94/25x14 RL 4_DevilsCrown (1to1).board
index b53bf22efa8..3b71a5d443e 100644
--- a/megamek/data/boards/unofficial/txsoldier94/25x14 RL 4_DevilsCrown (1to1).board	
+++ b/megamek/data/boards/unofficial/txsoldier94/25x14 RL 4_DevilsCrown (1to1).board	
@@ -1,5 +1,6 @@
 size 25 14
 tag "Water (Auto)"
+tag "MultipleTheme (Auto)"
 tag "DesertTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "desert"
diff --git a/megamek/data/boards/unofficial/txsoldier94/32x17 BattleForce_Classic.board b/megamek/data/boards/unofficial/txsoldier94/32x17 BattleForce_Classic.board
index e2c36715ade..2a445b12d57 100644
--- a/megamek/data/boards/unofficial/txsoldier94/32x17 BattleForce_Classic.board	
+++ b/megamek/data/boards/unofficial/txsoldier94/32x17 BattleForce_Classic.board	
@@ -2,6 +2,7 @@ size 32 17
 tag "GrassTheme (Auto)"
 tag "Water (Auto)"
 tag "Roads (Auto)"
+tag "MultipleTheme (Auto)"
 tag "Woods (Auto)"
 hex 0101 0 "" "grass"
 hex 0201 0 "" "grass"