diff --git a/Dwarf Fortress/raw/objects/creature_masterwork.txt b/Dwarf Fortress/raw/objects/creature_masterwork.txt
index 5121fc09..6af035f1 100644
--- a/Dwarf Fortress/raw/objects/creature_masterwork.txt	
+++ b/Dwarf Fortress/raw/objects/creature_masterwork.txt	
@@ -6604,7 +6604,7 @@ YE_JADE:1:IRIS_EYE_OCHRE:1:IRIS_EYE_RAW_UMBER:1:IRIS_EYE_RUST:1:IRIS_EYE_SILVER:
 [NATURAL_SKILL:BITE:0]YESHARDERINVADER_ORC
 [NATURAL_SKILL:GRASP_STRIKE:0]YESHARDERINVADER_ORC
 [NATURAL_SKILL:STANCE_STRIKE:0]YESHARDERINVADER_ORC
-[NATURAL_SKILL:DODGING:1]YESHARDERINVADER
+[NATURAL_SKILL:DODGING:1]YESHARDERINVADER_ORC
 
 
 	
diff --git a/Dwarf Fortress/raw/objects/entity_antmen.txt b/Dwarf Fortress/raw/objects/entity_antmen.txt
index 219b6962..7b95628f 100644
--- a/Dwarf Fortress/raw/objects/entity_antmen.txt	
+++ b/Dwarf Fortress/raw/objects/entity_antmen.txt	
@@ -2,8 +2,9 @@ entity_antmen
 
 YESANTMEN[OBJECT:ENTITY]
 
-YESANTMEN[ENTITY:ANTMEN]
+YESANTMEN[ENTITY:ANTMEN][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[LAYER_LINKED]
+	YESADVANT[INDIV_CONTROLLABLE]
 [CREATURE:ANTMAN][BABYSNATCHER]
 	[TRANSLATION:CZECH]
 	[WEAPON:ITEM_WEAPON_TRIDENT:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_automaton.txt b/Dwarf Fortress/raw/objects/entity_automaton.txt
index 47618b7f..81976fa5 100644
--- a/Dwarf Fortress/raw/objects/entity_automaton.txt	
+++ b/Dwarf Fortress/raw/objects/entity_automaton.txt	
@@ -2,9 +2,9 @@ entity_automaton
 
 	YESAUTOMATON[OBJECT:ENTITY]
 
-	YESAUTOMATON[ENTITY:AUTOMATON]
+	YESAUTOMATON[ENTITY:AUTOMATON][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	YESAUTOMATON[CREATURE:AUTOMATON][BABYSNATCHER]
-	[INDIV_CONTROLLABLE]
+	YESADVAUT[INDIV_CONTROLLABLE]
 
 [CLOTHING]
 	[DIGGER:ITEM_WEAPON_PICK:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_default.txt b/Dwarf Fortress/raw/objects/entity_default.txt
index afe4d91b..07efb9cf 100644
--- a/Dwarf Fortress/raw/objects/entity_default.txt	
+++ b/Dwarf Fortress/raw/objects/entity_default.txt	
@@ -2,11 +2,19 @@ entity_default
 
 [OBJECT:ENTITY]
 
-YESPLAYABLED[ENTITY:MOUNTAIN]
+YESPLAYABLED[ENTITY:MOUNTAIN][PERMITTED_REACTION:MATERIALS_DEFAULT]
+YESADVD[INDIV_CONTROLLABLE]
+!NOCIVD!CIV_CONTROLLABLE]--- is toggled when you play other races.
+[ADVENTURE_TIER:3]
+
 !BABYSNATCHER!
 
 [PERMITTED_REACTION:MAKE_MEDICINE]
 
+PERMITTED_REACTION:BREW_POT
+PERMITTED_REACTION:BREW_MAGMA
+PERMITTED_REACTION:BREW_WATER
+
 [PERMITTED_REACTION:RESEARCH_IGNORE] 
 [PERMITTED_BUILDING:TOWNPORTAL]
 [PERMITTED_REACTION:BLUEPRINT_townportal_ONE]
@@ -87,6 +95,8 @@ YESPLAYABLED[ENTITY:MOUNTAIN]
 [PERMITTED_REACTION:PRAY_GLASS]
 [PERMITTED_REACTION:PRAY_RAIN1]
 [PERMITTED_REACTION:PRAY_RAIN2]
+[PERMITTED_REACTION:PRAY_GLASS_SOUL]
+[PERMITTED_REACTION:PRAY_RAIN1_SOUL]
 
 [PERMITTED_REACTION:WOOD_PLANKS_1]
 [PERMITTED_REACTION:WOOD_PLANKS_2]
@@ -295,11 +305,12 @@ YESWOODCRAFTER[PERMITTED_BUILDING:WOODCUTTER]
 YESTORCHBEARER[PERMITTED_BUILDING:TORCHBEARER_STATUE]
 YESGEMOFLIGHT[PERMITTED_BUILDING:GLOWING_ORB]
 
-[PERMITTED_REACTION:LIGHT_WOOD_FIRE_INFO]
-[PERMITTED_REACTION:LIGHT_WOOD_BRAZIER_FIRE]
-[PERMITTED_REACTION:LIGHT_TORCH_FIRE]
-[PERMITTED_REACTION:LIGHT_WOOD_FIRE]
-[PERMITTED_REACTION:FIRE_WARNING]
+!!! need light emitting items !!!
+PERMITTED_REACTION:LIGHT_WOOD_FIRE_INFO
+PERMITTED_REACTION:LIGHT_WOOD_BRAZIER_FIRE
+PERMITTED_REACTION:LIGHT_TORCH_FIRE
+PERMITTED_REACTION:LIGHT_WOOD_FIRE
+PERMITTED_REACTION:FIRE_WARNING
 
 [PERMITTED_REACTION:TARPITCH_BITUM]
 [PERMITTED_REACTION:TARPITCH_LIGNITE]
@@ -969,43 +980,30 @@ YESMILLSTONE[PERMITTED_REACTION:CRAFT_GRIND_CRUSH_WEAPONRACK]
 [PERMITTED_REACTION:NICKEL_MAKING_BATCH]
 
 [PERMITTED_REACTION:CRAFT_GEM_WEAPON_HEAD]
-[PERMITTED_REACTION:BONE_FAKE_BONE_WEAPON_HEAD]
 [PERMITTED_REACTION:BONE_WEAPON_HEAD]
 [PERMITTED_REACTION:CRAFT_GEM_BLADE_END]
-[PERMITTED_REACTION:BONE_FAKE_BONE_BLADE_END]
 [PERMITTED_REACTION:BONE_BLADE_END]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_HILT]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_HILT]
 [PERMITTED_REACTION:BONE_TOOL_HILT]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_JUG]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_JUG]
 [PERMITTED_REACTION:BONE_TOOL_JUG]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_PIPE]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_PIPE]
 [PERMITTED_REACTION:BONE_TOOL_PIPE]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_CANDELABRA]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_CANDELABRA]
 [PERMITTED_REACTION:BONE_TOOL_CANDELABRA]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_BRAZIER]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_BRAZIER]
 [PERMITTED_REACTION:BONE_TOOL_BRAZIER]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_FIREPLACE]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_FIREPLACE]
 [PERMITTED_REACTION:BONE_TOOL_FIREPLACE]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_MORTAR]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_MORTAR]
 [PERMITTED_REACTION:BONE_TOOL_MORTAR]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_PESTLE]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_PESTLE]
 [PERMITTED_REACTION:BONE_TOOL_PESTLE]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_NEXT_BOX]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_NEXT_BOX]
 [PERMITTED_REACTION:BONE_TOOL_NEXT_BOX]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_LARGE_POT]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_LARGE_POT]
 [PERMITTED_REACTION:BONE_TOOL_LARGE_POT]
 [PERMITTED_REACTION:CRAFT_GEM_TOOL_HIVE]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_HIVE]
 [PERMITTED_REACTION:BONE_TOOL_HIVE]
 
 [PERMITTED_REACTION:CLOTH_WRITING_WOOL]
@@ -1086,48 +1084,11 @@ PERMITTED_REACTION:FORCE_CARAVAN_ELF_M
 
 new bone stuff
 YESMILLSTONE[PERMITTED_REACTION:MAKE_BONEMEAL_BONE_FAKE]
-[PERMITTED_REACTION:TRAIN_BONESETTING_APO_HELM_BONE_FAKE]
-[PERMITTED_REACTION:STUD_LEATHER_BONE_BONE_FAKE]
-[PERMITTED_REACTION:SACRIFICE_BONES_HELM_BONE_FAKE]
-[PERMITTED_REACTION:SLEEP_SETB_HELM_BONE_FAKE]
-[PERMITTED_REACTION:SLEEP_SETB2_HELM_BONE_FAKE]
-[PERMITTED_REACTION:DINING_SETB_HELM_BONE_FAKE]
-[PERMITTED_REACTION:TOMB_SETB_HELM_BONE_FAKE]
-[PERMITTED_REACTION:LIVING_SETB_HELM_BONE_FAKE]
 [PERMITTED_REACTION:MAKE_IRONBONE_BONE_FAKE]
-[PERMITTED_REACTION:BONE_FAKE_BONE_ARMORSTAND]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_BALLISTA]
-[PERMITTED_REACTION:BONE_FAKE_BED_BONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BLOCK_BONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_ARMOR_BONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_SHIELD]
-[PERMITTED_REACTION:BONE_FAKE_BONE_CABINET]
-[PERMITTED_REACTION:BONE_FAKE_BONE_CAGE]
-[PERMITTED_REACTION:BONE_FAKE_BONE_CHEST]
-[PERMITTED_REACTION:BONE_FAKE_BONE_COFFIN]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_CROWN_BONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_DAGGER_BONE]
-[PERMITTED_REACTION:BONE_FAKE_BONE_DOOR]
-[PERMITTED_REACTION:BONE_FAKE_BONE_FLOODGATE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_GRATE_BONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_HATCH_COVER_BONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_SHIELD]
-[PERMITTED_REACTION:BONE_FAKE_MECHANISMS_BONE]
-[PERMITTED_REACTION:BONE_FAKE_CRAFT_BONE_MILLSTONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_RATTLE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_SHIELD]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_SLAB_BONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_SPEAR_BONE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_SPIKE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_STATUE]
-[PERMITTED_REACTION:BONE_FAKE_BONE_TABLE]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_CHAIR_BONE]
-[PERMITTED_REACTION:BONE_FAKE_CRAFT_BONE_QUERN]
-[PERMITTED_REACTION:BONE_FAKE_BONE_WEAPONRACK]
 
 [PERMITTED_REACTION:DWARF]--- for traders only. Has no building.
 
-	YESCIVD[CIV_CONTROLLABLE]--- is toggled when you play other races.
+	
 	[CREATURE:DWARF]
 	NOENGLISH[TRANSLATION:DWARF_M]--- is toggled when you play with dwarvish/english language
 	[USE_ANIMAL_PRODUCTS]
@@ -1190,7 +1151,6 @@ WEAPON:ITEM_WEAPON_AXE_GREAT:FORCED axe
 
 
 
-	[HELM:BONE_FAKE:FORCED] => dont ask.
 
 //chaimail
 [ARMOR:ITEM_ARMOR_MAIL_SHIRT:FORCED]
@@ -1430,7 +1390,7 @@ WEAPON:ITEM_WEAPON_AXE_GREAT:FORCED axe
 	[ITEM_IMPROVEMENT_MODIFIER:RINGS_HANGING:64]
 	[ITEM_IMPROVEMENT_MODIFIER:BANDS:384]
 	[ITEM_IMPROVEMENT_MODIFIER:SPIKES:384]
-	[ADVENTURE_TIER:3]
+	
 	[FRIENDLY_COLOR:1:0:1]
 	[DEFAULT_SITE_TYPE:CAVE_DETAILED]
 	[LIKES_SITE:CAVE_DETAILED]
@@ -1750,8 +1710,10 @@ monastery monestary
 YESMONASTERY[PERMITTED_BUILDING:MONASTERY]
 [PERMITTED_REACTION:MMONASTERY_SKILL_DWARF]
 [PERMITTED_REACTION:JOIN_GUILD_PRIEST]
-[PERMITTED_REACTION:MAKE_CEREMONIAL_STATUE] => Maybe change it?
-[PERMITTED_REACTION:MAKE_CEREMONIAL_TOTEM] => Maybe change it?
+[PERMITTED_REACTION:JOIN_GUILD_PRIEST3]
+[PERMITTED_REACTION:JOIN_GUILD_PRIEST4]
+[PERMITTED_REACTION:JOIN_GUILD_PRIEST5]
+[PERMITTED_REACTION:JOIN_GUILD_PRIEST2]
 #######################################################################
 title
 	[PERMITTED_BUILDING:WORKSHOPS]
@@ -2959,6 +2921,18 @@ shrine of armok
 #######################################################################
 altar of armok
 	YESALTAR[PERMITTED_BUILDING:ARMOK_ALTAR]
+
+[PERMITTED_REACTION:PRAY_COTTON_SOUL]
+[PERMITTED_REACTION:PRAY_WOOL_SOUL]
+[PERMITTED_REACTION:PRAY_SILK_SOUL]
+[PERMITTED_REACTION:PRAY_WATER_SOUL]
+[PERMITTED_REACTION:PRAY_GEM_SOUL]
+[PERMITTED_REACTION:PRAY_SOUL]
+[PERMITTED_REACTION:PRAY_METAL_SOUL]
+[PERMITTED_REACTION:PRAY_MUSHROOM_SOUL]
+[PERMITTED_REACTION:PRAY_BOOZE_SOUL]
+
+
 [PERMITTED_REACTION:DRY_HEART] => sacrifice heart.
 [PERMITTED_REACTION:SACRIFICE]
 [PERMITTED_REACTION:SACRIFICE_LIFE]
@@ -2971,23 +2945,28 @@ altar of armok
 #######################################################################
 temple of armok
 	YESTEMPLE[PERMITTED_BUILDING:ARMOK_TEMPLE]
-[PERMITTED_REACTION:CLEANS_BLOODSTEEL]
-[PERMITTED_REACTION:RESEARCH_GOLEM] => golem heart in temple
 [PERMITTED_REACTION:SACRIFICE_ARMOR]
 [PERMITTED_REACTION:SACRIFICE_WEAPON]
+[PERMITTED_REACTION:SACRIFICE_HELM]
+[PERMITTED_REACTION:SACRIFICE_GREAVES]
+[PERMITTED_REACTION:SACRIFICE_GLOVES]
+[PERMITTED_REACTION:SACRIFICE_BOOTS]
+[PERMITTED_REACTION:SACRIFICE_SHIELD]
 [PERMITTED_REACTION:SACRIFICE_LIFE_MAGMA]
 [PERMITTED_REACTION:SACRIFICE_GUARDIAN]
-[PERMITTED_REACTION:SACRIFICE_WARLOCK_RING]
-[PERMITTED_REACTION:SACRIFICE_WARLOCK_FETISH]
-[PERMITTED_REACTION:SACRIFICE_WARLOCK_AMULET]
-[PERMITTED_REACTION:SACRIFICE_WARLOCK_TAROT]
-[PERMITTED_REACTION:SACRIFICE_WARLOCK_DEMONIC]
+[PERMITTED_REACTION:WARD_CULT]
+[PERMITTED_REACTION:WARD_CULT2]
+#######################################################################
+oracle of armok
+	YESTEMPLE[PERMITTED_BUILDING:ARMOK_ORACLE]
+
 [PERMITTED_REACTION:SACRIFICE_BLESSING]
 [PERMITTED_REACTION:SACRIFICE_COURAGE]	
 [PERMITTED_REACTION:SACRIFICE_EMOTION]
-[PERMITTED_REACTION:WARD_CULT]
-[PERMITTED_REACTION:WARD_CULT2]
 [PERMITTED_REACTION:COLOSSUS]
+[PERMITTED_REACTION:BLESS_SILVER]
+[PERMITTED_REACTION:CURSE_SILVER]
+
 #######################################################################
 title
 	[PERMITTED_BUILDING:MAGIC]
@@ -3594,15 +3573,6 @@ fletcher
 [PERMITTED_REACTION:MAKE_JAVELINS_TWO_BONE_D]
 [PERMITTED_REACTION:MAKE_JAVELINS_THREE_BONE_D]
 
-[PERMITTED_REACTION:BONE_FAKE_MAKE_ARROWS_ONE_BONE_D]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_ARROWS_TWO_BONE_D]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_ARROWS_THREE_BONE_D]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BOLTS_ONE_BONE_D]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BOLTS_TWO_BONE_D]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_BOLTS_THREE_BONE_D]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_JAVELINS_ONE_BONE_D]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_JAVELINS_TWO_BONE_D]
-[PERMITTED_REACTION:BONE_FAKE_MAKE_JAVELINS_THREE_BONE_D]
 #######################################################################
 toolmaker precision toolmaker
 YESTOOLMAKER[PERMITTED_BUILDING:TOOLMAKER]
@@ -5393,16 +5363,16 @@ YESBIOLOGIST[PERMITTED_BUILDING:BIOLOGISTS_LAB]
 [PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_TWO]
 [PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_FIVE]
 [PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_THREE]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_ONE]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FOUR]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_TWO]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FIVE]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_THREE]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_ONE]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FOUR]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_TWO]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FIVE]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_THREE]
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_ONE
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FOUR
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_TWO
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FIVE
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_THREE
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_ONE
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FOUR
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_TWO
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FIVE
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_THREE
 [PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_ONE]
 [PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_FOUR]
 [PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_TWO]
@@ -5463,16 +5433,16 @@ YESBIOLOGIST[PERMITTED_BUILDING:BIOLOGISTS_LAB]
 [PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_THREE_SUCCESS]
 [PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_FOUR_SUCCESS]
 [PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_FIVE_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_ONE_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_TWO_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_THREE_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FOUR_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FIVE_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_ONE_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_TWO_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_THREE_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FOUR_SUCCESS]
-[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FIVE_SUCCESS]
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_ONE_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_TWO_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_THREE_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FOUR_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FIVE_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_ONE_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_TWO_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_THREE_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FOUR_SUCCESS
+PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FIVE_SUCCESS
 [PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_ONE_SUCCESS]
 [PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_TWO_SUCCESS]
 [PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_THREE_SUCCESS]
@@ -5565,8 +5535,8 @@ YESWOR[PERMITTED_REACTION:FIREWOOD_START]
 	[ETHIC:THEFT:PUNISH_SERIOUS]
 	[ETHIC:ASSAULT:PUNISH_SERIOUS]
 	[ETHIC:SLAVERY:PUNISH_CAPITAL]
-   [ETHIC:EAT_SAPIENT_OTHER:UNTHINKABLE]
-   [ETHIC:EAT_SAPIENT_KILL:UNTHINKABLE]
+   [ETHIC:EAT_SAPIENT_OTHER:ACCEPTABLE]=> needed for souls, was UNTHINKABLE
+   [ETHIC:EAT_SAPIENT_KILL:ACCEPTABLE]=> needed for souls, was UNTHINKABLE
    [ETHIC:MAKE_TROPHY_SAME_RACE:ACCEPTABLE]
    [ETHIC:MAKE_TROPHY_SAPIENT:ACCEPTABLE]
    [ETHIC:MAKE_TROPHY_ANIMAL:ACCEPTABLE]
diff --git a/Dwarf Fortress/raw/objects/entity_drow.txt b/Dwarf Fortress/raw/objects/entity_drow.txt
index 3b9bbada..b047b24a 100644
--- a/Dwarf Fortress/raw/objects/entity_drow.txt	
+++ b/Dwarf Fortress/raw/objects/entity_drow.txt	
@@ -1,7 +1,9 @@
 entity_drow
 
 YESDROW[OBJECT:ENTITY]
-[ENTITY:DROW]
+[ENTITY:DROW][PERMITTED_REACTION:MATERIALS_DEFAULT]
+
+YESADVDROW[INDIV_CONTROLLABLE]
 	[CREATURE:DROW]!BABYSNATCHER!
 	[TRANSLATION:DROW]
 [WANDERER]
diff --git a/Dwarf Fortress/raw/objects/entity_drow_evil.txt b/Dwarf Fortress/raw/objects/entity_drow_evil.txt
index 8fafe9fd..486b52fd 100644
--- a/Dwarf Fortress/raw/objects/entity_drow_evil.txt	
+++ b/Dwarf Fortress/raw/objects/entity_drow_evil.txt	
@@ -11,7 +11,8 @@ entity_drow_evil
 #####
 # Changed some of the Drow weapons into closest Orcish counterpart
 #
-[ENTITY:DROW_EVIL]
+[ENTITY:DROW_EVIL][PERMITTED_REACTION:MATERIALS_DEFAULT]
+YESADVDROW_EVIL[INDIV_CONTROLLABLE]
 	[CREATURE:DROW_EVIL][BABYSNATCHER]
 	[TRANSLATION:DROW]
 [WANDERER]
diff --git a/Dwarf Fortress/raw/objects/entity_dwarf_evil.txt b/Dwarf Fortress/raw/objects/entity_dwarf_evil.txt
index d904bf8c..330910af 100644
--- a/Dwarf Fortress/raw/objects/entity_dwarf_evil.txt	
+++ b/Dwarf Fortress/raw/objects/entity_dwarf_evil.txt	
@@ -13,9 +13,11 @@ entity_dwarf_evil
 # Remove a number (not all) swords, thrown, and 2H weapons
 # Added ITEM_WEAPON_AUXILLA_KIT and ITEM_WEAPON_LEGION_KIT
 # Profession names
+[ENTITY:MOUNTAIN_EVIL][PERMITTED_REACTION:MATERIALS_DEFAULT]
+
+YESADVD_EVIL[INDIV_CONTROLLABLE]
 	[ARMOR:ITEM_ARMOR_SHIRT:FORCED]
 	[PANTS:ITEM_PANTS_PANTS:FORCED]
-[ENTITY:MOUNTAIN_EVIL]
 	[CREATURE:DWARF_EVIL][BABYSNATCHER]
 	[TRANSLATION:DWARF_M]
 	[USE_ANIMAL_PRODUCTS]
diff --git a/Dwarf Fortress/raw/objects/entity_elf.txt b/Dwarf Fortress/raw/objects/entity_elf.txt
index 02946f13..6b9cff13 100644
--- a/Dwarf Fortress/raw/objects/entity_elf.txt	
+++ b/Dwarf Fortress/raw/objects/entity_elf.txt	
@@ -3,8 +3,9 @@ entity_elf
 YESELFRACE[OBJECT:ENTITY]
 
 
-[ENTITY:FOREST]
+[ENTITY:FOREST][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[CREATURE:ELF]!BABYSNATCHER!
+	YESADVELF[INDIV_CONTROLLABLE]
 	[TRANSLATION:ELF]
 	[WEAPON:ITEM_WEAPON_ELF1:FORCED]
 	[WEAPON:ITEM_WEAPON_ELF2:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_elf_evil.txt b/Dwarf Fortress/raw/objects/entity_elf_evil.txt
index f7f0ad29..79148070 100644
--- a/Dwarf Fortress/raw/objects/entity_elf_evil.txt	
+++ b/Dwarf Fortress/raw/objects/entity_elf_evil.txt	
@@ -12,9 +12,10 @@ entity_elf_evil
 # Small tweaks to weapons & armor for a more nomadic/ashland elf feel rather than silvans
 
 
-[ENTITY:FOREST_EVIL]
+[ENTITY:FOREST_EVIL][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[CREATURE:ELF_EVIL][BABYSNATCHER]
 	[TRANSLATION:ELF]
+	YESADVELF_EVIL[INDIV_CONTROLLABLE]
 [WEAPON:ITEM_WEAPON_DAGGER_LARGE]
 
 	[ARMOR:ITEM_ARMOR_SHIRT:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_frost_giant.txt b/Dwarf Fortress/raw/objects/entity_frost_giant.txt
index bc0b9e24..094380d6 100644
--- a/Dwarf Fortress/raw/objects/entity_frost_giant.txt	
+++ b/Dwarf Fortress/raw/objects/entity_frost_giant.txt	
@@ -3,15 +3,15 @@ entity_frost_giant
 YESFROSTGIANT[OBJECT:ENTITY]
 
 
-[ENTITY:FROST_GIANT]
-	[INDIV_CONTROLLABLE]
+[ENTITY:FROST_GIANT][PERMITTED_REACTION:MATERIALS_DEFAULT]
+	
 	YESFROSTGIANT[CREATURE:FROST_GIANT]
 	[TRANSLATION:FINNISH]
 [USE_CAVE_ANIMALS]
 [USE_EVIL_ANIMALS]
 [BABYSNATCHER]
 		[DIGGER:ITEM_WEAPON_PICK]
-
+YESADVFROST_GIANT[INDIV_CONTROLLABLE]
 [WEAPON:ITEM_WEAPON_HALBERD:FORCED]
 [WEAPON:ITEM_WEAPON_SWORD_HANDER_ZWEI:FORCED]
 [WEAPON:ITEM_WEAPON_MAUL:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_gnome.txt b/Dwarf Fortress/raw/objects/entity_gnome.txt
index 41acc8e5..d3f1d064 100644
--- a/Dwarf Fortress/raw/objects/entity_gnome.txt	
+++ b/Dwarf Fortress/raw/objects/entity_gnome.txt	
@@ -1,7 +1,8 @@
 entity_gnome
 
 YESGNOME[OBJECT:ENTITY]
-[ENTITY:GNOMES]
+[ENTITY:GNOMES][PERMITTED_REACTION:MATERIALS_DEFAULT]
+YESADVGNOMES[INDIV_CONTROLLABLE]
 	[CREATURE:GNOME_CIV]!BABYSNATCHER!
 	[TRANSLATION:GNOME]
 	[DIGGER:ITEM_WEAPON_PICK]
diff --git a/Dwarf Fortress/raw/objects/entity_goblin.txt b/Dwarf Fortress/raw/objects/entity_goblin.txt
index 1f39a738..076e604a 100644
--- a/Dwarf Fortress/raw/objects/entity_goblin.txt	
+++ b/Dwarf Fortress/raw/objects/entity_goblin.txt	
@@ -2,10 +2,11 @@ entity_goblin
 
 YESGOBLIN[OBJECT:ENTITY]
 
-YESGOBLIN[ENTITY:EVIL]
+YESGOBLIN[ENTITY:EVIL][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[CREATURE:GOBLIN][BABYSNATCHER]
 	[TRANSLATION:GOBLIN]
 	[AMBUSHER]
+	YESADVGOBLIN[INDIV_CONTROLLABLE]
 	[DIGGER:ITEM_WEAPON_PICK]
 [AMMO:ITEM_AMMO_ARROWS_BODKIN:COMMON]
 [AMMO:ITEM_AMMO_ARROWS:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_gremlin.txt b/Dwarf Fortress/raw/objects/entity_gremlin.txt
index 91a56efc..10cf9ebd 100644
--- a/Dwarf Fortress/raw/objects/entity_gremlin.txt	
+++ b/Dwarf Fortress/raw/objects/entity_gremlin.txt	
@@ -1,12 +1,12 @@
 entity_gremlin
 
-YESGREMLIN[OBJECT:ENTITY]
+!NOGREMLIN!OBJECT:ENTITY]
 
-YESGREMLIN[ENTITY:TROUBLE_MAKERS]
+YESGREMLIN[ENTITY:TROUBLE_MAKERS][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[LAYER_LINKED]
 	[CREATURE:GREMLIN][BABYSNATCHER]
 	[TRANSLATION:SKAVEN]
-
+	YESADVGREMLIN[INDIV_CONTROLLABLE]
 	[WEAPON:ITEM_WEAPON_SPEAR:FORCED]
 	[WEAPON:ITEM_WEAPON_BOW:FORCED]
 	[AMMO:ITEM_AMMO_ARROWS_BODKIN:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_human.txt b/Dwarf Fortress/raw/objects/entity_human.txt
index 1bf608b2..dc127eab 100644
--- a/Dwarf Fortress/raw/objects/entity_human.txt	
+++ b/Dwarf Fortress/raw/objects/entity_human.txt	
@@ -1,8 +1,8 @@
 entity_human
 
 YESHUMANRACE[OBJECT:ENTITY]
-[ENTITY:PLAINS]
-	[INDIV_CONTROLLABLE]
+[ENTITY:PLAINS][PERMITTED_REACTION:MATERIALS_DEFAULT]
+	YESADVHUMAN[INDIV_CONTROLLABLE]
 	[CREATURE:HUMAN]!BABYSNATCHER!
 	[TRANSLATION:HUMAN]
 	[DIGGER:ITEM_WEAPON_PICK]
diff --git a/Dwarf Fortress/raw/objects/entity_human_evil.txt b/Dwarf Fortress/raw/objects/entity_human_evil.txt
index 1721aedc..234084c3 100644
--- a/Dwarf Fortress/raw/objects/entity_human_evil.txt	
+++ b/Dwarf Fortress/raw/objects/entity_human_evil.txt	
@@ -11,9 +11,10 @@ entity_human_evil
 #####
 # Gave more Pirate/bandit gear and less Paladin heavy arms & armor
 #####
-[ENTITY:PLAINS_EVIL]
+[ENTITY:PLAINS_EVIL][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[CREATURE:HUMAN_EVIL][BABYSNATCHER]
 	[TRANSLATION:HUMAN]
+	YESADVHUMAN_EVIL[INDIV_CONTROLLABLE]
 	[DIGGER:ITEM_WEAPON_PICK]
 		[ARMOR:ITEM_ARMOR_SHIRT:FORCED]
 	[PANTS:ITEM_PANTS_PANTS:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_kobold.txt b/Dwarf Fortress/raw/objects/entity_kobold.txt
index 6a1ad9dc..3bc3b990 100644
--- a/Dwarf Fortress/raw/objects/entity_kobold.txt	
+++ b/Dwarf Fortress/raw/objects/entity_kobold.txt	
@@ -2,8 +2,9 @@ entity_kobold
 
 YESKOBOLD[OBJECT:ENTITY]
 
-YESKOBOLD[ENTITY:SKULKING]
+YESKOBOLD[ENTITY:SKULKING][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[CREATURE:KOBOLD][BABYSNATCHER]
+	YESADVKOBOLD[INDIV_CONTROLLABLE]
 	[WEAPON:ITEM_WEAPON_SWORD_SHORT:UNCOMMON]
 	[WEAPON:ITEM_WEAPON_SPEAR:COMMON]
 	[WEAPON:ITEM_WEAPON_CROSSBOW:COMMON]
diff --git a/Dwarf Fortress/raw/objects/entity_kobold_camp.txt b/Dwarf Fortress/raw/objects/entity_kobold_camp.txt
index d62040eb..7759ccf5 100644
--- a/Dwarf Fortress/raw/objects/entity_kobold_camp.txt	
+++ b/Dwarf Fortress/raw/objects/entity_kobold_camp.txt	
@@ -1,13 +1,12 @@
 entity_kobold_camp
 
-!NOPLAYABLEK!OBJECT:ENTITY]
+!NOPLAYABLEK![OBJECT:ENTITY]
 
-[ENTITY:KOBOLD_CAMP]
+[ENTITY:KOBOLD_CAMP][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[CREATURE:KOBOLD_CAMP]!BABYSNATCHER!
 	[TRANSLATION:KOBOLD_CAMP]
 	!NOCIVK!CIV_CONTROLLABLE]
-	[INDIV_CONTROLLABLE]
-	[ADVENTURE_TIER:4]
+	YESADVKOBOLD_CAMP[INDIV_CONTROLLABLE]
 
 [WEAPON:ITEM_WEAPON_DAGGER_LARGE:FORCED]
 
@@ -463,7 +462,6 @@ YESCRAFTSMAN[PERMITTED_REACTION:MAKE_CANDLE_WAX_ORC]
 [PERMITTED_REACTION:PROCESS_NATIVE_PLATINUM]
 
 
-	[HELM:BONE_FAKE:FORCED] => dont ask.
 
 
 [PERMITTED_REACTION:COMPACT_PEAT_TO_FUEL]
diff --git a/Dwarf Fortress/raw/objects/entity_orc.txt b/Dwarf Fortress/raw/objects/entity_orc.txt
index fae6747a..33ba0764 100644
--- a/Dwarf Fortress/raw/objects/entity_orc.txt	
+++ b/Dwarf Fortress/raw/objects/entity_orc.txt	
@@ -2,8 +2,8 @@ entity_orc
 
 YESORC[OBJECT:ENTITY]
 
-[ENTITY:ORC]
-	[INDIV_CONTROLLABLE]
+[ENTITY:ORC][PERMITTED_REACTION:MATERIALS_DEFAULT]
+	YESADVORC[INDIV_CONTROLLABLE]
 	YESORC[CREATURE:ORC]
 	[TRANSLATION:GOBLIN]
 	[BABYSNATCHER]
diff --git a/Dwarf Fortress/raw/objects/entity_orcfort_taigaorc.txt b/Dwarf Fortress/raw/objects/entity_orcfort_taigaorc.txt
index 1105783e..93f2c29a 100644
--- a/Dwarf Fortress/raw/objects/entity_orcfort_taigaorc.txt	
+++ b/Dwarf Fortress/raw/objects/entity_orcfort_taigaorc.txt	
@@ -1,14 +1,14 @@
 entity_orcfort_taigaorc
 
-!NOPLAYABLEO!OBJECT:ENTITY]
+!NOPLAYABLEO![OBJECT:ENTITY]
 
 
-[ENTITY:TAIGA]
+[ENTITY:TAIGA][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	!NOCIVO!CIV_CONTROLLABLE]
 	[CREATURE:ORC_TAIGA]
 	[TRANSLATION:BLACKSPEECH]
 	[BABYSNATCHER]
-
+YESADVORC_TAIGA[INDIV_CONTROLLABLE]
 	[DIGGER:ITEM_WEAPON_PICK:FORCED]	
 	[BUILDS_OUTDOOR_FORTIFICATIONS]
 	[BUILDS_OUTDOOR_TOMBS]
@@ -1533,7 +1533,6 @@ YESTANNER[PERMITTED_REACTION:STUD_LEATHER]
 YESTANNER[PERMITTED_REACTION:STUD_LEATHER_TOOTH]
 YESTANNER[PERMITTED_REACTION:STUD_LEATHER_HORN]
 YESTANNER[PERMITTED_REACTION:STUD_LEATHER_BONE]
-YESTANNER[PERMITTED_REACTION:STUD_LEATHER_BONE_BONE_FAKE]
 YESTANNER[PERMITTED_REACTION:LAMELLAR]
 
 YESTANNER[PERMITTED_REACTION:UPGRADE_SCALE_ONE]
diff --git a/Dwarf Fortress/raw/objects/entity_troglodyte.txt b/Dwarf Fortress/raw/objects/entity_troglodyte.txt
index bb2a5f8b..b64fa82c 100644
--- a/Dwarf Fortress/raw/objects/entity_troglodyte.txt	
+++ b/Dwarf Fortress/raw/objects/entity_troglodyte.txt	
@@ -2,10 +2,11 @@ entity_troglodyte
 
 YESTROGLODYTE[OBJECT:ENTITY]
 
-[ENTITY:TROGS]
+[ENTITY:TROGS][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	[LAYER_LINKED]
 [CREATURE:TROGLODYTE][BABYSNATCHER]
 [TRANSLATION:RUSSIAN]
+YESADVTROG[INDIV_CONTROLLABLE]
 	[WEAPON:ITEM_WEAPON_HAMMER_WAR:FORCED]
 	[WEAPON:ITEM_WEAPON_MORNINGSTAR:FORCED]
 	[ARMOR:ITEM_ARMOR_BREASTPLATE:FORCED]
diff --git a/Dwarf Fortress/raw/objects/entity_warlock.txt b/Dwarf Fortress/raw/objects/entity_warlock.txt
index fb0624f7..1b5d37c3 100644
--- a/Dwarf Fortress/raw/objects/entity_warlock.txt	
+++ b/Dwarf Fortress/raw/objects/entity_warlock.txt	
@@ -3,9 +3,9 @@ entity_warlock
 
 YESWARLOCK[OBJECT:ENTITY]
 
-[ENTITY:WARLOCK]
+[ENTITY:WARLOCK][PERMITTED_REACTION:MATERIALS_DEFAULT]
 	YESWARLOCK[CREATURE:WARLOCK][BABYSNATCHER]
-	[INDIV_CONTROLLABLE]
+	YESADVWARLOCK[INDIV_CONTROLLABLE]
 	[TRANSLATION:ARABIC]
 	[DIGGER:ITEM_WEAPON_PICK]
 [RELIGION:PANTHEON]
diff --git a/Dwarf Fortress/raw/objects/reaction_masterwork.txt b/Dwarf Fortress/raw/objects/reaction_masterwork.txt
index 12eb00dd..b14d7e4a 100644
--- a/Dwarf Fortress/raw/objects/reaction_masterwork.txt	
+++ b/Dwarf Fortress/raw/objects/reaction_masterwork.txt	
@@ -14619,3 +14619,40 @@ For the Mercenaries
 	[REAGENT:large pot:1:TOOL:ITEM_TOOL_LARGE_POT:NONE:NONE][CONTAINS:hydraulic fluid][PRESERVE_REAGENT]
 
 
+[REACTION:MATERIAL_DEFAULT]
+	[NAME:####just for worldgen civs####]
+
+[REACTION:MATERIAL_WEAK]
+	[NAME:####just for worldgen civs####]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:GLASS_GREEN_WAR][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:SILVER][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:RUSTY_IRON][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:ROSE_GOLD][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:RHENAYAS_DARKLIGHT_IRON][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:IRON][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:COPPER][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:COBALT][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:BRONZE][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:BRASS][PRODUCT_DIMENSION:150]
+ 
+[REACTION:MATERIAL_NORMAL]
+	[NAME:####just for worldgen civs####]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:GLASS_CLEAR_WAR][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:STEEL][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:RUSTY_STEEL][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:METEORIC_IRON][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:STEEL_DROW][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:BLACK_BRONZE][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:BISMUTH_BRONZE][PRODUCT_DIMENSION:150]
+
+[REACTION:MATERIAL_STRONG]
+	[NAME:####just for worldgen civs####]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:GLASS_CRYSTAL_WAR][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:PATTERN_WOLFRAM][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:PATTERN_MITHRIL][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:PATTERN_COBALT][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:WOLFRAM][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:MAGMA_METAL][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:ORICHALCUM_ORC][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:MITHRIL][PRODUCT_DIMENSION:150]
+	[PRODUCT:100:1:BAR:NONE:INORGANIC:DEEPBRONZE][PRODUCT_DIMENSION:150]
\ No newline at end of file
diff --git a/Masterwork Dwarf Fortress.exe b/Masterwork Dwarf Fortress.exe
index 93baad71..103ad604 100644
Binary files a/Masterwork Dwarf Fortress.exe and b/Masterwork Dwarf Fortress.exe differ
diff --git a/Settings Source/MainForm.Designer.vb b/Settings Source/MainForm.Designer.vb
index 8b2ee3d2..e47e1d34 100644
--- a/Settings Source/MainForm.Designer.vb	
+++ b/Settings Source/MainForm.Designer.vb	
@@ -384,19 +384,35 @@ Partial Class MainForm
         Dim FileListManager82 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager82 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager85 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace41 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionList4 As MasterworkDwarfFortress.optionList = New MasterworkDwarfFortress.optionList()
         Dim FileListManager83 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
+        Dim ComboItem17 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem18 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem19 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem20 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem21 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem22 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem23 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem24 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem25 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem26 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem27 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem28 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem29 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem30 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem31 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem32 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
         Dim OptionManager83 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager86 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace42 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingleReplace41 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager84 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager84 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager87 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace43 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingleReplace42 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager85 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager85 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager88 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionBase1 As MasterworkDwarfFortress.optionBase = New MasterworkDwarfFortress.optionBase()
+        Dim OptionSingleReplace43 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager86 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager86 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager89 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
@@ -732,26 +748,26 @@ Partial Class MainForm
         Dim FileListManager169 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager169 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager172 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace127 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionMulti3 As MasterworkDwarfFortress.optionMulti = New MasterworkDwarfFortress.optionMulti()
         Dim FileListManager170 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager170 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager173 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace128 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim RawToken5 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim RawToken6 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim RawToken7 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim RawToken8 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim OptionSingleReplace127 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager171 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager171 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager174 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace129 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingleReplace128 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager172 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager172 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager175 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionMulti3 As MasterworkDwarfFortress.optionMulti = New MasterworkDwarfFortress.optionMulti()
+        Dim OptionSingleReplace129 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager173 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager173 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager176 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim RawToken5 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
-        Dim RawToken6 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
-        Dim RawToken7 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
-        Dim RawToken8 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
         Dim OptionSingleReplace130 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager174 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager174 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
@@ -896,30 +912,30 @@ Partial Class MainForm
         Dim FileListManager209 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager209 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager212 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace166 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionMulti4 As MasterworkDwarfFortress.optionMulti = New MasterworkDwarfFortress.optionMulti()
         Dim FileListManager210 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager210 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager213 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace167 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim RawToken9 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim RawToken10 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim OptionMulti5 As MasterworkDwarfFortress.optionMulti = New MasterworkDwarfFortress.optionMulti()
         Dim FileListManager211 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager211 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager214 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace168 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim RawToken11 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim RawToken12 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim OptionSingleReplace166 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager212 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager212 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager215 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionMulti4 As MasterworkDwarfFortress.optionMulti = New MasterworkDwarfFortress.optionMulti()
+        Dim OptionSingleReplace167 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager213 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager213 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager216 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim RawToken9 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
-        Dim RawToken10 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
-        Dim OptionMulti5 As MasterworkDwarfFortress.optionMulti = New MasterworkDwarfFortress.optionMulti()
+        Dim OptionSingleReplace168 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager214 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager214 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager217 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim RawToken11 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
-        Dim RawToken12 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
         Dim OptionSingleReplace169 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager215 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager215 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
@@ -928,28 +944,28 @@ Partial Class MainForm
         Dim FileListManager216 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager216 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager219 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace171 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionMulti6 As MasterworkDwarfFortress.optionMulti = New MasterworkDwarfFortress.optionMulti()
         Dim FileListManager217 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager217 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager220 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace172 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim RawToken13 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim RawToken14 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
+        Dim OptionSingleReplace171 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager218 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager218 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager221 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace173 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingleReplace172 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager219 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager219 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager222 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace174 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingleReplace173 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager220 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager220 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager223 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionMulti6 As MasterworkDwarfFortress.optionMulti = New MasterworkDwarfFortress.optionMulti()
+        Dim OptionSingleReplace174 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager221 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager221 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager224 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim RawToken13 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
-        Dim RawToken14 As MasterworkDwarfFortress.rawToken = New MasterworkDwarfFortress.rawToken()
         Dim OptionSingleReplace175 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager222 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager222 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
@@ -998,137 +1014,128 @@ Partial Class MainForm
         Dim FileListManager233 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager233 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager236 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace187 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingle38 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager234 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager234 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager237 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace188 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingle39 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager235 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager235 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager238 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace189 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingle40 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager236 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager236 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager239 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace190 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingle41 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager237 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager237 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager240 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle38 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle42 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager238 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager238 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager241 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle39 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle43 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager239 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager239 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager242 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle40 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle44 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager240 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager240 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager243 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle41 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle45 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager241 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager241 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager244 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle42 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle46 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager242 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager242 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager245 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle43 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingleReplace187 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager243 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager243 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager246 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle44 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle47 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager244 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager244 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager247 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle45 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle48 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager245 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager245 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager248 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle46 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle49 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager246 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager246 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager249 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace191 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingle50 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager247 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager247 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager250 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle47 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle51 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager248 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager248 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager251 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle48 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle52 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager249 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager249 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager252 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle49 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle53 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager250 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager250 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager253 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle50 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle54 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager251 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager251 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager254 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle51 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle55 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager252 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager252 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager255 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle52 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle56 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager253 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager253 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager256 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle53 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle57 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager254 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager254 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager257 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle54 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle58 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager255 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager255 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager258 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle55 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingleReplace188 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager256 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager256 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager259 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle56 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingleReplace189 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager257 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager257 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager260 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle57 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle59 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager258 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager258 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager261 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle58 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionSingle60 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
         Dim FileListManager259 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager259 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager262 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace192 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionList5 As MasterworkDwarfFortress.optionList = New MasterworkDwarfFortress.optionList()
         Dim FileListManager260 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
+        Dim ComboItem33 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem34 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem35 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
         Dim OptionManager260 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager263 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace193 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
+        Dim OptionSingleReplace190 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
         Dim FileListManager261 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
         Dim OptionManager261 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager264 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle59 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
+        Dim OptionList6 As MasterworkDwarfFortress.optionList = New MasterworkDwarfFortress.optionList()
         Dim FileListManager262 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
+        Dim ComboItem36 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem37 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
+        Dim ComboItem38 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
         Dim OptionManager262 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
         Dim OptionSettingManager265 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingle60 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
-        Dim FileListManager263 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
-        Dim OptionManager263 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
-        Dim OptionSettingManager266 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionSingleReplace194 As MasterworkDwarfFortress.optionSingleReplace = New MasterworkDwarfFortress.optionSingleReplace()
-        Dim FileListManager264 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
-        Dim OptionManager264 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
-        Dim OptionSettingManager267 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
-        Dim OptionList4 As MasterworkDwarfFortress.optionList = New MasterworkDwarfFortress.optionList()
-        Dim FileListManager265 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
-        Dim ComboItem17 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
-        Dim ComboItem18 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
-        Dim ComboItem19 As MasterworkDwarfFortress.comboItem = New MasterworkDwarfFortress.comboItem()
-        Dim OptionManager265 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
-        Dim OptionSettingManager268 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
         Dim OptionSingleFileReplace4 As MasterworkDwarfFortress.optionSingleFileReplace = New MasterworkDwarfFortress.optionSingleFileReplace()
         Dim ComboFileItem7 As MasterworkDwarfFortress.comboFileItem = New MasterworkDwarfFortress.comboFileItem()
         Dim ComboFileItem8 As MasterworkDwarfFortress.comboFileItem = New MasterworkDwarfFortress.comboFileItem()
@@ -1152,15 +1159,15 @@ Partial Class MainForm
         Dim ComboFileItem26 As MasterworkDwarfFortress.comboFileItem = New MasterworkDwarfFortress.comboFileItem()
         Dim ComboFileItem27 As MasterworkDwarfFortress.comboFileItem = New MasterworkDwarfFortress.comboFileItem()
         Dim ComboFileItem28 As MasterworkDwarfFortress.comboFileItem = New MasterworkDwarfFortress.comboFileItem()
-        Dim OptionSettingManager269 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
+        Dim OptionSettingManager266 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
         Dim OptionSingle61 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
-        Dim FileListManager266 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
-        Dim OptionManager266 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
-        Dim OptionSettingManager270 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
+        Dim FileListManager263 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
+        Dim OptionManager263 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
+        Dim OptionSettingManager267 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
         Dim OptionSingle62 As MasterworkDwarfFortress.optionSingle = New MasterworkDwarfFortress.optionSingle()
-        Dim FileListManager267 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
-        Dim OptionManager267 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
-        Dim OptionSettingManager271 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
+        Dim FileListManager264 As MasterworkDwarfFortress.fileListManager = New MasterworkDwarfFortress.fileListManager()
+        Dim OptionManager264 As MasterworkDwarfFortress.optionManager = New MasterworkDwarfFortress.optionManager()
+        Dim OptionSettingManager268 As MasterworkDwarfFortress.optionSettingManager = New MasterworkDwarfFortress.optionSettingManager()
         Me.ToolTipMaker = New System.Windows.Forms.ToolTip(Me.components)
         Me.lblChildCap = New System.Windows.Forms.Label()
         Me.btnUpdateSaves = New System.Windows.Forms.Button()
@@ -1251,12 +1258,9 @@ Partial Class MainForm
         Me.lblCivActive = New System.Windows.Forms.Label()
         Me.optBtnCivDwarves = New MasterworkDwarfFortress.optionSingleReplaceButton()
         Me.optBtnCivOrcs = New MasterworkDwarfFortress.optionSingleReplaceButton()
-        Me.optBtnPlayableDwarves = New MasterworkDwarfFortress.optionSingleReplaceButton()
-        Me.optBtnPlayableOrcs = New MasterworkDwarfFortress.optionSingleReplaceButton()
-        Me.optBtnPlayableKobolds = New MasterworkDwarfFortress.optionSingleReplaceButton()
         Me.optBtnCivKobolds = New MasterworkDwarfFortress.optionSingleReplaceButton()
         Me.lblCivBabySnatcher = New System.Windows.Forms.Label()
-        Me.lblCivPlayable = New System.Windows.Forms.Label()
+        Me.lblCivPlayableAdv = New System.Windows.Forms.Label()
         Me.lblCivMaterials = New System.Windows.Forms.Label()
         Me.lblCivSkills = New System.Windows.Forms.Label()
         Me.optBtnDrowRace = New MasterworkDwarfFortress.optionSingleReplaceButton()
@@ -1406,7 +1410,6 @@ Partial Class MainForm
         Me.optMultiHarderFarming = New MasterworkDwarfFortress.optionMultiButton()
         Me.optBtnHarderMining = New MasterworkDwarfFortress.optionSingleReplaceButton()
         Me.optBtnHarderLearning = New MasterworkDwarfFortress.optionSingleReplaceButton()
-        Me.optBtnHarderInvaders = New MasterworkDwarfFortress.optionSingleReplaceButton()
         Me.optBtnBodyguards = New MasterworkDwarfFortress.optionSingleReplaceButton()
         Me.optBtnSecrets = New MasterworkDwarfFortress.optionSingleReplaceButton()
         Me.optBtnDiseases = New MasterworkDwarfFortress.optionSingleReplaceButton()
@@ -1453,6 +1456,8 @@ Partial Class MainForm
         Me.optBtnHFS = New MasterworkDwarfFortress.optionSingleReplaceButton()
         Me.optMaskGoodAreas = New MasterworkDwarfFortress.optionFormatted()
         Me.optMaskEvilAreas = New MasterworkDwarfFortress.optionFormatted()
+        Me.optCbStartingLabors = New MasterworkDwarfFortress.optionComboBoxToken()
+        Me.lblPlayableFort = New System.Windows.Forms.Label()
         Me.lblHFSLevels = New System.Windows.Forms.Label()
         Me.lblSettingExplanation = New System.Windows.Forms.Label()
         Me.panCivTable = New MasterworkDwarfFortress.mwPanel()
@@ -1545,6 +1550,7 @@ Partial Class MainForm
         Me.lblWorldGenSelect = New System.Windows.Forms.Label()
         Me.grpWorldSettings = New MasterworkDwarfFortress.mwGroupBox()
         Me.lblPopCap = New System.Windows.Forms.Label()
+        Me.lblStartingLabor = New System.Windows.Forms.Label()
         Me.grpSaveSettings = New MasterworkDwarfFortress.mwGroupBox()
         Me.optCbAutoSave = New MasterworkDwarfFortress.optionComboBoxToken()
         Me.lblAutoSave = New System.Windows.Forms.Label()
@@ -1765,7 +1771,7 @@ Partial Class MainForm
         Me.lblChildCap.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.lblChildCap.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblChildCap.ForeColor = System.Drawing.SystemColors.Window
-        Me.lblChildCap.Location = New System.Drawing.Point(-8, 287)
+        Me.lblChildCap.Location = New System.Drawing.Point(-8, 284)
         Me.lblChildCap.Name = "lblChildCap"
         Me.lblChildCap.Size = New System.Drawing.Size(99, 23)
         Me.lblChildCap.TabIndex = 10
@@ -1779,7 +1785,7 @@ Partial Class MainForm
         Me.btnUpdateSaves.FlatAppearance.BorderSize = 0
         Me.btnUpdateSaves.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnUpdateSaves.ForeColor = System.Drawing.Color.White
-        Me.btnUpdateSaves.Location = New System.Drawing.Point(17, 280)
+        Me.btnUpdateSaves.Location = New System.Drawing.Point(17, 248)
         Me.btnUpdateSaves.Margin = New System.Windows.Forms.Padding(1)
         Me.btnUpdateSaves.Name = "btnUpdateSaves"
         Me.btnUpdateSaves.Size = New System.Drawing.Size(134, 27)
@@ -2944,7 +2950,7 @@ Partial Class MainForm
         Me.optNumPopCap.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.optNumPopCap.ForeColor = System.Drawing.Color.FromArgb(CType(CType(21,Byte),Integer), CType(CType(66,Byte),Integer), CType(CType(139,Byte),Integer))
         Me.optNumPopCap.Increment = New Decimal(New Integer() {20, 0, 0, 0})
-        Me.optNumPopCap.Location = New System.Drawing.Point(92, 263)
+        Me.optNumPopCap.Location = New System.Drawing.Point(92, 260)
         Me.optNumPopCap.Maximum = New Decimal(New Integer() {9999, 0, 0, 0})
         Me.optNumPopCap.Name = "optNumPopCap"
         FileListManager31.fileNames = Nothing
@@ -2967,7 +2973,7 @@ Partial Class MainForm
         '
         Me.optMaskChildBabyCap.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.optMaskChildBabyCap.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.optMaskChildBabyCap.Location = New System.Drawing.Point(92, 289)
+        Me.optMaskChildBabyCap.Location = New System.Drawing.Point(92, 286)
         Me.optMaskChildBabyCap.MaxLength = 9
         Me.optMaskChildBabyCap.Name = "optMaskChildBabyCap"
         Me.optMaskChildBabyCap.niceFormat = "####:####"
@@ -3309,7 +3315,7 @@ Partial Class MainForm
         Me.optCbPrintMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optCbPrintMode.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.optCbPrintMode.FormattingEnabled = true
-        Me.optCbPrintMode.Location = New System.Drawing.Point(72, 47)
+        Me.optCbPrintMode.Location = New System.Drawing.Point(17, 93)
         Me.optCbPrintMode.Name = "optCbPrintMode"
         FileListManager41.fileNames = Nothing
         OptionList3.fileManager = FileListManager41
@@ -3343,7 +3349,7 @@ Partial Class MainForm
         OptionList3.tokenName = "PRINT_MODE"
         OptionList3.updateTileSets = false
         Me.optCbPrintMode.options = OptionList3
-        Me.optCbPrintMode.Size = New System.Drawing.Size(91, 23)
+        Me.optCbPrintMode.Size = New System.Drawing.Size(134, 23)
         Me.optCbPrintMode.TabIndex = 3
         Me.ToolTipMaker.SetToolTip(Me.optCbPrintMode, "2D needed for TrueType, STANDARD needed for Rendermax.")
         '
@@ -3358,7 +3364,7 @@ Partial Class MainForm
         Me.optBtnSprites.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnSprites.Image = CType(resources.GetObject("optBtnSprites.Image"),System.Drawing.Image)
         Me.optBtnSprites.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.optBtnSprites.Location = New System.Drawing.Point(17, 128)
+        Me.optBtnSprites.Location = New System.Drawing.Point(17, 312)
         Me.optBtnSprites.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnSprites.Name = "optBtnSprites"
         FileListManager42.fileNames = Nothing
@@ -3390,7 +3396,7 @@ Partial Class MainForm
         Me.optBtnTruetype.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnTruetype.Image = CType(resources.GetObject("optBtnTruetype.Image"),System.Drawing.Image)
         Me.optBtnTruetype.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.optBtnTruetype.Location = New System.Drawing.Point(17, 99)
+        Me.optBtnTruetype.Location = New System.Drawing.Point(17, 283)
         Me.optBtnTruetype.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTruetype.Name = "optBtnTruetype"
         FileListManager43.fileNames = Nothing
@@ -3418,7 +3424,7 @@ Partial Class MainForm
         Me.optCbFonts.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optCbFonts.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.optCbFonts.FormattingEnabled = true
-        Me.optCbFonts.Location = New System.Drawing.Point(72, 72)
+        Me.optCbFonts.Location = New System.Drawing.Point(17, 142)
         Me.optCbFonts.Name = "optCbFonts"
         OptionSingleFileReplace3.fileName = "font.ttf"
         ComboFileItem5.display = "Default"
@@ -3432,7 +3438,7 @@ Partial Class MainForm
         OptionSettingManager46.settingName = "FONTS"
         OptionSingleFileReplace3.settingManager = OptionSettingManager46
         Me.optCbFonts.options = OptionSingleFileReplace3
-        Me.optCbFonts.Size = New System.Drawing.Size(91, 23)
+        Me.optCbFonts.Size = New System.Drawing.Size(134, 23)
         Me.optCbFonts.TabIndex = 5
         Me.ToolTipMaker.SetToolTip(Me.optCbFonts, "Switches from the standard font to a more Gothic looking font. Alpha Version.")
         '
@@ -3564,7 +3570,7 @@ Partial Class MainForm
         Me.optBtnEmbarkWarn.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnEmbarkWarn.Image = CType(resources.GetObject("optBtnEmbarkWarn.Image"),System.Drawing.Image)
         Me.optBtnEmbarkWarn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.optBtnEmbarkWarn.Location = New System.Drawing.Point(18, 29)
+        Me.optBtnEmbarkWarn.Location = New System.Drawing.Point(13, 41)
         Me.optBtnEmbarkWarn.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnEmbarkWarn.Name = "optBtnEmbarkWarn"
         FileListManager48.fileNames = Nothing
@@ -3589,7 +3595,7 @@ Partial Class MainForm
         '
         Me.optMaskEmbarkSize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.optMaskEmbarkSize.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.optMaskEmbarkSize.Location = New System.Drawing.Point(90, 59)
+        Me.optMaskEmbarkSize.Location = New System.Drawing.Point(85, 74)
         Me.optMaskEmbarkSize.MaxLength = 5
         Me.optMaskEmbarkSize.Name = "optMaskEmbarkSize"
         Me.optMaskEmbarkSize.niceFormat = "#:# (# is 1-16)"
@@ -3621,7 +3627,7 @@ Partial Class MainForm
         Me.optBtnTransformMsgs.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnTransformMsgs.Image = CType(resources.GetObject("optBtnTransformMsgs.Image"),System.Drawing.Image)
         Me.optBtnTransformMsgs.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.optBtnTransformMsgs.Location = New System.Drawing.Point(17, 19)
+        Me.optBtnTransformMsgs.Location = New System.Drawing.Point(17, 31)
         Me.optBtnTransformMsgs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTransformMsgs.Name = "optBtnTransformMsgs"
         OptionSingleReplace8.disabledValue = "]NOSTOPT"
@@ -3656,7 +3662,7 @@ Partial Class MainForm
         Me.optBtnDigStop.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnDigStop.Image = CType(resources.GetObject("optBtnDigStop.Image"),System.Drawing.Image)
         Me.optBtnDigStop.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.optBtnDigStop.Location = New System.Drawing.Point(17, 49)
+        Me.optBtnDigStop.Location = New System.Drawing.Point(17, 60)
         Me.optBtnDigStop.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDigStop.Name = "optBtnDigStop"
         OptionSingleReplace9.disabledValue = "]NOSTOP"
@@ -3688,7 +3694,7 @@ Partial Class MainForm
         Me.optBtnFrostGiants.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnFrostGiants.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnFrostGiants.Image = CType(resources.GetObject("optBtnFrostGiants.Image"),System.Drawing.Image)
-        Me.optBtnFrostGiants.Location = New System.Drawing.Point(104, 276)
+        Me.optBtnFrostGiants.Location = New System.Drawing.Point(104, 283)
         Me.optBtnFrostGiants.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFrostGiants.Name = "optBtnFrostGiants"
         OptionSingleReplace10.disabledValue = "!NOFROSTGIANT!"
@@ -3719,7 +3725,7 @@ Partial Class MainForm
         Me.optBtnWarlocks.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnWarlocks.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnWarlocks.Image = CType(resources.GetObject("optBtnWarlocks.Image"),System.Drawing.Image)
-        Me.optBtnWarlocks.Location = New System.Drawing.Point(104, 301)
+        Me.optBtnWarlocks.Location = New System.Drawing.Point(104, 308)
         Me.optBtnWarlocks.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnWarlocks.Name = "optBtnWarlocks"
         OptionSingleReplace11.disabledValue = "!NOWARLOCK!"
@@ -3750,7 +3756,7 @@ Partial Class MainForm
         Me.optBtnAutomatons.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnAutomatons.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnAutomatons.Image = CType(resources.GetObject("optBtnAutomatons.Image"),System.Drawing.Image)
-        Me.optBtnAutomatons.Location = New System.Drawing.Point(104, 326)
+        Me.optBtnAutomatons.Location = New System.Drawing.Point(104, 333)
         Me.optBtnAutomatons.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnAutomatons.Name = "optBtnAutomatons"
         OptionSingleReplace12.disabledValue = "!NOAUTOMATON!"
@@ -3781,7 +3787,7 @@ Partial Class MainForm
         Me.optBtnOrcs.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnOrcs.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnOrcs.Image = CType(resources.GetObject("optBtnOrcs.Image"),System.Drawing.Image)
-        Me.optBtnOrcs.Location = New System.Drawing.Point(104, 251)
+        Me.optBtnOrcs.Location = New System.Drawing.Point(104, 258)
         Me.optBtnOrcs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnOrcs.Name = "optBtnOrcs"
         OptionSingleReplace13.disabledValue = "!NOORC!"
@@ -3812,7 +3818,7 @@ Partial Class MainForm
         Me.optBtnGoblins.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnGoblins.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnGoblins.Image = CType(resources.GetObject("optBtnGoblins.Image"),System.Drawing.Image)
-        Me.optBtnGoblins.Location = New System.Drawing.Point(104, 226)
+        Me.optBtnGoblins.Location = New System.Drawing.Point(104, 233)
         Me.optBtnGoblins.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGoblins.Name = "optBtnGoblins"
         OptionSingleReplace14.disabledValue = "!NOGOBLIN!"
@@ -3843,7 +3849,7 @@ Partial Class MainForm
         Me.optBtnKobolds.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnKobolds.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnKobolds.Image = CType(resources.GetObject("optBtnKobolds.Image"),System.Drawing.Image)
-        Me.optBtnKobolds.Location = New System.Drawing.Point(104, 201)
+        Me.optBtnKobolds.Location = New System.Drawing.Point(104, 208)
         Me.optBtnKobolds.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnKobolds.Name = "optBtnKobolds"
         OptionSingleReplace15.disabledValue = "!NOKOBOLD!"
@@ -3874,7 +3880,7 @@ Partial Class MainForm
         Me.optBtnElfRace.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnElfRace.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnElfRace.Image = CType(resources.GetObject("optBtnElfRace.Image"),System.Drawing.Image)
-        Me.optBtnElfRace.Location = New System.Drawing.Point(104, 126)
+        Me.optBtnElfRace.Location = New System.Drawing.Point(104, 133)
         Me.optBtnElfRace.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnElfRace.Name = "optBtnElfRace"
         OptionSingleReplace16.disabledValue = "!NOELFRACE!"
@@ -3905,7 +3911,7 @@ Partial Class MainForm
         Me.optBtnAntmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnAntmen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnAntmen.Image = CType(resources.GetObject("optBtnAntmen.Image"),System.Drawing.Image)
-        Me.optBtnAntmen.Location = New System.Drawing.Point(104, 401)
+        Me.optBtnAntmen.Location = New System.Drawing.Point(104, 408)
         Me.optBtnAntmen.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnAntmen.Name = "optBtnAntmen"
         OptionSingleReplace17.disabledValue = "!NOANTMEN!"
@@ -3936,7 +3942,7 @@ Partial Class MainForm
         Me.optBtnGnomes.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnGnomes.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnGnomes.Image = CType(resources.GetObject("optBtnGnomes.Image"),System.Drawing.Image)
-        Me.optBtnGnomes.Location = New System.Drawing.Point(104, 176)
+        Me.optBtnGnomes.Location = New System.Drawing.Point(104, 183)
         Me.optBtnGnomes.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGnomes.Name = "optBtnGnomes"
         OptionSingleReplace18.disabledValue = "!NOGNOME!"
@@ -3968,7 +3974,7 @@ Partial Class MainForm
         Me.optBtnTroglodytes.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnTroglodytes.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnTroglodytes.Image = CType(resources.GetObject("optBtnTroglodytes.Image"),System.Drawing.Image)
-        Me.optBtnTroglodytes.Location = New System.Drawing.Point(104, 376)
+        Me.optBtnTroglodytes.Location = New System.Drawing.Point(104, 383)
         Me.optBtnTroglodytes.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTroglodytes.Name = "optBtnTroglodytes"
         OptionSingleReplace19.disabledValue = "!NOTROGLODYTE!"
@@ -3999,7 +4005,7 @@ Partial Class MainForm
         Me.optBtnGremlins.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnGremlins.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnGremlins.Image = CType(resources.GetObject("optBtnGremlins.Image"),System.Drawing.Image)
-        Me.optBtnGremlins.Location = New System.Drawing.Point(104, 351)
+        Me.optBtnGremlins.Location = New System.Drawing.Point(104, 358)
         Me.optBtnGremlins.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGremlins.Name = "optBtnGremlins"
         OptionSingleReplace20.disabledValue = "!NOGREMLIN!"
@@ -4030,7 +4036,7 @@ Partial Class MainForm
         Me.optBtnHumanRace.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnHumanRace.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnHumanRace.Image = CType(resources.GetObject("optBtnHumanRace.Image"),System.Drawing.Image)
-        Me.optBtnHumanRace.Location = New System.Drawing.Point(104, 101)
+        Me.optBtnHumanRace.Location = New System.Drawing.Point(104, 108)
         Me.optBtnHumanRace.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnHumanRace.Name = "optBtnHumanRace"
         OptionSingleReplace21.disabledValue = "!NOHUMANRACE!"
@@ -4062,7 +4068,7 @@ Partial Class MainForm
         Me.lblCivActive.Location = New System.Drawing.Point(106, 1)
         Me.lblCivActive.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
         Me.lblCivActive.Name = "lblCivActive"
-        Me.lblCivActive.Size = New System.Drawing.Size(51, 23)
+        Me.lblCivActive.Size = New System.Drawing.Size(51, 30)
         Me.lblCivActive.TabIndex = 6
         Me.lblCivActive.Text = "Active"
         Me.lblCivActive.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4077,7 +4083,7 @@ Partial Class MainForm
         Me.optBtnCivDwarves.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnCivDwarves.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnCivDwarves.Image = CType(resources.GetObject("optBtnCivDwarves.Image"),System.Drawing.Image)
-        Me.optBtnCivDwarves.Location = New System.Drawing.Point(104, 26)
+        Me.optBtnCivDwarves.Location = New System.Drawing.Point(104, 33)
         Me.optBtnCivDwarves.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCivDwarves.Name = "optBtnCivDwarves"
         OptionSingleReplace22.disabledValue = "!NOPLAYABLED!"
@@ -4108,7 +4114,7 @@ Partial Class MainForm
         Me.optBtnCivOrcs.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnCivOrcs.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnCivOrcs.Image = CType(resources.GetObject("optBtnCivOrcs.Image"),System.Drawing.Image)
-        Me.optBtnCivOrcs.Location = New System.Drawing.Point(104, 51)
+        Me.optBtnCivOrcs.Location = New System.Drawing.Point(104, 58)
         Me.optBtnCivOrcs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCivOrcs.Name = "optBtnCivOrcs"
         OptionSingleReplace23.disabledValue = "!NOPLAYABLEO!"
@@ -4130,99 +4136,6 @@ Partial Class MainForm
         Me.ToolTipMaker.SetToolTip(Me.optBtnCivOrcs, "Adds taiga orcs to the world.")
         Me.optBtnCivOrcs.UseVisualStyleBackColor = false
         '
-        'optBtnPlayableDwarves
-        '
-        Me.optBtnPlayableDwarves.Appearance = System.Windows.Forms.Appearance.Button
-        Me.optBtnPlayableDwarves.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
-        Me.optBtnPlayableDwarves.FlatAppearance.BorderSize = 0
-        Me.optBtnPlayableDwarves.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(225,Byte),Integer), CType(CType(210,Byte),Integer), CType(CType(165,Byte),Integer))
-        Me.optBtnPlayableDwarves.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.optBtnPlayableDwarves.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
-        Me.optBtnPlayableDwarves.Image = CType(resources.GetObject("optBtnPlayableDwarves.Image"),System.Drawing.Image)
-        Me.optBtnPlayableDwarves.Location = New System.Drawing.Point(161, 26)
-        Me.optBtnPlayableDwarves.Margin = New System.Windows.Forms.Padding(1)
-        Me.optBtnPlayableDwarves.Name = "optBtnPlayableDwarves"
-        OptionSingleReplace24.disabledValue = "!NOCIVD!"
-        OptionSingleReplace24.enabledValue = "YESCIVD["
-        FileListManager66.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace24.fileManager = FileListManager66
-        OptionManager66.loadFromDInit = false
-        OptionManager66.loadFromInit = false
-        OptionManager66.loadFromWorldGen = false
-        OptionSingleReplace24.optionManager = OptionManager66
-        OptionSettingManager69.settingName = Nothing
-        OptionSingleReplace24.settingManager = OptionSettingManager69
-        OptionSingleReplace24.tokenName = ""
-        OptionSingleReplace24.updateTileSets = false
-        Me.optBtnPlayableDwarves.options = OptionSingleReplace24
-        Me.optBtnPlayableDwarves.Size = New System.Drawing.Size(55, 23)
-        Me.optBtnPlayableDwarves.TabIndex = 9
-        Me.optBtnPlayableDwarves.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.ToolTipMaker.SetToolTip(Me.optBtnPlayableDwarves, "Sets dwarves to playable. If you have this on, you can play as dwarves.")
-        Me.optBtnPlayableDwarves.UseVisualStyleBackColor = false
-        '
-        'optBtnPlayableOrcs
-        '
-        Me.optBtnPlayableOrcs.Appearance = System.Windows.Forms.Appearance.Button
-        Me.optBtnPlayableOrcs.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
-        Me.optBtnPlayableOrcs.FlatAppearance.BorderSize = 0
-        Me.optBtnPlayableOrcs.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(225,Byte),Integer), CType(CType(210,Byte),Integer), CType(CType(165,Byte),Integer))
-        Me.optBtnPlayableOrcs.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.optBtnPlayableOrcs.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
-        Me.optBtnPlayableOrcs.Image = CType(resources.GetObject("optBtnPlayableOrcs.Image"),System.Drawing.Image)
-        Me.optBtnPlayableOrcs.Location = New System.Drawing.Point(161, 51)
-        Me.optBtnPlayableOrcs.Margin = New System.Windows.Forms.Padding(1)
-        Me.optBtnPlayableOrcs.Name = "optBtnPlayableOrcs"
-        OptionSingleReplace25.disabledValue = "!NOCIVO!"
-        OptionSingleReplace25.enabledValue = "YESCIVO["
-        FileListManager67.fileNames = New String() {"entity_orcfort_taigaorc.txt"}
-        OptionSingleReplace25.fileManager = FileListManager67
-        OptionManager67.loadFromDInit = false
-        OptionManager67.loadFromInit = false
-        OptionManager67.loadFromWorldGen = false
-        OptionSingleReplace25.optionManager = OptionManager67
-        OptionSettingManager70.settingName = Nothing
-        OptionSingleReplace25.settingManager = OptionSettingManager70
-        OptionSingleReplace25.tokenName = ""
-        OptionSingleReplace25.updateTileSets = false
-        Me.optBtnPlayableOrcs.options = OptionSingleReplace25
-        Me.optBtnPlayableOrcs.Size = New System.Drawing.Size(55, 23)
-        Me.optBtnPlayableOrcs.TabIndex = 10
-        Me.optBtnPlayableOrcs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.ToolTipMaker.SetToolTip(Me.optBtnPlayableOrcs, "Sets Taiga orcs to playable. If you have this on, you can play as orcs.")
-        Me.optBtnPlayableOrcs.UseVisualStyleBackColor = false
-        '
-        'optBtnPlayableKobolds
-        '
-        Me.optBtnPlayableKobolds.Appearance = System.Windows.Forms.Appearance.Button
-        Me.optBtnPlayableKobolds.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
-        Me.optBtnPlayableKobolds.FlatAppearance.BorderSize = 0
-        Me.optBtnPlayableKobolds.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(225,Byte),Integer), CType(CType(210,Byte),Integer), CType(CType(165,Byte),Integer))
-        Me.optBtnPlayableKobolds.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.optBtnPlayableKobolds.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
-        Me.optBtnPlayableKobolds.Image = CType(resources.GetObject("optBtnPlayableKobolds.Image"),System.Drawing.Image)
-        Me.optBtnPlayableKobolds.Location = New System.Drawing.Point(161, 76)
-        Me.optBtnPlayableKobolds.Margin = New System.Windows.Forms.Padding(1)
-        Me.optBtnPlayableKobolds.Name = "optBtnPlayableKobolds"
-        OptionSingleReplace26.disabledValue = "!NOCIVK!"
-        OptionSingleReplace26.enabledValue = "YESCIVK["
-        FileListManager68.fileNames = New String() {"entity_kobold_camp.txt"}
-        OptionSingleReplace26.fileManager = FileListManager68
-        OptionManager68.loadFromDInit = false
-        OptionManager68.loadFromInit = false
-        OptionManager68.loadFromWorldGen = false
-        OptionSingleReplace26.optionManager = OptionManager68
-        OptionSettingManager71.settingName = Nothing
-        OptionSingleReplace26.settingManager = OptionSettingManager71
-        OptionSingleReplace26.tokenName = ""
-        OptionSingleReplace26.updateTileSets = false
-        Me.optBtnPlayableKobolds.options = OptionSingleReplace26
-        Me.optBtnPlayableKobolds.Size = New System.Drawing.Size(55, 23)
-        Me.optBtnPlayableKobolds.TabIndex = 11
-        Me.optBtnPlayableKobolds.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.ToolTipMaker.SetToolTip(Me.optBtnPlayableKobolds, "Sets cutebolds as playable. If you have this on, you can play kobolds.")
-        Me.optBtnPlayableKobolds.UseVisualStyleBackColor = false
-        '
         'optBtnCivKobolds
         '
         Me.optBtnCivKobolds.Appearance = System.Windows.Forms.Appearance.Button
@@ -4232,22 +4145,22 @@ Partial Class MainForm
         Me.optBtnCivKobolds.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnCivKobolds.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnCivKobolds.Image = CType(resources.GetObject("optBtnCivKobolds.Image"),System.Drawing.Image)
-        Me.optBtnCivKobolds.Location = New System.Drawing.Point(104, 76)
+        Me.optBtnCivKobolds.Location = New System.Drawing.Point(104, 83)
         Me.optBtnCivKobolds.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCivKobolds.Name = "optBtnCivKobolds"
-        OptionSingleReplace27.disabledValue = "!NOPLAYABLEK!"
-        OptionSingleReplace27.enabledValue = "YESPLAYABLEK["
-        FileListManager69.fileNames = New String() {"entity_kobold_camp.txt"}
-        OptionSingleReplace27.fileManager = FileListManager69
-        OptionManager69.loadFromDInit = false
-        OptionManager69.loadFromInit = false
-        OptionManager69.loadFromWorldGen = false
-        OptionSingleReplace27.optionManager = OptionManager69
-        OptionSettingManager72.settingName = Nothing
-        OptionSingleReplace27.settingManager = OptionSettingManager72
-        OptionSingleReplace27.tokenName = ""
-        OptionSingleReplace27.updateTileSets = false
-        Me.optBtnCivKobolds.options = OptionSingleReplace27
+        OptionSingleReplace24.disabledValue = "!NOPLAYABLEK!"
+        OptionSingleReplace24.enabledValue = "YESPLAYABLEK["
+        FileListManager66.fileNames = New String() {"entity_kobold_camp.txt"}
+        OptionSingleReplace24.fileManager = FileListManager66
+        OptionManager66.loadFromDInit = false
+        OptionManager66.loadFromInit = false
+        OptionManager66.loadFromWorldGen = false
+        OptionSingleReplace24.optionManager = OptionManager66
+        OptionSettingManager69.settingName = Nothing
+        OptionSingleReplace24.settingManager = OptionSettingManager69
+        OptionSingleReplace24.tokenName = ""
+        OptionSingleReplace24.updateTileSets = false
+        Me.optBtnCivKobolds.options = OptionSingleReplace24
         Me.optBtnCivKobolds.Size = New System.Drawing.Size(53, 23)
         Me.optBtnCivKobolds.TabIndex = 7
         Me.optBtnCivKobolds.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4261,30 +4174,30 @@ Partial Class MainForm
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.lblCivBabySnatcher.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivBabySnatcher.ForeColor = System.Drawing.Color.White
-        Me.lblCivBabySnatcher.Location = New System.Drawing.Point(397, 1)
+        Me.lblCivBabySnatcher.Location = New System.Drawing.Point(491, 1)
         Me.lblCivBabySnatcher.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
         Me.lblCivBabySnatcher.Name = "lblCivBabySnatcher"
-        Me.lblCivBabySnatcher.Size = New System.Drawing.Size(46, 23)
+        Me.lblCivBabySnatcher.Size = New System.Drawing.Size(46, 30)
         Me.lblCivBabySnatcher.TabIndex = 6
         Me.lblCivBabySnatcher.Text = "Good"
         Me.lblCivBabySnatcher.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         Me.ToolTipMaker.SetToolTip(Me.lblCivBabySnatcher, "Determines which civilizations will ally together. (Good vs. Evil)")
         '
-        'lblCivPlayable
+        'lblCivPlayableAdv
         '
-        Me.lblCivPlayable.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom)  _
+        Me.lblCivPlayableAdv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom)  _
             Or System.Windows.Forms.AnchorStyles.Left)  _
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.lblCivPlayable.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.lblCivPlayable.ForeColor = System.Drawing.Color.White
-        Me.lblCivPlayable.Location = New System.Drawing.Point(163, 1)
-        Me.lblCivPlayable.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
-        Me.lblCivPlayable.Name = "lblCivPlayable"
-        Me.lblCivPlayable.Size = New System.Drawing.Size(64, 23)
-        Me.lblCivPlayable.TabIndex = 6
-        Me.lblCivPlayable.Text = "Playable"
-        Me.lblCivPlayable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.ToolTipMaker.SetToolTip(Me.lblCivPlayable, "Sets the civilization to playable.")
+        Me.lblCivPlayableAdv.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.lblCivPlayableAdv.ForeColor = System.Drawing.Color.White
+        Me.lblCivPlayableAdv.Location = New System.Drawing.Point(245, 1)
+        Me.lblCivPlayableAdv.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
+        Me.lblCivPlayableAdv.Name = "lblCivPlayableAdv"
+        Me.lblCivPlayableAdv.Size = New System.Drawing.Size(76, 30)
+        Me.lblCivPlayableAdv.TabIndex = 6
+        Me.lblCivPlayableAdv.Text = "Playable (Adventure)"
+        Me.lblCivPlayableAdv.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.ToolTipMaker.SetToolTip(Me.lblCivPlayableAdv, "Sets the civilization to playable.")
         '
         'lblCivMaterials
         '
@@ -4293,10 +4206,10 @@ Partial Class MainForm
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.lblCivMaterials.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivMaterials.ForeColor = System.Drawing.Color.White
-        Me.lblCivMaterials.Location = New System.Drawing.Point(449, 1)
+        Me.lblCivMaterials.Location = New System.Drawing.Point(543, 1)
         Me.lblCivMaterials.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
         Me.lblCivMaterials.Name = "lblCivMaterials"
-        Me.lblCivMaterials.Size = New System.Drawing.Size(68, 23)
+        Me.lblCivMaterials.Size = New System.Drawing.Size(68, 30)
         Me.lblCivMaterials.TabIndex = 6
         Me.lblCivMaterials.Text = "Materials"
         Me.lblCivMaterials.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4309,10 +4222,10 @@ Partial Class MainForm
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.lblCivSkills.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivSkills.ForeColor = System.Drawing.Color.White
-        Me.lblCivSkills.Location = New System.Drawing.Point(523, 1)
+        Me.lblCivSkills.Location = New System.Drawing.Point(617, 1)
         Me.lblCivSkills.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
         Me.lblCivSkills.Name = "lblCivSkills"
-        Me.lblCivSkills.Size = New System.Drawing.Size(61, 23)
+        Me.lblCivSkills.Size = New System.Drawing.Size(61, 30)
         Me.lblCivSkills.TabIndex = 6
         Me.lblCivSkills.Text = "Skills"
         Me.lblCivSkills.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4328,22 +4241,22 @@ Partial Class MainForm
         Me.optBtnDrowRace.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnDrowRace.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnDrowRace.Image = CType(resources.GetObject("optBtnDrowRace.Image"),System.Drawing.Image)
-        Me.optBtnDrowRace.Location = New System.Drawing.Point(104, 151)
+        Me.optBtnDrowRace.Location = New System.Drawing.Point(104, 158)
         Me.optBtnDrowRace.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDrowRace.Name = "optBtnDrowRace"
-        OptionSingleReplace28.disabledValue = "!NODROW!"
-        OptionSingleReplace28.enabledValue = "YESDROW["
-        FileListManager70.fileNames = New String() {"entity_drow.txt"}
-        OptionSingleReplace28.fileManager = FileListManager70
-        OptionManager70.loadFromDInit = false
-        OptionManager70.loadFromInit = false
-        OptionManager70.loadFromWorldGen = false
-        OptionSingleReplace28.optionManager = OptionManager70
-        OptionSettingManager73.settingName = Nothing
-        OptionSingleReplace28.settingManager = OptionSettingManager73
-        OptionSingleReplace28.tokenName = ""
-        OptionSingleReplace28.updateTileSets = false
-        Me.optBtnDrowRace.options = OptionSingleReplace28
+        OptionSingleReplace25.disabledValue = "!NODROW!"
+        OptionSingleReplace25.enabledValue = "YESDROW["
+        FileListManager67.fileNames = New String() {"entity_drow.txt"}
+        OptionSingleReplace25.fileManager = FileListManager67
+        OptionManager67.loadFromDInit = false
+        OptionManager67.loadFromInit = false
+        OptionManager67.loadFromWorldGen = false
+        OptionSingleReplace25.optionManager = OptionManager67
+        OptionSettingManager70.settingName = Nothing
+        OptionSingleReplace25.settingManager = OptionSettingManager70
+        OptionSingleReplace25.tokenName = ""
+        OptionSingleReplace25.updateTileSets = false
+        Me.optBtnDrowRace.options = OptionSingleReplace25
         Me.optBtnDrowRace.Size = New System.Drawing.Size(53, 23)
         Me.optBtnDrowRace.TabIndex = 2
         Me.optBtnDrowRace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4360,22 +4273,22 @@ Partial Class MainForm
         Me.optBtnEvilDwarves.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnEvilDwarves.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnEvilDwarves.Image = CType(resources.GetObject("optBtnEvilDwarves.Image"),System.Drawing.Image)
-        Me.optBtnEvilDwarves.Location = New System.Drawing.Point(104, 426)
+        Me.optBtnEvilDwarves.Location = New System.Drawing.Point(104, 433)
         Me.optBtnEvilDwarves.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnEvilDwarves.Name = "optBtnEvilDwarves"
-        OptionSingleReplace29.disabledValue = "!NODWARFEVIL!"
-        OptionSingleReplace29.enabledValue = "YESDWARFEVIL["
-        FileListManager71.fileNames = New String() {"entity_dwarf_evil.txt"}
-        OptionSingleReplace29.fileManager = FileListManager71
-        OptionManager71.loadFromDInit = false
-        OptionManager71.loadFromInit = false
-        OptionManager71.loadFromWorldGen = false
-        OptionSingleReplace29.optionManager = OptionManager71
-        OptionSettingManager74.settingName = Nothing
-        OptionSingleReplace29.settingManager = OptionSettingManager74
-        OptionSingleReplace29.tokenName = ""
-        OptionSingleReplace29.updateTileSets = false
-        Me.optBtnEvilDwarves.options = OptionSingleReplace29
+        OptionSingleReplace26.disabledValue = "!NODWARFEVIL!"
+        OptionSingleReplace26.enabledValue = "YESDWARFEVIL["
+        FileListManager68.fileNames = New String() {"entity_dwarf_evil.txt"}
+        OptionSingleReplace26.fileManager = FileListManager68
+        OptionManager68.loadFromDInit = false
+        OptionManager68.loadFromInit = false
+        OptionManager68.loadFromWorldGen = false
+        OptionSingleReplace26.optionManager = OptionManager68
+        OptionSettingManager71.settingName = Nothing
+        OptionSingleReplace26.settingManager = OptionSettingManager71
+        OptionSingleReplace26.tokenName = ""
+        OptionSingleReplace26.updateTileSets = false
+        Me.optBtnEvilDwarves.options = OptionSingleReplace26
         Me.optBtnEvilDwarves.Size = New System.Drawing.Size(53, 23)
         Me.optBtnEvilDwarves.TabIndex = 12
         Me.optBtnEvilDwarves.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4392,22 +4305,22 @@ Partial Class MainForm
         Me.optBtnEvilHumans.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnEvilHumans.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnEvilHumans.Image = CType(resources.GetObject("optBtnEvilHumans.Image"),System.Drawing.Image)
-        Me.optBtnEvilHumans.Location = New System.Drawing.Point(104, 451)
+        Me.optBtnEvilHumans.Location = New System.Drawing.Point(104, 458)
         Me.optBtnEvilHumans.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnEvilHumans.Name = "optBtnEvilHumans"
-        OptionSingleReplace30.disabledValue = "!NOHUMANEVIL!"
-        OptionSingleReplace30.enabledValue = "YESHUMANEVIL["
-        FileListManager72.fileNames = New String() {"entity_human_evil.txt"}
-        OptionSingleReplace30.fileManager = FileListManager72
-        OptionManager72.loadFromDInit = false
-        OptionManager72.loadFromInit = false
-        OptionManager72.loadFromWorldGen = false
-        OptionSingleReplace30.optionManager = OptionManager72
-        OptionSettingManager75.settingName = Nothing
-        OptionSingleReplace30.settingManager = OptionSettingManager75
-        OptionSingleReplace30.tokenName = ""
-        OptionSingleReplace30.updateTileSets = false
-        Me.optBtnEvilHumans.options = OptionSingleReplace30
+        OptionSingleReplace27.disabledValue = "!NOHUMANEVIL!"
+        OptionSingleReplace27.enabledValue = "YESHUMANEVIL["
+        FileListManager69.fileNames = New String() {"entity_human_evil.txt"}
+        OptionSingleReplace27.fileManager = FileListManager69
+        OptionManager69.loadFromDInit = false
+        OptionManager69.loadFromInit = false
+        OptionManager69.loadFromWorldGen = false
+        OptionSingleReplace27.optionManager = OptionManager69
+        OptionSettingManager72.settingName = Nothing
+        OptionSingleReplace27.settingManager = OptionSettingManager72
+        OptionSingleReplace27.tokenName = ""
+        OptionSingleReplace27.updateTileSets = false
+        Me.optBtnEvilHumans.options = OptionSingleReplace27
         Me.optBtnEvilHumans.Size = New System.Drawing.Size(53, 23)
         Me.optBtnEvilHumans.TabIndex = 13
         Me.optBtnEvilHumans.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4424,22 +4337,22 @@ Partial Class MainForm
         Me.optBtnEvilElves.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnEvilElves.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnEvilElves.Image = CType(resources.GetObject("optBtnEvilElves.Image"),System.Drawing.Image)
-        Me.optBtnEvilElves.Location = New System.Drawing.Point(104, 501)
+        Me.optBtnEvilElves.Location = New System.Drawing.Point(104, 508)
         Me.optBtnEvilElves.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnEvilElves.Name = "optBtnEvilElves"
-        OptionSingleReplace31.disabledValue = "!NOELFEVIL!"
-        OptionSingleReplace31.enabledValue = "YESELFEVIL["
-        FileListManager73.fileNames = New String() {"entity_elf_evil.txt"}
-        OptionSingleReplace31.fileManager = FileListManager73
-        OptionManager73.loadFromDInit = false
-        OptionManager73.loadFromInit = false
-        OptionManager73.loadFromWorldGen = false
-        OptionSingleReplace31.optionManager = OptionManager73
-        OptionSettingManager76.settingName = Nothing
-        OptionSingleReplace31.settingManager = OptionSettingManager76
-        OptionSingleReplace31.tokenName = ""
-        OptionSingleReplace31.updateTileSets = false
-        Me.optBtnEvilElves.options = OptionSingleReplace31
+        OptionSingleReplace28.disabledValue = "!NOELFEVIL!"
+        OptionSingleReplace28.enabledValue = "YESELFEVIL["
+        FileListManager70.fileNames = New String() {"entity_elf_evil.txt"}
+        OptionSingleReplace28.fileManager = FileListManager70
+        OptionManager70.loadFromDInit = false
+        OptionManager70.loadFromInit = false
+        OptionManager70.loadFromWorldGen = false
+        OptionSingleReplace28.optionManager = OptionManager70
+        OptionSettingManager73.settingName = Nothing
+        OptionSingleReplace28.settingManager = OptionSettingManager73
+        OptionSingleReplace28.tokenName = ""
+        OptionSingleReplace28.updateTileSets = false
+        Me.optBtnEvilElves.options = OptionSingleReplace28
         Me.optBtnEvilElves.Size = New System.Drawing.Size(53, 23)
         Me.optBtnEvilElves.TabIndex = 14
         Me.optBtnEvilElves.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4456,22 +4369,22 @@ Partial Class MainForm
         Me.optBtnEvilDrow.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optBtnEvilDrow.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
         Me.optBtnEvilDrow.Image = CType(resources.GetObject("optBtnEvilDrow.Image"),System.Drawing.Image)
-        Me.optBtnEvilDrow.Location = New System.Drawing.Point(104, 476)
+        Me.optBtnEvilDrow.Location = New System.Drawing.Point(104, 483)
         Me.optBtnEvilDrow.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnEvilDrow.Name = "optBtnEvilDrow"
-        OptionSingleReplace32.disabledValue = "!NODROWEVIL!"
-        OptionSingleReplace32.enabledValue = "YESDROWEVIL["
-        FileListManager74.fileNames = New String() {"entity_drow_evil.txt"}
-        OptionSingleReplace32.fileManager = FileListManager74
-        OptionManager74.loadFromDInit = false
-        OptionManager74.loadFromInit = false
-        OptionManager74.loadFromWorldGen = false
-        OptionSingleReplace32.optionManager = OptionManager74
-        OptionSettingManager77.settingName = Nothing
-        OptionSingleReplace32.settingManager = OptionSettingManager77
-        OptionSingleReplace32.tokenName = ""
-        OptionSingleReplace32.updateTileSets = false
-        Me.optBtnEvilDrow.options = OptionSingleReplace32
+        OptionSingleReplace29.disabledValue = "!NODROWEVIL!"
+        OptionSingleReplace29.enabledValue = "YESDROWEVIL["
+        FileListManager71.fileNames = New String() {"entity_drow_evil.txt"}
+        OptionSingleReplace29.fileManager = FileListManager71
+        OptionManager71.loadFromDInit = false
+        OptionManager71.loadFromInit = false
+        OptionManager71.loadFromWorldGen = false
+        OptionSingleReplace29.optionManager = OptionManager71
+        OptionSettingManager74.settingName = Nothing
+        OptionSingleReplace29.settingManager = OptionSettingManager74
+        OptionSingleReplace29.tokenName = ""
+        OptionSingleReplace29.updateTileSets = false
+        Me.optBtnEvilDrow.options = OptionSingleReplace29
         Me.optBtnEvilDrow.Size = New System.Drawing.Size(53, 23)
         Me.optBtnEvilDrow.TabIndex = 15
         Me.optBtnEvilDrow.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -4491,19 +4404,19 @@ Partial Class MainForm
         Me.optBtnDomesticPets.Location = New System.Drawing.Point(5, 19)
         Me.optBtnDomesticPets.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDomesticPets.Name = "optBtnDomesticPets"
-        OptionSingleReplace33.disabledValue = "!NODOMESTICPET!"
-        OptionSingleReplace33.enabledValue = "YESDOMESTICPET["
-        FileListManager75.fileNames = New String() {"creature_pet_masterwork.txt"}
-        OptionSingleReplace33.fileManager = FileListManager75
-        OptionManager75.loadFromDInit = false
-        OptionManager75.loadFromInit = false
-        OptionManager75.loadFromWorldGen = false
-        OptionSingleReplace33.optionManager = OptionManager75
-        OptionSettingManager78.settingName = Nothing
-        OptionSingleReplace33.settingManager = OptionSettingManager78
-        OptionSingleReplace33.tokenName = ""
-        OptionSingleReplace33.updateTileSets = false
-        Me.optBtnDomesticPets.options = OptionSingleReplace33
+        OptionSingleReplace30.disabledValue = "!NODOMESTICPET!"
+        OptionSingleReplace30.enabledValue = "YESDOMESTICPET["
+        FileListManager72.fileNames = New String() {"creature_pet_masterwork.txt"}
+        OptionSingleReplace30.fileManager = FileListManager72
+        OptionManager72.loadFromDInit = false
+        OptionManager72.loadFromInit = false
+        OptionManager72.loadFromWorldGen = false
+        OptionSingleReplace30.optionManager = OptionManager72
+        OptionSettingManager75.settingName = Nothing
+        OptionSingleReplace30.settingManager = OptionSettingManager75
+        OptionSingleReplace30.tokenName = ""
+        OptionSingleReplace30.updateTileSets = false
+        Me.optBtnDomesticPets.options = OptionSingleReplace30
         Me.optBtnDomesticPets.Size = New System.Drawing.Size(134, 27)
         Me.optBtnDomesticPets.TabIndex = 0
         Me.optBtnDomesticPets.Text = "Domestic Pets"
@@ -4524,19 +4437,19 @@ Partial Class MainForm
         Me.optBtnMoreVermin.Location = New System.Drawing.Point(5, 77)
         Me.optBtnMoreVermin.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreVermin.Name = "optBtnMoreVermin"
-        OptionSingleReplace34.disabledValue = "!NOVERMIN!"
-        OptionSingleReplace34.enabledValue = "YESVERMIN["
-        FileListManager76.fileNames = New String() {"creature_vermin_masterwork.txt"}
-        OptionSingleReplace34.fileManager = FileListManager76
-        OptionManager76.loadFromDInit = false
-        OptionManager76.loadFromInit = false
-        OptionManager76.loadFromWorldGen = false
-        OptionSingleReplace34.optionManager = OptionManager76
-        OptionSettingManager79.settingName = Nothing
-        OptionSingleReplace34.settingManager = OptionSettingManager79
-        OptionSingleReplace34.tokenName = ""
-        OptionSingleReplace34.updateTileSets = false
-        Me.optBtnMoreVermin.options = OptionSingleReplace34
+        OptionSingleReplace31.disabledValue = "!NOVERMIN!"
+        OptionSingleReplace31.enabledValue = "YESVERMIN["
+        FileListManager73.fileNames = New String() {"creature_vermin_masterwork.txt"}
+        OptionSingleReplace31.fileManager = FileListManager73
+        OptionManager73.loadFromDInit = false
+        OptionManager73.loadFromInit = false
+        OptionManager73.loadFromWorldGen = false
+        OptionSingleReplace31.optionManager = OptionManager73
+        OptionSettingManager76.settingName = Nothing
+        OptionSingleReplace31.settingManager = OptionSettingManager76
+        OptionSingleReplace31.tokenName = ""
+        OptionSingleReplace31.updateTileSets = false
+        Me.optBtnMoreVermin.options = OptionSingleReplace31
         Me.optBtnMoreVermin.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreVermin.TabIndex = 2
         Me.optBtnMoreVermin.Text = "Vermin"
@@ -4557,19 +4470,19 @@ Partial Class MainForm
         Me.optBtnMoreGiantAnimals.Location = New System.Drawing.Point(5, 106)
         Me.optBtnMoreGiantAnimals.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreGiantAnimals.Name = "optBtnMoreGiantAnimals"
-        OptionSingleReplace35.disabledValue = "NOGIANT!"
-        OptionSingleReplace35.enabledValue = "YESGIANT["
-        FileListManager77.fileNames = New String() {"c_variation_default.txt"}
-        OptionSingleReplace35.fileManager = FileListManager77
-        OptionManager77.loadFromDInit = false
-        OptionManager77.loadFromInit = false
-        OptionManager77.loadFromWorldGen = false
-        OptionSingleReplace35.optionManager = OptionManager77
-        OptionSettingManager80.settingName = Nothing
-        OptionSingleReplace35.settingManager = OptionSettingManager80
-        OptionSingleReplace35.tokenName = ""
-        OptionSingleReplace35.updateTileSets = false
-        Me.optBtnMoreGiantAnimals.options = OptionSingleReplace35
+        OptionSingleReplace32.disabledValue = "NOGIANT!"
+        OptionSingleReplace32.enabledValue = "YESGIANT["
+        FileListManager74.fileNames = New String() {"c_variation_default.txt"}
+        OptionSingleReplace32.fileManager = FileListManager74
+        OptionManager74.loadFromDInit = false
+        OptionManager74.loadFromInit = false
+        OptionManager74.loadFromWorldGen = false
+        OptionSingleReplace32.optionManager = OptionManager74
+        OptionSettingManager77.settingName = Nothing
+        OptionSingleReplace32.settingManager = OptionSettingManager77
+        OptionSingleReplace32.tokenName = ""
+        OptionSingleReplace32.updateTileSets = false
+        Me.optBtnMoreGiantAnimals.options = OptionSingleReplace32
         Me.optBtnMoreGiantAnimals.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreGiantAnimals.TabIndex = 3
         Me.optBtnMoreGiantAnimals.Text = "Giant Animals"
@@ -4590,19 +4503,19 @@ Partial Class MainForm
         Me.optBtnMoreMegaBeasts.Location = New System.Drawing.Point(5, 135)
         Me.optBtnMoreMegaBeasts.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreMegaBeasts.Name = "optBtnMoreMegaBeasts"
-        OptionSingleReplace36.disabledValue = "!NOMEGABEAST!"
-        OptionSingleReplace36.enabledValue = "YESMEGABEAST["
-        FileListManager78.fileNames = New String() {"creature_beasts_masterwork.txt"}
-        OptionSingleReplace36.fileManager = FileListManager78
-        OptionManager78.loadFromDInit = false
-        OptionManager78.loadFromInit = false
-        OptionManager78.loadFromWorldGen = false
-        OptionSingleReplace36.optionManager = OptionManager78
-        OptionSettingManager81.settingName = Nothing
-        OptionSingleReplace36.settingManager = OptionSettingManager81
-        OptionSingleReplace36.tokenName = ""
-        OptionSingleReplace36.updateTileSets = false
-        Me.optBtnMoreMegaBeasts.options = OptionSingleReplace36
+        OptionSingleReplace33.disabledValue = "!NOMEGABEAST!"
+        OptionSingleReplace33.enabledValue = "YESMEGABEAST["
+        FileListManager75.fileNames = New String() {"creature_beasts_masterwork.txt"}
+        OptionSingleReplace33.fileManager = FileListManager75
+        OptionManager75.loadFromDInit = false
+        OptionManager75.loadFromInit = false
+        OptionManager75.loadFromWorldGen = false
+        OptionSingleReplace33.optionManager = OptionManager75
+        OptionSettingManager78.settingName = Nothing
+        OptionSingleReplace33.settingManager = OptionSettingManager78
+        OptionSingleReplace33.tokenName = ""
+        OptionSingleReplace33.updateTileSets = false
+        Me.optBtnMoreMegaBeasts.options = OptionSingleReplace33
         Me.optBtnMoreMegaBeasts.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreMegaBeasts.TabIndex = 4
         Me.optBtnMoreMegaBeasts.Text = "Megabeasts"
@@ -4623,19 +4536,19 @@ Partial Class MainForm
         Me.optBtnMoreBirds.Location = New System.Drawing.Point(5, 164)
         Me.optBtnMoreBirds.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreBirds.Name = "optBtnMoreBirds"
-        OptionSingleReplace37.disabledValue = "!NOBIRD!"
-        OptionSingleReplace37.enabledValue = "YESBIRD["
-        FileListManager79.fileNames = New String() {"creature_birds.txt", "creature_birds_new.txt"}
-        OptionSingleReplace37.fileManager = FileListManager79
-        OptionManager79.loadFromDInit = false
-        OptionManager79.loadFromInit = false
-        OptionManager79.loadFromWorldGen = false
-        OptionSingleReplace37.optionManager = OptionManager79
-        OptionSettingManager82.settingName = Nothing
-        OptionSingleReplace37.settingManager = OptionSettingManager82
-        OptionSingleReplace37.tokenName = ""
-        OptionSingleReplace37.updateTileSets = false
-        Me.optBtnMoreBirds.options = OptionSingleReplace37
+        OptionSingleReplace34.disabledValue = "!NOBIRD!"
+        OptionSingleReplace34.enabledValue = "YESBIRD["
+        FileListManager76.fileNames = New String() {"creature_birds.txt", "creature_birds_new.txt"}
+        OptionSingleReplace34.fileManager = FileListManager76
+        OptionManager76.loadFromDInit = false
+        OptionManager76.loadFromInit = false
+        OptionManager76.loadFromWorldGen = false
+        OptionSingleReplace34.optionManager = OptionManager76
+        OptionSettingManager79.settingName = Nothing
+        OptionSingleReplace34.settingManager = OptionSettingManager79
+        OptionSingleReplace34.tokenName = ""
+        OptionSingleReplace34.updateTileSets = false
+        Me.optBtnMoreBirds.options = OptionSingleReplace34
         Me.optBtnMoreBirds.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreBirds.TabIndex = 5
         Me.optBtnMoreBirds.Text = "Birds"
@@ -4657,19 +4570,19 @@ Partial Class MainForm
         Me.optBtnMoreFish.Location = New System.Drawing.Point(5, 193)
         Me.optBtnMoreFish.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreFish.Name = "optBtnMoreFish"
-        OptionSingleReplace38.disabledValue = "!NOFISH!"
-        OptionSingleReplace38.enabledValue = "YESFISH["
-        FileListManager80.fileNames = New String() {"creature_fish_masterwork.txt"}
-        OptionSingleReplace38.fileManager = FileListManager80
-        OptionManager80.loadFromDInit = false
-        OptionManager80.loadFromInit = false
-        OptionManager80.loadFromWorldGen = false
-        OptionSingleReplace38.optionManager = OptionManager80
-        OptionSettingManager83.settingName = Nothing
-        OptionSingleReplace38.settingManager = OptionSettingManager83
-        OptionSingleReplace38.tokenName = ""
-        OptionSingleReplace38.updateTileSets = true
-        Me.optBtnMoreFish.options = OptionSingleReplace38
+        OptionSingleReplace35.disabledValue = "!NOFISH!"
+        OptionSingleReplace35.enabledValue = "YESFISH["
+        FileListManager77.fileNames = New String() {"creature_fish_masterwork.txt"}
+        OptionSingleReplace35.fileManager = FileListManager77
+        OptionManager77.loadFromDInit = false
+        OptionManager77.loadFromInit = false
+        OptionManager77.loadFromWorldGen = false
+        OptionSingleReplace35.optionManager = OptionManager77
+        OptionSettingManager80.settingName = Nothing
+        OptionSingleReplace35.settingManager = OptionSettingManager80
+        OptionSingleReplace35.tokenName = ""
+        OptionSingleReplace35.updateTileSets = true
+        Me.optBtnMoreFish.options = OptionSingleReplace35
         Me.optBtnMoreFish.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreFish.TabIndex = 6
         Me.optBtnMoreFish.Text = "Fish"
@@ -4690,19 +4603,19 @@ Partial Class MainForm
         Me.optBtnMoreAnimalmen.Location = New System.Drawing.Point(5, 222)
         Me.optBtnMoreAnimalmen.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreAnimalmen.Name = "optBtnMoreAnimalmen"
-        OptionSingleReplace39.disabledValue = "NOPERSON!"
-        OptionSingleReplace39.enabledValue = "YESPERSON["
-        FileListManager81.fileNames = New String() {"c_variation_default.txt"}
-        OptionSingleReplace39.fileManager = FileListManager81
-        OptionManager81.loadFromDInit = false
-        OptionManager81.loadFromInit = false
-        OptionManager81.loadFromWorldGen = false
-        OptionSingleReplace39.optionManager = OptionManager81
-        OptionSettingManager84.settingName = Nothing
-        OptionSingleReplace39.settingManager = OptionSettingManager84
-        OptionSingleReplace39.tokenName = ""
-        OptionSingleReplace39.updateTileSets = false
-        Me.optBtnMoreAnimalmen.options = OptionSingleReplace39
+        OptionSingleReplace36.disabledValue = "NOPERSON!"
+        OptionSingleReplace36.enabledValue = "YESPERSON["
+        FileListManager78.fileNames = New String() {"c_variation_default.txt"}
+        OptionSingleReplace36.fileManager = FileListManager78
+        OptionManager78.loadFromDInit = false
+        OptionManager78.loadFromInit = false
+        OptionManager78.loadFromWorldGen = false
+        OptionSingleReplace36.optionManager = OptionManager78
+        OptionSettingManager81.settingName = Nothing
+        OptionSingleReplace36.settingManager = OptionSettingManager81
+        OptionSingleReplace36.tokenName = ""
+        OptionSingleReplace36.updateTileSets = false
+        Me.optBtnMoreAnimalmen.options = OptionSingleReplace36
         Me.optBtnMoreAnimalmen.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreAnimalmen.TabIndex = 7
         Me.optBtnMoreAnimalmen.Text = "Animalmen"
@@ -4723,19 +4636,19 @@ Partial Class MainForm
         Me.optBtnMoreCavernCreatures.Location = New System.Drawing.Point(5, 251)
         Me.optBtnMoreCavernCreatures.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreCavernCreatures.Name = "optBtnMoreCavernCreatures"
-        OptionSingleReplace40.disabledValue = "!NOCAVERN!"
-        OptionSingleReplace40.enabledValue = "YESCAVERN["
-        FileListManager82.fileNames = New String() {"creature_cavern_masterwork.txt"}
-        OptionSingleReplace40.fileManager = FileListManager82
-        OptionManager82.loadFromDInit = false
-        OptionManager82.loadFromInit = false
-        OptionManager82.loadFromWorldGen = false
-        OptionSingleReplace40.optionManager = OptionManager82
-        OptionSettingManager85.settingName = Nothing
-        OptionSingleReplace40.settingManager = OptionSettingManager85
-        OptionSingleReplace40.tokenName = ""
-        OptionSingleReplace40.updateTileSets = false
-        Me.optBtnMoreCavernCreatures.options = OptionSingleReplace40
+        OptionSingleReplace37.disabledValue = "!NOCAVERN!"
+        OptionSingleReplace37.enabledValue = "YESCAVERN["
+        FileListManager79.fileNames = New String() {"creature_cavern_masterwork.txt"}
+        OptionSingleReplace37.fileManager = FileListManager79
+        OptionManager79.loadFromDInit = false
+        OptionManager79.loadFromInit = false
+        OptionManager79.loadFromWorldGen = false
+        OptionSingleReplace37.optionManager = OptionManager79
+        OptionSettingManager82.settingName = Nothing
+        OptionSingleReplace37.settingManager = OptionSettingManager82
+        OptionSingleReplace37.tokenName = ""
+        OptionSingleReplace37.updateTileSets = false
+        Me.optBtnMoreCavernCreatures.options = OptionSingleReplace37
         Me.optBtnMoreCavernCreatures.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreCavernCreatures.TabIndex = 8
         Me.optBtnMoreCavernCreatures.Text = "Cavern Creatures"
@@ -4756,19 +4669,19 @@ Partial Class MainForm
         Me.optBtnMoreSurfaceCreatures.Location = New System.Drawing.Point(5, 280)
         Me.optBtnMoreSurfaceCreatures.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreSurfaceCreatures.Name = "optBtnMoreSurfaceCreatures"
-        OptionSingleReplace41.disabledValue = "!NOMONSTER!"
-        OptionSingleReplace41.enabledValue = "YESMONSTER["
-        FileListManager83.fileNames = New String() {"creature_monster_masterwork.txt"}
-        OptionSingleReplace41.fileManager = FileListManager83
-        OptionManager83.loadFromDInit = false
-        OptionManager83.loadFromInit = false
-        OptionManager83.loadFromWorldGen = false
-        OptionSingleReplace41.optionManager = OptionManager83
-        OptionSettingManager86.settingName = Nothing
-        OptionSingleReplace41.settingManager = OptionSettingManager86
-        OptionSingleReplace41.tokenName = ""
-        OptionSingleReplace41.updateTileSets = false
-        Me.optBtnMoreSurfaceCreatures.options = OptionSingleReplace41
+        OptionSingleReplace38.disabledValue = "!NOMONSTER!"
+        OptionSingleReplace38.enabledValue = "YESMONSTER["
+        FileListManager80.fileNames = New String() {"creature_monster_masterwork.txt"}
+        OptionSingleReplace38.fileManager = FileListManager80
+        OptionManager80.loadFromDInit = false
+        OptionManager80.loadFromInit = false
+        OptionManager80.loadFromWorldGen = false
+        OptionSingleReplace38.optionManager = OptionManager80
+        OptionSettingManager83.settingName = Nothing
+        OptionSingleReplace38.settingManager = OptionSettingManager83
+        OptionSingleReplace38.tokenName = ""
+        OptionSingleReplace38.updateTileSets = false
+        Me.optBtnMoreSurfaceCreatures.options = OptionSingleReplace38
         Me.optBtnMoreSurfaceCreatures.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreSurfaceCreatures.TabIndex = 9
         Me.optBtnMoreSurfaceCreatures.Text = "Surface Creatures"
@@ -4789,19 +4702,19 @@ Partial Class MainForm
         Me.optBtnMoreDemons.Location = New System.Drawing.Point(5, 309)
         Me.optBtnMoreDemons.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreDemons.Name = "optBtnMoreDemons"
-        OptionSingleReplace42.disabledValue = "!NOHELL!"
-        OptionSingleReplace42.enabledValue = "YESHELL["
-        FileListManager84.fileNames = New String() {"creature_hell_masterwork.txt"}
-        OptionSingleReplace42.fileManager = FileListManager84
-        OptionManager84.loadFromDInit = false
-        OptionManager84.loadFromInit = false
-        OptionManager84.loadFromWorldGen = false
-        OptionSingleReplace42.optionManager = OptionManager84
-        OptionSettingManager87.settingName = Nothing
-        OptionSingleReplace42.settingManager = OptionSettingManager87
-        OptionSingleReplace42.tokenName = ""
-        OptionSingleReplace42.updateTileSets = false
-        Me.optBtnMoreDemons.options = OptionSingleReplace42
+        OptionSingleReplace39.disabledValue = "!NOHELL!"
+        OptionSingleReplace39.enabledValue = "YESHELL["
+        FileListManager81.fileNames = New String() {"creature_hell_masterwork.txt"}
+        OptionSingleReplace39.fileManager = FileListManager81
+        OptionManager81.loadFromDInit = false
+        OptionManager81.loadFromInit = false
+        OptionManager81.loadFromWorldGen = false
+        OptionSingleReplace39.optionManager = OptionManager81
+        OptionSettingManager84.settingName = Nothing
+        OptionSingleReplace39.settingManager = OptionSettingManager84
+        OptionSingleReplace39.tokenName = ""
+        OptionSingleReplace39.updateTileSets = false
+        Me.optBtnMoreDemons.options = OptionSingleReplace39
         Me.optBtnMoreDemons.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreDemons.TabIndex = 10
         Me.optBtnMoreDemons.Text = "Demons"
@@ -4822,19 +4735,19 @@ Partial Class MainForm
         Me.optBtnMoreMagical.Location = New System.Drawing.Point(5, 338)
         Me.optBtnMoreMagical.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreMagical.Name = "optBtnMoreMagical"
-        OptionSingleReplace43.disabledValue = "!NOMAGICCREATURES!"
-        OptionSingleReplace43.enabledValue = "YESMAGICCREATURES["
-        FileListManager85.fileNames = New String() {"creature_magical_ff.txt", "creature_food_ff.txt"}
-        OptionSingleReplace43.fileManager = FileListManager85
-        OptionManager85.loadFromDInit = false
-        OptionManager85.loadFromInit = false
-        OptionManager85.loadFromWorldGen = false
-        OptionSingleReplace43.optionManager = OptionManager85
-        OptionSettingManager88.settingName = Nothing
-        OptionSingleReplace43.settingManager = OptionSettingManager88
-        OptionSingleReplace43.tokenName = ""
-        OptionSingleReplace43.updateTileSets = false
-        Me.optBtnMoreMagical.options = OptionSingleReplace43
+        OptionSingleReplace40.disabledValue = "!NOMAGICCREATURES!"
+        OptionSingleReplace40.enabledValue = "YESMAGICCREATURES["
+        FileListManager82.fileNames = New String() {"creature_magical_ff.txt", "creature_food_ff.txt"}
+        OptionSingleReplace40.fileManager = FileListManager82
+        OptionManager82.loadFromDInit = false
+        OptionManager82.loadFromInit = false
+        OptionManager82.loadFromWorldGen = false
+        OptionSingleReplace40.optionManager = OptionManager82
+        OptionSettingManager85.settingName = Nothing
+        OptionSingleReplace40.settingManager = OptionSettingManager85
+        OptionSingleReplace40.tokenName = ""
+        OptionSingleReplace40.updateTileSets = false
+        Me.optBtnMoreMagical.options = OptionSingleReplace40
         Me.optBtnMoreMagical.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreMagical.TabIndex = 11
         Me.optBtnMoreMagical.Text = "Magical"
@@ -4846,21 +4759,69 @@ Partial Class MainForm
         '
         Me.optCbPatternInvaderSkills.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.optCbPatternInvaderSkills.FormattingEnabled = true
-        Me.optCbPatternInvaderSkills.Items.AddRange(New Object() {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15"})
         Me.optCbPatternInvaderSkills.Location = New System.Drawing.Point(148, 355)
         Me.optCbPatternInvaderSkills.Margin = New System.Windows.Forms.Padding(1)
         Me.optCbPatternInvaderSkills.Name = "optCbPatternInvaderSkills"
-        FileListManager86.fileNames = New String() {"creature_fortdefense.txt", "creature_masterwork.txt", "creature_standard.txt", "creature_subterranean.txt"}
-        OptionBase1.fileManager = FileListManager86
-        OptionManager86.loadFromDInit = false
-        OptionManager86.loadFromInit = false
-        OptionManager86.loadFromWorldGen = false
-        OptionBase1.optionManager = OptionManager86
-        OptionSettingManager89.settingName = Nothing
-        OptionBase1.settingManager = OptionSettingManager89
-        OptionBase1.updateTileSets = true
-        Me.optCbPatternInvaderSkills.options = OptionBase1
-        Me.optCbPatternInvaderSkills.pattern = "(\[NATURAL_SKILL:.*:)(?<value>\d+)(\]YESHARDERINVADER)"
+        FileListManager83.fileNames = New String() {"creature_fortdefense.txt", "creature_masterwork.txt", "creature_subterranean.txt"}
+        OptionList4.fileManager = FileListManager83
+        ComboItem17.display = "0"
+        ComboItem17.value = "0"
+        ComboItem18.display = "1"
+        ComboItem18.value = "1"
+        ComboItem19.display = "2"
+        ComboItem19.value = "2"
+        ComboItem20.display = "3"
+        ComboItem20.value = "3"
+        ComboItem21.display = "4"
+        ComboItem21.value = "4"
+        ComboItem22.display = "5"
+        ComboItem22.value = "5"
+        ComboItem23.display = "6"
+        ComboItem23.value = "6"
+        ComboItem24.display = "7"
+        ComboItem24.value = "7"
+        ComboItem25.display = "8"
+        ComboItem25.value = "8"
+        ComboItem26.display = "9"
+        ComboItem26.value = "9"
+        ComboItem27.display = "10"
+        ComboItem27.value = "10"
+        ComboItem28.display = "11"
+        ComboItem28.value = "11"
+        ComboItem29.display = "12"
+        ComboItem29.value = "12"
+        ComboItem30.display = "13"
+        ComboItem30.value = "13"
+        ComboItem31.display = "14"
+        ComboItem31.value = "14"
+        ComboItem32.display = "15"
+        ComboItem32.value = "15"
+        OptionList4.itemList.Add(ComboItem17)
+        OptionList4.itemList.Add(ComboItem18)
+        OptionList4.itemList.Add(ComboItem19)
+        OptionList4.itemList.Add(ComboItem20)
+        OptionList4.itemList.Add(ComboItem21)
+        OptionList4.itemList.Add(ComboItem22)
+        OptionList4.itemList.Add(ComboItem23)
+        OptionList4.itemList.Add(ComboItem24)
+        OptionList4.itemList.Add(ComboItem25)
+        OptionList4.itemList.Add(ComboItem26)
+        OptionList4.itemList.Add(ComboItem27)
+        OptionList4.itemList.Add(ComboItem28)
+        OptionList4.itemList.Add(ComboItem29)
+        OptionList4.itemList.Add(ComboItem30)
+        OptionList4.itemList.Add(ComboItem31)
+        OptionList4.itemList.Add(ComboItem32)
+        OptionManager83.loadFromDInit = false
+        OptionManager83.loadFromInit = false
+        OptionManager83.loadFromWorldGen = false
+        OptionList4.optionManager = OptionManager83
+        OptionSettingManager86.settingName = Nothing
+        OptionList4.settingManager = OptionSettingManager86
+        OptionList4.tokenName = ""
+        OptionList4.updateTileSets = true
+        Me.optCbPatternInvaderSkills.options = OptionList4
+        Me.optCbPatternInvaderSkills.pattern = "(\[NATURAL_SKILL:.*:)(?<value>\d+)(\]YESHARDERINVADER\b)"
         Me.optCbPatternInvaderSkills.replace = "${1}${value}${2}"
         Me.optCbPatternInvaderSkills.Size = New System.Drawing.Size(57, 23)
         Me.optCbPatternInvaderSkills.TabIndex = 22
@@ -4880,19 +4841,19 @@ Partial Class MainForm
         Me.optBtnFdFrogmen.Location = New System.Drawing.Point(8, 48)
         Me.optBtnFdFrogmen.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdFrogmen.Name = "optBtnFdFrogmen"
-        OptionSingleReplace44.disabledValue = "!NOFROG!"
-        OptionSingleReplace44.enabledValue = "YESFROG["
-        FileListManager87.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace44.fileManager = FileListManager87
-        OptionManager87.loadFromDInit = false
-        OptionManager87.loadFromInit = false
-        OptionManager87.loadFromWorldGen = false
-        OptionSingleReplace44.optionManager = OptionManager87
-        OptionSettingManager90.settingName = Nothing
-        OptionSingleReplace44.settingManager = OptionSettingManager90
-        OptionSingleReplace44.tokenName = ""
-        OptionSingleReplace44.updateTileSets = false
-        Me.optBtnFdFrogmen.options = OptionSingleReplace44
+        OptionSingleReplace41.disabledValue = "!NOFROG!"
+        OptionSingleReplace41.enabledValue = "YESFROG["
+        FileListManager84.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace41.fileManager = FileListManager84
+        OptionManager84.loadFromDInit = false
+        OptionManager84.loadFromInit = false
+        OptionManager84.loadFromWorldGen = false
+        OptionSingleReplace41.optionManager = OptionManager84
+        OptionSettingManager87.settingName = Nothing
+        OptionSingleReplace41.settingManager = OptionSettingManager87
+        OptionSingleReplace41.tokenName = ""
+        OptionSingleReplace41.updateTileSets = false
+        Me.optBtnFdFrogmen.options = OptionSingleReplace41
         Me.optBtnFdFrogmen.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdFrogmen.TabIndex = 1
         Me.optBtnFdFrogmen.Text = "Frogmen"
@@ -4913,19 +4874,19 @@ Partial Class MainForm
         Me.optBtnFdFireImps.Location = New System.Drawing.Point(8, 77)
         Me.optBtnFdFireImps.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdFireImps.Name = "optBtnFdFireImps"
-        OptionSingleReplace45.disabledValue = "!NOIMP!"
-        OptionSingleReplace45.enabledValue = "YESIMP["
-        FileListManager88.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace45.fileManager = FileListManager88
-        OptionManager88.loadFromDInit = false
-        OptionManager88.loadFromInit = false
-        OptionManager88.loadFromWorldGen = false
-        OptionSingleReplace45.optionManager = OptionManager88
-        OptionSettingManager91.settingName = Nothing
-        OptionSingleReplace45.settingManager = OptionSettingManager91
-        OptionSingleReplace45.tokenName = ""
-        OptionSingleReplace45.updateTileSets = false
-        Me.optBtnFdFireImps.options = OptionSingleReplace45
+        OptionSingleReplace42.disabledValue = "!NOIMP!"
+        OptionSingleReplace42.enabledValue = "YESIMP["
+        FileListManager85.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace42.fileManager = FileListManager85
+        OptionManager85.loadFromDInit = false
+        OptionManager85.loadFromInit = false
+        OptionManager85.loadFromWorldGen = false
+        OptionSingleReplace42.optionManager = OptionManager85
+        OptionSettingManager88.settingName = Nothing
+        OptionSingleReplace42.settingManager = OptionSettingManager88
+        OptionSingleReplace42.tokenName = ""
+        OptionSingleReplace42.updateTileSets = false
+        Me.optBtnFdFireImps.options = OptionSingleReplace42
         Me.optBtnFdFireImps.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdFireImps.TabIndex = 2
         Me.optBtnFdFireImps.Text = "Hellfire Imps"
@@ -4946,19 +4907,19 @@ Partial Class MainForm
         Me.optBtnFdStranglers.Location = New System.Drawing.Point(8, 106)
         Me.optBtnFdStranglers.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdStranglers.Name = "optBtnFdStranglers"
-        OptionSingleReplace46.disabledValue = "!NOSTRANGLER!"
-        OptionSingleReplace46.enabledValue = "YESSTRANGLER["
-        FileListManager89.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace46.fileManager = FileListManager89
-        OptionManager89.loadFromDInit = false
-        OptionManager89.loadFromInit = false
-        OptionManager89.loadFromWorldGen = false
-        OptionSingleReplace46.optionManager = OptionManager89
-        OptionSettingManager92.settingName = Nothing
-        OptionSingleReplace46.settingManager = OptionSettingManager92
-        OptionSingleReplace46.tokenName = ""
-        OptionSingleReplace46.updateTileSets = false
-        Me.optBtnFdStranglers.options = OptionSingleReplace46
+        OptionSingleReplace43.disabledValue = "!NOSTRANGLER!"
+        OptionSingleReplace43.enabledValue = "YESSTRANGLER["
+        FileListManager86.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace43.fileManager = FileListManager86
+        OptionManager86.loadFromDInit = false
+        OptionManager86.loadFromInit = false
+        OptionManager86.loadFromWorldGen = false
+        OptionSingleReplace43.optionManager = OptionManager86
+        OptionSettingManager89.settingName = Nothing
+        OptionSingleReplace43.settingManager = OptionSettingManager89
+        OptionSingleReplace43.tokenName = ""
+        OptionSingleReplace43.updateTileSets = false
+        Me.optBtnFdStranglers.options = OptionSingleReplace43
         Me.optBtnFdStranglers.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdStranglers.TabIndex = 3
         Me.optBtnFdStranglers.Text = "Stranglers"
@@ -4979,19 +4940,19 @@ Partial Class MainForm
         Me.optBtnFdWerewolfs.Location = New System.Drawing.Point(8, 135)
         Me.optBtnFdWerewolfs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdWerewolfs.Name = "optBtnFdWerewolfs"
-        OptionSingleReplace47.disabledValue = "!NOWEREWOLF!"
-        OptionSingleReplace47.enabledValue = "YESWEREWOLF["
-        FileListManager90.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace47.fileManager = FileListManager90
-        OptionManager90.loadFromDInit = false
-        OptionManager90.loadFromInit = false
-        OptionManager90.loadFromWorldGen = false
-        OptionSingleReplace47.optionManager = OptionManager90
-        OptionSettingManager93.settingName = Nothing
-        OptionSingleReplace47.settingManager = OptionSettingManager93
-        OptionSingleReplace47.tokenName = ""
-        OptionSingleReplace47.updateTileSets = false
-        Me.optBtnFdWerewolfs.options = OptionSingleReplace47
+        OptionSingleReplace44.disabledValue = "!NOWEREWOLF!"
+        OptionSingleReplace44.enabledValue = "YESWEREWOLF["
+        FileListManager87.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace44.fileManager = FileListManager87
+        OptionManager87.loadFromDInit = false
+        OptionManager87.loadFromInit = false
+        OptionManager87.loadFromWorldGen = false
+        OptionSingleReplace44.optionManager = OptionManager87
+        OptionSettingManager90.settingName = Nothing
+        OptionSingleReplace44.settingManager = OptionSettingManager90
+        OptionSingleReplace44.tokenName = ""
+        OptionSingleReplace44.updateTileSets = false
+        Me.optBtnFdWerewolfs.options = OptionSingleReplace44
         Me.optBtnFdWerewolfs.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdWerewolfs.TabIndex = 4
         Me.optBtnFdWerewolfs.Text = "Werewolves"
@@ -5012,19 +4973,19 @@ Partial Class MainForm
         Me.optBtnFdBlendecs.Location = New System.Drawing.Point(8, 164)
         Me.optBtnFdBlendecs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdBlendecs.Name = "optBtnFdBlendecs"
-        OptionSingleReplace48.disabledValue = "!NOBLENDEC!"
-        OptionSingleReplace48.enabledValue = "YESBLENDEC["
-        FileListManager91.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace48.fileManager = FileListManager91
-        OptionManager91.loadFromDInit = false
-        OptionManager91.loadFromInit = false
-        OptionManager91.loadFromWorldGen = false
-        OptionSingleReplace48.optionManager = OptionManager91
-        OptionSettingManager94.settingName = Nothing
-        OptionSingleReplace48.settingManager = OptionSettingManager94
-        OptionSingleReplace48.tokenName = ""
-        OptionSingleReplace48.updateTileSets = false
-        Me.optBtnFdBlendecs.options = OptionSingleReplace48
+        OptionSingleReplace45.disabledValue = "!NOBLENDEC!"
+        OptionSingleReplace45.enabledValue = "YESBLENDEC["
+        FileListManager88.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace45.fileManager = FileListManager88
+        OptionManager88.loadFromDInit = false
+        OptionManager88.loadFromInit = false
+        OptionManager88.loadFromWorldGen = false
+        OptionSingleReplace45.optionManager = OptionManager88
+        OptionSettingManager91.settingName = Nothing
+        OptionSingleReplace45.settingManager = OptionSettingManager91
+        OptionSingleReplace45.tokenName = ""
+        OptionSingleReplace45.updateTileSets = false
+        Me.optBtnFdBlendecs.options = OptionSingleReplace45
         Me.optBtnFdBlendecs.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdBlendecs.TabIndex = 5
         Me.optBtnFdBlendecs.Text = "Foul Blendecs"
@@ -5045,19 +5006,19 @@ Partial Class MainForm
         Me.optBtnFdSerpentmen.Location = New System.Drawing.Point(8, 193)
         Me.optBtnFdSerpentmen.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdSerpentmen.Name = "optBtnFdSerpentmen"
-        OptionSingleReplace49.disabledValue = "!NOSERPENT!"
-        OptionSingleReplace49.enabledValue = "YESSERPENT["
-        FileListManager92.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace49.fileManager = FileListManager92
-        OptionManager92.loadFromDInit = false
-        OptionManager92.loadFromInit = false
-        OptionManager92.loadFromWorldGen = false
-        OptionSingleReplace49.optionManager = OptionManager92
-        OptionSettingManager95.settingName = Nothing
-        OptionSingleReplace49.settingManager = OptionSettingManager95
-        OptionSingleReplace49.tokenName = ""
-        OptionSingleReplace49.updateTileSets = false
-        Me.optBtnFdSerpentmen.options = OptionSingleReplace49
+        OptionSingleReplace46.disabledValue = "!NOSERPENT!"
+        OptionSingleReplace46.enabledValue = "YESSERPENT["
+        FileListManager89.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace46.fileManager = FileListManager89
+        OptionManager89.loadFromDInit = false
+        OptionManager89.loadFromInit = false
+        OptionManager89.loadFromWorldGen = false
+        OptionSingleReplace46.optionManager = OptionManager89
+        OptionSettingManager92.settingName = Nothing
+        OptionSingleReplace46.settingManager = OptionSettingManager92
+        OptionSingleReplace46.tokenName = ""
+        OptionSingleReplace46.updateTileSets = false
+        Me.optBtnFdSerpentmen.options = OptionSingleReplace46
         Me.optBtnFdSerpentmen.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdSerpentmen.TabIndex = 6
         Me.optBtnFdSerpentmen.Text = "Serpentmen"
@@ -5078,19 +5039,19 @@ Partial Class MainForm
         Me.optBtnFdWhiteTigermen.Location = New System.Drawing.Point(8, 222)
         Me.optBtnFdWhiteTigermen.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdWhiteTigermen.Name = "optBtnFdWhiteTigermen"
-        OptionSingleReplace50.disabledValue = "!NOTIGER!"
-        OptionSingleReplace50.enabledValue = "YESTIGER["
-        FileListManager93.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace50.fileManager = FileListManager93
-        OptionManager93.loadFromDInit = false
-        OptionManager93.loadFromInit = false
-        OptionManager93.loadFromWorldGen = false
-        OptionSingleReplace50.optionManager = OptionManager93
-        OptionSettingManager96.settingName = Nothing
-        OptionSingleReplace50.settingManager = OptionSettingManager96
-        OptionSingleReplace50.tokenName = ""
-        OptionSingleReplace50.updateTileSets = false
-        Me.optBtnFdWhiteTigermen.options = OptionSingleReplace50
+        OptionSingleReplace47.disabledValue = "!NOTIGER!"
+        OptionSingleReplace47.enabledValue = "YESTIGER["
+        FileListManager90.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace47.fileManager = FileListManager90
+        OptionManager90.loadFromDInit = false
+        OptionManager90.loadFromInit = false
+        OptionManager90.loadFromWorldGen = false
+        OptionSingleReplace47.optionManager = OptionManager90
+        OptionSettingManager93.settingName = Nothing
+        OptionSingleReplace47.settingManager = OptionSettingManager93
+        OptionSingleReplace47.tokenName = ""
+        OptionSingleReplace47.updateTileSets = false
+        Me.optBtnFdWhiteTigermen.options = OptionSingleReplace47
         Me.optBtnFdWhiteTigermen.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdWhiteTigermen.TabIndex = 7
         Me.optBtnFdWhiteTigermen.Text = "White Tigermen"
@@ -5111,19 +5072,19 @@ Partial Class MainForm
         Me.optBtnFdBeakWolfs.Location = New System.Drawing.Point(8, 251)
         Me.optBtnFdBeakWolfs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdBeakWolfs.Name = "optBtnFdBeakWolfs"
-        OptionSingleReplace51.disabledValue = "!NOBEAKWOLF!"
-        OptionSingleReplace51.enabledValue = "YESBEAKWOLF["
-        FileListManager94.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace51.fileManager = FileListManager94
-        OptionManager94.loadFromDInit = false
-        OptionManager94.loadFromInit = false
-        OptionManager94.loadFromWorldGen = false
-        OptionSingleReplace51.optionManager = OptionManager94
-        OptionSettingManager97.settingName = Nothing
-        OptionSingleReplace51.settingManager = OptionSettingManager97
-        OptionSingleReplace51.tokenName = ""
-        OptionSingleReplace51.updateTileSets = false
-        Me.optBtnFdBeakWolfs.options = OptionSingleReplace51
+        OptionSingleReplace48.disabledValue = "!NOBEAKWOLF!"
+        OptionSingleReplace48.enabledValue = "YESBEAKWOLF["
+        FileListManager91.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace48.fileManager = FileListManager91
+        OptionManager91.loadFromDInit = false
+        OptionManager91.loadFromInit = false
+        OptionManager91.loadFromWorldGen = false
+        OptionSingleReplace48.optionManager = OptionManager91
+        OptionSettingManager94.settingName = Nothing
+        OptionSingleReplace48.settingManager = OptionSettingManager94
+        OptionSingleReplace48.tokenName = ""
+        OptionSingleReplace48.updateTileSets = false
+        Me.optBtnFdBeakWolfs.options = OptionSingleReplace48
         Me.optBtnFdBeakWolfs.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdBeakWolfs.TabIndex = 8
         Me.optBtnFdBeakWolfs.Text = "Beak Wolfs"
@@ -5144,19 +5105,19 @@ Partial Class MainForm
         Me.optBtnFdElephants.Location = New System.Drawing.Point(8, 280)
         Me.optBtnFdElephants.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdElephants.Name = "optBtnFdElephants"
-        OptionSingleReplace52.disabledValue = "!NOELEPHANT!"
-        OptionSingleReplace52.enabledValue = "YESELEPHANT["
-        FileListManager95.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace52.fileManager = FileListManager95
-        OptionManager95.loadFromDInit = false
-        OptionManager95.loadFromInit = false
-        OptionManager95.loadFromWorldGen = false
-        OptionSingleReplace52.optionManager = OptionManager95
-        OptionSettingManager98.settingName = Nothing
-        OptionSingleReplace52.settingManager = OptionSettingManager98
-        OptionSingleReplace52.tokenName = ""
-        OptionSingleReplace52.updateTileSets = false
-        Me.optBtnFdElephants.options = OptionSingleReplace52
+        OptionSingleReplace49.disabledValue = "!NOELEPHANT!"
+        OptionSingleReplace49.enabledValue = "YESELEPHANT["
+        FileListManager92.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace49.fileManager = FileListManager92
+        OptionManager92.loadFromDInit = false
+        OptionManager92.loadFromInit = false
+        OptionManager92.loadFromWorldGen = false
+        OptionSingleReplace49.optionManager = OptionManager92
+        OptionSettingManager95.settingName = Nothing
+        OptionSingleReplace49.settingManager = OptionSettingManager95
+        OptionSingleReplace49.tokenName = ""
+        OptionSingleReplace49.updateTileSets = false
+        Me.optBtnFdElephants.options = OptionSingleReplace49
         Me.optBtnFdElephants.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdElephants.TabIndex = 9
         Me.optBtnFdElephants.Text = "Elephants"
@@ -5177,19 +5138,19 @@ Partial Class MainForm
         Me.optBtnFdFerricElves.Location = New System.Drawing.Point(8, 309)
         Me.optBtnFdFerricElves.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdFerricElves.Name = "optBtnFdFerricElves"
-        OptionSingleReplace53.disabledValue = "!NOFERRICELF!"
-        OptionSingleReplace53.enabledValue = "YESFERRICELF["
-        FileListManager96.fileNames = New String() {"entity_fortdefense_easy.txt"}
-        OptionSingleReplace53.fileManager = FileListManager96
-        OptionManager96.loadFromDInit = false
-        OptionManager96.loadFromInit = false
-        OptionManager96.loadFromWorldGen = false
-        OptionSingleReplace53.optionManager = OptionManager96
-        OptionSettingManager99.settingName = Nothing
-        OptionSingleReplace53.settingManager = OptionSettingManager99
-        OptionSingleReplace53.tokenName = ""
-        OptionSingleReplace53.updateTileSets = false
-        Me.optBtnFdFerricElves.options = OptionSingleReplace53
+        OptionSingleReplace50.disabledValue = "!NOFERRICELF!"
+        OptionSingleReplace50.enabledValue = "YESFERRICELF["
+        FileListManager93.fileNames = New String() {"entity_fortdefense_easy.txt"}
+        OptionSingleReplace50.fileManager = FileListManager93
+        OptionManager93.loadFromDInit = false
+        OptionManager93.loadFromInit = false
+        OptionManager93.loadFromWorldGen = false
+        OptionSingleReplace50.optionManager = OptionManager93
+        OptionSettingManager96.settingName = Nothing
+        OptionSingleReplace50.settingManager = OptionSettingManager96
+        OptionSingleReplace50.tokenName = ""
+        OptionSingleReplace50.updateTileSets = false
+        Me.optBtnFdFerricElves.options = OptionSingleReplace50
         Me.optBtnFdFerricElves.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdFerricElves.TabIndex = 10
         Me.optBtnFdFerricElves.Text = "Ferric Elves"
@@ -5210,19 +5171,19 @@ Partial Class MainForm
         Me.optBtnFdGreatBadgermen.Location = New System.Drawing.Point(148, 48)
         Me.optBtnFdGreatBadgermen.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdGreatBadgermen.Name = "optBtnFdGreatBadgermen"
-        OptionSingleReplace54.disabledValue = "!NOBADGER!"
-        OptionSingleReplace54.enabledValue = "YESBADGER["
-        FileListManager97.fileNames = New String() {"entity_fortdefense_medium.txt"}
-        OptionSingleReplace54.fileManager = FileListManager97
-        OptionManager97.loadFromDInit = false
-        OptionManager97.loadFromInit = false
-        OptionManager97.loadFromWorldGen = false
-        OptionSingleReplace54.optionManager = OptionManager97
-        OptionSettingManager100.settingName = Nothing
-        OptionSingleReplace54.settingManager = OptionSettingManager100
-        OptionSingleReplace54.tokenName = ""
-        OptionSingleReplace54.updateTileSets = false
-        Me.optBtnFdGreatBadgermen.options = OptionSingleReplace54
+        OptionSingleReplace51.disabledValue = "!NOBADGER!"
+        OptionSingleReplace51.enabledValue = "YESBADGER["
+        FileListManager94.fileNames = New String() {"entity_fortdefense_medium.txt"}
+        OptionSingleReplace51.fileManager = FileListManager94
+        OptionManager94.loadFromDInit = false
+        OptionManager94.loadFromInit = false
+        OptionManager94.loadFromWorldGen = false
+        OptionSingleReplace51.optionManager = OptionManager94
+        OptionSettingManager97.settingName = Nothing
+        OptionSingleReplace51.settingManager = OptionSettingManager97
+        OptionSingleReplace51.tokenName = ""
+        OptionSingleReplace51.updateTileSets = false
+        Me.optBtnFdGreatBadgermen.options = OptionSingleReplace51
         Me.optBtnFdGreatBadgermen.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdGreatBadgermen.TabIndex = 13
         Me.optBtnFdGreatBadgermen.Text = "Badgermen"
@@ -5243,19 +5204,19 @@ Partial Class MainForm
         Me.optBtnFdPandashi.Location = New System.Drawing.Point(148, 77)
         Me.optBtnFdPandashi.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdPandashi.Name = "optBtnFdPandashi"
-        OptionSingleReplace55.disabledValue = "!NOPANDASHI!"
-        OptionSingleReplace55.enabledValue = "YESPANDASHI["
-        FileListManager98.fileNames = New String() {"entity_fortdefense_medium.txt"}
-        OptionSingleReplace55.fileManager = FileListManager98
-        OptionManager98.loadFromDInit = false
-        OptionManager98.loadFromInit = false
-        OptionManager98.loadFromWorldGen = false
-        OptionSingleReplace55.optionManager = OptionManager98
-        OptionSettingManager101.settingName = Nothing
-        OptionSingleReplace55.settingManager = OptionSettingManager101
-        OptionSingleReplace55.tokenName = ""
-        OptionSingleReplace55.updateTileSets = false
-        Me.optBtnFdPandashi.options = OptionSingleReplace55
+        OptionSingleReplace52.disabledValue = "!NOPANDASHI!"
+        OptionSingleReplace52.enabledValue = "YESPANDASHI["
+        FileListManager95.fileNames = New String() {"entity_fortdefense_medium.txt"}
+        OptionSingleReplace52.fileManager = FileListManager95
+        OptionManager95.loadFromDInit = false
+        OptionManager95.loadFromInit = false
+        OptionManager95.loadFromWorldGen = false
+        OptionSingleReplace52.optionManager = OptionManager95
+        OptionSettingManager98.settingName = Nothing
+        OptionSingleReplace52.settingManager = OptionSettingManager98
+        OptionSingleReplace52.tokenName = ""
+        OptionSingleReplace52.updateTileSets = false
+        Me.optBtnFdPandashi.options = OptionSingleReplace52
         Me.optBtnFdPandashi.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdPandashi.TabIndex = 14
         Me.optBtnFdPandashi.Text = "Pandashi"
@@ -5276,19 +5237,19 @@ Partial Class MainForm
         Me.optBtnFdRaptormen.Location = New System.Drawing.Point(148, 106)
         Me.optBtnFdRaptormen.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdRaptormen.Name = "optBtnFdRaptormen"
-        OptionSingleReplace56.disabledValue = "!NORAPTOR!"
-        OptionSingleReplace56.enabledValue = "YESRAPTOR["
-        FileListManager99.fileNames = New String() {"entity_fortdefense_medium.txt"}
-        OptionSingleReplace56.fileManager = FileListManager99
-        OptionManager99.loadFromDInit = false
-        OptionManager99.loadFromInit = false
-        OptionManager99.loadFromWorldGen = false
-        OptionSingleReplace56.optionManager = OptionManager99
-        OptionSettingManager102.settingName = Nothing
-        OptionSingleReplace56.settingManager = OptionSettingManager102
-        OptionSingleReplace56.tokenName = ""
-        OptionSingleReplace56.updateTileSets = false
-        Me.optBtnFdRaptormen.options = OptionSingleReplace56
+        OptionSingleReplace53.disabledValue = "!NORAPTOR!"
+        OptionSingleReplace53.enabledValue = "YESRAPTOR["
+        FileListManager96.fileNames = New String() {"entity_fortdefense_medium.txt"}
+        OptionSingleReplace53.fileManager = FileListManager96
+        OptionManager96.loadFromDInit = false
+        OptionManager96.loadFromInit = false
+        OptionManager96.loadFromWorldGen = false
+        OptionSingleReplace53.optionManager = OptionManager96
+        OptionSettingManager99.settingName = Nothing
+        OptionSingleReplace53.settingManager = OptionSettingManager99
+        OptionSingleReplace53.tokenName = ""
+        OptionSingleReplace53.updateTileSets = false
+        Me.optBtnFdRaptormen.options = OptionSingleReplace53
         Me.optBtnFdRaptormen.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdRaptormen.TabIndex = 15
         Me.optBtnFdRaptormen.Text = "Raptormen"
@@ -5309,19 +5270,19 @@ Partial Class MainForm
         Me.optBtnFdHarpies.Location = New System.Drawing.Point(148, 135)
         Me.optBtnFdHarpies.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdHarpies.Name = "optBtnFdHarpies"
-        OptionSingleReplace57.disabledValue = "!NOHARPY!"
-        OptionSingleReplace57.enabledValue = "YESHARPY["
-        FileListManager100.fileNames = New String() {"entity_fortdefense_medium.txt"}
-        OptionSingleReplace57.fileManager = FileListManager100
-        OptionManager100.loadFromDInit = false
-        OptionManager100.loadFromInit = false
-        OptionManager100.loadFromWorldGen = false
-        OptionSingleReplace57.optionManager = OptionManager100
-        OptionSettingManager103.settingName = Nothing
-        OptionSingleReplace57.settingManager = OptionSettingManager103
-        OptionSingleReplace57.tokenName = ""
-        OptionSingleReplace57.updateTileSets = false
-        Me.optBtnFdHarpies.options = OptionSingleReplace57
+        OptionSingleReplace54.disabledValue = "!NOHARPY!"
+        OptionSingleReplace54.enabledValue = "YESHARPY["
+        FileListManager97.fileNames = New String() {"entity_fortdefense_medium.txt"}
+        OptionSingleReplace54.fileManager = FileListManager97
+        OptionManager97.loadFromDInit = false
+        OptionManager97.loadFromInit = false
+        OptionManager97.loadFromWorldGen = false
+        OptionSingleReplace54.optionManager = OptionManager97
+        OptionSettingManager100.settingName = Nothing
+        OptionSingleReplace54.settingManager = OptionSettingManager100
+        OptionSingleReplace54.tokenName = ""
+        OptionSingleReplace54.updateTileSets = false
+        Me.optBtnFdHarpies.options = OptionSingleReplace54
         Me.optBtnFdHarpies.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdHarpies.TabIndex = 16
         Me.optBtnFdHarpies.Text = "Furies"
@@ -5342,19 +5303,19 @@ Partial Class MainForm
         Me.optBtnFdMinotaurs.Location = New System.Drawing.Point(148, 193)
         Me.optBtnFdMinotaurs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdMinotaurs.Name = "optBtnFdMinotaurs"
-        OptionSingleReplace58.disabledValue = "!NOMINOTAUR!"
-        OptionSingleReplace58.enabledValue = "YESMINOTAUR["
-        FileListManager101.fileNames = New String() {"entity_fortdefense_hard.txt"}
-        OptionSingleReplace58.fileManager = FileListManager101
-        OptionManager101.loadFromDInit = false
-        OptionManager101.loadFromInit = false
-        OptionManager101.loadFromWorldGen = false
-        OptionSingleReplace58.optionManager = OptionManager101
-        OptionSettingManager104.settingName = Nothing
-        OptionSingleReplace58.settingManager = OptionSettingManager104
-        OptionSingleReplace58.tokenName = ""
-        OptionSingleReplace58.updateTileSets = false
-        Me.optBtnFdMinotaurs.options = OptionSingleReplace58
+        OptionSingleReplace55.disabledValue = "!NOMINOTAUR!"
+        OptionSingleReplace55.enabledValue = "YESMINOTAUR["
+        FileListManager98.fileNames = New String() {"entity_fortdefense_hard.txt"}
+        OptionSingleReplace55.fileManager = FileListManager98
+        OptionManager98.loadFromDInit = false
+        OptionManager98.loadFromInit = false
+        OptionManager98.loadFromWorldGen = false
+        OptionSingleReplace55.optionManager = OptionManager98
+        OptionSettingManager101.settingName = Nothing
+        OptionSingleReplace55.settingManager = OptionSettingManager101
+        OptionSingleReplace55.tokenName = ""
+        OptionSingleReplace55.updateTileSets = false
+        Me.optBtnFdMinotaurs.options = OptionSingleReplace55
         Me.optBtnFdMinotaurs.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdMinotaurs.TabIndex = 18
         Me.optBtnFdMinotaurs.Text = "Minotaurs"
@@ -5375,19 +5336,19 @@ Partial Class MainForm
         Me.optBtnFdJotun.Location = New System.Drawing.Point(148, 222)
         Me.optBtnFdJotun.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdJotun.Name = "optBtnFdJotun"
-        OptionSingleReplace59.disabledValue = "!NOJOTUN!"
-        OptionSingleReplace59.enabledValue = "YESJOTUN["
-        FileListManager102.fileNames = New String() {"entity_fortdefense_hard.txt"}
-        OptionSingleReplace59.fileManager = FileListManager102
-        OptionManager102.loadFromDInit = false
-        OptionManager102.loadFromInit = false
-        OptionManager102.loadFromWorldGen = false
-        OptionSingleReplace59.optionManager = OptionManager102
-        OptionSettingManager105.settingName = Nothing
-        OptionSingleReplace59.settingManager = OptionSettingManager105
-        OptionSingleReplace59.tokenName = ""
-        OptionSingleReplace59.updateTileSets = false
-        Me.optBtnFdJotun.options = OptionSingleReplace59
+        OptionSingleReplace56.disabledValue = "!NOJOTUN!"
+        OptionSingleReplace56.enabledValue = "YESJOTUN["
+        FileListManager99.fileNames = New String() {"entity_fortdefense_hard.txt"}
+        OptionSingleReplace56.fileManager = FileListManager99
+        OptionManager99.loadFromDInit = false
+        OptionManager99.loadFromInit = false
+        OptionManager99.loadFromWorldGen = false
+        OptionSingleReplace56.optionManager = OptionManager99
+        OptionSettingManager102.settingName = Nothing
+        OptionSingleReplace56.settingManager = OptionSettingManager102
+        OptionSingleReplace56.tokenName = ""
+        OptionSingleReplace56.updateTileSets = false
+        Me.optBtnFdJotun.options = OptionSingleReplace56
         Me.optBtnFdJotun.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdJotun.TabIndex = 19
         Me.optBtnFdJotun.Text = "Jotun"
@@ -5408,20 +5369,20 @@ Partial Class MainForm
         Me.optBtnFdSpiderFiends.Location = New System.Drawing.Point(148, 251)
         Me.optBtnFdSpiderFiends.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdSpiderFiends.Name = "optBtnFdSpiderFiends"
-        OptionSingleReplace60.disabledValue = "!NOSPIDER!"
-        OptionSingleReplace60.enabledValue = "YESSPIDER["
-        FileListManager103.fileNames = New String() {"entity_fortdefense_hard.txt"}
-        OptionSingleReplace60.fileManager = FileListManager103
-        OptionManager103.loadFromDInit = false
-        OptionManager103.loadFromInit = false
-        OptionManager103.loadFromWorldGen = false
-        OptionSingleReplace60.optionManager = OptionManager103
-        OptionSettingManager106.settingName = Nothing
-        OptionSingleReplace60.settingManager = OptionSettingManager106
-        OptionSingleReplace60.tokenName = ""
-        OptionSingleReplace60.updateTileSets = false
-        Me.optBtnFdSpiderFiends.options = OptionSingleReplace60
-        Me.optBtnFdSpiderFiends.Size = New System.Drawing.Size(134, 27)
+        OptionSingleReplace57.disabledValue = "!NOSPIDER!"
+        OptionSingleReplace57.enabledValue = "YESSPIDER["
+        FileListManager100.fileNames = New String() {"entity_fortdefense_hard.txt"}
+        OptionSingleReplace57.fileManager = FileListManager100
+        OptionManager100.loadFromDInit = false
+        OptionManager100.loadFromInit = false
+        OptionManager100.loadFromWorldGen = false
+        OptionSingleReplace57.optionManager = OptionManager100
+        OptionSettingManager103.settingName = Nothing
+        OptionSingleReplace57.settingManager = OptionSettingManager103
+        OptionSingleReplace57.tokenName = ""
+        OptionSingleReplace57.updateTileSets = false
+        Me.optBtnFdSpiderFiends.options = OptionSingleReplace57
+        Me.optBtnFdSpiderFiends.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdSpiderFiends.TabIndex = 20
         Me.optBtnFdSpiderFiends.Text = "Spider Fiends"
         Me.optBtnFdSpiderFiends.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -5441,19 +5402,19 @@ Partial Class MainForm
         Me.optBtnFdNightwings.Location = New System.Drawing.Point(148, 280)
         Me.optBtnFdNightwings.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFdNightwings.Name = "optBtnFdNightwings"
-        OptionSingleReplace61.disabledValue = "!NONIGHTWING!"
-        OptionSingleReplace61.enabledValue = "YESNIGHTWING["
-        FileListManager104.fileNames = New String() {"entity_fortdefense_hard.txt"}
-        OptionSingleReplace61.fileManager = FileListManager104
-        OptionManager104.loadFromDInit = false
-        OptionManager104.loadFromInit = false
-        OptionManager104.loadFromWorldGen = false
-        OptionSingleReplace61.optionManager = OptionManager104
-        OptionSettingManager107.settingName = Nothing
-        OptionSingleReplace61.settingManager = OptionSettingManager107
-        OptionSingleReplace61.tokenName = ""
-        OptionSingleReplace61.updateTileSets = false
-        Me.optBtnFdNightwings.options = OptionSingleReplace61
+        OptionSingleReplace58.disabledValue = "!NONIGHTWING!"
+        OptionSingleReplace58.enabledValue = "YESNIGHTWING["
+        FileListManager101.fileNames = New String() {"entity_fortdefense_hard.txt"}
+        OptionSingleReplace58.fileManager = FileListManager101
+        OptionManager101.loadFromDInit = false
+        OptionManager101.loadFromInit = false
+        OptionManager101.loadFromWorldGen = false
+        OptionSingleReplace58.optionManager = OptionManager101
+        OptionSettingManager104.settingName = Nothing
+        OptionSingleReplace58.settingManager = OptionSettingManager104
+        OptionSingleReplace58.tokenName = ""
+        OptionSingleReplace58.updateTileSets = false
+        Me.optBtnFdNightwings.options = OptionSingleReplace58
         Me.optBtnFdNightwings.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFdNightwings.TabIndex = 21
         Me.optBtnFdNightwings.Text = "Nightwings"
@@ -5475,19 +5436,19 @@ Partial Class MainForm
         Me.optBtnSteamEngine.Location = New System.Drawing.Point(5, 40)
         Me.optBtnSteamEngine.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnSteamEngine.Name = "optBtnSteamEngine"
-        OptionSingleReplace62.disabledValue = "!NOSTEAMENGINE!"
-        OptionSingleReplace62.enabledValue = "YESSTEAMENGINE["
-        FileListManager105.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace62.fileManager = FileListManager105
-        OptionManager105.loadFromDInit = false
-        OptionManager105.loadFromInit = false
-        OptionManager105.loadFromWorldGen = false
-        OptionSingleReplace62.optionManager = OptionManager105
-        OptionSettingManager108.settingName = Nothing
-        OptionSingleReplace62.settingManager = OptionSettingManager108
-        OptionSingleReplace62.tokenName = ""
-        OptionSingleReplace62.updateTileSets = false
-        Me.optBtnSteamEngine.options = OptionSingleReplace62
+        OptionSingleReplace59.disabledValue = "!NOSTEAMENGINE!"
+        OptionSingleReplace59.enabledValue = "YESSTEAMENGINE["
+        FileListManager102.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace59.fileManager = FileListManager102
+        OptionManager102.loadFromDInit = false
+        OptionManager102.loadFromInit = false
+        OptionManager102.loadFromWorldGen = false
+        OptionSingleReplace59.optionManager = OptionManager102
+        OptionSettingManager105.settingName = Nothing
+        OptionSingleReplace59.settingManager = OptionSettingManager105
+        OptionSingleReplace59.tokenName = ""
+        OptionSingleReplace59.updateTileSets = false
+        Me.optBtnSteamEngine.options = OptionSingleReplace59
         Me.optBtnSteamEngine.Size = New System.Drawing.Size(134, 27)
         Me.optBtnSteamEngine.TabIndex = 0
         Me.optBtnSteamEngine.Text = "Steam Engine"
@@ -5509,19 +5470,19 @@ Partial Class MainForm
         Me.optBtnMachineFactory.Location = New System.Drawing.Point(5, 69)
         Me.optBtnMachineFactory.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMachineFactory.Name = "optBtnMachineFactory"
-        OptionSingleReplace63.disabledValue = "!NOMACHINEFACTORY!"
-        OptionSingleReplace63.enabledValue = "YESMACHINEFACTORY["
-        FileListManager106.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace63.fileManager = FileListManager106
-        OptionManager106.loadFromDInit = false
-        OptionManager106.loadFromInit = false
-        OptionManager106.loadFromWorldGen = false
-        OptionSingleReplace63.optionManager = OptionManager106
-        OptionSettingManager109.settingName = Nothing
-        OptionSingleReplace63.settingManager = OptionSettingManager109
-        OptionSingleReplace63.tokenName = ""
-        OptionSingleReplace63.updateTileSets = false
-        Me.optBtnMachineFactory.options = OptionSingleReplace63
+        OptionSingleReplace60.disabledValue = "!NOMACHINEFACTORY!"
+        OptionSingleReplace60.enabledValue = "YESMACHINEFACTORY["
+        FileListManager103.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace60.fileManager = FileListManager103
+        OptionManager103.loadFromDInit = false
+        OptionManager103.loadFromInit = false
+        OptionManager103.loadFromWorldGen = false
+        OptionSingleReplace60.optionManager = OptionManager103
+        OptionSettingManager106.settingName = Nothing
+        OptionSingleReplace60.settingManager = OptionSettingManager106
+        OptionSingleReplace60.tokenName = ""
+        OptionSingleReplace60.updateTileSets = false
+        Me.optBtnMachineFactory.options = OptionSingleReplace60
         Me.optBtnMachineFactory.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMachineFactory.TabIndex = 1
         Me.optBtnMachineFactory.Text = "Machine Factory"
@@ -5544,19 +5505,19 @@ Partial Class MainForm
         Me.optBtnLiquidSpawner.Location = New System.Drawing.Point(5, 98)
         Me.optBtnLiquidSpawner.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnLiquidSpawner.Name = "optBtnLiquidSpawner"
-        OptionSingleReplace64.disabledValue = "!NOLIQUIDSPAWNER!"
-        OptionSingleReplace64.enabledValue = "YESLIQUIDSPAWNER["
-        FileListManager107.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace64.fileManager = FileListManager107
-        OptionManager107.loadFromDInit = false
-        OptionManager107.loadFromInit = false
-        OptionManager107.loadFromWorldGen = false
-        OptionSingleReplace64.optionManager = OptionManager107
-        OptionSettingManager110.settingName = Nothing
-        OptionSingleReplace64.settingManager = OptionSettingManager110
-        OptionSingleReplace64.tokenName = ""
-        OptionSingleReplace64.updateTileSets = false
-        Me.optBtnLiquidSpawner.options = OptionSingleReplace64
+        OptionSingleReplace61.disabledValue = "!NOLIQUIDSPAWNER!"
+        OptionSingleReplace61.enabledValue = "YESLIQUIDSPAWNER["
+        FileListManager104.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace61.fileManager = FileListManager104
+        OptionManager104.loadFromDInit = false
+        OptionManager104.loadFromInit = false
+        OptionManager104.loadFromWorldGen = false
+        OptionSingleReplace61.optionManager = OptionManager104
+        OptionSettingManager107.settingName = Nothing
+        OptionSingleReplace61.settingManager = OptionSettingManager107
+        OptionSingleReplace61.tokenName = ""
+        OptionSingleReplace61.updateTileSets = false
+        Me.optBtnLiquidSpawner.options = OptionSingleReplace61
         Me.optBtnLiquidSpawner.Size = New System.Drawing.Size(134, 27)
         Me.optBtnLiquidSpawner.TabIndex = 2
         Me.optBtnLiquidSpawner.Text = "Liquid Spawner"
@@ -5579,19 +5540,19 @@ Partial Class MainForm
         Me.optBtnCoinMint.Location = New System.Drawing.Point(5, 127)
         Me.optBtnCoinMint.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCoinMint.Name = "optBtnCoinMint"
-        OptionSingleReplace65.disabledValue = "!NOCOINMINT!"
-        OptionSingleReplace65.enabledValue = "YESCOINMINT["
-        FileListManager108.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace65.fileManager = FileListManager108
-        OptionManager108.loadFromDInit = false
-        OptionManager108.loadFromInit = false
-        OptionManager108.loadFromWorldGen = false
-        OptionSingleReplace65.optionManager = OptionManager108
-        OptionSettingManager111.settingName = Nothing
-        OptionSingleReplace65.settingManager = OptionSettingManager111
-        OptionSingleReplace65.tokenName = ""
-        OptionSingleReplace65.updateTileSets = false
-        Me.optBtnCoinMint.options = OptionSingleReplace65
+        OptionSingleReplace62.disabledValue = "!NOCOINMINT!"
+        OptionSingleReplace62.enabledValue = "YESCOINMINT["
+        FileListManager105.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace62.fileManager = FileListManager105
+        OptionManager105.loadFromDInit = false
+        OptionManager105.loadFromInit = false
+        OptionManager105.loadFromWorldGen = false
+        OptionSingleReplace62.optionManager = OptionManager105
+        OptionSettingManager108.settingName = Nothing
+        OptionSingleReplace62.settingManager = OptionSettingManager108
+        OptionSingleReplace62.tokenName = ""
+        OptionSingleReplace62.updateTileSets = false
+        Me.optBtnCoinMint.options = OptionSingleReplace62
         Me.optBtnCoinMint.Size = New System.Drawing.Size(134, 27)
         Me.optBtnCoinMint.TabIndex = 3
         Me.optBtnCoinMint.Text = "Coin Mint"
@@ -5613,19 +5574,19 @@ Partial Class MainForm
         Me.optBtnBonecarver.Location = New System.Drawing.Point(5, 19)
         Me.optBtnBonecarver.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBonecarver.Name = "optBtnBonecarver"
-        OptionSingleReplace66.disabledValue = "!NOBONEYARD!"
-        OptionSingleReplace66.enabledValue = "YESBONEYARD["
-        FileListManager109.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace66.fileManager = FileListManager109
-        OptionManager109.loadFromDInit = false
-        OptionManager109.loadFromInit = false
-        OptionManager109.loadFromWorldGen = false
-        OptionSingleReplace66.optionManager = OptionManager109
-        OptionSettingManager112.settingName = Nothing
-        OptionSingleReplace66.settingManager = OptionSettingManager112
-        OptionSingleReplace66.tokenName = ""
-        OptionSingleReplace66.updateTileSets = false
-        Me.optBtnBonecarver.options = OptionSingleReplace66
+        OptionSingleReplace63.disabledValue = "!NOBONEYARD!"
+        OptionSingleReplace63.enabledValue = "YESBONEYARD["
+        FileListManager106.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace63.fileManager = FileListManager106
+        OptionManager106.loadFromDInit = false
+        OptionManager106.loadFromInit = false
+        OptionManager106.loadFromWorldGen = false
+        OptionSingleReplace63.optionManager = OptionManager106
+        OptionSettingManager109.settingName = Nothing
+        OptionSingleReplace63.settingManager = OptionSettingManager109
+        OptionSingleReplace63.tokenName = ""
+        OptionSingleReplace63.updateTileSets = false
+        Me.optBtnBonecarver.options = OptionSingleReplace63
         Me.optBtnBonecarver.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBonecarver.TabIndex = 0
         Me.optBtnBonecarver.Text = "Bonecarver"
@@ -5647,19 +5608,19 @@ Partial Class MainForm
         Me.optBtnStonecrafter.Location = New System.Drawing.Point(5, 48)
         Me.optBtnStonecrafter.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnStonecrafter.Name = "optBtnStonecrafter"
-        OptionSingleReplace67.disabledValue = "!NOSTONECUTTER!"
-        OptionSingleReplace67.enabledValue = "YESSTONECUTTER["
-        FileListManager110.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace67.fileManager = FileListManager110
-        OptionManager110.loadFromDInit = false
-        OptionManager110.loadFromInit = false
-        OptionManager110.loadFromWorldGen = false
-        OptionSingleReplace67.optionManager = OptionManager110
-        OptionSettingManager113.settingName = Nothing
-        OptionSingleReplace67.settingManager = OptionSettingManager113
-        OptionSingleReplace67.tokenName = ""
-        OptionSingleReplace67.updateTileSets = false
-        Me.optBtnStonecrafter.options = OptionSingleReplace67
+        OptionSingleReplace64.disabledValue = "!NOSTONECUTTER!"
+        OptionSingleReplace64.enabledValue = "YESSTONECUTTER["
+        FileListManager107.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace64.fileManager = FileListManager107
+        OptionManager107.loadFromDInit = false
+        OptionManager107.loadFromInit = false
+        OptionManager107.loadFromWorldGen = false
+        OptionSingleReplace64.optionManager = OptionManager107
+        OptionSettingManager110.settingName = Nothing
+        OptionSingleReplace64.settingManager = OptionSettingManager110
+        OptionSingleReplace64.tokenName = ""
+        OptionSingleReplace64.updateTileSets = false
+        Me.optBtnStonecrafter.options = OptionSingleReplace64
         Me.optBtnStonecrafter.Size = New System.Drawing.Size(134, 27)
         Me.optBtnStonecrafter.TabIndex = 1
         Me.optBtnStonecrafter.Text = "Stonecrafter"
@@ -5681,19 +5642,19 @@ Partial Class MainForm
         Me.optBtnGemcutter.Location = New System.Drawing.Point(5, 77)
         Me.optBtnGemcutter.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGemcutter.Name = "optBtnGemcutter"
-        OptionSingleReplace68.disabledValue = "!GEMWORKSHOP!"
-        OptionSingleReplace68.enabledValue = "YESGEMWORKSHOP["
-        FileListManager111.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace68.fileManager = FileListManager111
-        OptionManager111.loadFromDInit = false
-        OptionManager111.loadFromInit = false
-        OptionManager111.loadFromWorldGen = false
-        OptionSingleReplace68.optionManager = OptionManager111
-        OptionSettingManager114.settingName = Nothing
-        OptionSingleReplace68.settingManager = OptionSettingManager114
-        OptionSingleReplace68.tokenName = ""
-        OptionSingleReplace68.updateTileSets = false
-        Me.optBtnGemcutter.options = OptionSingleReplace68
+        OptionSingleReplace65.disabledValue = "!GEMWORKSHOP!"
+        OptionSingleReplace65.enabledValue = "YESGEMWORKSHOP["
+        FileListManager108.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace65.fileManager = FileListManager108
+        OptionManager108.loadFromDInit = false
+        OptionManager108.loadFromInit = false
+        OptionManager108.loadFromWorldGen = false
+        OptionSingleReplace65.optionManager = OptionManager108
+        OptionSettingManager111.settingName = Nothing
+        OptionSingleReplace65.settingManager = OptionSettingManager111
+        OptionSingleReplace65.tokenName = ""
+        OptionSingleReplace65.updateTileSets = false
+        Me.optBtnGemcutter.options = OptionSingleReplace65
         Me.optBtnGemcutter.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGemcutter.TabIndex = 2
         Me.optBtnGemcutter.Text = "Gemcutter"
@@ -5716,19 +5677,19 @@ Partial Class MainForm
         Me.optBtnWoodcrafter.Location = New System.Drawing.Point(5, 106)
         Me.optBtnWoodcrafter.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnWoodcrafter.Name = "optBtnWoodcrafter"
-        OptionSingleReplace69.disabledValue = "!NOWOODCRAFTER!"
-        OptionSingleReplace69.enabledValue = "YESWOODCRAFTER["
-        FileListManager112.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace69.fileManager = FileListManager112
-        OptionManager112.loadFromDInit = false
-        OptionManager112.loadFromInit = false
-        OptionManager112.loadFromWorldGen = false
-        OptionSingleReplace69.optionManager = OptionManager112
-        OptionSettingManager115.settingName = Nothing
-        OptionSingleReplace69.settingManager = OptionSettingManager115
-        OptionSingleReplace69.tokenName = ""
-        OptionSingleReplace69.updateTileSets = false
-        Me.optBtnWoodcrafter.options = OptionSingleReplace69
+        OptionSingleReplace66.disabledValue = "!NOWOODCRAFTER!"
+        OptionSingleReplace66.enabledValue = "YESWOODCRAFTER["
+        FileListManager109.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace66.fileManager = FileListManager109
+        OptionManager109.loadFromDInit = false
+        OptionManager109.loadFromInit = false
+        OptionManager109.loadFromWorldGen = false
+        OptionSingleReplace66.optionManager = OptionManager109
+        OptionSettingManager112.settingName = Nothing
+        OptionSingleReplace66.settingManager = OptionSettingManager112
+        OptionSingleReplace66.tokenName = ""
+        OptionSingleReplace66.updateTileSets = false
+        Me.optBtnWoodcrafter.options = OptionSingleReplace66
         Me.optBtnWoodcrafter.Size = New System.Drawing.Size(134, 27)
         Me.optBtnWoodcrafter.TabIndex = 3
         Me.optBtnWoodcrafter.Text = "Woodcrafter"
@@ -5750,19 +5711,19 @@ Partial Class MainForm
         Me.optBtnThatchery.Location = New System.Drawing.Point(5, 135)
         Me.optBtnThatchery.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnThatchery.Name = "optBtnThatchery"
-        OptionSingleReplace70.disabledValue = "!NOTHATCHERY!"
-        OptionSingleReplace70.enabledValue = "YESTHATCHERY["
-        FileListManager113.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace70.fileManager = FileListManager113
-        OptionManager113.loadFromDInit = false
-        OptionManager113.loadFromInit = false
-        OptionManager113.loadFromWorldGen = false
-        OptionSingleReplace70.optionManager = OptionManager113
-        OptionSettingManager116.settingName = Nothing
-        OptionSingleReplace70.settingManager = OptionSettingManager116
-        OptionSingleReplace70.tokenName = ""
-        OptionSingleReplace70.updateTileSets = false
-        Me.optBtnThatchery.options = OptionSingleReplace70
+        OptionSingleReplace67.disabledValue = "!NOTHATCHERY!"
+        OptionSingleReplace67.enabledValue = "YESTHATCHERY["
+        FileListManager110.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace67.fileManager = FileListManager110
+        OptionManager110.loadFromDInit = false
+        OptionManager110.loadFromInit = false
+        OptionManager110.loadFromWorldGen = false
+        OptionSingleReplace67.optionManager = OptionManager110
+        OptionSettingManager113.settingName = Nothing
+        OptionSingleReplace67.settingManager = OptionSettingManager113
+        OptionSingleReplace67.tokenName = ""
+        OptionSingleReplace67.updateTileSets = false
+        Me.optBtnThatchery.options = OptionSingleReplace67
         Me.optBtnThatchery.Size = New System.Drawing.Size(134, 27)
         Me.optBtnThatchery.TabIndex = 4
         Me.optBtnThatchery.Text = "Thatchery"
@@ -5784,19 +5745,19 @@ Partial Class MainForm
         Me.optBtnFurnitureWorkshop.Location = New System.Drawing.Point(5, 164)
         Me.optBtnFurnitureWorkshop.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFurnitureWorkshop.Name = "optBtnFurnitureWorkshop"
-        OptionSingleReplace71.disabledValue = "!NOFURNITURE!"
-        OptionSingleReplace71.enabledValue = "YESFURNITURE["
-        FileListManager114.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace71.fileManager = FileListManager114
-        OptionManager114.loadFromDInit = false
-        OptionManager114.loadFromInit = false
-        OptionManager114.loadFromWorldGen = false
-        OptionSingleReplace71.optionManager = OptionManager114
-        OptionSettingManager117.settingName = Nothing
-        OptionSingleReplace71.settingManager = OptionSettingManager117
-        OptionSingleReplace71.tokenName = ""
-        OptionSingleReplace71.updateTileSets = false
-        Me.optBtnFurnitureWorkshop.options = OptionSingleReplace71
+        OptionSingleReplace68.disabledValue = "!NOFURNITURE!"
+        OptionSingleReplace68.enabledValue = "YESFURNITURE["
+        FileListManager111.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace68.fileManager = FileListManager111
+        OptionManager111.loadFromDInit = false
+        OptionManager111.loadFromInit = false
+        OptionManager111.loadFromWorldGen = false
+        OptionSingleReplace68.optionManager = OptionManager111
+        OptionSettingManager114.settingName = Nothing
+        OptionSingleReplace68.settingManager = OptionSettingManager114
+        OptionSingleReplace68.tokenName = ""
+        OptionSingleReplace68.updateTileSets = false
+        Me.optBtnFurnitureWorkshop.options = OptionSingleReplace68
         Me.optBtnFurnitureWorkshop.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFurnitureWorkshop.TabIndex = 5
         Me.optBtnFurnitureWorkshop.Text = "Furniture Shop"
@@ -5819,19 +5780,19 @@ Partial Class MainForm
         Me.optBtnTailor.Location = New System.Drawing.Point(5, 193)
         Me.optBtnTailor.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTailor.Name = "optBtnTailor"
-        OptionSingleReplace72.disabledValue = "!NOTAILOR!"
-        OptionSingleReplace72.enabledValue = "YESTAILOR["
-        FileListManager115.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace72.fileManager = FileListManager115
-        OptionManager115.loadFromDInit = false
-        OptionManager115.loadFromInit = false
-        OptionManager115.loadFromWorldGen = false
-        OptionSingleReplace72.optionManager = OptionManager115
-        OptionSettingManager118.settingName = Nothing
-        OptionSingleReplace72.settingManager = OptionSettingManager118
-        OptionSingleReplace72.tokenName = ""
-        OptionSingleReplace72.updateTileSets = false
-        Me.optBtnTailor.options = OptionSingleReplace72
+        OptionSingleReplace69.disabledValue = "!NOTAILOR!"
+        OptionSingleReplace69.enabledValue = "YESTAILOR["
+        FileListManager112.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace69.fileManager = FileListManager112
+        OptionManager112.loadFromDInit = false
+        OptionManager112.loadFromInit = false
+        OptionManager112.loadFromWorldGen = false
+        OptionSingleReplace69.optionManager = OptionManager112
+        OptionSettingManager115.settingName = Nothing
+        OptionSingleReplace69.settingManager = OptionSettingManager115
+        OptionSingleReplace69.tokenName = ""
+        OptionSingleReplace69.updateTileSets = false
+        Me.optBtnTailor.options = OptionSingleReplace69
         Me.optBtnTailor.Size = New System.Drawing.Size(134, 27)
         Me.optBtnTailor.TabIndex = 6
         Me.optBtnTailor.Text = "Tailor"
@@ -5854,19 +5815,19 @@ Partial Class MainForm
         Me.optBtnChandler.Location = New System.Drawing.Point(5, 222)
         Me.optBtnChandler.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnChandler.Name = "optBtnChandler"
-        OptionSingleReplace73.disabledValue = "!NOCHANDLER!"
-        OptionSingleReplace73.enabledValue = "YESCHANDLER["
-        FileListManager116.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace73.fileManager = FileListManager116
-        OptionManager116.loadFromDInit = false
-        OptionManager116.loadFromInit = false
-        OptionManager116.loadFromWorldGen = false
-        OptionSingleReplace73.optionManager = OptionManager116
-        OptionSettingManager119.settingName = Nothing
-        OptionSingleReplace73.settingManager = OptionSettingManager119
-        OptionSingleReplace73.tokenName = ""
-        OptionSingleReplace73.updateTileSets = false
-        Me.optBtnChandler.options = OptionSingleReplace73
+        OptionSingleReplace70.disabledValue = "!NOCHANDLER!"
+        OptionSingleReplace70.enabledValue = "YESCHANDLER["
+        FileListManager113.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace70.fileManager = FileListManager113
+        OptionManager113.loadFromDInit = false
+        OptionManager113.loadFromInit = false
+        OptionManager113.loadFromWorldGen = false
+        OptionSingleReplace70.optionManager = OptionManager113
+        OptionSettingManager116.settingName = Nothing
+        OptionSingleReplace70.settingManager = OptionSettingManager116
+        OptionSingleReplace70.tokenName = ""
+        OptionSingleReplace70.updateTileSets = false
+        Me.optBtnChandler.options = OptionSingleReplace70
         Me.optBtnChandler.Size = New System.Drawing.Size(134, 27)
         Me.optBtnChandler.TabIndex = 7
         Me.optBtnChandler.Text = "Chandler"
@@ -5888,19 +5849,19 @@ Partial Class MainForm
         Me.optBtnFletcher.Location = New System.Drawing.Point(5, 251)
         Me.optBtnFletcher.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFletcher.Name = "optBtnFletcher"
-        OptionSingleReplace74.disabledValue = "!NOFLETCHER!"
-        OptionSingleReplace74.enabledValue = "YESFLETCHER["
-        FileListManager117.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace74.fileManager = FileListManager117
-        OptionManager117.loadFromDInit = false
-        OptionManager117.loadFromInit = false
-        OptionManager117.loadFromWorldGen = false
-        OptionSingleReplace74.optionManager = OptionManager117
-        OptionSettingManager120.settingName = Nothing
-        OptionSingleReplace74.settingManager = OptionSettingManager120
-        OptionSingleReplace74.tokenName = ""
-        OptionSingleReplace74.updateTileSets = false
-        Me.optBtnFletcher.options = OptionSingleReplace74
+        OptionSingleReplace71.disabledValue = "!NOFLETCHER!"
+        OptionSingleReplace71.enabledValue = "YESFLETCHER["
+        FileListManager114.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace71.fileManager = FileListManager114
+        OptionManager114.loadFromDInit = false
+        OptionManager114.loadFromInit = false
+        OptionManager114.loadFromWorldGen = false
+        OptionSingleReplace71.optionManager = OptionManager114
+        OptionSettingManager117.settingName = Nothing
+        OptionSingleReplace71.settingManager = OptionSettingManager117
+        OptionSingleReplace71.tokenName = ""
+        OptionSingleReplace71.updateTileSets = false
+        Me.optBtnFletcher.options = OptionSingleReplace71
         Me.optBtnFletcher.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFletcher.TabIndex = 8
         Me.optBtnFletcher.Text = "Fletcher"
@@ -5922,19 +5883,19 @@ Partial Class MainForm
         Me.optBtnPottery.Location = New System.Drawing.Point(5, 280)
         Me.optBtnPottery.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnPottery.Name = "optBtnPottery"
-        OptionSingleReplace75.disabledValue = "!NOPOTTERY!"
-        OptionSingleReplace75.enabledValue = "YESPOTTERY["
-        FileListManager118.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace75.fileManager = FileListManager118
-        OptionManager118.loadFromDInit = false
-        OptionManager118.loadFromInit = false
-        OptionManager118.loadFromWorldGen = false
-        OptionSingleReplace75.optionManager = OptionManager118
-        OptionSettingManager121.settingName = Nothing
-        OptionSingleReplace75.settingManager = OptionSettingManager121
-        OptionSingleReplace75.tokenName = ""
-        OptionSingleReplace75.updateTileSets = false
-        Me.optBtnPottery.options = OptionSingleReplace75
+        OptionSingleReplace72.disabledValue = "!NOPOTTERY!"
+        OptionSingleReplace72.enabledValue = "YESPOTTERY["
+        FileListManager115.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace72.fileManager = FileListManager115
+        OptionManager115.loadFromDInit = false
+        OptionManager115.loadFromInit = false
+        OptionManager115.loadFromWorldGen = false
+        OptionSingleReplace72.optionManager = OptionManager115
+        OptionSettingManager118.settingName = Nothing
+        OptionSingleReplace72.settingManager = OptionSettingManager118
+        OptionSingleReplace72.tokenName = ""
+        OptionSingleReplace72.updateTileSets = false
+        Me.optBtnPottery.options = OptionSingleReplace72
         Me.optBtnPottery.Size = New System.Drawing.Size(134, 27)
         Me.optBtnPottery.TabIndex = 9
         Me.optBtnPottery.Text = "Pottery"
@@ -5957,19 +5918,19 @@ Partial Class MainForm
         Me.optBtnGreatDyer.Location = New System.Drawing.Point(5, 309)
         Me.optBtnGreatDyer.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGreatDyer.Name = "optBtnGreatDyer"
-        OptionSingleReplace76.disabledValue = "!NODYER!"
-        OptionSingleReplace76.enabledValue = "YESDYER["
-        FileListManager119.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace76.fileManager = FileListManager119
-        OptionManager119.loadFromDInit = false
-        OptionManager119.loadFromInit = false
-        OptionManager119.loadFromWorldGen = false
-        OptionSingleReplace76.optionManager = OptionManager119
-        OptionSettingManager122.settingName = Nothing
-        OptionSingleReplace76.settingManager = OptionSettingManager122
-        OptionSingleReplace76.tokenName = ""
-        OptionSingleReplace76.updateTileSets = false
-        Me.optBtnGreatDyer.options = OptionSingleReplace76
+        OptionSingleReplace73.disabledValue = "!NODYER!"
+        OptionSingleReplace73.enabledValue = "YESDYER["
+        FileListManager116.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace73.fileManager = FileListManager116
+        OptionManager116.loadFromDInit = false
+        OptionManager116.loadFromInit = false
+        OptionManager116.loadFromWorldGen = false
+        OptionSingleReplace73.optionManager = OptionManager116
+        OptionSettingManager119.settingName = Nothing
+        OptionSingleReplace73.settingManager = OptionSettingManager119
+        OptionSingleReplace73.tokenName = ""
+        OptionSingleReplace73.updateTileSets = false
+        Me.optBtnGreatDyer.options = OptionSingleReplace73
         Me.optBtnGreatDyer.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGreatDyer.TabIndex = 10
         Me.optBtnGreatDyer.Text = "Greater Dyery"
@@ -5992,19 +5953,19 @@ Partial Class MainForm
         Me.optBtnPainter.Location = New System.Drawing.Point(5, 338)
         Me.optBtnPainter.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnPainter.Name = "optBtnPainter"
-        OptionSingleReplace77.disabledValue = "!NOPAINTER!"
-        OptionSingleReplace77.enabledValue = "YESPAINTER["
-        FileListManager120.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace77.fileManager = FileListManager120
-        OptionManager120.loadFromDInit = false
-        OptionManager120.loadFromInit = false
-        OptionManager120.loadFromWorldGen = false
-        OptionSingleReplace77.optionManager = OptionManager120
-        OptionSettingManager123.settingName = Nothing
-        OptionSingleReplace77.settingManager = OptionSettingManager123
-        OptionSingleReplace77.tokenName = ""
-        OptionSingleReplace77.updateTileSets = false
-        Me.optBtnPainter.options = OptionSingleReplace77
+        OptionSingleReplace74.disabledValue = "!NOPAINTER!"
+        OptionSingleReplace74.enabledValue = "YESPAINTER["
+        FileListManager117.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace74.fileManager = FileListManager117
+        OptionManager117.loadFromDInit = false
+        OptionManager117.loadFromInit = false
+        OptionManager117.loadFromWorldGen = false
+        OptionSingleReplace74.optionManager = OptionManager117
+        OptionSettingManager120.settingName = Nothing
+        OptionSingleReplace74.settingManager = OptionSettingManager120
+        OptionSingleReplace74.tokenName = ""
+        OptionSingleReplace74.updateTileSets = false
+        Me.optBtnPainter.options = OptionSingleReplace74
         Me.optBtnPainter.Size = New System.Drawing.Size(134, 27)
         Me.optBtnPainter.TabIndex = 11
         Me.optBtnPainter.Text = "Painter"
@@ -6026,19 +5987,19 @@ Partial Class MainForm
         Me.optBtnToolmaker.Location = New System.Drawing.Point(5, 367)
         Me.optBtnToolmaker.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnToolmaker.Name = "optBtnToolmaker"
-        OptionSingleReplace78.disabledValue = "!NOTOOLMAKER!"
-        OptionSingleReplace78.enabledValue = "YESTOOLMAKER["
-        FileListManager121.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace78.fileManager = FileListManager121
-        OptionManager121.loadFromDInit = false
-        OptionManager121.loadFromInit = false
-        OptionManager121.loadFromWorldGen = false
-        OptionSingleReplace78.optionManager = OptionManager121
-        OptionSettingManager124.settingName = Nothing
-        OptionSingleReplace78.settingManager = OptionSettingManager124
-        OptionSingleReplace78.tokenName = ""
-        OptionSingleReplace78.updateTileSets = false
-        Me.optBtnToolmaker.options = OptionSingleReplace78
+        OptionSingleReplace75.disabledValue = "!NOTOOLMAKER!"
+        OptionSingleReplace75.enabledValue = "YESTOOLMAKER["
+        FileListManager118.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace75.fileManager = FileListManager118
+        OptionManager118.loadFromDInit = false
+        OptionManager118.loadFromInit = false
+        OptionManager118.loadFromWorldGen = false
+        OptionSingleReplace75.optionManager = OptionManager118
+        OptionSettingManager121.settingName = Nothing
+        OptionSingleReplace75.settingManager = OptionSettingManager121
+        OptionSingleReplace75.tokenName = ""
+        OptionSingleReplace75.updateTileSets = false
+        Me.optBtnToolmaker.options = OptionSingleReplace75
         Me.optBtnToolmaker.Size = New System.Drawing.Size(134, 27)
         Me.optBtnToolmaker.TabIndex = 12
         Me.optBtnToolmaker.Text = "Toolmaker"
@@ -6060,19 +6021,19 @@ Partial Class MainForm
         Me.optBtnWeightBench.Location = New System.Drawing.Point(5, 25)
         Me.optBtnWeightBench.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnWeightBench.Name = "optBtnWeightBench"
-        OptionSingleReplace79.disabledValue = "!NOWEIGHT!"
-        OptionSingleReplace79.enabledValue = "YESWEIGHT["
-        FileListManager122.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace79.fileManager = FileListManager122
-        OptionManager122.loadFromDInit = false
-        OptionManager122.loadFromInit = false
-        OptionManager122.loadFromWorldGen = false
-        OptionSingleReplace79.optionManager = OptionManager122
-        OptionSettingManager125.settingName = Nothing
-        OptionSingleReplace79.settingManager = OptionSettingManager125
-        OptionSingleReplace79.tokenName = ""
-        OptionSingleReplace79.updateTileSets = false
-        Me.optBtnWeightBench.options = OptionSingleReplace79
+        OptionSingleReplace76.disabledValue = "!NOWEIGHT!"
+        OptionSingleReplace76.enabledValue = "YESWEIGHT["
+        FileListManager119.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace76.fileManager = FileListManager119
+        OptionManager119.loadFromDInit = false
+        OptionManager119.loadFromInit = false
+        OptionManager119.loadFromWorldGen = false
+        OptionSingleReplace76.optionManager = OptionManager119
+        OptionSettingManager122.settingName = Nothing
+        OptionSingleReplace76.settingManager = OptionSettingManager122
+        OptionSingleReplace76.tokenName = ""
+        OptionSingleReplace76.updateTileSets = false
+        Me.optBtnWeightBench.options = OptionSingleReplace76
         Me.optBtnWeightBench.Size = New System.Drawing.Size(134, 27)
         Me.optBtnWeightBench.TabIndex = 0
         Me.optBtnWeightBench.Text = "Weight Bench"
@@ -6094,19 +6055,19 @@ Partial Class MainForm
         Me.optBtnWoodsplitting.Location = New System.Drawing.Point(5, 54)
         Me.optBtnWoodsplitting.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnWoodsplitting.Name = "optBtnWoodsplitting"
-        OptionSingleReplace80.disabledValue = "!NOWOODSPLITTING!"
-        OptionSingleReplace80.enabledValue = "YESWOODSPLITTING["
-        FileListManager123.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace80.fileManager = FileListManager123
-        OptionManager123.loadFromDInit = false
-        OptionManager123.loadFromInit = false
-        OptionManager123.loadFromWorldGen = false
-        OptionSingleReplace80.optionManager = OptionManager123
-        OptionSettingManager126.settingName = Nothing
-        OptionSingleReplace80.settingManager = OptionSettingManager126
-        OptionSingleReplace80.tokenName = ""
-        OptionSingleReplace80.updateTileSets = false
-        Me.optBtnWoodsplitting.options = OptionSingleReplace80
+        OptionSingleReplace77.disabledValue = "!NOWOODSPLITTING!"
+        OptionSingleReplace77.enabledValue = "YESWOODSPLITTING["
+        FileListManager120.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace77.fileManager = FileListManager120
+        OptionManager120.loadFromDInit = false
+        OptionManager120.loadFromInit = false
+        OptionManager120.loadFromWorldGen = false
+        OptionSingleReplace77.optionManager = OptionManager120
+        OptionSettingManager123.settingName = Nothing
+        OptionSingleReplace77.settingManager = OptionSettingManager123
+        OptionSingleReplace77.tokenName = ""
+        OptionSingleReplace77.updateTileSets = false
+        Me.optBtnWoodsplitting.options = OptionSingleReplace77
         Me.optBtnWoodsplitting.Size = New System.Drawing.Size(134, 27)
         Me.optBtnWoodsplitting.TabIndex = 1
         Me.optBtnWoodsplitting.Text = "Wood Block"
@@ -6129,19 +6090,19 @@ Partial Class MainForm
         Me.optBtnStorage.Location = New System.Drawing.Point(5, 83)
         Me.optBtnStorage.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnStorage.Name = "optBtnStorage"
-        OptionSingleReplace81.disabledValue = "!NOSTORAGE!"
-        OptionSingleReplace81.enabledValue = "YESSTORAGE["
-        FileListManager124.fileNames = New String() {"entity_default.txt", "reaction_masterwork.txt"}
-        OptionSingleReplace81.fileManager = FileListManager124
-        OptionManager124.loadFromDInit = false
-        OptionManager124.loadFromInit = false
-        OptionManager124.loadFromWorldGen = false
-        OptionSingleReplace81.optionManager = OptionManager124
-        OptionSettingManager127.settingName = Nothing
-        OptionSingleReplace81.settingManager = OptionSettingManager127
-        OptionSingleReplace81.tokenName = ""
-        OptionSingleReplace81.updateTileSets = false
-        Me.optBtnStorage.options = OptionSingleReplace81
+        OptionSingleReplace78.disabledValue = "!NOSTORAGE!"
+        OptionSingleReplace78.enabledValue = "YESSTORAGE["
+        FileListManager121.fileNames = New String() {"entity_default.txt", "reaction_masterwork.txt"}
+        OptionSingleReplace78.fileManager = FileListManager121
+        OptionManager121.loadFromDInit = false
+        OptionManager121.loadFromInit = false
+        OptionManager121.loadFromWorldGen = false
+        OptionSingleReplace78.optionManager = OptionManager121
+        OptionSettingManager124.settingName = Nothing
+        OptionSingleReplace78.settingManager = OptionSettingManager124
+        OptionSingleReplace78.tokenName = ""
+        OptionSingleReplace78.updateTileSets = false
+        Me.optBtnStorage.options = OptionSingleReplace78
         Me.optBtnStorage.Size = New System.Drawing.Size(134, 27)
         Me.optBtnStorage.TabIndex = 2
         Me.optBtnStorage.Text = "Trade Storehouse"
@@ -6163,19 +6124,19 @@ Partial Class MainForm
         Me.optBtnBrewery.Location = New System.Drawing.Point(5, 19)
         Me.optBtnBrewery.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBrewery.Name = "optBtnBrewery"
-        OptionSingleReplace82.disabledValue = "!NOBREWERY!"
-        OptionSingleReplace82.enabledValue = "YESBREWERY["
-        FileListManager125.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace82.fileManager = FileListManager125
-        OptionManager125.loadFromDInit = false
-        OptionManager125.loadFromInit = false
-        OptionManager125.loadFromWorldGen = false
-        OptionSingleReplace82.optionManager = OptionManager125
-        OptionSettingManager128.settingName = Nothing
-        OptionSingleReplace82.settingManager = OptionSettingManager128
-        OptionSingleReplace82.tokenName = ""
-        OptionSingleReplace82.updateTileSets = false
-        Me.optBtnBrewery.options = OptionSingleReplace82
+        OptionSingleReplace79.disabledValue = "!NOBREWERY!"
+        OptionSingleReplace79.enabledValue = "YESBREWERY["
+        FileListManager122.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace79.fileManager = FileListManager122
+        OptionManager122.loadFromDInit = false
+        OptionManager122.loadFromInit = false
+        OptionManager122.loadFromWorldGen = false
+        OptionSingleReplace79.optionManager = OptionManager122
+        OptionSettingManager125.settingName = Nothing
+        OptionSingleReplace79.settingManager = OptionSettingManager125
+        OptionSingleReplace79.tokenName = ""
+        OptionSingleReplace79.updateTileSets = false
+        Me.optBtnBrewery.options = OptionSingleReplace79
         Me.optBtnBrewery.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBrewery.TabIndex = 0
         Me.optBtnBrewery.Text = "Brewery"
@@ -6198,19 +6159,19 @@ Partial Class MainForm
         Me.optBtnSawmill.Location = New System.Drawing.Point(5, 48)
         Me.optBtnSawmill.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnSawmill.Name = "optBtnSawmill"
-        OptionSingleReplace83.disabledValue = "!NOSAWMILL!"
-        OptionSingleReplace83.enabledValue = "YESSAWMILL["
-        FileListManager126.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace83.fileManager = FileListManager126
-        OptionManager126.loadFromDInit = false
-        OptionManager126.loadFromInit = false
-        OptionManager126.loadFromWorldGen = false
-        OptionSingleReplace83.optionManager = OptionManager126
-        OptionSettingManager129.settingName = Nothing
-        OptionSingleReplace83.settingManager = OptionSettingManager129
-        OptionSingleReplace83.tokenName = ""
-        OptionSingleReplace83.updateTileSets = false
-        Me.optBtnSawmill.options = OptionSingleReplace83
+        OptionSingleReplace80.disabledValue = "!NOSAWMILL!"
+        OptionSingleReplace80.enabledValue = "YESSAWMILL["
+        FileListManager123.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace80.fileManager = FileListManager123
+        OptionManager123.loadFromDInit = false
+        OptionManager123.loadFromInit = false
+        OptionManager123.loadFromWorldGen = false
+        OptionSingleReplace80.optionManager = OptionManager123
+        OptionSettingManager126.settingName = Nothing
+        OptionSingleReplace80.settingManager = OptionSettingManager126
+        OptionSingleReplace80.tokenName = ""
+        OptionSingleReplace80.updateTileSets = false
+        Me.optBtnSawmill.options = OptionSingleReplace80
         Me.optBtnSawmill.Size = New System.Drawing.Size(134, 27)
         Me.optBtnSawmill.TabIndex = 1
         Me.optBtnSawmill.Text = "Sawmill"
@@ -6233,19 +6194,19 @@ Partial Class MainForm
         Me.optBtnFishpond.Location = New System.Drawing.Point(5, 77)
         Me.optBtnFishpond.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFishpond.Name = "optBtnFishpond"
-        OptionSingleReplace84.disabledValue = "!NOFISHPOND!"
-        OptionSingleReplace84.enabledValue = "YESFISHPOND["
-        FileListManager127.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace84.fileManager = FileListManager127
-        OptionManager127.loadFromDInit = false
-        OptionManager127.loadFromInit = false
-        OptionManager127.loadFromWorldGen = false
-        OptionSingleReplace84.optionManager = OptionManager127
-        OptionSettingManager130.settingName = Nothing
-        OptionSingleReplace84.settingManager = OptionSettingManager130
-        OptionSingleReplace84.tokenName = ""
-        OptionSingleReplace84.updateTileSets = false
-        Me.optBtnFishpond.options = OptionSingleReplace84
+        OptionSingleReplace81.disabledValue = "!NOFISHPOND!"
+        OptionSingleReplace81.enabledValue = "YESFISHPOND["
+        FileListManager124.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace81.fileManager = FileListManager124
+        OptionManager124.loadFromDInit = false
+        OptionManager124.loadFromInit = false
+        OptionManager124.loadFromWorldGen = false
+        OptionSingleReplace81.optionManager = OptionManager124
+        OptionSettingManager127.settingName = Nothing
+        OptionSingleReplace81.settingManager = OptionSettingManager127
+        OptionSingleReplace81.tokenName = ""
+        OptionSingleReplace81.updateTileSets = false
+        Me.optBtnFishpond.options = OptionSingleReplace81
         Me.optBtnFishpond.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFishpond.TabIndex = 2
         Me.optBtnFishpond.Text = "Fishpond"
@@ -6267,19 +6228,19 @@ Partial Class MainForm
         Me.optBtnSlaughterhouse.Location = New System.Drawing.Point(5, 106)
         Me.optBtnSlaughterhouse.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnSlaughterhouse.Name = "optBtnSlaughterhouse"
-        OptionSingleReplace85.disabledValue = "!NOSLAUGHTERHOUSE!"
-        OptionSingleReplace85.enabledValue = "YESSLAUGHTERHOUSE["
-        FileListManager128.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace85.fileManager = FileListManager128
-        OptionManager128.loadFromDInit = false
-        OptionManager128.loadFromInit = false
-        OptionManager128.loadFromWorldGen = false
-        OptionSingleReplace85.optionManager = OptionManager128
-        OptionSettingManager131.settingName = Nothing
-        OptionSingleReplace85.settingManager = OptionSettingManager131
-        OptionSingleReplace85.tokenName = ""
-        OptionSingleReplace85.updateTileSets = false
-        Me.optBtnSlaughterhouse.options = OptionSingleReplace85
+        OptionSingleReplace82.disabledValue = "!NOSLAUGHTERHOUSE!"
+        OptionSingleReplace82.enabledValue = "YESSLAUGHTERHOUSE["
+        FileListManager125.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace82.fileManager = FileListManager125
+        OptionManager125.loadFromDInit = false
+        OptionManager125.loadFromInit = false
+        OptionManager125.loadFromWorldGen = false
+        OptionSingleReplace82.optionManager = OptionManager125
+        OptionSettingManager128.settingName = Nothing
+        OptionSingleReplace82.settingManager = OptionSettingManager128
+        OptionSingleReplace82.tokenName = ""
+        OptionSingleReplace82.updateTileSets = false
+        Me.optBtnSlaughterhouse.options = OptionSingleReplace82
         Me.optBtnSlaughterhouse.Size = New System.Drawing.Size(134, 27)
         Me.optBtnSlaughterhouse.TabIndex = 3
         Me.optBtnSlaughterhouse.Text = "Slaughterhouse"
@@ -6301,21 +6262,21 @@ Partial Class MainForm
         Me.optBtnStables.Location = New System.Drawing.Point(5, 135)
         Me.optBtnStables.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnStables.Name = "optBtnStables"
-        OptionSingleReplace86.disabledValue = "!NOSTABLES!"
-        OptionSingleReplace86.enabledValue = "YESSTABLES["
-        FileListManager129.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace86.fileManager = FileListManager129
-        OptionManager129.loadFromDInit = false
-        OptionManager129.loadFromInit = false
-        OptionManager129.loadFromWorldGen = false
-        OptionSingleReplace86.optionManager = OptionManager129
-        OptionSettingManager132.settingName = Nothing
-        OptionSingleReplace86.settingManager = OptionSettingManager132
-        OptionSingleReplace86.tokenName = ""
-        OptionSingleReplace86.updateTileSets = false
-        Me.optBtnStables.options = OptionSingleReplace86
-        Me.optBtnStables.Size = New System.Drawing.Size(134, 27)
-        Me.optBtnStables.TabIndex = 4
+        OptionSingleReplace83.disabledValue = "!NOSTABLES!"
+        OptionSingleReplace83.enabledValue = "YESSTABLES["
+        FileListManager126.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace83.fileManager = FileListManager126
+        OptionManager126.loadFromDInit = false
+        OptionManager126.loadFromInit = false
+        OptionManager126.loadFromWorldGen = false
+        OptionSingleReplace83.optionManager = OptionManager126
+        OptionSettingManager129.settingName = Nothing
+        OptionSingleReplace83.settingManager = OptionSettingManager129
+        OptionSingleReplace83.tokenName = ""
+        OptionSingleReplace83.updateTileSets = false
+        Me.optBtnStables.options = OptionSingleReplace83
+        Me.optBtnStables.Size = New System.Drawing.Size(134, 27)
+        Me.optBtnStables.TabIndex = 4
         Me.optBtnStables.Text = "Stables"
         Me.optBtnStables.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         Me.ToolTipMaker.SetToolTip(Me.optBtnStables, "Allows the indoor feeding of grazers.")
@@ -6335,19 +6296,19 @@ Partial Class MainForm
         Me.optBtnResearch.Location = New System.Drawing.Point(5, 19)
         Me.optBtnResearch.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnResearch.Name = "optBtnResearch"
-        OptionSingleReplace87.disabledValue = "!NOBEASTLAB!"
-        OptionSingleReplace87.enabledValue = "YESBEASTLAB["
-        FileListManager130.fileNames = New String() {"entity_default.txt", "building_masterwork.txt", "building_furnaces_masterwork.txt"}
-        OptionSingleReplace87.fileManager = FileListManager130
-        OptionManager130.loadFromDInit = false
-        OptionManager130.loadFromInit = false
-        OptionManager130.loadFromWorldGen = false
-        OptionSingleReplace87.optionManager = OptionManager130
-        OptionSettingManager133.settingName = Nothing
-        OptionSingleReplace87.settingManager = OptionSettingManager133
-        OptionSingleReplace87.tokenName = ""
-        OptionSingleReplace87.updateTileSets = false
-        Me.optBtnResearch.options = OptionSingleReplace87
+        OptionSingleReplace84.disabledValue = "!NOBEASTLAB!"
+        OptionSingleReplace84.enabledValue = "YESBEASTLAB["
+        FileListManager127.fileNames = New String() {"entity_default.txt", "building_masterwork.txt", "building_furnaces_masterwork.txt"}
+        OptionSingleReplace84.fileManager = FileListManager127
+        OptionManager127.loadFromDInit = false
+        OptionManager127.loadFromInit = false
+        OptionManager127.loadFromWorldGen = false
+        OptionSingleReplace84.optionManager = OptionManager127
+        OptionSettingManager130.settingName = Nothing
+        OptionSingleReplace84.settingManager = OptionSettingManager130
+        OptionSingleReplace84.tokenName = ""
+        OptionSingleReplace84.updateTileSets = false
+        Me.optBtnResearch.options = OptionSingleReplace84
         Me.optBtnResearch.Size = New System.Drawing.Size(134, 27)
         Me.optBtnResearch.TabIndex = 0
         Me.optBtnResearch.Text = "Research"
@@ -6369,19 +6330,19 @@ Partial Class MainForm
         Me.optBtnArcheology.Location = New System.Drawing.Point(5, 48)
         Me.optBtnArcheology.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnArcheology.Name = "optBtnArcheology"
-        OptionSingleReplace88.disabledValue = "!NOARCHEOLOGIST!"
-        OptionSingleReplace88.enabledValue = "YESARCHEOLOGIST["
-        FileListManager131.fileNames = New String() {"entity_default.txt", "inorganic_fossil.txt"}
-        OptionSingleReplace88.fileManager = FileListManager131
-        OptionManager131.loadFromDInit = false
-        OptionManager131.loadFromInit = false
-        OptionManager131.loadFromWorldGen = false
-        OptionSingleReplace88.optionManager = OptionManager131
-        OptionSettingManager134.settingName = Nothing
-        OptionSingleReplace88.settingManager = OptionSettingManager134
-        OptionSingleReplace88.tokenName = ""
-        OptionSingleReplace88.updateTileSets = false
-        Me.optBtnArcheology.options = OptionSingleReplace88
+        OptionSingleReplace85.disabledValue = "!NOARCHEOLOGIST!"
+        OptionSingleReplace85.enabledValue = "YESARCHEOLOGIST["
+        FileListManager128.fileNames = New String() {"entity_default.txt", "inorganic_fossil.txt"}
+        OptionSingleReplace85.fileManager = FileListManager128
+        OptionManager128.loadFromDInit = false
+        OptionManager128.loadFromInit = false
+        OptionManager128.loadFromWorldGen = false
+        OptionSingleReplace85.optionManager = OptionManager128
+        OptionSettingManager131.settingName = Nothing
+        OptionSingleReplace85.settingManager = OptionSettingManager131
+        OptionSingleReplace85.tokenName = ""
+        OptionSingleReplace85.updateTileSets = false
+        Me.optBtnArcheology.options = OptionSingleReplace85
         Me.optBtnArcheology.Size = New System.Drawing.Size(134, 27)
         Me.optBtnArcheology.TabIndex = 1
         Me.optBtnArcheology.Text = "Archeology"
@@ -6403,19 +6364,19 @@ Partial Class MainForm
         Me.optBtnApothecary.Location = New System.Drawing.Point(5, 77)
         Me.optBtnApothecary.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnApothecary.Name = "optBtnApothecary"
-        OptionSingleReplace89.disabledValue = "!NOAPO!"
-        OptionSingleReplace89.enabledValue = "YESAPO["
-        FileListManager132.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace89.fileManager = FileListManager132
-        OptionManager132.loadFromDInit = false
-        OptionManager132.loadFromInit = false
-        OptionManager132.loadFromWorldGen = false
-        OptionSingleReplace89.optionManager = OptionManager132
-        OptionSettingManager135.settingName = Nothing
-        OptionSingleReplace89.settingManager = OptionSettingManager135
-        OptionSingleReplace89.tokenName = ""
-        OptionSingleReplace89.updateTileSets = false
-        Me.optBtnApothecary.options = OptionSingleReplace89
+        OptionSingleReplace86.disabledValue = "!NOAPO!"
+        OptionSingleReplace86.enabledValue = "YESAPO["
+        FileListManager129.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace86.fileManager = FileListManager129
+        OptionManager129.loadFromDInit = false
+        OptionManager129.loadFromInit = false
+        OptionManager129.loadFromWorldGen = false
+        OptionSingleReplace86.optionManager = OptionManager129
+        OptionSettingManager132.settingName = Nothing
+        OptionSingleReplace86.settingManager = OptionSettingManager132
+        OptionSingleReplace86.tokenName = ""
+        OptionSingleReplace86.updateTileSets = false
+        Me.optBtnApothecary.options = OptionSingleReplace86
         Me.optBtnApothecary.Size = New System.Drawing.Size(134, 27)
         Me.optBtnApothecary.TabIndex = 2
         Me.optBtnApothecary.Text = "Apothecary"
@@ -6438,19 +6399,19 @@ Partial Class MainForm
         Me.optBtnBiology.Location = New System.Drawing.Point(5, 106)
         Me.optBtnBiology.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBiology.Name = "optBtnBiology"
-        OptionSingleReplace90.disabledValue = "!NOBIOLOGIST!"
-        OptionSingleReplace90.enabledValue = "YESBIOLOGIST["
-        FileListManager133.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace90.fileManager = FileListManager133
-        OptionManager133.loadFromDInit = false
-        OptionManager133.loadFromInit = false
-        OptionManager133.loadFromWorldGen = false
-        OptionSingleReplace90.optionManager = OptionManager133
-        OptionSettingManager136.settingName = Nothing
-        OptionSingleReplace90.settingManager = OptionSettingManager136
-        OptionSingleReplace90.tokenName = ""
-        OptionSingleReplace90.updateTileSets = false
-        Me.optBtnBiology.options = OptionSingleReplace90
+        OptionSingleReplace87.disabledValue = "!NOBIOLOGIST!"
+        OptionSingleReplace87.enabledValue = "YESBIOLOGIST["
+        FileListManager130.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace87.fileManager = FileListManager130
+        OptionManager130.loadFromDInit = false
+        OptionManager130.loadFromInit = false
+        OptionManager130.loadFromWorldGen = false
+        OptionSingleReplace87.optionManager = OptionManager130
+        OptionSettingManager133.settingName = Nothing
+        OptionSingleReplace87.settingManager = OptionSettingManager133
+        OptionSingleReplace87.tokenName = ""
+        OptionSingleReplace87.updateTileSets = false
+        Me.optBtnBiology.options = OptionSingleReplace87
         Me.optBtnBiology.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBiology.TabIndex = 3
         Me.optBtnBiology.Text = "Biology"
@@ -6473,19 +6434,19 @@ Partial Class MainForm
         Me.optBtnTavern.Location = New System.Drawing.Point(5, 23)
         Me.optBtnTavern.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTavern.Name = "optBtnTavern"
-        OptionSingleReplace91.disabledValue = "!NOMUSIC!"
-        OptionSingleReplace91.enabledValue = "YESMUSIC["
-        FileListManager134.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace91.fileManager = FileListManager134
-        OptionManager134.loadFromDInit = false
-        OptionManager134.loadFromInit = false
-        OptionManager134.loadFromWorldGen = false
-        OptionSingleReplace91.optionManager = OptionManager134
-        OptionSettingManager137.settingName = Nothing
-        OptionSingleReplace91.settingManager = OptionSettingManager137
-        OptionSingleReplace91.tokenName = ""
-        OptionSingleReplace91.updateTileSets = false
-        Me.optBtnTavern.options = OptionSingleReplace91
+        OptionSingleReplace88.disabledValue = "!NOMUSIC!"
+        OptionSingleReplace88.enabledValue = "YESMUSIC["
+        FileListManager131.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace88.fileManager = FileListManager131
+        OptionManager131.loadFromDInit = false
+        OptionManager131.loadFromInit = false
+        OptionManager131.loadFromWorldGen = false
+        OptionSingleReplace88.optionManager = OptionManager131
+        OptionSettingManager134.settingName = Nothing
+        OptionSingleReplace88.settingManager = OptionSettingManager134
+        OptionSingleReplace88.tokenName = ""
+        OptionSingleReplace88.updateTileSets = false
+        Me.optBtnTavern.options = OptionSingleReplace88
         Me.optBtnTavern.Size = New System.Drawing.Size(134, 27)
         Me.optBtnTavern.TabIndex = 0
         Me.optBtnTavern.Text = "Morul's Tavern"
@@ -6508,19 +6469,19 @@ Partial Class MainForm
         Me.optBtnOlon.Location = New System.Drawing.Point(5, 52)
         Me.optBtnOlon.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnOlon.Name = "optBtnOlon"
-        OptionSingleReplace92.disabledValue = "!NOOLON!"
-        OptionSingleReplace92.enabledValue = "YESOLON["
-        FileListManager135.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace92.fileManager = FileListManager135
-        OptionManager135.loadFromDInit = false
-        OptionManager135.loadFromInit = false
-        OptionManager135.loadFromWorldGen = false
-        OptionSingleReplace92.optionManager = OptionManager135
-        OptionSettingManager138.settingName = Nothing
-        OptionSingleReplace92.settingManager = OptionSettingManager138
-        OptionSingleReplace92.tokenName = ""
-        OptionSingleReplace92.updateTileSets = false
-        Me.optBtnOlon.options = OptionSingleReplace92
+        OptionSingleReplace89.disabledValue = "!NOOLON!"
+        OptionSingleReplace89.enabledValue = "YESOLON["
+        FileListManager132.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace89.fileManager = FileListManager132
+        OptionManager132.loadFromDInit = false
+        OptionManager132.loadFromInit = false
+        OptionManager132.loadFromWorldGen = false
+        OptionSingleReplace89.optionManager = OptionManager132
+        OptionSettingManager135.settingName = Nothing
+        OptionSingleReplace89.settingManager = OptionSettingManager135
+        OptionSingleReplace89.tokenName = ""
+        OptionSingleReplace89.updateTileSets = false
+        Me.optBtnOlon.options = OptionSingleReplace89
         Me.optBtnOlon.Size = New System.Drawing.Size(134, 27)
         Me.optBtnOlon.TabIndex = 1
         Me.optBtnOlon.Text = "Olon's Wonders"
@@ -6542,19 +6503,19 @@ Partial Class MainForm
         Me.optBtnBomrek.Location = New System.Drawing.Point(5, 81)
         Me.optBtnBomrek.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBomrek.Name = "optBtnBomrek"
-        OptionSingleReplace93.disabledValue = "!NOBOMREK!"
-        OptionSingleReplace93.enabledValue = "YESBOMREK["
-        FileListManager136.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace93.fileManager = FileListManager136
-        OptionManager136.loadFromDInit = false
-        OptionManager136.loadFromInit = false
-        OptionManager136.loadFromWorldGen = false
-        OptionSingleReplace93.optionManager = OptionManager136
-        OptionSettingManager139.settingName = Nothing
-        OptionSingleReplace93.settingManager = OptionSettingManager139
-        OptionSingleReplace93.tokenName = ""
-        OptionSingleReplace93.updateTileSets = false
-        Me.optBtnBomrek.options = OptionSingleReplace93
+        OptionSingleReplace90.disabledValue = "!NOBOMREK!"
+        OptionSingleReplace90.enabledValue = "YESBOMREK["
+        FileListManager133.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace90.fileManager = FileListManager133
+        OptionManager133.loadFromDInit = false
+        OptionManager133.loadFromInit = false
+        OptionManager133.loadFromWorldGen = false
+        OptionSingleReplace90.optionManager = OptionManager133
+        OptionSettingManager136.settingName = Nothing
+        OptionSingleReplace90.settingManager = OptionSettingManager136
+        OptionSingleReplace90.tokenName = ""
+        OptionSingleReplace90.updateTileSets = false
+        Me.optBtnBomrek.options = OptionSingleReplace90
         Me.optBtnBomrek.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBomrek.TabIndex = 2
         Me.optBtnBomrek.Text = "Bomrek's Bargains"
@@ -6576,19 +6537,19 @@ Partial Class MainForm
         Me.optBtnUrist.Location = New System.Drawing.Point(5, 110)
         Me.optBtnUrist.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnUrist.Name = "optBtnUrist"
-        OptionSingleReplace94.disabledValue = "!NOURIST!"
-        OptionSingleReplace94.enabledValue = "YESURIST["
-        FileListManager137.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace94.fileManager = FileListManager137
-        OptionManager137.loadFromDInit = false
-        OptionManager137.loadFromInit = false
-        OptionManager137.loadFromWorldGen = false
-        OptionSingleReplace94.optionManager = OptionManager137
-        OptionSettingManager140.settingName = Nothing
-        OptionSingleReplace94.settingManager = OptionSettingManager140
-        OptionSingleReplace94.tokenName = ""
-        OptionSingleReplace94.updateTileSets = false
-        Me.optBtnUrist.options = OptionSingleReplace94
+        OptionSingleReplace91.disabledValue = "!NOURIST!"
+        OptionSingleReplace91.enabledValue = "YESURIST["
+        FileListManager134.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace91.fileManager = FileListManager134
+        OptionManager134.loadFromDInit = false
+        OptionManager134.loadFromInit = false
+        OptionManager134.loadFromWorldGen = false
+        OptionSingleReplace91.optionManager = OptionManager134
+        OptionSettingManager137.settingName = Nothing
+        OptionSingleReplace91.settingManager = OptionSettingManager137
+        OptionSingleReplace91.tokenName = ""
+        OptionSingleReplace91.updateTileSets = false
+        Me.optBtnUrist.options = OptionSingleReplace91
         Me.optBtnUrist.Size = New System.Drawing.Size(134, 27)
         Me.optBtnUrist.TabIndex = 3
         Me.optBtnUrist.Text = "Urist's Emporium"
@@ -6610,19 +6571,19 @@ Partial Class MainForm
         Me.optBtnTeduk.Location = New System.Drawing.Point(5, 139)
         Me.optBtnTeduk.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTeduk.Name = "optBtnTeduk"
-        OptionSingleReplace95.disabledValue = "!NOTEDUK!"
-        OptionSingleReplace95.enabledValue = "YESTEDUK["
-        FileListManager138.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace95.fileManager = FileListManager138
-        OptionManager138.loadFromDInit = false
-        OptionManager138.loadFromInit = false
-        OptionManager138.loadFromWorldGen = false
-        OptionSingleReplace95.optionManager = OptionManager138
-        OptionSettingManager141.settingName = Nothing
-        OptionSingleReplace95.settingManager = OptionSettingManager141
-        OptionSingleReplace95.tokenName = ""
-        OptionSingleReplace95.updateTileSets = false
-        Me.optBtnTeduk.options = OptionSingleReplace95
+        OptionSingleReplace92.disabledValue = "!NOTEDUK!"
+        OptionSingleReplace92.enabledValue = "YESTEDUK["
+        FileListManager135.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace92.fileManager = FileListManager135
+        OptionManager135.loadFromDInit = false
+        OptionManager135.loadFromInit = false
+        OptionManager135.loadFromWorldGen = false
+        OptionSingleReplace92.optionManager = OptionManager135
+        OptionSettingManager138.settingName = Nothing
+        OptionSingleReplace92.settingManager = OptionSettingManager138
+        OptionSingleReplace92.tokenName = ""
+        OptionSingleReplace92.updateTileSets = false
+        Me.optBtnTeduk.options = OptionSingleReplace92
         Me.optBtnTeduk.Size = New System.Drawing.Size(134, 27)
         Me.optBtnTeduk.TabIndex = 4
         Me.optBtnTeduk.Text = "Teduk's Fine Goods"
@@ -6644,19 +6605,19 @@ Partial Class MainForm
         Me.optBtnIneri.Location = New System.Drawing.Point(5, 168)
         Me.optBtnIneri.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnIneri.Name = "optBtnIneri"
-        OptionSingleReplace96.disabledValue = "!NOINARI!"
-        OptionSingleReplace96.enabledValue = "YESINARI["
-        FileListManager139.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace96.fileManager = FileListManager139
-        OptionManager139.loadFromDInit = false
-        OptionManager139.loadFromInit = false
-        OptionManager139.loadFromWorldGen = false
-        OptionSingleReplace96.optionManager = OptionManager139
-        OptionSettingManager142.settingName = Nothing
-        OptionSingleReplace96.settingManager = OptionSettingManager142
-        OptionSingleReplace96.tokenName = ""
-        OptionSingleReplace96.updateTileSets = false
-        Me.optBtnIneri.options = OptionSingleReplace96
+        OptionSingleReplace93.disabledValue = "!NOINARI!"
+        OptionSingleReplace93.enabledValue = "YESINARI["
+        FileListManager136.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace93.fileManager = FileListManager136
+        OptionManager136.loadFromDInit = false
+        OptionManager136.loadFromInit = false
+        OptionManager136.loadFromWorldGen = false
+        OptionSingleReplace93.optionManager = OptionManager136
+        OptionSettingManager139.settingName = Nothing
+        OptionSingleReplace93.settingManager = OptionSettingManager139
+        OptionSingleReplace93.tokenName = ""
+        OptionSingleReplace93.updateTileSets = false
+        Me.optBtnIneri.options = OptionSingleReplace93
         Me.optBtnIneri.Size = New System.Drawing.Size(134, 27)
         Me.optBtnIneri.TabIndex = 5
         Me.optBtnIneri.Text = "Ineri's Pet Shop"
@@ -6678,19 +6639,19 @@ Partial Class MainForm
         Me.optBtnAlchemy.Location = New System.Drawing.Point(5, 25)
         Me.optBtnAlchemy.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnAlchemy.Name = "optBtnAlchemy"
-        OptionSingleReplace97.disabledValue = "!NOALCHEMY!"
-        OptionSingleReplace97.enabledValue = "YESALCHEMY["
-        FileListManager140.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace97.fileManager = FileListManager140
-        OptionManager140.loadFromDInit = false
-        OptionManager140.loadFromInit = false
-        OptionManager140.loadFromWorldGen = false
-        OptionSingleReplace97.optionManager = OptionManager140
-        OptionSettingManager143.settingName = Nothing
-        OptionSingleReplace97.settingManager = OptionSettingManager143
-        OptionSingleReplace97.tokenName = ""
-        OptionSingleReplace97.updateTileSets = false
-        Me.optBtnAlchemy.options = OptionSingleReplace97
+        OptionSingleReplace94.disabledValue = "!NOALCHEMY!"
+        OptionSingleReplace94.enabledValue = "YESALCHEMY["
+        FileListManager137.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace94.fileManager = FileListManager137
+        OptionManager137.loadFromDInit = false
+        OptionManager137.loadFromInit = false
+        OptionManager137.loadFromWorldGen = false
+        OptionSingleReplace94.optionManager = OptionManager137
+        OptionSettingManager140.settingName = Nothing
+        OptionSingleReplace94.settingManager = OptionSettingManager140
+        OptionSingleReplace94.tokenName = ""
+        OptionSingleReplace94.updateTileSets = false
+        Me.optBtnAlchemy.options = OptionSingleReplace94
         Me.optBtnAlchemy.Size = New System.Drawing.Size(134, 27)
         Me.optBtnAlchemy.TabIndex = 0
         Me.optBtnAlchemy.Text = "Alchemy"
@@ -6713,19 +6674,19 @@ Partial Class MainForm
         Me.optBtnToxicology.Location = New System.Drawing.Point(5, 54)
         Me.optBtnToxicology.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnToxicology.Name = "optBtnToxicology"
-        OptionSingleReplace98.disabledValue = "!NOTOXICIST!"
-        OptionSingleReplace98.enabledValue = "YESTOXICIST["
-        FileListManager141.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace98.fileManager = FileListManager141
-        OptionManager141.loadFromDInit = false
-        OptionManager141.loadFromInit = false
-        OptionManager141.loadFromWorldGen = false
-        OptionSingleReplace98.optionManager = OptionManager141
-        OptionSettingManager144.settingName = Nothing
-        OptionSingleReplace98.settingManager = OptionSettingManager144
-        OptionSingleReplace98.tokenName = ""
-        OptionSingleReplace98.updateTileSets = false
-        Me.optBtnToxicology.options = OptionSingleReplace98
+        OptionSingleReplace95.disabledValue = "!NOTOXICIST!"
+        OptionSingleReplace95.enabledValue = "YESTOXICIST["
+        FileListManager138.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace95.fileManager = FileListManager138
+        OptionManager138.loadFromDInit = false
+        OptionManager138.loadFromInit = false
+        OptionManager138.loadFromWorldGen = false
+        OptionSingleReplace95.optionManager = OptionManager138
+        OptionSettingManager141.settingName = Nothing
+        OptionSingleReplace95.settingManager = OptionSettingManager141
+        OptionSingleReplace95.tokenName = ""
+        OptionSingleReplace95.updateTileSets = false
+        Me.optBtnToxicology.options = OptionSingleReplace95
         Me.optBtnToxicology.Size = New System.Drawing.Size(134, 27)
         Me.optBtnToxicology.TabIndex = 1
         Me.optBtnToxicology.Text = "Toxicology"
@@ -6747,19 +6708,19 @@ Partial Class MainForm
         Me.optBtnChemistry.Location = New System.Drawing.Point(5, 83)
         Me.optBtnChemistry.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnChemistry.Name = "optBtnChemistry"
-        OptionSingleReplace99.disabledValue = "!NOCHEMISTRYLAB!"
-        OptionSingleReplace99.enabledValue = "YESCHEMISTRYLAB["
-        FileListManager142.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace99.fileManager = FileListManager142
-        OptionManager142.loadFromDInit = false
-        OptionManager142.loadFromInit = false
-        OptionManager142.loadFromWorldGen = false
-        OptionSingleReplace99.optionManager = OptionManager142
-        OptionSettingManager145.settingName = Nothing
-        OptionSingleReplace99.settingManager = OptionSettingManager145
-        OptionSingleReplace99.tokenName = ""
-        OptionSingleReplace99.updateTileSets = false
-        Me.optBtnChemistry.options = OptionSingleReplace99
+        OptionSingleReplace96.disabledValue = "!NOCHEMISTRYLAB!"
+        OptionSingleReplace96.enabledValue = "YESCHEMISTRYLAB["
+        FileListManager139.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace96.fileManager = FileListManager139
+        OptionManager139.loadFromDInit = false
+        OptionManager139.loadFromInit = false
+        OptionManager139.loadFromWorldGen = false
+        OptionSingleReplace96.optionManager = OptionManager139
+        OptionSettingManager142.settingName = Nothing
+        OptionSingleReplace96.settingManager = OptionSettingManager142
+        OptionSingleReplace96.tokenName = ""
+        OptionSingleReplace96.updateTileSets = false
+        Me.optBtnChemistry.options = OptionSingleReplace96
         Me.optBtnChemistry.Size = New System.Drawing.Size(134, 27)
         Me.optBtnChemistry.TabIndex = 2
         Me.optBtnChemistry.Text = "Chemistry"
@@ -6781,19 +6742,19 @@ Partial Class MainForm
         Me.optBtnHerbalist.Location = New System.Drawing.Point(5, 112)
         Me.optBtnHerbalist.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnHerbalist.Name = "optBtnHerbalist"
-        OptionSingleReplace100.disabledValue = "!NOHERBALIST!"
-        OptionSingleReplace100.enabledValue = "YESHERBALIST["
-        FileListManager143.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace100.fileManager = FileListManager143
-        OptionManager143.loadFromDInit = false
-        OptionManager143.loadFromInit = false
-        OptionManager143.loadFromWorldGen = false
-        OptionSingleReplace100.optionManager = OptionManager143
-        OptionSettingManager146.settingName = Nothing
-        OptionSingleReplace100.settingManager = OptionSettingManager146
-        OptionSingleReplace100.tokenName = ""
-        OptionSingleReplace100.updateTileSets = false
-        Me.optBtnHerbalist.options = OptionSingleReplace100
+        OptionSingleReplace97.disabledValue = "!NOHERBALIST!"
+        OptionSingleReplace97.enabledValue = "YESHERBALIST["
+        FileListManager140.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace97.fileManager = FileListManager140
+        OptionManager140.loadFromDInit = false
+        OptionManager140.loadFromInit = false
+        OptionManager140.loadFromWorldGen = false
+        OptionSingleReplace97.optionManager = OptionManager140
+        OptionSettingManager143.settingName = Nothing
+        OptionSingleReplace97.settingManager = OptionSettingManager143
+        OptionSingleReplace97.tokenName = ""
+        OptionSingleReplace97.updateTileSets = false
+        Me.optBtnHerbalist.options = OptionSingleReplace97
         Me.optBtnHerbalist.Size = New System.Drawing.Size(134, 27)
         Me.optBtnHerbalist.TabIndex = 3
         Me.optBtnHerbalist.Text = "Botany"
@@ -6815,19 +6776,19 @@ Partial Class MainForm
         Me.optBtnAltar.Location = New System.Drawing.Point(5, 19)
         Me.optBtnAltar.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnAltar.Name = "optBtnAltar"
-        OptionSingleReplace101.disabledValue = "!NOALTAR!"
-        OptionSingleReplace101.enabledValue = "YESALTAR["
-        FileListManager144.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace101.fileManager = FileListManager144
-        OptionManager144.loadFromDInit = false
-        OptionManager144.loadFromInit = false
-        OptionManager144.loadFromWorldGen = false
-        OptionSingleReplace101.optionManager = OptionManager144
-        OptionSettingManager147.settingName = Nothing
-        OptionSingleReplace101.settingManager = OptionSettingManager147
-        OptionSingleReplace101.tokenName = ""
-        OptionSingleReplace101.updateTileSets = false
-        Me.optBtnAltar.options = OptionSingleReplace101
+        OptionSingleReplace98.disabledValue = "!NOALTAR!"
+        OptionSingleReplace98.enabledValue = "YESALTAR["
+        FileListManager141.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace98.fileManager = FileListManager141
+        OptionManager141.loadFromDInit = false
+        OptionManager141.loadFromInit = false
+        OptionManager141.loadFromWorldGen = false
+        OptionSingleReplace98.optionManager = OptionManager141
+        OptionSettingManager144.settingName = Nothing
+        OptionSingleReplace98.settingManager = OptionSettingManager144
+        OptionSingleReplace98.tokenName = ""
+        OptionSingleReplace98.updateTileSets = false
+        Me.optBtnAltar.options = OptionSingleReplace98
         Me.optBtnAltar.Size = New System.Drawing.Size(134, 27)
         Me.optBtnAltar.TabIndex = 0
         Me.optBtnAltar.Text = "Altar of Armok"
@@ -6849,19 +6810,19 @@ Partial Class MainForm
         Me.optBtnShrine.Location = New System.Drawing.Point(5, 48)
         Me.optBtnShrine.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnShrine.Name = "optBtnShrine"
-        OptionSingleReplace102.disabledValue = "!NOSHRINE!"
-        OptionSingleReplace102.enabledValue = "YESSHRINE["
-        FileListManager145.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace102.fileManager = FileListManager145
-        OptionManager145.loadFromDInit = false
-        OptionManager145.loadFromInit = false
-        OptionManager145.loadFromWorldGen = false
-        OptionSingleReplace102.optionManager = OptionManager145
-        OptionSettingManager148.settingName = Nothing
-        OptionSingleReplace102.settingManager = OptionSettingManager148
-        OptionSingleReplace102.tokenName = ""
-        OptionSingleReplace102.updateTileSets = false
-        Me.optBtnShrine.options = OptionSingleReplace102
+        OptionSingleReplace99.disabledValue = "!NOSHRINE!"
+        OptionSingleReplace99.enabledValue = "YESSHRINE["
+        FileListManager142.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace99.fileManager = FileListManager142
+        OptionManager142.loadFromDInit = false
+        OptionManager142.loadFromInit = false
+        OptionManager142.loadFromWorldGen = false
+        OptionSingleReplace99.optionManager = OptionManager142
+        OptionSettingManager145.settingName = Nothing
+        OptionSingleReplace99.settingManager = OptionSettingManager145
+        OptionSingleReplace99.tokenName = ""
+        OptionSingleReplace99.updateTileSets = false
+        Me.optBtnShrine.options = OptionSingleReplace99
         Me.optBtnShrine.Size = New System.Drawing.Size(134, 27)
         Me.optBtnShrine.TabIndex = 1
         Me.optBtnShrine.Text = "Shrine of Armok"
@@ -6883,19 +6844,19 @@ Partial Class MainForm
         Me.optBtnTemple.Location = New System.Drawing.Point(5, 77)
         Me.optBtnTemple.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTemple.Name = "optBtnTemple"
-        OptionSingleReplace103.disabledValue = "!NOTEMPLE!"
-        OptionSingleReplace103.enabledValue = "YESTEMPLE["
-        FileListManager146.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace103.fileManager = FileListManager146
-        OptionManager146.loadFromDInit = false
-        OptionManager146.loadFromInit = false
-        OptionManager146.loadFromWorldGen = false
-        OptionSingleReplace103.optionManager = OptionManager146
-        OptionSettingManager149.settingName = Nothing
-        OptionSingleReplace103.settingManager = OptionSettingManager149
-        OptionSingleReplace103.tokenName = ""
-        OptionSingleReplace103.updateTileSets = false
-        Me.optBtnTemple.options = OptionSingleReplace103
+        OptionSingleReplace100.disabledValue = "!NOTEMPLE!"
+        OptionSingleReplace100.enabledValue = "YESTEMPLE["
+        FileListManager143.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace100.fileManager = FileListManager143
+        OptionManager143.loadFromDInit = false
+        OptionManager143.loadFromInit = false
+        OptionManager143.loadFromWorldGen = false
+        OptionSingleReplace100.optionManager = OptionManager143
+        OptionSettingManager146.settingName = Nothing
+        OptionSingleReplace100.settingManager = OptionSettingManager146
+        OptionSingleReplace100.tokenName = ""
+        OptionSingleReplace100.updateTileSets = false
+        Me.optBtnTemple.options = OptionSingleReplace100
         Me.optBtnTemple.Size = New System.Drawing.Size(134, 27)
         Me.optBtnTemple.TabIndex = 2
         Me.optBtnTemple.Text = "Temple of Armok"
@@ -6917,19 +6878,19 @@ Partial Class MainForm
         Me.optBtnEmbassy.Location = New System.Drawing.Point(5, 19)
         Me.optBtnEmbassy.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnEmbassy.Name = "optBtnEmbassy"
-        OptionSingleReplace104.disabledValue = "!NOEMBASSY!"
-        OptionSingleReplace104.enabledValue = "YESEMBASSY["
-        FileListManager147.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace104.fileManager = FileListManager147
-        OptionManager147.loadFromDInit = false
-        OptionManager147.loadFromInit = false
-        OptionManager147.loadFromWorldGen = false
-        OptionSingleReplace104.optionManager = OptionManager147
-        OptionSettingManager150.settingName = Nothing
-        OptionSingleReplace104.settingManager = OptionSettingManager150
-        OptionSingleReplace104.tokenName = ""
-        OptionSingleReplace104.updateTileSets = false
-        Me.optBtnEmbassy.options = OptionSingleReplace104
+        OptionSingleReplace101.disabledValue = "!NOEMBASSY!"
+        OptionSingleReplace101.enabledValue = "YESEMBASSY["
+        FileListManager144.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace101.fileManager = FileListManager144
+        OptionManager144.loadFromDInit = false
+        OptionManager144.loadFromInit = false
+        OptionManager144.loadFromWorldGen = false
+        OptionSingleReplace101.optionManager = OptionManager144
+        OptionSettingManager147.settingName = Nothing
+        OptionSingleReplace101.settingManager = OptionSettingManager147
+        OptionSingleReplace101.tokenName = ""
+        OptionSingleReplace101.updateTileSets = false
+        Me.optBtnEmbassy.options = OptionSingleReplace101
         Me.optBtnEmbassy.Size = New System.Drawing.Size(134, 27)
         Me.optBtnEmbassy.TabIndex = 0
         Me.optBtnEmbassy.Text = "Embassy"
@@ -6951,19 +6912,19 @@ Partial Class MainForm
         Me.optBtnExpedition.Location = New System.Drawing.Point(5, 48)
         Me.optBtnExpedition.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnExpedition.Name = "optBtnExpedition"
-        OptionSingleReplace105.disabledValue = "!NOEXPEDITION!"
-        OptionSingleReplace105.enabledValue = "YESEXPEDITION["
-        FileListManager148.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace105.fileManager = FileListManager148
-        OptionManager148.loadFromDInit = false
-        OptionManager148.loadFromInit = false
-        OptionManager148.loadFromWorldGen = false
-        OptionSingleReplace105.optionManager = OptionManager148
-        OptionSettingManager151.settingName = Nothing
-        OptionSingleReplace105.settingManager = OptionSettingManager151
-        OptionSingleReplace105.tokenName = ""
-        OptionSingleReplace105.updateTileSets = false
-        Me.optBtnExpedition.options = OptionSingleReplace105
+        OptionSingleReplace102.disabledValue = "!NOEXPEDITION!"
+        OptionSingleReplace102.enabledValue = "YESEXPEDITION["
+        FileListManager145.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace102.fileManager = FileListManager145
+        OptionManager145.loadFromDInit = false
+        OptionManager145.loadFromInit = false
+        OptionManager145.loadFromWorldGen = false
+        OptionSingleReplace102.optionManager = OptionManager145
+        OptionSettingManager148.settingName = Nothing
+        OptionSingleReplace102.settingManager = OptionSettingManager148
+        OptionSingleReplace102.tokenName = ""
+        OptionSingleReplace102.updateTileSets = false
+        Me.optBtnExpedition.options = OptionSingleReplace102
         Me.optBtnExpedition.Size = New System.Drawing.Size(134, 27)
         Me.optBtnExpedition.TabIndex = 1
         Me.optBtnExpedition.Text = "Expedition Outfitter"
@@ -6985,19 +6946,19 @@ Partial Class MainForm
         Me.optBtnPodium.Location = New System.Drawing.Point(5, 77)
         Me.optBtnPodium.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnPodium.Name = "optBtnPodium"
-        OptionSingleReplace106.disabledValue = "!NOSPEAKERSPODIUM!"
-        OptionSingleReplace106.enabledValue = "YESSPEAKERSPODIUM["
-        FileListManager149.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace106.fileManager = FileListManager149
-        OptionManager149.loadFromDInit = false
-        OptionManager149.loadFromInit = false
-        OptionManager149.loadFromWorldGen = false
-        OptionSingleReplace106.optionManager = OptionManager149
-        OptionSettingManager152.settingName = Nothing
-        OptionSingleReplace106.settingManager = OptionSettingManager152
-        OptionSingleReplace106.tokenName = ""
-        OptionSingleReplace106.updateTileSets = false
-        Me.optBtnPodium.options = OptionSingleReplace106
+        OptionSingleReplace103.disabledValue = "!NOSPEAKERSPODIUM!"
+        OptionSingleReplace103.enabledValue = "YESSPEAKERSPODIUM["
+        FileListManager146.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace103.fileManager = FileListManager146
+        OptionManager146.loadFromDInit = false
+        OptionManager146.loadFromInit = false
+        OptionManager146.loadFromWorldGen = false
+        OptionSingleReplace103.optionManager = OptionManager146
+        OptionSettingManager149.settingName = Nothing
+        OptionSingleReplace103.settingManager = OptionSettingManager149
+        OptionSingleReplace103.tokenName = ""
+        OptionSingleReplace103.updateTileSets = false
+        Me.optBtnPodium.options = OptionSingleReplace103
         Me.optBtnPodium.Size = New System.Drawing.Size(134, 27)
         Me.optBtnPodium.TabIndex = 2
         Me.optBtnPodium.Text = "Speaker's Podium"
@@ -7019,19 +6980,19 @@ Partial Class MainForm
         Me.optBtnScriptorium.Location = New System.Drawing.Point(5, 19)
         Me.optBtnScriptorium.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnScriptorium.Name = "optBtnScriptorium"
-        OptionSingleReplace107.disabledValue = "!NOSCRIPTORIUM!"
-        OptionSingleReplace107.enabledValue = "YESSCRIPTORIUM["
-        FileListManager150.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace107.fileManager = FileListManager150
-        OptionManager150.loadFromDInit = false
-        OptionManager150.loadFromInit = false
-        OptionManager150.loadFromWorldGen = false
-        OptionSingleReplace107.optionManager = OptionManager150
-        OptionSettingManager153.settingName = Nothing
-        OptionSingleReplace107.settingManager = OptionSettingManager153
-        OptionSingleReplace107.tokenName = ""
-        OptionSingleReplace107.updateTileSets = false
-        Me.optBtnScriptorium.options = OptionSingleReplace107
+        OptionSingleReplace104.disabledValue = "!NOSCRIPTORIUM!"
+        OptionSingleReplace104.enabledValue = "YESSCRIPTORIUM["
+        FileListManager147.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace104.fileManager = FileListManager147
+        OptionManager147.loadFromDInit = false
+        OptionManager147.loadFromInit = false
+        OptionManager147.loadFromWorldGen = false
+        OptionSingleReplace104.optionManager = OptionManager147
+        OptionSettingManager150.settingName = Nothing
+        OptionSingleReplace104.settingManager = OptionSettingManager150
+        OptionSingleReplace104.tokenName = ""
+        OptionSingleReplace104.updateTileSets = false
+        Me.optBtnScriptorium.options = OptionSingleReplace104
         Me.optBtnScriptorium.Size = New System.Drawing.Size(134, 27)
         Me.optBtnScriptorium.TabIndex = 0
         Me.optBtnScriptorium.Text = "Scriptorium"
@@ -7053,19 +7014,19 @@ Partial Class MainForm
         Me.optBtnLibraries.Location = New System.Drawing.Point(5, 48)
         Me.optBtnLibraries.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnLibraries.Name = "optBtnLibraries"
-        OptionSingleReplace108.disabledValue = "!NOLIBRARY!"
-        OptionSingleReplace108.enabledValue = "YESLIBRARY["
-        FileListManager151.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace108.fileManager = FileListManager151
-        OptionManager151.loadFromDInit = false
-        OptionManager151.loadFromInit = false
-        OptionManager151.loadFromWorldGen = false
-        OptionSingleReplace108.optionManager = OptionManager151
-        OptionSettingManager154.settingName = Nothing
-        OptionSingleReplace108.settingManager = OptionSettingManager154
-        OptionSingleReplace108.tokenName = ""
-        OptionSingleReplace108.updateTileSets = false
-        Me.optBtnLibraries.options = OptionSingleReplace108
+        OptionSingleReplace105.disabledValue = "!NOLIBRARY!"
+        OptionSingleReplace105.enabledValue = "YESLIBRARY["
+        FileListManager148.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace105.fileManager = FileListManager148
+        OptionManager148.loadFromDInit = false
+        OptionManager148.loadFromInit = false
+        OptionManager148.loadFromWorldGen = false
+        OptionSingleReplace105.optionManager = OptionManager148
+        OptionSettingManager151.settingName = Nothing
+        OptionSingleReplace105.settingManager = OptionSettingManager151
+        OptionSingleReplace105.tokenName = ""
+        OptionSingleReplace105.updateTileSets = false
+        Me.optBtnLibraries.options = OptionSingleReplace105
         Me.optBtnLibraries.Size = New System.Drawing.Size(134, 27)
         Me.optBtnLibraries.TabIndex = 1
         Me.optBtnLibraries.Text = "Libraries"
@@ -7087,19 +7048,19 @@ Partial Class MainForm
         Me.optBtnColosseum.Location = New System.Drawing.Point(5, 27)
         Me.optBtnColosseum.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnColosseum.Name = "optBtnColosseum"
-        OptionSingleReplace109.disabledValue = "!NOCOLLOSSEUM!"
-        OptionSingleReplace109.enabledValue = "YESCOLLOSSEUM["
-        FileListManager152.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace109.fileManager = FileListManager152
-        OptionManager152.loadFromDInit = false
-        OptionManager152.loadFromInit = false
-        OptionManager152.loadFromWorldGen = false
-        OptionSingleReplace109.optionManager = OptionManager152
-        OptionSettingManager155.settingName = Nothing
-        OptionSingleReplace109.settingManager = OptionSettingManager155
-        OptionSingleReplace109.tokenName = ""
-        OptionSingleReplace109.updateTileSets = false
-        Me.optBtnColosseum.options = OptionSingleReplace109
+        OptionSingleReplace106.disabledValue = "!NOCOLLOSSEUM!"
+        OptionSingleReplace106.enabledValue = "YESCOLLOSSEUM["
+        FileListManager149.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace106.fileManager = FileListManager149
+        OptionManager149.loadFromDInit = false
+        OptionManager149.loadFromInit = false
+        OptionManager149.loadFromWorldGen = false
+        OptionSingleReplace106.optionManager = OptionManager149
+        OptionSettingManager152.settingName = Nothing
+        OptionSingleReplace106.settingManager = OptionSettingManager152
+        OptionSingleReplace106.tokenName = ""
+        OptionSingleReplace106.updateTileSets = false
+        Me.optBtnColosseum.options = OptionSingleReplace106
         Me.optBtnColosseum.Size = New System.Drawing.Size(134, 27)
         Me.optBtnColosseum.TabIndex = 0
         Me.optBtnColosseum.Text = "Colosseum"
@@ -7121,19 +7082,19 @@ Partial Class MainForm
         Me.optBtnGuildhall.Location = New System.Drawing.Point(5, 56)
         Me.optBtnGuildhall.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGuildhall.Name = "optBtnGuildhall"
-        OptionSingleReplace110.disabledValue = "!NOGUILDHALL!"
-        OptionSingleReplace110.enabledValue = "YESGUILDHALL["
-        FileListManager153.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace110.fileManager = FileListManager153
-        OptionManager153.loadFromDInit = false
-        OptionManager153.loadFromInit = false
-        OptionManager153.loadFromWorldGen = false
-        OptionSingleReplace110.optionManager = OptionManager153
-        OptionSettingManager156.settingName = Nothing
-        OptionSingleReplace110.settingManager = OptionSettingManager156
-        OptionSingleReplace110.tokenName = ""
-        OptionSingleReplace110.updateTileSets = false
-        Me.optBtnGuildhall.options = OptionSingleReplace110
+        OptionSingleReplace107.disabledValue = "!NOGUILDHALL!"
+        OptionSingleReplace107.enabledValue = "YESGUILDHALL["
+        FileListManager150.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace107.fileManager = FileListManager150
+        OptionManager150.loadFromDInit = false
+        OptionManager150.loadFromInit = false
+        OptionManager150.loadFromWorldGen = false
+        OptionSingleReplace107.optionManager = OptionManager150
+        OptionSettingManager153.settingName = Nothing
+        OptionSingleReplace107.settingManager = OptionSettingManager153
+        OptionSingleReplace107.tokenName = ""
+        OptionSingleReplace107.updateTileSets = false
+        Me.optBtnGuildhall.options = OptionSingleReplace107
         Me.optBtnGuildhall.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGuildhall.TabIndex = 1
         Me.optBtnGuildhall.Text = "Guildhall"
@@ -7155,19 +7116,19 @@ Partial Class MainForm
         Me.optBtnPrison.Location = New System.Drawing.Point(5, 85)
         Me.optBtnPrison.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnPrison.Name = "optBtnPrison"
-        OptionSingleReplace111.disabledValue = "!NOPRISON!"
-        OptionSingleReplace111.enabledValue = "YESPRISON["
-        FileListManager154.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace111.fileManager = FileListManager154
-        OptionManager154.loadFromDInit = false
-        OptionManager154.loadFromInit = false
-        OptionManager154.loadFromWorldGen = false
-        OptionSingleReplace111.optionManager = OptionManager154
-        OptionSettingManager157.settingName = Nothing
-        OptionSingleReplace111.settingManager = OptionSettingManager157
-        OptionSingleReplace111.tokenName = ""
-        OptionSingleReplace111.updateTileSets = false
-        Me.optBtnPrison.options = OptionSingleReplace111
+        OptionSingleReplace108.disabledValue = "!NOPRISON!"
+        OptionSingleReplace108.enabledValue = "YESPRISON["
+        FileListManager151.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace108.fileManager = FileListManager151
+        OptionManager151.loadFromDInit = false
+        OptionManager151.loadFromInit = false
+        OptionManager151.loadFromWorldGen = false
+        OptionSingleReplace108.optionManager = OptionManager151
+        OptionSettingManager154.settingName = Nothing
+        OptionSingleReplace108.settingManager = OptionSettingManager154
+        OptionSingleReplace108.tokenName = ""
+        OptionSingleReplace108.updateTileSets = false
+        Me.optBtnPrison.options = OptionSingleReplace108
         Me.optBtnPrison.Size = New System.Drawing.Size(134, 27)
         Me.optBtnPrison.TabIndex = 2
         Me.optBtnPrison.Text = "Prison"
@@ -7189,19 +7150,19 @@ Partial Class MainForm
         Me.optBtnMonastery.Location = New System.Drawing.Point(5, 114)
         Me.optBtnMonastery.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMonastery.Name = "optBtnMonastery"
-        OptionSingleReplace112.disabledValue = "!NOMONASTERY!"
-        OptionSingleReplace112.enabledValue = "YESMONASTERY["
-        FileListManager155.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace112.fileManager = FileListManager155
-        OptionManager155.loadFromDInit = false
-        OptionManager155.loadFromInit = false
-        OptionManager155.loadFromWorldGen = false
-        OptionSingleReplace112.optionManager = OptionManager155
-        OptionSettingManager158.settingName = Nothing
-        OptionSingleReplace112.settingManager = OptionSettingManager158
-        OptionSingleReplace112.tokenName = ""
-        OptionSingleReplace112.updateTileSets = false
-        Me.optBtnMonastery.options = OptionSingleReplace112
+        OptionSingleReplace109.disabledValue = "!NOMONASTERY!"
+        OptionSingleReplace109.enabledValue = "YESMONASTERY["
+        FileListManager152.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace109.fileManager = FileListManager152
+        OptionManager152.loadFromDInit = false
+        OptionManager152.loadFromInit = false
+        OptionManager152.loadFromWorldGen = false
+        OptionSingleReplace109.optionManager = OptionManager152
+        OptionSettingManager155.settingName = Nothing
+        OptionSingleReplace109.settingManager = OptionSettingManager155
+        OptionSingleReplace109.tokenName = ""
+        OptionSingleReplace109.updateTileSets = false
+        Me.optBtnMonastery.options = OptionSingleReplace109
         Me.optBtnMonastery.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMonastery.TabIndex = 3
         Me.optBtnMonastery.Text = "Monastery"
@@ -7224,19 +7185,19 @@ Partial Class MainForm
         Me.optBtnGarrison.Location = New System.Drawing.Point(5, 143)
         Me.optBtnGarrison.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGarrison.Name = "optBtnGarrison"
-        OptionSingleReplace113.disabledValue = "!NOGARRISON!"
-        OptionSingleReplace113.enabledValue = "YESGARRISON["
-        FileListManager156.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace113.fileManager = FileListManager156
-        OptionManager156.loadFromDInit = false
-        OptionManager156.loadFromInit = false
-        OptionManager156.loadFromWorldGen = false
-        OptionSingleReplace113.optionManager = OptionManager156
-        OptionSettingManager159.settingName = Nothing
-        OptionSingleReplace113.settingManager = OptionSettingManager159
-        OptionSingleReplace113.tokenName = ""
-        OptionSingleReplace113.updateTileSets = false
-        Me.optBtnGarrison.options = OptionSingleReplace113
+        OptionSingleReplace110.disabledValue = "!NOGARRISON!"
+        OptionSingleReplace110.enabledValue = "YESGARRISON["
+        FileListManager153.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace110.fileManager = FileListManager153
+        OptionManager153.loadFromDInit = false
+        OptionManager153.loadFromInit = false
+        OptionManager153.loadFromWorldGen = false
+        OptionSingleReplace110.optionManager = OptionManager153
+        OptionSettingManager156.settingName = Nothing
+        OptionSingleReplace110.settingManager = OptionSettingManager156
+        OptionSingleReplace110.tokenName = ""
+        OptionSingleReplace110.updateTileSets = false
+        Me.optBtnGarrison.options = OptionSingleReplace110
         Me.optBtnGarrison.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGarrison.TabIndex = 4
         Me.optBtnGarrison.Text = "Garrison"
@@ -7259,19 +7220,19 @@ Partial Class MainForm
         Me.optBtnBrazier.Location = New System.Drawing.Point(5, 19)
         Me.optBtnBrazier.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBrazier.Name = "optBtnBrazier"
-        OptionSingleReplace114.disabledValue = "!NOBRAZIER!"
-        OptionSingleReplace114.enabledValue = "YESBRAZIER["
-        FileListManager157.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace114.fileManager = FileListManager157
-        OptionManager157.loadFromDInit = false
-        OptionManager157.loadFromInit = false
-        OptionManager157.loadFromWorldGen = false
-        OptionSingleReplace114.optionManager = OptionManager157
-        OptionSettingManager160.settingName = Nothing
-        OptionSingleReplace114.settingManager = OptionSettingManager160
-        OptionSingleReplace114.tokenName = ""
-        OptionSingleReplace114.updateTileSets = false
-        Me.optBtnBrazier.options = OptionSingleReplace114
+        OptionSingleReplace111.disabledValue = "!NOBRAZIER!"
+        OptionSingleReplace111.enabledValue = "YESBRAZIER["
+        FileListManager154.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace111.fileManager = FileListManager154
+        OptionManager154.loadFromDInit = false
+        OptionManager154.loadFromInit = false
+        OptionManager154.loadFromWorldGen = false
+        OptionSingleReplace111.optionManager = OptionManager154
+        OptionSettingManager157.settingName = Nothing
+        OptionSingleReplace111.settingManager = OptionSettingManager157
+        OptionSingleReplace111.tokenName = ""
+        OptionSingleReplace111.updateTileSets = false
+        Me.optBtnBrazier.options = OptionSingleReplace111
         Me.optBtnBrazier.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBrazier.TabIndex = 0
         Me.optBtnBrazier.Text = "Brazier"
@@ -7293,19 +7254,19 @@ Partial Class MainForm
         Me.optBtnCandelabra.Location = New System.Drawing.Point(5, 48)
         Me.optBtnCandelabra.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCandelabra.Name = "optBtnCandelabra"
-        OptionSingleReplace115.disabledValue = "!NOCANDELABRA!"
-        OptionSingleReplace115.enabledValue = "YESCANDELABRA["
-        FileListManager158.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace115.fileManager = FileListManager158
-        OptionManager158.loadFromDInit = false
-        OptionManager158.loadFromInit = false
-        OptionManager158.loadFromWorldGen = false
-        OptionSingleReplace115.optionManager = OptionManager158
-        OptionSettingManager161.settingName = Nothing
-        OptionSingleReplace115.settingManager = OptionSettingManager161
-        OptionSingleReplace115.tokenName = ""
-        OptionSingleReplace115.updateTileSets = false
-        Me.optBtnCandelabra.options = OptionSingleReplace115
+        OptionSingleReplace112.disabledValue = "!NOCANDELABRA!"
+        OptionSingleReplace112.enabledValue = "YESCANDELABRA["
+        FileListManager155.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace112.fileManager = FileListManager155
+        OptionManager155.loadFromDInit = false
+        OptionManager155.loadFromInit = false
+        OptionManager155.loadFromWorldGen = false
+        OptionSingleReplace112.optionManager = OptionManager155
+        OptionSettingManager158.settingName = Nothing
+        OptionSingleReplace112.settingManager = OptionSettingManager158
+        OptionSingleReplace112.tokenName = ""
+        OptionSingleReplace112.updateTileSets = false
+        Me.optBtnCandelabra.options = OptionSingleReplace112
         Me.optBtnCandelabra.Size = New System.Drawing.Size(134, 27)
         Me.optBtnCandelabra.TabIndex = 1
         Me.optBtnCandelabra.Text = "Candelabra"
@@ -7327,19 +7288,19 @@ Partial Class MainForm
         Me.optBtnFireplace.Location = New System.Drawing.Point(5, 77)
         Me.optBtnFireplace.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFireplace.Name = "optBtnFireplace"
-        OptionSingleReplace116.disabledValue = "!NOFIREPLACE!"
-        OptionSingleReplace116.enabledValue = "YESFIREPLACE["
-        FileListManager159.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace116.fileManager = FileListManager159
-        OptionManager159.loadFromDInit = false
-        OptionManager159.loadFromInit = false
-        OptionManager159.loadFromWorldGen = false
-        OptionSingleReplace116.optionManager = OptionManager159
-        OptionSettingManager162.settingName = Nothing
-        OptionSingleReplace116.settingManager = OptionSettingManager162
-        OptionSingleReplace116.tokenName = ""
-        OptionSingleReplace116.updateTileSets = false
-        Me.optBtnFireplace.options = OptionSingleReplace116
+        OptionSingleReplace113.disabledValue = "!NOFIREPLACE!"
+        OptionSingleReplace113.enabledValue = "YESFIREPLACE["
+        FileListManager156.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace113.fileManager = FileListManager156
+        OptionManager156.loadFromDInit = false
+        OptionManager156.loadFromInit = false
+        OptionManager156.loadFromWorldGen = false
+        OptionSingleReplace113.optionManager = OptionManager156
+        OptionSettingManager159.settingName = Nothing
+        OptionSingleReplace113.settingManager = OptionSettingManager159
+        OptionSingleReplace113.tokenName = ""
+        OptionSingleReplace113.updateTileSets = false
+        Me.optBtnFireplace.options = OptionSingleReplace113
         Me.optBtnFireplace.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFireplace.TabIndex = 2
         Me.optBtnFireplace.Text = "Fireplace"
@@ -7361,19 +7322,19 @@ Partial Class MainForm
         Me.optBtnTorchbearerStatue.Location = New System.Drawing.Point(5, 106)
         Me.optBtnTorchbearerStatue.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTorchbearerStatue.Name = "optBtnTorchbearerStatue"
-        OptionSingleReplace117.disabledValue = "!NOTORCHBEARER!"
-        OptionSingleReplace117.enabledValue = "YESTORCHBEARER["
-        FileListManager160.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace117.fileManager = FileListManager160
-        OptionManager160.loadFromDInit = false
-        OptionManager160.loadFromInit = false
-        OptionManager160.loadFromWorldGen = false
-        OptionSingleReplace117.optionManager = OptionManager160
-        OptionSettingManager163.settingName = Nothing
-        OptionSingleReplace117.settingManager = OptionSettingManager163
-        OptionSingleReplace117.tokenName = ""
-        OptionSingleReplace117.updateTileSets = false
-        Me.optBtnTorchbearerStatue.options = OptionSingleReplace117
+        OptionSingleReplace114.disabledValue = "!NOTORCHBEARER!"
+        OptionSingleReplace114.enabledValue = "YESTORCHBEARER["
+        FileListManager157.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace114.fileManager = FileListManager157
+        OptionManager157.loadFromDInit = false
+        OptionManager157.loadFromInit = false
+        OptionManager157.loadFromWorldGen = false
+        OptionSingleReplace114.optionManager = OptionManager157
+        OptionSettingManager160.settingName = Nothing
+        OptionSingleReplace114.settingManager = OptionSettingManager160
+        OptionSingleReplace114.tokenName = ""
+        OptionSingleReplace114.updateTileSets = false
+        Me.optBtnTorchbearerStatue.options = OptionSingleReplace114
         Me.optBtnTorchbearerStatue.Size = New System.Drawing.Size(134, 27)
         Me.optBtnTorchbearerStatue.TabIndex = 3
         Me.optBtnTorchbearerStatue.Text = "Torchbearer"
@@ -7395,19 +7356,19 @@ Partial Class MainForm
         Me.optBtnGemOfLight.Location = New System.Drawing.Point(5, 135)
         Me.optBtnGemOfLight.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGemOfLight.Name = "optBtnGemOfLight"
-        OptionSingleReplace118.disabledValue = "!NOGEMOFLIGHT!"
-        OptionSingleReplace118.enabledValue = "YESGEMOFLIGHT["
-        FileListManager161.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace118.fileManager = FileListManager161
-        OptionManager161.loadFromDInit = false
-        OptionManager161.loadFromInit = false
-        OptionManager161.loadFromWorldGen = false
-        OptionSingleReplace118.optionManager = OptionManager161
-        OptionSettingManager164.settingName = Nothing
-        OptionSingleReplace118.settingManager = OptionSettingManager164
-        OptionSingleReplace118.tokenName = ""
-        OptionSingleReplace118.updateTileSets = false
-        Me.optBtnGemOfLight.options = OptionSingleReplace118
+        OptionSingleReplace115.disabledValue = "!NOGEMOFLIGHT!"
+        OptionSingleReplace115.enabledValue = "YESGEMOFLIGHT["
+        FileListManager158.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace115.fileManager = FileListManager158
+        OptionManager158.loadFromDInit = false
+        OptionManager158.loadFromInit = false
+        OptionManager158.loadFromWorldGen = false
+        OptionSingleReplace115.optionManager = OptionManager158
+        OptionSettingManager161.settingName = Nothing
+        OptionSingleReplace115.settingManager = OptionSettingManager161
+        OptionSingleReplace115.tokenName = ""
+        OptionSingleReplace115.updateTileSets = false
+        Me.optBtnGemOfLight.options = OptionSingleReplace115
         Me.optBtnGemOfLight.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGemOfLight.TabIndex = 4
         Me.optBtnGemOfLight.Text = "Gem of Light"
@@ -7429,19 +7390,19 @@ Partial Class MainForm
         Me.optBtnAmmocaster.Location = New System.Drawing.Point(5, 19)
         Me.optBtnAmmocaster.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnAmmocaster.Name = "optBtnAmmocaster"
-        OptionSingleReplace119.disabledValue = "!NOAMMOCASTER!"
-        OptionSingleReplace119.enabledValue = "YESAMMOCASTER["
-        FileListManager162.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace119.fileManager = FileListManager162
-        OptionManager162.loadFromDInit = false
-        OptionManager162.loadFromInit = false
-        OptionManager162.loadFromWorldGen = false
-        OptionSingleReplace119.optionManager = OptionManager162
-        OptionSettingManager165.settingName = Nothing
-        OptionSingleReplace119.settingManager = OptionSettingManager165
-        OptionSingleReplace119.tokenName = ""
-        OptionSingleReplace119.updateTileSets = false
-        Me.optBtnAmmocaster.options = OptionSingleReplace119
+        OptionSingleReplace116.disabledValue = "!NOAMMOCASTER!"
+        OptionSingleReplace116.enabledValue = "YESAMMOCASTER["
+        FileListManager159.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace116.fileManager = FileListManager159
+        OptionManager159.loadFromDInit = false
+        OptionManager159.loadFromInit = false
+        OptionManager159.loadFromWorldGen = false
+        OptionSingleReplace116.optionManager = OptionManager159
+        OptionSettingManager162.settingName = Nothing
+        OptionSingleReplace116.settingManager = OptionSettingManager162
+        OptionSingleReplace116.tokenName = ""
+        OptionSingleReplace116.updateTileSets = false
+        Me.optBtnAmmocaster.options = OptionSingleReplace116
         Me.optBtnAmmocaster.Size = New System.Drawing.Size(134, 27)
         Me.optBtnAmmocaster.TabIndex = 0
         Me.optBtnAmmocaster.Text = "Ammo Caster"
@@ -7463,19 +7424,19 @@ Partial Class MainForm
         Me.optBtnGunsmith.Location = New System.Drawing.Point(5, 48)
         Me.optBtnGunsmith.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGunsmith.Name = "optBtnGunsmith"
-        OptionSingleReplace120.disabledValue = "!NOGUN!"
-        OptionSingleReplace120.enabledValue = "YESGUN["
-        FileListManager163.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace120.fileManager = FileListManager163
-        OptionManager163.loadFromDInit = false
-        OptionManager163.loadFromInit = false
-        OptionManager163.loadFromWorldGen = false
-        OptionSingleReplace120.optionManager = OptionManager163
-        OptionSettingManager166.settingName = Nothing
-        OptionSingleReplace120.settingManager = OptionSettingManager166
-        OptionSingleReplace120.tokenName = ""
-        OptionSingleReplace120.updateTileSets = false
-        Me.optBtnGunsmith.options = OptionSingleReplace120
+        OptionSingleReplace117.disabledValue = "!NOGUN!"
+        OptionSingleReplace117.enabledValue = "YESGUN["
+        FileListManager160.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace117.fileManager = FileListManager160
+        OptionManager160.loadFromDInit = false
+        OptionManager160.loadFromInit = false
+        OptionManager160.loadFromWorldGen = false
+        OptionSingleReplace117.optionManager = OptionManager160
+        OptionSettingManager163.settingName = Nothing
+        OptionSingleReplace117.settingManager = OptionSettingManager163
+        OptionSingleReplace117.tokenName = ""
+        OptionSingleReplace117.updateTileSets = false
+        Me.optBtnGunsmith.options = OptionSingleReplace117
         Me.optBtnGunsmith.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGunsmith.TabIndex = 1
         Me.optBtnGunsmith.Text = "Gunsmith"
@@ -7488,28 +7449,28 @@ Partial Class MainForm
         Me.optBtnHeavySiegeworks.Appearance = System.Windows.Forms.Appearance.Button
         Me.optBtnHeavySiegeworks.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.optBtnHeavySiegeworks.FlatAppearance.BorderSize = 0
-        Me.optBtnHeavySiegeworks.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
-        Me.optBtnHeavySiegeworks.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(225,Byte),Integer), CType(CType(210,Byte),Integer), CType(CType(165,Byte),Integer))
-        Me.optBtnHeavySiegeworks.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.optBtnHeavySiegeworks.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
-        Me.optBtnHeavySiegeworks.Image = CType(resources.GetObject("optBtnHeavySiegeworks.Image"),System.Drawing.Image)
-        Me.optBtnHeavySiegeworks.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.optBtnHeavySiegeworks.Location = New System.Drawing.Point(5, 77)
-        Me.optBtnHeavySiegeworks.Margin = New System.Windows.Forms.Padding(1)
-        Me.optBtnHeavySiegeworks.Name = "optBtnHeavySiegeworks"
-        OptionSingleReplace121.disabledValue = "!NOHEAVYSIEGE!"
-        OptionSingleReplace121.enabledValue = "YESHEAVYSIEGE["
-        FileListManager164.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace121.fileManager = FileListManager164
-        OptionManager164.loadFromDInit = false
-        OptionManager164.loadFromInit = false
-        OptionManager164.loadFromWorldGen = false
-        OptionSingleReplace121.optionManager = OptionManager164
-        OptionSettingManager167.settingName = Nothing
-        OptionSingleReplace121.settingManager = OptionSettingManager167
-        OptionSingleReplace121.tokenName = ""
-        OptionSingleReplace121.updateTileSets = false
-        Me.optBtnHeavySiegeworks.options = OptionSingleReplace121
+        Me.optBtnHeavySiegeworks.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.optBtnHeavySiegeworks.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(225,Byte),Integer), CType(CType(210,Byte),Integer), CType(CType(165,Byte),Integer))
+        Me.optBtnHeavySiegeworks.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.optBtnHeavySiegeworks.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
+        Me.optBtnHeavySiegeworks.Image = CType(resources.GetObject("optBtnHeavySiegeworks.Image"),System.Drawing.Image)
+        Me.optBtnHeavySiegeworks.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.optBtnHeavySiegeworks.Location = New System.Drawing.Point(5, 77)
+        Me.optBtnHeavySiegeworks.Margin = New System.Windows.Forms.Padding(1)
+        Me.optBtnHeavySiegeworks.Name = "optBtnHeavySiegeworks"
+        OptionSingleReplace118.disabledValue = "!NOHEAVYSIEGE!"
+        OptionSingleReplace118.enabledValue = "YESHEAVYSIEGE["
+        FileListManager161.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace118.fileManager = FileListManager161
+        OptionManager161.loadFromDInit = false
+        OptionManager161.loadFromInit = false
+        OptionManager161.loadFromWorldGen = false
+        OptionSingleReplace118.optionManager = OptionManager161
+        OptionSettingManager164.settingName = Nothing
+        OptionSingleReplace118.settingManager = OptionSettingManager164
+        OptionSingleReplace118.tokenName = ""
+        OptionSingleReplace118.updateTileSets = false
+        Me.optBtnHeavySiegeworks.options = OptionSingleReplace118
         Me.optBtnHeavySiegeworks.Size = New System.Drawing.Size(134, 27)
         Me.optBtnHeavySiegeworks.TabIndex = 2
         Me.optBtnHeavySiegeworks.Text = "Heavy Siegeworks"
@@ -7532,19 +7493,19 @@ Partial Class MainForm
         Me.optBtnEngineer.Location = New System.Drawing.Point(5, 106)
         Me.optBtnEngineer.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnEngineer.Name = "optBtnEngineer"
-        OptionSingleReplace122.disabledValue = "!NOENGINEER!"
-        OptionSingleReplace122.enabledValue = "YESENGINEER["
-        FileListManager165.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace122.fileManager = FileListManager165
-        OptionManager165.loadFromDInit = false
-        OptionManager165.loadFromInit = false
-        OptionManager165.loadFromWorldGen = false
-        OptionSingleReplace122.optionManager = OptionManager165
-        OptionSettingManager168.settingName = Nothing
-        OptionSingleReplace122.settingManager = OptionSettingManager168
-        OptionSingleReplace122.tokenName = ""
-        OptionSingleReplace122.updateTileSets = false
-        Me.optBtnEngineer.options = OptionSingleReplace122
+        OptionSingleReplace119.disabledValue = "!NOENGINEER!"
+        OptionSingleReplace119.enabledValue = "YESENGINEER["
+        FileListManager162.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace119.fileManager = FileListManager162
+        OptionManager162.loadFromDInit = false
+        OptionManager162.loadFromInit = false
+        OptionManager162.loadFromWorldGen = false
+        OptionSingleReplace119.optionManager = OptionManager162
+        OptionSettingManager165.settingName = Nothing
+        OptionSingleReplace119.settingManager = OptionSettingManager165
+        OptionSingleReplace119.tokenName = ""
+        OptionSingleReplace119.updateTileSets = false
+        Me.optBtnEngineer.options = OptionSingleReplace119
         Me.optBtnEngineer.Size = New System.Drawing.Size(134, 27)
         Me.optBtnEngineer.TabIndex = 3
         Me.optBtnEngineer.Text = "Engineer"
@@ -7566,19 +7527,19 @@ Partial Class MainForm
         Me.optBtnInventor.Location = New System.Drawing.Point(5, 135)
         Me.optBtnInventor.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnInventor.Name = "optBtnInventor"
-        OptionSingleReplace123.disabledValue = "!NOINVENTORSWORKBENCH!"
-        OptionSingleReplace123.enabledValue = "YESINVENTORSWORKBENCH["
-        FileListManager166.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace123.fileManager = FileListManager166
-        OptionManager166.loadFromDInit = false
-        OptionManager166.loadFromInit = false
-        OptionManager166.loadFromWorldGen = false
-        OptionSingleReplace123.optionManager = OptionManager166
-        OptionSettingManager169.settingName = Nothing
-        OptionSingleReplace123.settingManager = OptionSettingManager169
-        OptionSingleReplace123.tokenName = ""
-        OptionSingleReplace123.updateTileSets = false
-        Me.optBtnInventor.options = OptionSingleReplace123
+        OptionSingleReplace120.disabledValue = "!NOINVENTORSWORKBENCH!"
+        OptionSingleReplace120.enabledValue = "YESINVENTORSWORKBENCH["
+        FileListManager163.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace120.fileManager = FileListManager163
+        OptionManager163.loadFromDInit = false
+        OptionManager163.loadFromInit = false
+        OptionManager163.loadFromWorldGen = false
+        OptionSingleReplace120.optionManager = OptionManager163
+        OptionSettingManager166.settingName = Nothing
+        OptionSingleReplace120.settingManager = OptionSettingManager166
+        OptionSingleReplace120.tokenName = ""
+        OptionSingleReplace120.updateTileSets = false
+        Me.optBtnInventor.options = OptionSingleReplace120
         Me.optBtnInventor.Size = New System.Drawing.Size(134, 27)
         Me.optBtnInventor.TabIndex = 4
         Me.optBtnInventor.Text = "Inventor"
@@ -7601,19 +7562,19 @@ Partial Class MainForm
         Me.optBtnGreatforge.Location = New System.Drawing.Point(5, 164)
         Me.optBtnGreatforge.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGreatforge.Name = "optBtnGreatforge"
-        OptionSingleReplace124.disabledValue = "!NOGREATFORGE!"
-        OptionSingleReplace124.enabledValue = "YESGREATFORGE["
-        FileListManager167.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace124.fileManager = FileListManager167
-        OptionManager167.loadFromDInit = false
-        OptionManager167.loadFromInit = false
-        OptionManager167.loadFromWorldGen = false
-        OptionSingleReplace124.optionManager = OptionManager167
-        OptionSettingManager170.settingName = Nothing
-        OptionSingleReplace124.settingManager = OptionSettingManager170
-        OptionSingleReplace124.tokenName = ""
-        OptionSingleReplace124.updateTileSets = false
-        Me.optBtnGreatforge.options = OptionSingleReplace124
+        OptionSingleReplace121.disabledValue = "!NOGREATFORGE!"
+        OptionSingleReplace121.enabledValue = "YESGREATFORGE["
+        FileListManager164.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace121.fileManager = FileListManager164
+        OptionManager164.loadFromDInit = false
+        OptionManager164.loadFromInit = false
+        OptionManager164.loadFromWorldGen = false
+        OptionSingleReplace121.optionManager = OptionManager164
+        OptionSettingManager167.settingName = Nothing
+        OptionSingleReplace121.settingManager = OptionSettingManager167
+        OptionSingleReplace121.tokenName = ""
+        OptionSingleReplace121.updateTileSets = false
+        Me.optBtnGreatforge.options = OptionSingleReplace121
         Me.optBtnGreatforge.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGreatforge.TabIndex = 5
         Me.optBtnGreatforge.Text = "Greatforge"
@@ -7635,19 +7596,19 @@ Partial Class MainForm
         Me.optBtnGlassforge.Location = New System.Drawing.Point(5, 193)
         Me.optBtnGlassforge.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGlassforge.Name = "optBtnGlassforge"
-        OptionSingleReplace125.disabledValue = "!NOGLASSFORGE!"
-        OptionSingleReplace125.enabledValue = "YESGLASSFORGE["
-        FileListManager168.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace125.fileManager = FileListManager168
-        OptionManager168.loadFromDInit = false
-        OptionManager168.loadFromInit = false
-        OptionManager168.loadFromWorldGen = false
-        OptionSingleReplace125.optionManager = OptionManager168
-        OptionSettingManager171.settingName = Nothing
-        OptionSingleReplace125.settingManager = OptionSettingManager171
-        OptionSingleReplace125.tokenName = ""
-        OptionSingleReplace125.updateTileSets = false
-        Me.optBtnGlassforge.options = OptionSingleReplace125
+        OptionSingleReplace122.disabledValue = "!NOGLASSFORGE!"
+        OptionSingleReplace122.enabledValue = "YESGLASSFORGE["
+        FileListManager165.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace122.fileManager = FileListManager165
+        OptionManager165.loadFromDInit = false
+        OptionManager165.loadFromInit = false
+        OptionManager165.loadFromWorldGen = false
+        OptionSingleReplace122.optionManager = OptionManager165
+        OptionSettingManager168.settingName = Nothing
+        OptionSingleReplace122.settingManager = OptionSettingManager168
+        OptionSingleReplace122.tokenName = ""
+        OptionSingleReplace122.updateTileSets = false
+        Me.optBtnGlassforge.options = OptionSingleReplace122
         Me.optBtnGlassforge.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGlassforge.TabIndex = 6
         Me.optBtnGlassforge.Text = "Glassforge"
@@ -7669,19 +7630,19 @@ Partial Class MainForm
         Me.optBtnGemforge.Location = New System.Drawing.Point(5, 222)
         Me.optBtnGemforge.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGemforge.Name = "optBtnGemforge"
-        OptionSingleReplace126.disabledValue = "!NOGEMFORGE!"
-        OptionSingleReplace126.enabledValue = "YESGEMFORGE["
-        FileListManager169.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace126.fileManager = FileListManager169
-        OptionManager169.loadFromDInit = false
-        OptionManager169.loadFromInit = false
-        OptionManager169.loadFromWorldGen = false
-        OptionSingleReplace126.optionManager = OptionManager169
-        OptionSettingManager172.settingName = Nothing
-        OptionSingleReplace126.settingManager = OptionSettingManager172
-        OptionSingleReplace126.tokenName = ""
-        OptionSingleReplace126.updateTileSets = false
-        Me.optBtnGemforge.options = OptionSingleReplace126
+        OptionSingleReplace123.disabledValue = "!NOGEMFORGE!"
+        OptionSingleReplace123.enabledValue = "YESGEMFORGE["
+        FileListManager166.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace123.fileManager = FileListManager166
+        OptionManager166.loadFromDInit = false
+        OptionManager166.loadFromInit = false
+        OptionManager166.loadFromWorldGen = false
+        OptionSingleReplace123.optionManager = OptionManager166
+        OptionSettingManager169.settingName = Nothing
+        OptionSingleReplace123.settingManager = OptionSettingManager169
+        OptionSingleReplace123.tokenName = ""
+        OptionSingleReplace123.updateTileSets = false
+        Me.optBtnGemforge.options = OptionSingleReplace123
         Me.optBtnGemforge.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGemforge.TabIndex = 7
         Me.optBtnGemforge.Text = "Gemforge"
@@ -7704,19 +7665,19 @@ Partial Class MainForm
         Me.optBtnRockForge.Location = New System.Drawing.Point(5, 251)
         Me.optBtnRockForge.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnRockForge.Name = "optBtnRockForge"
-        OptionSingleReplace127.disabledValue = "!NOMAGMASAFE!"
-        OptionSingleReplace127.enabledValue = "YESMAGMASAFE["
-        FileListManager170.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace127.fileManager = FileListManager170
-        OptionManager170.loadFromDInit = false
-        OptionManager170.loadFromInit = false
-        OptionManager170.loadFromWorldGen = false
-        OptionSingleReplace127.optionManager = OptionManager170
-        OptionSettingManager173.settingName = Nothing
-        OptionSingleReplace127.settingManager = OptionSettingManager173
-        OptionSingleReplace127.tokenName = ""
-        OptionSingleReplace127.updateTileSets = false
-        Me.optBtnRockForge.options = OptionSingleReplace127
+        OptionSingleReplace124.disabledValue = "!NOMAGMASAFE!"
+        OptionSingleReplace124.enabledValue = "YESMAGMASAFE["
+        FileListManager167.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace124.fileManager = FileListManager167
+        OptionManager167.loadFromDInit = false
+        OptionManager167.loadFromInit = false
+        OptionManager167.loadFromWorldGen = false
+        OptionSingleReplace124.optionManager = OptionManager167
+        OptionSettingManager170.settingName = Nothing
+        OptionSingleReplace124.settingManager = OptionSettingManager170
+        OptionSingleReplace124.tokenName = ""
+        OptionSingleReplace124.updateTileSets = false
+        Me.optBtnRockForge.options = OptionSingleReplace124
         Me.optBtnRockForge.Size = New System.Drawing.Size(134, 27)
         Me.optBtnRockForge.TabIndex = 8
         Me.optBtnRockForge.Text = "Rock Forge"
@@ -7738,19 +7699,19 @@ Partial Class MainForm
         Me.optBtnBrickOven.Location = New System.Drawing.Point(5, 19)
         Me.optBtnBrickOven.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBrickOven.Name = "optBtnBrickOven"
-        OptionSingleReplace128.disabledValue = "!NOBRICK!"
-        OptionSingleReplace128.enabledValue = "YESBRICK["
-        FileListManager171.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace128.fileManager = FileListManager171
-        OptionManager171.loadFromDInit = false
-        OptionManager171.loadFromInit = false
-        OptionManager171.loadFromWorldGen = false
-        OptionSingleReplace128.optionManager = OptionManager171
-        OptionSettingManager174.settingName = Nothing
-        OptionSingleReplace128.settingManager = OptionSettingManager174
-        OptionSingleReplace128.tokenName = ""
-        OptionSingleReplace128.updateTileSets = false
-        Me.optBtnBrickOven.options = OptionSingleReplace128
+        OptionSingleReplace125.disabledValue = "!NOBRICK!"
+        OptionSingleReplace125.enabledValue = "YESBRICK["
+        FileListManager168.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace125.fileManager = FileListManager168
+        OptionManager168.loadFromDInit = false
+        OptionManager168.loadFromInit = false
+        OptionManager168.loadFromWorldGen = false
+        OptionSingleReplace125.optionManager = OptionManager168
+        OptionSettingManager171.settingName = Nothing
+        OptionSingleReplace125.settingManager = OptionSettingManager171
+        OptionSingleReplace125.tokenName = ""
+        OptionSingleReplace125.updateTileSets = false
+        Me.optBtnBrickOven.options = OptionSingleReplace125
         Me.optBtnBrickOven.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBrickOven.TabIndex = 0
         Me.optBtnBrickOven.Text = "Brick Oven"
@@ -7772,19 +7733,19 @@ Partial Class MainForm
         Me.optBtnCrematorium.Location = New System.Drawing.Point(5, 48)
         Me.optBtnCrematorium.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCrematorium.Name = "optBtnCrematorium"
-        OptionSingleReplace129.disabledValue = "!NOCREMATORY!"
-        OptionSingleReplace129.enabledValue = "YESCREMATORY["
-        FileListManager172.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace129.fileManager = FileListManager172
-        OptionManager172.loadFromDInit = false
-        OptionManager172.loadFromInit = false
-        OptionManager172.loadFromWorldGen = false
-        OptionSingleReplace129.optionManager = OptionManager172
-        OptionSettingManager175.settingName = Nothing
-        OptionSingleReplace129.settingManager = OptionSettingManager175
-        OptionSingleReplace129.tokenName = ""
-        OptionSingleReplace129.updateTileSets = false
-        Me.optBtnCrematorium.options = OptionSingleReplace129
+        OptionSingleReplace126.disabledValue = "!NOCREMATORY!"
+        OptionSingleReplace126.enabledValue = "YESCREMATORY["
+        FileListManager169.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace126.fileManager = FileListManager169
+        OptionManager169.loadFromDInit = false
+        OptionManager169.loadFromInit = false
+        OptionManager169.loadFromWorldGen = false
+        OptionSingleReplace126.optionManager = OptionManager169
+        OptionSettingManager172.settingName = Nothing
+        OptionSingleReplace126.settingManager = OptionSettingManager172
+        OptionSingleReplace126.tokenName = ""
+        OptionSingleReplace126.updateTileSets = false
+        Me.optBtnCrematorium.options = OptionSingleReplace126
         Me.optBtnCrematorium.Size = New System.Drawing.Size(134, 27)
         Me.optBtnCrematorium.TabIndex = 1
         Me.optBtnCrematorium.Text = "Crematorium"
@@ -7805,14 +7766,14 @@ Partial Class MainForm
         Me.optMultiOreProcessor.Location = New System.Drawing.Point(5, 77)
         Me.optMultiOreProcessor.Margin = New System.Windows.Forms.Padding(1)
         Me.optMultiOreProcessor.Name = "optMultiOreProcessor"
-        FileListManager173.fileNames = New String() {"entity_default.txt", "inorganic_mineral.txt", "inorganic_dfhack.txt", "reaction_masterwork.txt"}
-        OptionMulti3.fileManager = FileListManager173
-        OptionManager173.loadFromDInit = false
-        OptionManager173.loadFromInit = false
-        OptionManager173.loadFromWorldGen = false
-        OptionMulti3.optionManager = OptionManager173
-        OptionSettingManager176.settingName = Nothing
-        OptionMulti3.settingManager = OptionSettingManager176
+        FileListManager170.fileNames = New String() {"entity_default.txt", "inorganic_mineral.txt", "inorganic_dfhack.txt", "reaction_masterwork.txt"}
+        OptionMulti3.fileManager = FileListManager170
+        OptionManager170.loadFromDInit = false
+        OptionManager170.loadFromInit = false
+        OptionManager170.loadFromWorldGen = false
+        OptionMulti3.optionManager = OptionManager170
+        OptionSettingManager173.settingName = Nothing
+        OptionMulti3.settingManager = OptionSettingManager173
         RawToken5.optionOffValue = "!NOSMELTING!"
         RawToken5.optionOnValue = "YESSMELTING["
         RawToken5.tokenName = "Smelting"
@@ -7853,19 +7814,19 @@ Partial Class MainForm
         Me.optBtnKiln.Location = New System.Drawing.Point(5, 106)
         Me.optBtnKiln.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnKiln.Name = "optBtnKiln"
-        OptionSingleReplace130.disabledValue = "!NOKILN!"
-        OptionSingleReplace130.enabledValue = "YESKILN["
-        FileListManager174.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace130.fileManager = FileListManager174
-        OptionManager174.loadFromDInit = false
-        OptionManager174.loadFromInit = false
-        OptionManager174.loadFromWorldGen = false
-        OptionSingleReplace130.optionManager = OptionManager174
-        OptionSettingManager177.settingName = Nothing
-        OptionSingleReplace130.settingManager = OptionSettingManager177
-        OptionSingleReplace130.tokenName = ""
-        OptionSingleReplace130.updateTileSets = false
-        Me.optBtnKiln.options = OptionSingleReplace130
+        OptionSingleReplace127.disabledValue = "!NOKILN!"
+        OptionSingleReplace127.enabledValue = "YESKILN["
+        FileListManager171.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace127.fileManager = FileListManager171
+        OptionManager171.loadFromDInit = false
+        OptionManager171.loadFromInit = false
+        OptionManager171.loadFromWorldGen = false
+        OptionSingleReplace127.optionManager = OptionManager171
+        OptionSettingManager174.settingName = Nothing
+        OptionSingleReplace127.settingManager = OptionSettingManager174
+        OptionSingleReplace127.tokenName = ""
+        OptionSingleReplace127.updateTileSets = false
+        Me.optBtnKiln.options = OptionSingleReplace127
         Me.optBtnKiln.Size = New System.Drawing.Size(134, 27)
         Me.optBtnKiln.TabIndex = 3
         Me.optBtnKiln.Text = "Kiln"
@@ -7887,19 +7848,19 @@ Partial Class MainForm
         Me.optBtnSlagPit.Location = New System.Drawing.Point(5, 135)
         Me.optBtnSlagPit.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnSlagPit.Name = "optBtnSlagPit"
-        OptionSingleReplace131.disabledValue = "!NOSLAGPIT!"
-        OptionSingleReplace131.enabledValue = "YESSLAGPIT["
-        FileListManager175.fileNames = New String() {"entity_default.txt", "reaction_masterwork.txt", "inorganic_mineral.txt"}
-        OptionSingleReplace131.fileManager = FileListManager175
-        OptionManager175.loadFromDInit = false
-        OptionManager175.loadFromInit = false
-        OptionManager175.loadFromWorldGen = false
-        OptionSingleReplace131.optionManager = OptionManager175
-        OptionSettingManager178.settingName = Nothing
-        OptionSingleReplace131.settingManager = OptionSettingManager178
-        OptionSingleReplace131.tokenName = ""
-        OptionSingleReplace131.updateTileSets = true
-        Me.optBtnSlagPit.options = OptionSingleReplace131
+        OptionSingleReplace128.disabledValue = "!NOSLAGPIT!"
+        OptionSingleReplace128.enabledValue = "YESSLAGPIT["
+        FileListManager172.fileNames = New String() {"entity_default.txt", "reaction_masterwork.txt", "inorganic_mineral.txt"}
+        OptionSingleReplace128.fileManager = FileListManager172
+        OptionManager172.loadFromDInit = false
+        OptionManager172.loadFromInit = false
+        OptionManager172.loadFromWorldGen = false
+        OptionSingleReplace128.optionManager = OptionManager172
+        OptionSettingManager175.settingName = Nothing
+        OptionSingleReplace128.settingManager = OptionSettingManager175
+        OptionSingleReplace128.tokenName = ""
+        OptionSingleReplace128.updateTileSets = true
+        Me.optBtnSlagPit.options = OptionSingleReplace128
         Me.optBtnSlagPit.Size = New System.Drawing.Size(134, 27)
         Me.optBtnSlagPit.TabIndex = 4
         Me.optBtnSlagPit.Text = "Slag Pit"
@@ -7921,19 +7882,19 @@ Partial Class MainForm
         Me.optBtnRuneArmory.Location = New System.Drawing.Point(5, 19)
         Me.optBtnRuneArmory.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnRuneArmory.Name = "optBtnRuneArmory"
-        OptionSingleReplace132.disabledValue = "!NORUNEARMORY!"
-        OptionSingleReplace132.enabledValue = "YESRUNEARMORY["
-        FileListManager176.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace132.fileManager = FileListManager176
-        OptionManager176.loadFromDInit = false
-        OptionManager176.loadFromInit = false
-        OptionManager176.loadFromWorldGen = false
-        OptionSingleReplace132.optionManager = OptionManager176
-        OptionSettingManager179.settingName = Nothing
-        OptionSingleReplace132.settingManager = OptionSettingManager179
-        OptionSingleReplace132.tokenName = ""
-        OptionSingleReplace132.updateTileSets = false
-        Me.optBtnRuneArmory.options = OptionSingleReplace132
+        OptionSingleReplace129.disabledValue = "!NORUNEARMORY!"
+        OptionSingleReplace129.enabledValue = "YESRUNEARMORY["
+        FileListManager173.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace129.fileManager = FileListManager173
+        OptionManager173.loadFromDInit = false
+        OptionManager173.loadFromInit = false
+        OptionManager173.loadFromWorldGen = false
+        OptionSingleReplace129.optionManager = OptionManager173
+        OptionSettingManager176.settingName = Nothing
+        OptionSingleReplace129.settingManager = OptionSettingManager176
+        OptionSingleReplace129.tokenName = ""
+        OptionSingleReplace129.updateTileSets = false
+        Me.optBtnRuneArmory.options = OptionSingleReplace129
         Me.optBtnRuneArmory.Size = New System.Drawing.Size(134, 27)
         Me.optBtnRuneArmory.TabIndex = 0
         Me.optBtnRuneArmory.Text = "Rune Armory"
@@ -7955,19 +7916,19 @@ Partial Class MainForm
         Me.optBtnRuneWeaponry.Location = New System.Drawing.Point(5, 48)
         Me.optBtnRuneWeaponry.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnRuneWeaponry.Name = "optBtnRuneWeaponry"
-        OptionSingleReplace133.disabledValue = "!NORUNESMITH!"
-        OptionSingleReplace133.enabledValue = "YESRUNESMITH["
-        FileListManager177.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace133.fileManager = FileListManager177
-        OptionManager177.loadFromDInit = false
-        OptionManager177.loadFromInit = false
-        OptionManager177.loadFromWorldGen = false
-        OptionSingleReplace133.optionManager = OptionManager177
-        OptionSettingManager180.settingName = Nothing
-        OptionSingleReplace133.settingManager = OptionSettingManager180
-        OptionSingleReplace133.tokenName = ""
-        OptionSingleReplace133.updateTileSets = false
-        Me.optBtnRuneWeaponry.options = OptionSingleReplace133
+        OptionSingleReplace130.disabledValue = "!NORUNESMITH!"
+        OptionSingleReplace130.enabledValue = "YESRUNESMITH["
+        FileListManager174.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace130.fileManager = FileListManager174
+        OptionManager174.loadFromDInit = false
+        OptionManager174.loadFromInit = false
+        OptionManager174.loadFromWorldGen = false
+        OptionSingleReplace130.optionManager = OptionManager174
+        OptionSettingManager177.settingName = Nothing
+        OptionSingleReplace130.settingManager = OptionSettingManager177
+        OptionSingleReplace130.tokenName = ""
+        OptionSingleReplace130.updateTileSets = false
+        Me.optBtnRuneWeaponry.options = OptionSingleReplace130
         Me.optBtnRuneWeaponry.Size = New System.Drawing.Size(134, 27)
         Me.optBtnRuneWeaponry.TabIndex = 1
         Me.optBtnRuneWeaponry.Text = "Rune Weaponry"
@@ -7989,19 +7950,19 @@ Partial Class MainForm
         Me.optBtnArmory.Location = New System.Drawing.Point(5, 77)
         Me.optBtnArmory.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnArmory.Name = "optBtnArmory"
-        OptionSingleReplace134.disabledValue = "!NOARMORY!"
-        OptionSingleReplace134.enabledValue = "YESARMORY["
-        FileListManager178.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace134.fileManager = FileListManager178
-        OptionManager178.loadFromDInit = false
-        OptionManager178.loadFromInit = false
-        OptionManager178.loadFromWorldGen = false
-        OptionSingleReplace134.optionManager = OptionManager178
-        OptionSettingManager181.settingName = Nothing
-        OptionSingleReplace134.settingManager = OptionSettingManager181
-        OptionSingleReplace134.tokenName = ""
-        OptionSingleReplace134.updateTileSets = false
-        Me.optBtnArmory.options = OptionSingleReplace134
+        OptionSingleReplace131.disabledValue = "!NOARMORY!"
+        OptionSingleReplace131.enabledValue = "YESARMORY["
+        FileListManager175.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace131.fileManager = FileListManager175
+        OptionManager175.loadFromDInit = false
+        OptionManager175.loadFromInit = false
+        OptionManager175.loadFromWorldGen = false
+        OptionSingleReplace131.optionManager = OptionManager175
+        OptionSettingManager178.settingName = Nothing
+        OptionSingleReplace131.settingManager = OptionSettingManager178
+        OptionSingleReplace131.tokenName = ""
+        OptionSingleReplace131.updateTileSets = false
+        Me.optBtnArmory.options = OptionSingleReplace131
         Me.optBtnArmory.Size = New System.Drawing.Size(134, 27)
         Me.optBtnArmory.TabIndex = 2
         Me.optBtnArmory.Text = "Armory"
@@ -8023,19 +7984,19 @@ Partial Class MainForm
         Me.optBtnWeaponry.Location = New System.Drawing.Point(5, 106)
         Me.optBtnWeaponry.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnWeaponry.Name = "optBtnWeaponry"
-        OptionSingleReplace135.disabledValue = "!NOWEAPONRY!"
-        OptionSingleReplace135.enabledValue = "YESWEAPONRY["
-        FileListManager179.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace135.fileManager = FileListManager179
-        OptionManager179.loadFromDInit = false
-        OptionManager179.loadFromInit = false
-        OptionManager179.loadFromWorldGen = false
-        OptionSingleReplace135.optionManager = OptionManager179
-        OptionSettingManager182.settingName = Nothing
-        OptionSingleReplace135.settingManager = OptionSettingManager182
-        OptionSingleReplace135.tokenName = ""
-        OptionSingleReplace135.updateTileSets = false
-        Me.optBtnWeaponry.options = OptionSingleReplace135
+        OptionSingleReplace132.disabledValue = "!NOWEAPONRY!"
+        OptionSingleReplace132.enabledValue = "YESWEAPONRY["
+        FileListManager176.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace132.fileManager = FileListManager176
+        OptionManager176.loadFromDInit = false
+        OptionManager176.loadFromInit = false
+        OptionManager176.loadFromWorldGen = false
+        OptionSingleReplace132.optionManager = OptionManager176
+        OptionSettingManager179.settingName = Nothing
+        OptionSingleReplace132.settingManager = OptionSettingManager179
+        OptionSingleReplace132.tokenName = ""
+        OptionSingleReplace132.updateTileSets = false
+        Me.optBtnWeaponry.options = OptionSingleReplace132
         Me.optBtnWeaponry.Size = New System.Drawing.Size(134, 27)
         Me.optBtnWeaponry.TabIndex = 3
         Me.optBtnWeaponry.Text = "Weaponry"
@@ -8058,19 +8019,19 @@ Partial Class MainForm
         Me.optBtnMegabeastKennel.Location = New System.Drawing.Point(5, 135)
         Me.optBtnMegabeastKennel.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMegabeastKennel.Name = "optBtnMegabeastKennel"
-        OptionSingleReplace136.disabledValue = "!NOMEGABEASTKENNELS!"
-        OptionSingleReplace136.enabledValue = "YESMEGABEASTKENNELS["
-        FileListManager180.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace136.fileManager = FileListManager180
-        OptionManager180.loadFromDInit = false
-        OptionManager180.loadFromInit = false
-        OptionManager180.loadFromWorldGen = false
-        OptionSingleReplace136.optionManager = OptionManager180
-        OptionSettingManager183.settingName = Nothing
-        OptionSingleReplace136.settingManager = OptionSettingManager183
-        OptionSingleReplace136.tokenName = ""
-        OptionSingleReplace136.updateTileSets = false
-        Me.optBtnMegabeastKennel.options = OptionSingleReplace136
+        OptionSingleReplace133.disabledValue = "!NOMEGABEASTKENNELS!"
+        OptionSingleReplace133.enabledValue = "YESMEGABEASTKENNELS["
+        FileListManager177.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace133.fileManager = FileListManager177
+        OptionManager177.loadFromDInit = false
+        OptionManager177.loadFromInit = false
+        OptionManager177.loadFromWorldGen = false
+        OptionSingleReplace133.optionManager = OptionManager177
+        OptionSettingManager180.settingName = Nothing
+        OptionSingleReplace133.settingManager = OptionSettingManager180
+        OptionSingleReplace133.tokenName = ""
+        OptionSingleReplace133.updateTileSets = false
+        Me.optBtnMegabeastKennel.options = OptionSingleReplace133
         Me.optBtnMegabeastKennel.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMegabeastKennel.TabIndex = 4
         Me.optBtnMegabeastKennel.Text = "MegaBeast Kennels"
@@ -8093,19 +8054,19 @@ Partial Class MainForm
         Me.optBtnWarKennel.Location = New System.Drawing.Point(5, 164)
         Me.optBtnWarKennel.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnWarKennel.Name = "optBtnWarKennel"
-        OptionSingleReplace137.disabledValue = "!NOARMORED!"
-        OptionSingleReplace137.enabledValue = "YESARMORED["
-        FileListManager181.fileNames = New String() {"entity_default.txt", "creature_pet_armored.txt"}
-        OptionSingleReplace137.fileManager = FileListManager181
-        OptionManager181.loadFromDInit = false
-        OptionManager181.loadFromInit = false
-        OptionManager181.loadFromWorldGen = false
-        OptionSingleReplace137.optionManager = OptionManager181
-        OptionSettingManager184.settingName = Nothing
-        OptionSingleReplace137.settingManager = OptionSettingManager184
-        OptionSingleReplace137.tokenName = ""
-        OptionSingleReplace137.updateTileSets = false
-        Me.optBtnWarKennel.options = OptionSingleReplace137
+        OptionSingleReplace134.disabledValue = "!NOARMORED!"
+        OptionSingleReplace134.enabledValue = "YESARMORED["
+        FileListManager178.fileNames = New String() {"entity_default.txt", "creature_pet_armored.txt"}
+        OptionSingleReplace134.fileManager = FileListManager178
+        OptionManager178.loadFromDInit = false
+        OptionManager178.loadFromInit = false
+        OptionManager178.loadFromWorldGen = false
+        OptionSingleReplace134.optionManager = OptionManager178
+        OptionSettingManager181.settingName = Nothing
+        OptionSingleReplace134.settingManager = OptionSettingManager181
+        OptionSingleReplace134.tokenName = ""
+        OptionSingleReplace134.updateTileSets = false
+        Me.optBtnWarKennel.options = OptionSingleReplace134
         Me.optBtnWarKennel.Size = New System.Drawing.Size(134, 27)
         Me.optBtnWarKennel.TabIndex = 5
         Me.optBtnWarKennel.Text = "War Kennels"
@@ -8127,19 +8088,19 @@ Partial Class MainForm
         Me.optBtnBlastFurnace.Location = New System.Drawing.Point(5, 29)
         Me.optBtnBlastFurnace.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBlastFurnace.Name = "optBtnBlastFurnace"
-        OptionSingleReplace138.disabledValue = "!NOBLASTFURNACE!"
-        OptionSingleReplace138.enabledValue = "YESBLASTFURNACE["
-        FileListManager182.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace138.fileManager = FileListManager182
-        OptionManager182.loadFromDInit = false
-        OptionManager182.loadFromInit = false
-        OptionManager182.loadFromWorldGen = false
-        OptionSingleReplace138.optionManager = OptionManager182
-        OptionSettingManager185.settingName = Nothing
-        OptionSingleReplace138.settingManager = OptionSettingManager185
-        OptionSingleReplace138.tokenName = ""
-        OptionSingleReplace138.updateTileSets = false
-        Me.optBtnBlastFurnace.options = OptionSingleReplace138
+        OptionSingleReplace135.disabledValue = "!NOBLASTFURNACE!"
+        OptionSingleReplace135.enabledValue = "YESBLASTFURNACE["
+        FileListManager179.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace135.fileManager = FileListManager179
+        OptionManager179.loadFromDInit = false
+        OptionManager179.loadFromInit = false
+        OptionManager179.loadFromWorldGen = false
+        OptionSingleReplace135.optionManager = OptionManager179
+        OptionSettingManager182.settingName = Nothing
+        OptionSingleReplace135.settingManager = OptionSettingManager182
+        OptionSingleReplace135.tokenName = ""
+        OptionSingleReplace135.updateTileSets = false
+        Me.optBtnBlastFurnace.options = OptionSingleReplace135
         Me.optBtnBlastFurnace.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBlastFurnace.TabIndex = 0
         Me.optBtnBlastFurnace.Text = "Blast Furnace"
@@ -8161,19 +8122,19 @@ Partial Class MainForm
         Me.optBtnCrucible.Location = New System.Drawing.Point(5, 58)
         Me.optBtnCrucible.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCrucible.Name = "optBtnCrucible"
-        OptionSingleReplace139.disabledValue = "!NOCRUCIBLE!"
-        OptionSingleReplace139.enabledValue = "YESCRUCIBLE["
-        FileListManager183.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace139.fileManager = FileListManager183
-        OptionManager183.loadFromDInit = false
-        OptionManager183.loadFromInit = false
-        OptionManager183.loadFromWorldGen = false
-        OptionSingleReplace139.optionManager = OptionManager183
-        OptionSettingManager186.settingName = Nothing
-        OptionSingleReplace139.settingManager = OptionSettingManager186
-        OptionSingleReplace139.tokenName = ""
-        OptionSingleReplace139.updateTileSets = false
-        Me.optBtnCrucible.options = OptionSingleReplace139
+        OptionSingleReplace136.disabledValue = "!NOCRUCIBLE!"
+        OptionSingleReplace136.enabledValue = "YESCRUCIBLE["
+        FileListManager180.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace136.fileManager = FileListManager180
+        OptionManager180.loadFromDInit = false
+        OptionManager180.loadFromInit = false
+        OptionManager180.loadFromWorldGen = false
+        OptionSingleReplace136.optionManager = OptionManager180
+        OptionSettingManager183.settingName = Nothing
+        OptionSingleReplace136.settingManager = OptionSettingManager183
+        OptionSingleReplace136.tokenName = ""
+        OptionSingleReplace136.updateTileSets = false
+        Me.optBtnCrucible.options = OptionSingleReplace136
         Me.optBtnCrucible.Size = New System.Drawing.Size(134, 27)
         Me.optBtnCrucible.TabIndex = 1
         Me.optBtnCrucible.Text = "Crucible"
@@ -8195,19 +8156,19 @@ Partial Class MainForm
         Me.optBtnFinishingForge.Location = New System.Drawing.Point(5, 87)
         Me.optBtnFinishingForge.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFinishingForge.Name = "optBtnFinishingForge"
-        OptionSingleReplace140.disabledValue = "!NOFINISHINGFORGE!"
-        OptionSingleReplace140.enabledValue = "YESFINISHINGFORGE["
-        FileListManager184.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace140.fileManager = FileListManager184
-        OptionManager184.loadFromDInit = false
-        OptionManager184.loadFromInit = false
-        OptionManager184.loadFromWorldGen = false
-        OptionSingleReplace140.optionManager = OptionManager184
-        OptionSettingManager187.settingName = Nothing
-        OptionSingleReplace140.settingManager = OptionSettingManager187
-        OptionSingleReplace140.tokenName = ""
-        OptionSingleReplace140.updateTileSets = false
-        Me.optBtnFinishingForge.options = OptionSingleReplace140
+        OptionSingleReplace137.disabledValue = "!NOFINISHINGFORGE!"
+        OptionSingleReplace137.enabledValue = "YESFINISHINGFORGE["
+        FileListManager181.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace137.fileManager = FileListManager181
+        OptionManager181.loadFromDInit = false
+        OptionManager181.loadFromInit = false
+        OptionManager181.loadFromWorldGen = false
+        OptionSingleReplace137.optionManager = OptionManager181
+        OptionSettingManager184.settingName = Nothing
+        OptionSingleReplace137.settingManager = OptionSettingManager184
+        OptionSingleReplace137.tokenName = ""
+        OptionSingleReplace137.updateTileSets = false
+        Me.optBtnFinishingForge.options = OptionSingleReplace137
         Me.optBtnFinishingForge.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFinishingForge.TabIndex = 2
         Me.optBtnFinishingForge.Text = "Finishing Forge"
@@ -8229,19 +8190,19 @@ Partial Class MainForm
         Me.optBtnMetallurgist.Location = New System.Drawing.Point(5, 116)
         Me.optBtnMetallurgist.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMetallurgist.Name = "optBtnMetallurgist"
-        OptionSingleReplace141.disabledValue = "!NOMETALLURGIST!"
-        OptionSingleReplace141.enabledValue = "YESMETALLURGIST["
-        FileListManager185.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace141.fileManager = FileListManager185
-        OptionManager185.loadFromDInit = false
-        OptionManager185.loadFromInit = false
-        OptionManager185.loadFromWorldGen = false
-        OptionSingleReplace141.optionManager = OptionManager185
-        OptionSettingManager188.settingName = Nothing
-        OptionSingleReplace141.settingManager = OptionSettingManager188
-        OptionSingleReplace141.tokenName = ""
-        OptionSingleReplace141.updateTileSets = false
-        Me.optBtnMetallurgist.options = OptionSingleReplace141
+        OptionSingleReplace138.disabledValue = "!NOMETALLURGIST!"
+        OptionSingleReplace138.enabledValue = "YESMETALLURGIST["
+        FileListManager182.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace138.fileManager = FileListManager182
+        OptionManager182.loadFromDInit = false
+        OptionManager182.loadFromInit = false
+        OptionManager182.loadFromWorldGen = false
+        OptionSingleReplace138.optionManager = OptionManager182
+        OptionSettingManager185.settingName = Nothing
+        OptionSingleReplace138.settingManager = OptionSettingManager185
+        OptionSingleReplace138.tokenName = ""
+        OptionSingleReplace138.updateTileSets = false
+        Me.optBtnMetallurgist.options = OptionSingleReplace138
         Me.optBtnMetallurgist.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMetallurgist.TabIndex = 3
         Me.optBtnMetallurgist.Text = "Metallurgist"
@@ -8263,19 +8224,19 @@ Partial Class MainForm
         Me.optBtnArbalest.Location = New System.Drawing.Point(5, 25)
         Me.optBtnArbalest.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnArbalest.Name = "optBtnArbalest"
-        OptionSingleReplace142.disabledValue = "!NOARBALEST!"
-        OptionSingleReplace142.enabledValue = "YESARBALEST["
-        FileListManager186.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace142.fileManager = FileListManager186
-        OptionManager186.loadFromDInit = false
-        OptionManager186.loadFromInit = false
-        OptionManager186.loadFromWorldGen = false
-        OptionSingleReplace142.optionManager = OptionManager186
-        OptionSettingManager189.settingName = Nothing
-        OptionSingleReplace142.settingManager = OptionSettingManager189
-        OptionSingleReplace142.tokenName = ""
-        OptionSingleReplace142.updateTileSets = false
-        Me.optBtnArbalest.options = OptionSingleReplace142
+        OptionSingleReplace139.disabledValue = "!NOARBALEST!"
+        OptionSingleReplace139.enabledValue = "YESARBALEST["
+        FileListManager183.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace139.fileManager = FileListManager183
+        OptionManager183.loadFromDInit = false
+        OptionManager183.loadFromInit = false
+        OptionManager183.loadFromWorldGen = false
+        OptionSingleReplace139.optionManager = OptionManager183
+        OptionSettingManager186.settingName = Nothing
+        OptionSingleReplace139.settingManager = OptionSettingManager186
+        OptionSingleReplace139.tokenName = ""
+        OptionSingleReplace139.updateTileSets = false
+        Me.optBtnArbalest.options = OptionSingleReplace139
         Me.optBtnArbalest.Size = New System.Drawing.Size(134, 27)
         Me.optBtnArbalest.TabIndex = 0
         Me.optBtnArbalest.Text = "Arbalest"
@@ -8297,19 +8258,19 @@ Partial Class MainForm
         Me.optBtnTrebuchet.Location = New System.Drawing.Point(5, 54)
         Me.optBtnTrebuchet.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTrebuchet.Name = "optBtnTrebuchet"
-        OptionSingleReplace143.disabledValue = "!NOTREBUCHET!"
-        OptionSingleReplace143.enabledValue = "YESTREBUCHET["
-        FileListManager187.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace143.fileManager = FileListManager187
-        OptionManager187.loadFromDInit = false
-        OptionManager187.loadFromInit = false
-        OptionManager187.loadFromWorldGen = false
-        OptionSingleReplace143.optionManager = OptionManager187
-        OptionSettingManager190.settingName = Nothing
-        OptionSingleReplace143.settingManager = OptionSettingManager190
-        OptionSingleReplace143.tokenName = ""
-        OptionSingleReplace143.updateTileSets = false
-        Me.optBtnTrebuchet.options = OptionSingleReplace143
+        OptionSingleReplace140.disabledValue = "!NOTREBUCHET!"
+        OptionSingleReplace140.enabledValue = "YESTREBUCHET["
+        FileListManager184.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace140.fileManager = FileListManager184
+        OptionManager184.loadFromDInit = false
+        OptionManager184.loadFromInit = false
+        OptionManager184.loadFromWorldGen = false
+        OptionSingleReplace140.optionManager = OptionManager184
+        OptionSettingManager187.settingName = Nothing
+        OptionSingleReplace140.settingManager = OptionSettingManager187
+        OptionSingleReplace140.tokenName = ""
+        OptionSingleReplace140.updateTileSets = false
+        Me.optBtnTrebuchet.options = OptionSingleReplace140
         Me.optBtnTrebuchet.Size = New System.Drawing.Size(134, 27)
         Me.optBtnTrebuchet.TabIndex = 1
         Me.optBtnTrebuchet.Text = "Trebuchet"
@@ -8331,19 +8292,19 @@ Partial Class MainForm
         Me.optBtnDisplayCase.Location = New System.Drawing.Point(5, 19)
         Me.optBtnDisplayCase.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDisplayCase.Name = "optBtnDisplayCase"
-        OptionSingleReplace144.disabledValue = "!NODECORATION!"
-        OptionSingleReplace144.enabledValue = "YESDECORATION["
-        FileListManager188.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace144.fileManager = FileListManager188
-        OptionManager188.loadFromDInit = false
-        OptionManager188.loadFromInit = false
-        OptionManager188.loadFromWorldGen = false
-        OptionSingleReplace144.optionManager = OptionManager188
-        OptionSettingManager191.settingName = Nothing
-        OptionSingleReplace144.settingManager = OptionSettingManager191
-        OptionSingleReplace144.tokenName = ""
-        OptionSingleReplace144.updateTileSets = false
-        Me.optBtnDisplayCase.options = OptionSingleReplace144
+        OptionSingleReplace141.disabledValue = "!NODECORATION!"
+        OptionSingleReplace141.enabledValue = "YESDECORATION["
+        FileListManager185.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace141.fileManager = FileListManager185
+        OptionManager185.loadFromDInit = false
+        OptionManager185.loadFromInit = false
+        OptionManager185.loadFromWorldGen = false
+        OptionSingleReplace141.optionManager = OptionManager185
+        OptionSettingManager188.settingName = Nothing
+        OptionSingleReplace141.settingManager = OptionSettingManager188
+        OptionSingleReplace141.tokenName = ""
+        OptionSingleReplace141.updateTileSets = false
+        Me.optBtnDisplayCase.options = OptionSingleReplace141
         Me.optBtnDisplayCase.Size = New System.Drawing.Size(134, 27)
         Me.optBtnDisplayCase.TabIndex = 0
         Me.optBtnDisplayCase.Text = "Display Case"
@@ -8365,19 +8326,19 @@ Partial Class MainForm
         Me.optBtnPottedPlant.Location = New System.Drawing.Point(5, 48)
         Me.optBtnPottedPlant.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnPottedPlant.Name = "optBtnPottedPlant"
-        OptionSingleReplace145.disabledValue = "!NOPOTTEDPLANT!"
-        OptionSingleReplace145.enabledValue = "YESPOTTEDPLANT["
-        FileListManager189.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace145.fileManager = FileListManager189
-        OptionManager189.loadFromDInit = false
-        OptionManager189.loadFromInit = false
-        OptionManager189.loadFromWorldGen = false
-        OptionSingleReplace145.optionManager = OptionManager189
-        OptionSettingManager192.settingName = Nothing
-        OptionSingleReplace145.settingManager = OptionSettingManager192
-        OptionSingleReplace145.tokenName = ""
-        OptionSingleReplace145.updateTileSets = false
-        Me.optBtnPottedPlant.options = OptionSingleReplace145
+        OptionSingleReplace142.disabledValue = "!NOPOTTEDPLANT!"
+        OptionSingleReplace142.enabledValue = "YESPOTTEDPLANT["
+        FileListManager186.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace142.fileManager = FileListManager186
+        OptionManager186.loadFromDInit = false
+        OptionManager186.loadFromInit = false
+        OptionManager186.loadFromWorldGen = false
+        OptionSingleReplace142.optionManager = OptionManager186
+        OptionSettingManager189.settingName = Nothing
+        OptionSingleReplace142.settingManager = OptionSettingManager189
+        OptionSingleReplace142.tokenName = ""
+        OptionSingleReplace142.updateTileSets = false
+        Me.optBtnPottedPlant.options = OptionSingleReplace142
         Me.optBtnPottedPlant.Size = New System.Drawing.Size(134, 27)
         Me.optBtnPottedPlant.TabIndex = 1
         Me.optBtnPottedPlant.Text = "Plants"
@@ -8399,19 +8360,19 @@ Partial Class MainForm
         Me.optBtnTotems.Location = New System.Drawing.Point(5, 77)
         Me.optBtnTotems.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTotems.Name = "optBtnTotems"
-        OptionSingleReplace146.disabledValue = "!NOTOTEM!"
-        OptionSingleReplace146.enabledValue = "YESTOTEM["
-        FileListManager190.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace146.fileManager = FileListManager190
-        OptionManager190.loadFromDInit = false
-        OptionManager190.loadFromInit = false
-        OptionManager190.loadFromWorldGen = false
-        OptionSingleReplace146.optionManager = OptionManager190
-        OptionSettingManager193.settingName = Nothing
-        OptionSingleReplace146.settingManager = OptionSettingManager193
-        OptionSingleReplace146.tokenName = ""
-        OptionSingleReplace146.updateTileSets = false
-        Me.optBtnTotems.options = OptionSingleReplace146
+        OptionSingleReplace143.disabledValue = "!NOTOTEM!"
+        OptionSingleReplace143.enabledValue = "YESTOTEM["
+        FileListManager187.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace143.fileManager = FileListManager187
+        OptionManager187.loadFromDInit = false
+        OptionManager187.loadFromInit = false
+        OptionManager187.loadFromWorldGen = false
+        OptionSingleReplace143.optionManager = OptionManager187
+        OptionSettingManager190.settingName = Nothing
+        OptionSingleReplace143.settingManager = OptionSettingManager190
+        OptionSingleReplace143.tokenName = ""
+        OptionSingleReplace143.updateTileSets = false
+        Me.optBtnTotems.options = OptionSingleReplace143
         Me.optBtnTotems.Size = New System.Drawing.Size(134, 27)
         Me.optBtnTotems.TabIndex = 2
         Me.optBtnTotems.Text = "Totems"
@@ -8433,19 +8394,19 @@ Partial Class MainForm
         Me.optBtnFountain.Location = New System.Drawing.Point(5, 106)
         Me.optBtnFountain.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFountain.Name = "optBtnFountain"
-        OptionSingleReplace147.disabledValue = "!NOFOUNTAIN!"
-        OptionSingleReplace147.enabledValue = "YESFOUNTAIN["
-        FileListManager191.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace147.fileManager = FileListManager191
-        OptionManager191.loadFromDInit = false
-        OptionManager191.loadFromInit = false
-        OptionManager191.loadFromWorldGen = false
-        OptionSingleReplace147.optionManager = OptionManager191
-        OptionSettingManager194.settingName = Nothing
-        OptionSingleReplace147.settingManager = OptionSettingManager194
-        OptionSingleReplace147.tokenName = ""
-        OptionSingleReplace147.updateTileSets = false
-        Me.optBtnFountain.options = OptionSingleReplace147
+        OptionSingleReplace144.disabledValue = "!NOFOUNTAIN!"
+        OptionSingleReplace144.enabledValue = "YESFOUNTAIN["
+        FileListManager188.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace144.fileManager = FileListManager188
+        OptionManager188.loadFromDInit = false
+        OptionManager188.loadFromInit = false
+        OptionManager188.loadFromWorldGen = false
+        OptionSingleReplace144.optionManager = OptionManager188
+        OptionSettingManager191.settingName = Nothing
+        OptionSingleReplace144.settingManager = OptionSettingManager191
+        OptionSingleReplace144.tokenName = ""
+        OptionSingleReplace144.updateTileSets = false
+        Me.optBtnFountain.options = OptionSingleReplace144
         Me.optBtnFountain.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFountain.TabIndex = 3
         Me.optBtnFountain.Text = "Fountain"
@@ -8467,19 +8428,19 @@ Partial Class MainForm
         Me.optBtnDwarvenLoo.Location = New System.Drawing.Point(5, 135)
         Me.optBtnDwarvenLoo.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDwarvenLoo.Name = "optBtnDwarvenLoo"
-        OptionSingleReplace148.disabledValue = "!NOLOO!"
-        OptionSingleReplace148.enabledValue = "YESLOO["
-        FileListManager192.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace148.fileManager = FileListManager192
-        OptionManager192.loadFromDInit = false
-        OptionManager192.loadFromInit = false
-        OptionManager192.loadFromWorldGen = false
-        OptionSingleReplace148.optionManager = OptionManager192
-        OptionSettingManager195.settingName = Nothing
-        OptionSingleReplace148.settingManager = OptionSettingManager195
-        OptionSingleReplace148.tokenName = ""
-        OptionSingleReplace148.updateTileSets = false
-        Me.optBtnDwarvenLoo.options = OptionSingleReplace148
+        OptionSingleReplace145.disabledValue = "!NOLOO!"
+        OptionSingleReplace145.enabledValue = "YESLOO["
+        FileListManager189.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace145.fileManager = FileListManager189
+        OptionManager189.loadFromDInit = false
+        OptionManager189.loadFromInit = false
+        OptionManager189.loadFromWorldGen = false
+        OptionSingleReplace145.optionManager = OptionManager189
+        OptionSettingManager192.settingName = Nothing
+        OptionSingleReplace145.settingManager = OptionSettingManager192
+        OptionSingleReplace145.tokenName = ""
+        OptionSingleReplace145.updateTileSets = false
+        Me.optBtnDwarvenLoo.options = OptionSingleReplace145
         Me.optBtnDwarvenLoo.Size = New System.Drawing.Size(134, 27)
         Me.optBtnDwarvenLoo.TabIndex = 4
         Me.optBtnDwarvenLoo.Text = "Dwarven Loo"
@@ -8502,19 +8463,19 @@ Partial Class MainForm
         Me.optBtnCarpet.Location = New System.Drawing.Point(5, 164)
         Me.optBtnCarpet.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCarpet.Name = "optBtnCarpet"
-        OptionSingleReplace149.disabledValue = "!NOCARPET!"
-        OptionSingleReplace149.enabledValue = "YESCARPET["
-        FileListManager193.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace149.fileManager = FileListManager193
-        OptionManager193.loadFromDInit = false
-        OptionManager193.loadFromInit = false
-        OptionManager193.loadFromWorldGen = false
-        OptionSingleReplace149.optionManager = OptionManager193
-        OptionSettingManager196.settingName = Nothing
-        OptionSingleReplace149.settingManager = OptionSettingManager196
-        OptionSingleReplace149.tokenName = ""
-        OptionSingleReplace149.updateTileSets = false
-        Me.optBtnCarpet.options = OptionSingleReplace149
+        OptionSingleReplace146.disabledValue = "!NOCARPET!"
+        OptionSingleReplace146.enabledValue = "YESCARPET["
+        FileListManager190.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace146.fileManager = FileListManager190
+        OptionManager190.loadFromDInit = false
+        OptionManager190.loadFromInit = false
+        OptionManager190.loadFromWorldGen = false
+        OptionSingleReplace146.optionManager = OptionManager190
+        OptionSettingManager193.settingName = Nothing
+        OptionSingleReplace146.settingManager = OptionSettingManager193
+        OptionSingleReplace146.tokenName = ""
+        OptionSingleReplace146.updateTileSets = false
+        Me.optBtnCarpet.options = OptionSingleReplace146
         Me.optBtnCarpet.Size = New System.Drawing.Size(134, 27)
         Me.optBtnCarpet.TabIndex = 5
         Me.optBtnCarpet.Text = "Carpets"
@@ -8536,19 +8497,19 @@ Partial Class MainForm
         Me.optBtnDecoItems.Location = New System.Drawing.Point(5, 193)
         Me.optBtnDecoItems.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDecoItems.Name = "optBtnDecoItems"
-        OptionSingleReplace150.disabledValue = "!NODECOITEMS!"
-        OptionSingleReplace150.enabledValue = "YESDECOITEMS["
-        FileListManager194.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace150.fileManager = FileListManager194
-        OptionManager194.loadFromDInit = false
-        OptionManager194.loadFromInit = false
-        OptionManager194.loadFromWorldGen = false
-        OptionSingleReplace150.optionManager = OptionManager194
-        OptionSettingManager197.settingName = Nothing
-        OptionSingleReplace150.settingManager = OptionSettingManager197
-        OptionSingleReplace150.tokenName = ""
-        OptionSingleReplace150.updateTileSets = false
-        Me.optBtnDecoItems.options = OptionSingleReplace150
+        OptionSingleReplace147.disabledValue = "!NODECOITEMS!"
+        OptionSingleReplace147.enabledValue = "YESDECOITEMS["
+        FileListManager191.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace147.fileManager = FileListManager191
+        OptionManager191.loadFromDInit = false
+        OptionManager191.loadFromInit = false
+        OptionManager191.loadFromWorldGen = false
+        OptionSingleReplace147.optionManager = OptionManager191
+        OptionSettingManager194.settingName = Nothing
+        OptionSingleReplace147.settingManager = OptionSettingManager194
+        OptionSingleReplace147.tokenName = ""
+        OptionSingleReplace147.updateTileSets = false
+        Me.optBtnDecoItems.options = OptionSingleReplace147
         Me.optBtnDecoItems.Size = New System.Drawing.Size(134, 27)
         Me.optBtnDecoItems.TabIndex = 6
         Me.optBtnDecoItems.Text = "Items"
@@ -8570,19 +8531,19 @@ Partial Class MainForm
         Me.optBtnStatues.Location = New System.Drawing.Point(5, 222)
         Me.optBtnStatues.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnStatues.Name = "optBtnStatues"
-        OptionSingleReplace151.disabledValue = "!NOSTATUES!"
-        OptionSingleReplace151.enabledValue = "YESSTATUES["
-        FileListManager195.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace151.fileManager = FileListManager195
-        OptionManager195.loadFromDInit = false
-        OptionManager195.loadFromInit = false
-        OptionManager195.loadFromWorldGen = false
-        OptionSingleReplace151.optionManager = OptionManager195
-        OptionSettingManager198.settingName = Nothing
-        OptionSingleReplace151.settingManager = OptionSettingManager198
-        OptionSingleReplace151.tokenName = ""
-        OptionSingleReplace151.updateTileSets = false
-        Me.optBtnStatues.options = OptionSingleReplace151
+        OptionSingleReplace148.disabledValue = "!NOSTATUES!"
+        OptionSingleReplace148.enabledValue = "YESSTATUES["
+        FileListManager192.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace148.fileManager = FileListManager192
+        OptionManager192.loadFromDInit = false
+        OptionManager192.loadFromInit = false
+        OptionManager192.loadFromWorldGen = false
+        OptionSingleReplace148.optionManager = OptionManager192
+        OptionSettingManager195.settingName = Nothing
+        OptionSingleReplace148.settingManager = OptionSettingManager195
+        OptionSingleReplace148.tokenName = ""
+        OptionSingleReplace148.updateTileSets = false
+        Me.optBtnStatues.options = OptionSingleReplace148
         Me.optBtnStatues.Size = New System.Drawing.Size(134, 27)
         Me.optBtnStatues.TabIndex = 7
         Me.optBtnStatues.Text = "Statues"
@@ -8604,19 +8565,19 @@ Partial Class MainForm
         Me.optBtnMagicSchool.Location = New System.Drawing.Point(5, 19)
         Me.optBtnMagicSchool.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMagicSchool.Name = "optBtnMagicSchool"
-        OptionSingleReplace152.disabledValue = "!NOSCHOOLWIZARD!"
-        OptionSingleReplace152.enabledValue = "YESSCHOOLWIZARD["
-        FileListManager196.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace152.fileManager = FileListManager196
-        OptionManager196.loadFromDInit = false
-        OptionManager196.loadFromInit = false
-        OptionManager196.loadFromWorldGen = false
-        OptionSingleReplace152.optionManager = OptionManager196
-        OptionSettingManager199.settingName = Nothing
-        OptionSingleReplace152.settingManager = OptionSettingManager199
-        OptionSingleReplace152.tokenName = ""
-        OptionSingleReplace152.updateTileSets = false
-        Me.optBtnMagicSchool.options = OptionSingleReplace152
+        OptionSingleReplace149.disabledValue = "!NOSCHOOLWIZARD!"
+        OptionSingleReplace149.enabledValue = "YESSCHOOLWIZARD["
+        FileListManager193.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace149.fileManager = FileListManager193
+        OptionManager193.loadFromDInit = false
+        OptionManager193.loadFromInit = false
+        OptionManager193.loadFromWorldGen = false
+        OptionSingleReplace149.optionManager = OptionManager193
+        OptionSettingManager196.settingName = Nothing
+        OptionSingleReplace149.settingManager = OptionSettingManager196
+        OptionSingleReplace149.tokenName = ""
+        OptionSingleReplace149.updateTileSets = false
+        Me.optBtnMagicSchool.options = OptionSingleReplace149
         Me.optBtnMagicSchool.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMagicSchool.TabIndex = 0
         Me.optBtnMagicSchool.Text = "School of Wizardry"
@@ -8638,19 +8599,19 @@ Partial Class MainForm
         Me.optBtnElementalMagic.Location = New System.Drawing.Point(5, 48)
         Me.optBtnElementalMagic.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnElementalMagic.Name = "optBtnElementalMagic"
-        OptionSingleReplace153.disabledValue = "!NOELEMENTALMAGIC!"
-        OptionSingleReplace153.enabledValue = "YESELEMENTALMAGIC["
-        FileListManager197.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace153.fileManager = FileListManager197
-        OptionManager197.loadFromDInit = false
-        OptionManager197.loadFromInit = false
-        OptionManager197.loadFromWorldGen = false
-        OptionSingleReplace153.optionManager = OptionManager197
-        OptionSettingManager200.settingName = Nothing
-        OptionSingleReplace153.settingManager = OptionSettingManager200
-        OptionSingleReplace153.tokenName = ""
-        OptionSingleReplace153.updateTileSets = false
-        Me.optBtnElementalMagic.options = OptionSingleReplace153
+        OptionSingleReplace150.disabledValue = "!NOELEMENTALMAGIC!"
+        OptionSingleReplace150.enabledValue = "YESELEMENTALMAGIC["
+        FileListManager194.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace150.fileManager = FileListManager194
+        OptionManager194.loadFromDInit = false
+        OptionManager194.loadFromInit = false
+        OptionManager194.loadFromWorldGen = false
+        OptionSingleReplace150.optionManager = OptionManager194
+        OptionSettingManager197.settingName = Nothing
+        OptionSingleReplace150.settingManager = OptionSettingManager197
+        OptionSingleReplace150.tokenName = ""
+        OptionSingleReplace150.updateTileSets = false
+        Me.optBtnElementalMagic.options = OptionSingleReplace150
         Me.optBtnElementalMagic.Size = New System.Drawing.Size(134, 27)
         Me.optBtnElementalMagic.TabIndex = 1
         Me.optBtnElementalMagic.Text = "Elemental Altars"
@@ -8673,19 +8634,19 @@ Partial Class MainForm
         Me.optBtnWhiteMagic.Location = New System.Drawing.Point(5, 77)
         Me.optBtnWhiteMagic.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnWhiteMagic.Name = "optBtnWhiteMagic"
-        OptionSingleReplace154.disabledValue = "!NOWHITEMAGIC!"
-        OptionSingleReplace154.enabledValue = "YESWHITEMAGIC["
-        FileListManager198.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace154.fileManager = FileListManager198
-        OptionManager198.loadFromDInit = false
-        OptionManager198.loadFromInit = false
-        OptionManager198.loadFromWorldGen = false
-        OptionSingleReplace154.optionManager = OptionManager198
-        OptionSettingManager201.settingName = Nothing
-        OptionSingleReplace154.settingManager = OptionSettingManager201
-        OptionSingleReplace154.tokenName = ""
-        OptionSingleReplace154.updateTileSets = false
-        Me.optBtnWhiteMagic.options = OptionSingleReplace154
+        OptionSingleReplace151.disabledValue = "!NOWHITEMAGIC!"
+        OptionSingleReplace151.enabledValue = "YESWHITEMAGIC["
+        FileListManager195.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace151.fileManager = FileListManager195
+        OptionManager195.loadFromDInit = false
+        OptionManager195.loadFromInit = false
+        OptionManager195.loadFromWorldGen = false
+        OptionSingleReplace151.optionManager = OptionManager195
+        OptionSettingManager198.settingName = Nothing
+        OptionSingleReplace151.settingManager = OptionSettingManager198
+        OptionSingleReplace151.tokenName = ""
+        OptionSingleReplace151.updateTileSets = false
+        Me.optBtnWhiteMagic.options = OptionSingleReplace151
         Me.optBtnWhiteMagic.Size = New System.Drawing.Size(134, 27)
         Me.optBtnWhiteMagic.TabIndex = 2
         Me.optBtnWhiteMagic.Text = "Good Altar"
@@ -8707,19 +8668,19 @@ Partial Class MainForm
         Me.optBtnBlackMagic.Location = New System.Drawing.Point(5, 106)
         Me.optBtnBlackMagic.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBlackMagic.Name = "optBtnBlackMagic"
-        OptionSingleReplace155.disabledValue = "!NOBLACKMAGIC!"
-        OptionSingleReplace155.enabledValue = "YESBLACKMAGIC["
-        FileListManager199.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace155.fileManager = FileListManager199
-        OptionManager199.loadFromDInit = false
-        OptionManager199.loadFromInit = false
-        OptionManager199.loadFromWorldGen = false
-        OptionSingleReplace155.optionManager = OptionManager199
-        OptionSettingManager202.settingName = Nothing
-        OptionSingleReplace155.settingManager = OptionSettingManager202
-        OptionSingleReplace155.tokenName = ""
-        OptionSingleReplace155.updateTileSets = false
-        Me.optBtnBlackMagic.options = OptionSingleReplace155
+        OptionSingleReplace152.disabledValue = "!NOBLACKMAGIC!"
+        OptionSingleReplace152.enabledValue = "YESBLACKMAGIC["
+        FileListManager196.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace152.fileManager = FileListManager196
+        OptionManager196.loadFromDInit = false
+        OptionManager196.loadFromInit = false
+        OptionManager196.loadFromWorldGen = false
+        OptionSingleReplace152.optionManager = OptionManager196
+        OptionSettingManager199.settingName = Nothing
+        OptionSingleReplace152.settingManager = OptionSettingManager199
+        OptionSingleReplace152.tokenName = ""
+        OptionSingleReplace152.updateTileSets = false
+        Me.optBtnBlackMagic.options = OptionSingleReplace152
         Me.optBtnBlackMagic.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBlackMagic.TabIndex = 3
         Me.optBtnBlackMagic.Text = "Evil Altar"
@@ -8742,19 +8703,19 @@ Partial Class MainForm
         Me.optBtnWarpstonePool.Location = New System.Drawing.Point(5, 135)
         Me.optBtnWarpstonePool.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnWarpstonePool.Name = "optBtnWarpstonePool"
-        OptionSingleReplace156.disabledValue = "!NOWARPSTONELAB!"
-        OptionSingleReplace156.enabledValue = "YESWARPSTONELAB["
-        FileListManager200.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace156.fileManager = FileListManager200
-        OptionManager200.loadFromDInit = false
-        OptionManager200.loadFromInit = false
-        OptionManager200.loadFromWorldGen = false
-        OptionSingleReplace156.optionManager = OptionManager200
-        OptionSettingManager203.settingName = Nothing
-        OptionSingleReplace156.settingManager = OptionSettingManager203
-        OptionSingleReplace156.tokenName = ""
-        OptionSingleReplace156.updateTileSets = false
-        Me.optBtnWarpstonePool.options = OptionSingleReplace156
+        OptionSingleReplace153.disabledValue = "!NOWARPSTONELAB!"
+        OptionSingleReplace153.enabledValue = "YESWARPSTONELAB["
+        FileListManager197.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace153.fileManager = FileListManager197
+        OptionManager197.loadFromDInit = false
+        OptionManager197.loadFromInit = false
+        OptionManager197.loadFromWorldGen = false
+        OptionSingleReplace153.optionManager = OptionManager197
+        OptionSettingManager200.settingName = Nothing
+        OptionSingleReplace153.settingManager = OptionSettingManager200
+        OptionSingleReplace153.tokenName = ""
+        OptionSingleReplace153.updateTileSets = false
+        Me.optBtnWarpstonePool.options = OptionSingleReplace153
         Me.optBtnWarpstonePool.Size = New System.Drawing.Size(134, 27)
         Me.optBtnWarpstonePool.TabIndex = 4
         Me.optBtnWarpstonePool.Text = "Warpstone Pool"
@@ -8776,19 +8737,19 @@ Partial Class MainForm
         Me.optBtnGolemForge.Location = New System.Drawing.Point(5, 25)
         Me.optBtnGolemForge.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGolemForge.Name = "optBtnGolemForge"
-        OptionSingleReplace157.disabledValue = "!NOGOLEM!"
-        OptionSingleReplace157.enabledValue = "YESGOLEM["
-        FileListManager201.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace157.fileManager = FileListManager201
-        OptionManager201.loadFromDInit = false
-        OptionManager201.loadFromInit = false
-        OptionManager201.loadFromWorldGen = false
-        OptionSingleReplace157.optionManager = OptionManager201
-        OptionSettingManager204.settingName = Nothing
-        OptionSingleReplace157.settingManager = OptionSettingManager204
-        OptionSingleReplace157.tokenName = ""
-        OptionSingleReplace157.updateTileSets = false
-        Me.optBtnGolemForge.options = OptionSingleReplace157
+        OptionSingleReplace154.disabledValue = "!NOGOLEM!"
+        OptionSingleReplace154.enabledValue = "YESGOLEM["
+        FileListManager198.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace154.fileManager = FileListManager198
+        OptionManager198.loadFromDInit = false
+        OptionManager198.loadFromInit = false
+        OptionManager198.loadFromWorldGen = false
+        OptionSingleReplace154.optionManager = OptionManager198
+        OptionSettingManager201.settingName = Nothing
+        OptionSingleReplace154.settingManager = OptionSettingManager201
+        OptionSingleReplace154.tokenName = ""
+        OptionSingleReplace154.updateTileSets = false
+        Me.optBtnGolemForge.options = OptionSingleReplace154
         Me.optBtnGolemForge.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGolemForge.TabIndex = 0
         Me.optBtnGolemForge.Text = "Golemforge"
@@ -8810,19 +8771,19 @@ Partial Class MainForm
         Me.optBtnGreatMagmaForge.Location = New System.Drawing.Point(5, 54)
         Me.optBtnGreatMagmaForge.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnGreatMagmaForge.Name = "optBtnGreatMagmaForge"
-        OptionSingleReplace158.disabledValue = "!NOGREATMAGMAFORGE!"
-        OptionSingleReplace158.enabledValue = "YESGREATMAGMAFORGE["
-        FileListManager202.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace158.fileManager = FileListManager202
-        OptionManager202.loadFromDInit = false
-        OptionManager202.loadFromInit = false
-        OptionManager202.loadFromWorldGen = false
-        OptionSingleReplace158.optionManager = OptionManager202
-        OptionSettingManager205.settingName = Nothing
-        OptionSingleReplace158.settingManager = OptionSettingManager205
-        OptionSingleReplace158.tokenName = ""
-        OptionSingleReplace158.updateTileSets = false
-        Me.optBtnGreatMagmaForge.options = OptionSingleReplace158
+        OptionSingleReplace155.disabledValue = "!NOGREATMAGMAFORGE!"
+        OptionSingleReplace155.enabledValue = "YESGREATMAGMAFORGE["
+        FileListManager199.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace155.fileManager = FileListManager199
+        OptionManager199.loadFromDInit = false
+        OptionManager199.loadFromInit = false
+        OptionManager199.loadFromWorldGen = false
+        OptionSingleReplace155.optionManager = OptionManager199
+        OptionSettingManager202.settingName = Nothing
+        OptionSingleReplace155.settingManager = OptionSettingManager202
+        OptionSingleReplace155.tokenName = ""
+        OptionSingleReplace155.updateTileSets = false
+        Me.optBtnGreatMagmaForge.options = OptionSingleReplace155
         Me.optBtnGreatMagmaForge.Size = New System.Drawing.Size(134, 27)
         Me.optBtnGreatMagmaForge.TabIndex = 1
         Me.optBtnGreatMagmaForge.Text = "Foundry"
@@ -8844,19 +8805,19 @@ Partial Class MainForm
         Me.optBtnClayOven.Location = New System.Drawing.Point(5, 19)
         Me.optBtnClayOven.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnClayOven.Name = "optBtnClayOven"
-        OptionSingleReplace159.disabledValue = "!NOCLAYOVEN!"
-        OptionSingleReplace159.enabledValue = "YESCLAYOVEN["
-        FileListManager203.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace159.fileManager = FileListManager203
-        OptionManager203.loadFromDInit = false
-        OptionManager203.loadFromInit = false
-        OptionManager203.loadFromWorldGen = false
-        OptionSingleReplace159.optionManager = OptionManager203
-        OptionSettingManager206.settingName = Nothing
-        OptionSingleReplace159.settingManager = OptionSettingManager206
-        OptionSingleReplace159.tokenName = ""
-        OptionSingleReplace159.updateTileSets = false
-        Me.optBtnClayOven.options = OptionSingleReplace159
+        OptionSingleReplace156.disabledValue = "!NOCLAYOVEN!"
+        OptionSingleReplace156.enabledValue = "YESCLAYOVEN["
+        FileListManager200.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace156.fileManager = FileListManager200
+        OptionManager200.loadFromDInit = false
+        OptionManager200.loadFromInit = false
+        OptionManager200.loadFromWorldGen = false
+        OptionSingleReplace156.optionManager = OptionManager200
+        OptionSettingManager203.settingName = Nothing
+        OptionSingleReplace156.settingManager = OptionSettingManager203
+        OptionSingleReplace156.tokenName = ""
+        OptionSingleReplace156.updateTileSets = false
+        Me.optBtnClayOven.options = OptionSingleReplace156
         Me.optBtnClayOven.Size = New System.Drawing.Size(134, 27)
         Me.optBtnClayOven.TabIndex = 0
         Me.optBtnClayOven.Text = "Clay Oven"
@@ -8879,19 +8840,19 @@ Partial Class MainForm
         Me.optBtnCrafts.Location = New System.Drawing.Point(5, 48)
         Me.optBtnCrafts.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCrafts.Name = "optBtnCrafts"
-        OptionSingleReplace160.disabledValue = "!NOCRAFTSMAN!"
-        OptionSingleReplace160.enabledValue = "YESCRAFTSMAN["
-        FileListManager204.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace160.fileManager = FileListManager204
-        OptionManager204.loadFromDInit = false
-        OptionManager204.loadFromInit = false
-        OptionManager204.loadFromWorldGen = false
-        OptionSingleReplace160.optionManager = OptionManager204
-        OptionSettingManager207.settingName = Nothing
-        OptionSingleReplace160.settingManager = OptionSettingManager207
-        OptionSingleReplace160.tokenName = ""
-        OptionSingleReplace160.updateTileSets = false
-        Me.optBtnCrafts.options = OptionSingleReplace160
+        OptionSingleReplace157.disabledValue = "!NOCRAFTSMAN!"
+        OptionSingleReplace157.enabledValue = "YESCRAFTSMAN["
+        FileListManager201.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace157.fileManager = FileListManager201
+        OptionManager201.loadFromDInit = false
+        OptionManager201.loadFromInit = false
+        OptionManager201.loadFromWorldGen = false
+        OptionSingleReplace157.optionManager = OptionManager201
+        OptionSettingManager204.settingName = Nothing
+        OptionSingleReplace157.settingManager = OptionSettingManager204
+        OptionSingleReplace157.tokenName = ""
+        OptionSingleReplace157.updateTileSets = false
+        Me.optBtnCrafts.options = OptionSingleReplace157
         Me.optBtnCrafts.Size = New System.Drawing.Size(134, 27)
         Me.optBtnCrafts.TabIndex = 1
         Me.optBtnCrafts.Text = "Craftsmen"
@@ -8913,19 +8874,19 @@ Partial Class MainForm
         Me.optBtnQuenMill.Location = New System.Drawing.Point(5, 77)
         Me.optBtnQuenMill.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnQuenMill.Name = "optBtnQuenMill"
-        OptionSingleReplace161.disabledValue = "!NOMILLING!"
-        OptionSingleReplace161.enabledValue = "YESMILLING["
-        FileListManager205.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace161.fileManager = FileListManager205
-        OptionManager205.loadFromDInit = false
-        OptionManager205.loadFromInit = false
-        OptionManager205.loadFromWorldGen = false
-        OptionSingleReplace161.optionManager = OptionManager205
-        OptionSettingManager208.settingName = Nothing
-        OptionSingleReplace161.settingManager = OptionSettingManager208
-        OptionSingleReplace161.tokenName = ""
-        OptionSingleReplace161.updateTileSets = false
-        Me.optBtnQuenMill.options = OptionSingleReplace161
+        OptionSingleReplace158.disabledValue = "!NOMILLING!"
+        OptionSingleReplace158.enabledValue = "YESMILLING["
+        FileListManager202.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace158.fileManager = FileListManager202
+        OptionManager202.loadFromDInit = false
+        OptionManager202.loadFromInit = false
+        OptionManager202.loadFromWorldGen = false
+        OptionSingleReplace158.optionManager = OptionManager202
+        OptionSettingManager205.settingName = Nothing
+        OptionSingleReplace158.settingManager = OptionSettingManager205
+        OptionSingleReplace158.tokenName = ""
+        OptionSingleReplace158.updateTileSets = false
+        Me.optBtnQuenMill.options = OptionSingleReplace158
         Me.optBtnQuenMill.Size = New System.Drawing.Size(134, 27)
         Me.optBtnQuenMill.TabIndex = 2
         Me.optBtnQuenMill.Text = "Quern"
@@ -8948,19 +8909,19 @@ Partial Class MainForm
         Me.optBtnMillstone.Location = New System.Drawing.Point(5, 106)
         Me.optBtnMillstone.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMillstone.Name = "optBtnMillstone"
-        OptionSingleReplace162.disabledValue = "!NOMILLSTONE!"
-        OptionSingleReplace162.enabledValue = "YESMILLSTONE["
-        FileListManager206.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace162.fileManager = FileListManager206
-        OptionManager206.loadFromDInit = false
-        OptionManager206.loadFromInit = false
-        OptionManager206.loadFromWorldGen = false
-        OptionSingleReplace162.optionManager = OptionManager206
-        OptionSettingManager209.settingName = Nothing
-        OptionSingleReplace162.settingManager = OptionSettingManager209
-        OptionSingleReplace162.tokenName = ""
-        OptionSingleReplace162.updateTileSets = false
-        Me.optBtnMillstone.options = OptionSingleReplace162
+        OptionSingleReplace159.disabledValue = "!NOMILLSTONE!"
+        OptionSingleReplace159.enabledValue = "YESMILLSTONE["
+        FileListManager203.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace159.fileManager = FileListManager203
+        OptionManager203.loadFromDInit = false
+        OptionManager203.loadFromInit = false
+        OptionManager203.loadFromWorldGen = false
+        OptionSingleReplace159.optionManager = OptionManager203
+        OptionSettingManager206.settingName = Nothing
+        OptionSingleReplace159.settingManager = OptionSettingManager206
+        OptionSingleReplace159.tokenName = ""
+        OptionSingleReplace159.updateTileSets = false
+        Me.optBtnMillstone.options = OptionSingleReplace159
         Me.optBtnMillstone.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMillstone.TabIndex = 3
         Me.optBtnMillstone.Text = "Millstone"
@@ -8982,19 +8943,19 @@ Partial Class MainForm
         Me.optBtnStill.Location = New System.Drawing.Point(5, 135)
         Me.optBtnStill.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnStill.Name = "optBtnStill"
-        OptionSingleReplace163.disabledValue = "!NOSTILL!"
-        OptionSingleReplace163.enabledValue = "YESSTILL["
-        FileListManager207.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace163.fileManager = FileListManager207
-        OptionManager207.loadFromDInit = false
-        OptionManager207.loadFromInit = false
-        OptionManager207.loadFromWorldGen = false
-        OptionSingleReplace163.optionManager = OptionManager207
-        OptionSettingManager210.settingName = Nothing
-        OptionSingleReplace163.settingManager = OptionSettingManager210
-        OptionSingleReplace163.tokenName = ""
-        OptionSingleReplace163.updateTileSets = false
-        Me.optBtnStill.options = OptionSingleReplace163
+        OptionSingleReplace160.disabledValue = "!NOSTILL!"
+        OptionSingleReplace160.enabledValue = "YESSTILL["
+        FileListManager204.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace160.fileManager = FileListManager204
+        OptionManager204.loadFromDInit = false
+        OptionManager204.loadFromInit = false
+        OptionManager204.loadFromWorldGen = false
+        OptionSingleReplace160.optionManager = OptionManager204
+        OptionSettingManager207.settingName = Nothing
+        OptionSingleReplace160.settingManager = OptionSettingManager207
+        OptionSingleReplace160.tokenName = ""
+        OptionSingleReplace160.updateTileSets = false
+        Me.optBtnStill.options = OptionSingleReplace160
         Me.optBtnStill.Size = New System.Drawing.Size(134, 27)
         Me.optBtnStill.TabIndex = 4
         Me.optBtnStill.Text = "Still"
@@ -9016,19 +8977,19 @@ Partial Class MainForm
         Me.optBtnKitchen.Location = New System.Drawing.Point(5, 164)
         Me.optBtnKitchen.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnKitchen.Name = "optBtnKitchen"
-        OptionSingleReplace164.disabledValue = "!NOKITCHEN!"
-        OptionSingleReplace164.enabledValue = "YESKITCHEN["
-        FileListManager208.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace164.fileManager = FileListManager208
-        OptionManager208.loadFromDInit = false
-        OptionManager208.loadFromInit = false
-        OptionManager208.loadFromWorldGen = false
-        OptionSingleReplace164.optionManager = OptionManager208
-        OptionSettingManager211.settingName = Nothing
-        OptionSingleReplace164.settingManager = OptionSettingManager211
-        OptionSingleReplace164.tokenName = ""
-        OptionSingleReplace164.updateTileSets = false
-        Me.optBtnKitchen.options = OptionSingleReplace164
+        OptionSingleReplace161.disabledValue = "!NOKITCHEN!"
+        OptionSingleReplace161.enabledValue = "YESKITCHEN["
+        FileListManager205.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace161.fileManager = FileListManager205
+        OptionManager205.loadFromDInit = false
+        OptionManager205.loadFromInit = false
+        OptionManager205.loadFromWorldGen = false
+        OptionSingleReplace161.optionManager = OptionManager205
+        OptionSettingManager208.settingName = Nothing
+        OptionSingleReplace161.settingManager = OptionSettingManager208
+        OptionSingleReplace161.tokenName = ""
+        OptionSingleReplace161.updateTileSets = false
+        Me.optBtnKitchen.options = OptionSingleReplace161
         Me.optBtnKitchen.Size = New System.Drawing.Size(134, 27)
         Me.optBtnKitchen.TabIndex = 5
         Me.optBtnKitchen.Text = "Kitchen"
@@ -9050,19 +9011,19 @@ Partial Class MainForm
         Me.optBtnTanner.Location = New System.Drawing.Point(5, 193)
         Me.optBtnTanner.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnTanner.Name = "optBtnTanner"
-        OptionSingleReplace165.disabledValue = "!NOTANNER!"
-        OptionSingleReplace165.enabledValue = "YESTANNER["
-        FileListManager209.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace165.fileManager = FileListManager209
-        OptionManager209.loadFromDInit = false
-        OptionManager209.loadFromInit = false
-        OptionManager209.loadFromWorldGen = false
-        OptionSingleReplace165.optionManager = OptionManager209
-        OptionSettingManager212.settingName = Nothing
-        OptionSingleReplace165.settingManager = OptionSettingManager212
-        OptionSingleReplace165.tokenName = ""
-        OptionSingleReplace165.updateTileSets = false
-        Me.optBtnTanner.options = OptionSingleReplace165
+        OptionSingleReplace162.disabledValue = "!NOTANNER!"
+        OptionSingleReplace162.enabledValue = "YESTANNER["
+        FileListManager206.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace162.fileManager = FileListManager206
+        OptionManager206.loadFromDInit = false
+        OptionManager206.loadFromInit = false
+        OptionManager206.loadFromWorldGen = false
+        OptionSingleReplace162.optionManager = OptionManager206
+        OptionSettingManager209.settingName = Nothing
+        OptionSingleReplace162.settingManager = OptionSettingManager209
+        OptionSingleReplace162.tokenName = ""
+        OptionSingleReplace162.updateTileSets = false
+        Me.optBtnTanner.options = OptionSingleReplace162
         Me.optBtnTanner.Size = New System.Drawing.Size(134, 27)
         Me.optBtnTanner.TabIndex = 6
         Me.optBtnTanner.Text = "Tanner"
@@ -9084,19 +9045,19 @@ Partial Class MainForm
         Me.optBtnScrewPress.Location = New System.Drawing.Point(5, 222)
         Me.optBtnScrewPress.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnScrewPress.Name = "optBtnScrewPress"
-        OptionSingleReplace166.disabledValue = "!NOSCREWPRESS!"
-        OptionSingleReplace166.enabledValue = "YESSCREWPRESS["
-        FileListManager210.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace166.fileManager = FileListManager210
-        OptionManager210.loadFromDInit = false
-        OptionManager210.loadFromInit = false
-        OptionManager210.loadFromWorldGen = false
-        OptionSingleReplace166.optionManager = OptionManager210
-        OptionSettingManager213.settingName = Nothing
-        OptionSingleReplace166.settingManager = OptionSettingManager213
-        OptionSingleReplace166.tokenName = ""
-        OptionSingleReplace166.updateTileSets = false
-        Me.optBtnScrewPress.options = OptionSingleReplace166
+        OptionSingleReplace163.disabledValue = "!NOSCREWPRESS!"
+        OptionSingleReplace163.enabledValue = "YESSCREWPRESS["
+        FileListManager207.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace163.fileManager = FileListManager207
+        OptionManager207.loadFromDInit = false
+        OptionManager207.loadFromInit = false
+        OptionManager207.loadFromWorldGen = false
+        OptionSingleReplace163.optionManager = OptionManager207
+        OptionSettingManager210.settingName = Nothing
+        OptionSingleReplace163.settingManager = OptionSettingManager210
+        OptionSingleReplace163.tokenName = ""
+        OptionSingleReplace163.updateTileSets = false
+        Me.optBtnScrewPress.options = OptionSingleReplace163
         Me.optBtnScrewPress.Size = New System.Drawing.Size(134, 27)
         Me.optBtnScrewPress.TabIndex = 7
         Me.optBtnScrewPress.Text = "Screw Press"
@@ -9118,19 +9079,19 @@ Partial Class MainForm
         Me.optBtnSoapmaker.Location = New System.Drawing.Point(5, 251)
         Me.optBtnSoapmaker.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnSoapmaker.Name = "optBtnSoapmaker"
-        OptionSingleReplace167.disabledValue = "!NOSOAP!"
-        OptionSingleReplace167.enabledValue = "YESSOAP["
-        FileListManager211.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace167.fileManager = FileListManager211
-        OptionManager211.loadFromDInit = false
-        OptionManager211.loadFromInit = false
-        OptionManager211.loadFromWorldGen = false
-        OptionSingleReplace167.optionManager = OptionManager211
-        OptionSettingManager214.settingName = Nothing
-        OptionSingleReplace167.settingManager = OptionSettingManager214
-        OptionSingleReplace167.tokenName = ""
-        OptionSingleReplace167.updateTileSets = false
-        Me.optBtnSoapmaker.options = OptionSingleReplace167
+        OptionSingleReplace164.disabledValue = "!NOSOAP!"
+        OptionSingleReplace164.enabledValue = "YESSOAP["
+        FileListManager208.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace164.fileManager = FileListManager208
+        OptionManager208.loadFromDInit = false
+        OptionManager208.loadFromInit = false
+        OptionManager208.loadFromWorldGen = false
+        OptionSingleReplace164.optionManager = OptionManager208
+        OptionSettingManager211.settingName = Nothing
+        OptionSingleReplace164.settingManager = OptionSettingManager211
+        OptionSingleReplace164.tokenName = ""
+        OptionSingleReplace164.updateTileSets = false
+        Me.optBtnSoapmaker.options = OptionSingleReplace164
         Me.optBtnSoapmaker.Size = New System.Drawing.Size(134, 27)
         Me.optBtnSoapmaker.TabIndex = 8
         Me.optBtnSoapmaker.Text = "Soapmaker"
@@ -9153,19 +9114,19 @@ Partial Class MainForm
         Me.optBtnAquifier.Location = New System.Drawing.Point(5, 19)
         Me.optBtnAquifier.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnAquifier.Name = "optBtnAquifier"
-        OptionSingleReplace168.disabledValue = "!AQUIFER!"
-        OptionSingleReplace168.enabledValue = "[AQUIFER]"
-        FileListManager212.fileNames = New String() {"inorganic_stone_layer.txt", "inorganic_stone_mineral.txt", "inorganic_stone_soil.txt"}
-        OptionSingleReplace168.fileManager = FileListManager212
-        OptionManager212.loadFromDInit = false
-        OptionManager212.loadFromInit = false
-        OptionManager212.loadFromWorldGen = false
-        OptionSingleReplace168.optionManager = OptionManager212
-        OptionSettingManager215.settingName = Nothing
-        OptionSingleReplace168.settingManager = OptionSettingManager215
-        OptionSingleReplace168.tokenName = ""
-        OptionSingleReplace168.updateTileSets = true
-        Me.optBtnAquifier.options = OptionSingleReplace168
+        OptionSingleReplace165.disabledValue = "!AQUIFER!"
+        OptionSingleReplace165.enabledValue = "[AQUIFER]"
+        FileListManager209.fileNames = New String() {"inorganic_stone_layer.txt", "inorganic_stone_mineral.txt", "inorganic_stone_soil.txt"}
+        OptionSingleReplace165.fileManager = FileListManager209
+        OptionManager209.loadFromDInit = false
+        OptionManager209.loadFromInit = false
+        OptionManager209.loadFromWorldGen = false
+        OptionSingleReplace165.optionManager = OptionManager209
+        OptionSettingManager212.settingName = Nothing
+        OptionSingleReplace165.settingManager = OptionSettingManager212
+        OptionSingleReplace165.tokenName = ""
+        OptionSingleReplace165.updateTileSets = true
+        Me.optBtnAquifier.options = OptionSingleReplace165
         Me.optBtnAquifier.Size = New System.Drawing.Size(134, 27)
         Me.optBtnAquifier.TabIndex = 0
         Me.optBtnAquifier.Text = "Aquifers"
@@ -9186,14 +9147,14 @@ Partial Class MainForm
         Me.optMultiHarderSmithing.Location = New System.Drawing.Point(5, 48)
         Me.optMultiHarderSmithing.Margin = New System.Windows.Forms.Padding(1)
         Me.optMultiHarderSmithing.Name = "optMultiHarderSmithing"
-        FileListManager213.fileNames = New String() {"item_weapon.txt", "item_armor.txt", "item_gloves.txt", "item_helm.txt", "item_shoes.txt", "item_shield.txt"}
-        OptionMulti4.fileManager = FileListManager213
-        OptionManager213.loadFromDInit = false
-        OptionManager213.loadFromInit = false
-        OptionManager213.loadFromWorldGen = false
-        OptionMulti4.optionManager = OptionManager213
-        OptionSettingManager216.settingName = Nothing
-        OptionMulti4.settingManager = OptionSettingManager216
+        FileListManager210.fileNames = New String() {"item_weapon.txt", "item_armor.txt", "item_gloves.txt", "item_helm.txt", "item_shoes.txt", "item_shield.txt"}
+        OptionMulti4.fileManager = FileListManager210
+        OptionManager210.loadFromDInit = false
+        OptionManager210.loadFromInit = false
+        OptionManager210.loadFromWorldGen = false
+        OptionMulti4.optionManager = OptionManager210
+        OptionSettingManager213.settingName = Nothing
+        OptionMulti4.settingManager = OptionSettingManager213
         RawToken9.optionOffValue = "1]NO2"
         RawToken9.optionOnValue = "6]YES"
         RawToken9.tokenName = ""
@@ -9225,14 +9186,14 @@ Partial Class MainForm
         Me.optMultiHarderFarming.Location = New System.Drawing.Point(5, 77)
         Me.optMultiHarderFarming.Margin = New System.Windows.Forms.Padding(1)
         Me.optMultiHarderFarming.Name = "optMultiHarderFarming"
-        FileListManager214.fileNames = New String() {"plant_standard.txt"}
-        OptionMulti5.fileManager = FileListManager214
-        OptionManager214.loadFromDInit = false
-        OptionManager214.loadFromInit = false
-        OptionManager214.loadFromWorldGen = false
-        OptionMulti5.optionManager = OptionManager214
-        OptionSettingManager217.settingName = Nothing
-        OptionMulti5.settingManager = OptionSettingManager217
+        FileListManager211.fileNames = New String() {"plant_standard.txt"}
+        OptionMulti5.fileManager = FileListManager211
+        OptionManager211.loadFromDInit = false
+        OptionManager211.loadFromInit = false
+        OptionManager211.loadFromWorldGen = false
+        OptionMulti5.optionManager = OptionManager211
+        OptionSettingManager214.settingName = Nothing
+        OptionMulti5.settingManager = OptionSettingManager214
         RawToken11.optionOffValue = "[GROWDUR:600]"
         RawToken11.optionOnValue = "[GROWDUR:4032]"
         RawToken11.tokenName = ""
@@ -9265,19 +9226,19 @@ Partial Class MainForm
         Me.optBtnHarderMining.Location = New System.Drawing.Point(5, 106)
         Me.optBtnHarderMining.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnHarderMining.Name = "optBtnHarderMining"
-        OptionSingleReplace169.disabledValue = "!NOWARP!"
-        OptionSingleReplace169.enabledValue = "YESWARP["
-        FileListManager215.fileNames = New String() {"inorganic_zwarpstone.txt"}
-        OptionSingleReplace169.fileManager = FileListManager215
-        OptionManager215.loadFromDInit = false
-        OptionManager215.loadFromInit = false
-        OptionManager215.loadFromWorldGen = false
-        OptionSingleReplace169.optionManager = OptionManager215
-        OptionSettingManager218.settingName = Nothing
-        OptionSingleReplace169.settingManager = OptionSettingManager218
-        OptionSingleReplace169.tokenName = ""
-        OptionSingleReplace169.updateTileSets = true
-        Me.optBtnHarderMining.options = OptionSingleReplace169
+        OptionSingleReplace166.disabledValue = "!NOWARP!"
+        OptionSingleReplace166.enabledValue = "YESWARP["
+        FileListManager212.fileNames = New String() {"inorganic_zwarpstone.txt"}
+        OptionSingleReplace166.fileManager = FileListManager212
+        OptionManager212.loadFromDInit = false
+        OptionManager212.loadFromInit = false
+        OptionManager212.loadFromWorldGen = false
+        OptionSingleReplace166.optionManager = OptionManager212
+        OptionSettingManager215.settingName = Nothing
+        OptionSingleReplace166.settingManager = OptionSettingManager215
+        OptionSingleReplace166.tokenName = ""
+        OptionSingleReplace166.updateTileSets = true
+        Me.optBtnHarderMining.options = OptionSingleReplace166
         Me.optBtnHarderMining.Size = New System.Drawing.Size(134, 27)
         Me.optBtnHarderMining.TabIndex = 3
         Me.optBtnHarderMining.Text = "Harder Mining"
@@ -9299,19 +9260,19 @@ Partial Class MainForm
         Me.optBtnHarderLearning.Location = New System.Drawing.Point(5, 135)
         Me.optBtnHarderLearning.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnHarderLearning.Name = "optBtnHarderLearning"
-        OptionSingleReplace170.disabledValue = "!NOLEARNING!"
-        OptionSingleReplace170.enabledValue = "YESLEARNING["
-        FileListManager216.fileNames = New String() {"creature_standard.txt"}
-        OptionSingleReplace170.fileManager = FileListManager216
-        OptionManager216.loadFromDInit = false
-        OptionManager216.loadFromInit = false
-        OptionManager216.loadFromWorldGen = false
-        OptionSingleReplace170.optionManager = OptionManager216
-        OptionSettingManager219.settingName = Nothing
-        OptionSingleReplace170.settingManager = OptionSettingManager219
-        OptionSingleReplace170.tokenName = ""
-        OptionSingleReplace170.updateTileSets = true
-        Me.optBtnHarderLearning.options = OptionSingleReplace170
+        OptionSingleReplace167.disabledValue = "!NOLEARNING!"
+        OptionSingleReplace167.enabledValue = "YESLEARNING["
+        FileListManager213.fileNames = New String() {"creature_standard.txt"}
+        OptionSingleReplace167.fileManager = FileListManager213
+        OptionManager213.loadFromDInit = false
+        OptionManager213.loadFromInit = false
+        OptionManager213.loadFromWorldGen = false
+        OptionSingleReplace167.optionManager = OptionManager213
+        OptionSettingManager216.settingName = Nothing
+        OptionSingleReplace167.settingManager = OptionSettingManager216
+        OptionSingleReplace167.tokenName = ""
+        OptionSingleReplace167.updateTileSets = true
+        Me.optBtnHarderLearning.options = OptionSingleReplace167
         Me.optBtnHarderLearning.Size = New System.Drawing.Size(134, 27)
         Me.optBtnHarderLearning.TabIndex = 4
         Me.optBtnHarderLearning.Text = "Harder Learning"
@@ -9319,40 +9280,6 @@ Partial Class MainForm
         Me.ToolTipMaker.SetToolTip(Me.optBtnHarderLearning, "All dwarves learn only half as fast. Makes Guilds more important.")
         Me.optBtnHarderLearning.UseVisualStyleBackColor = false
         '
-        'optBtnHarderInvaders
-        '
-        Me.optBtnHarderInvaders.Appearance = System.Windows.Forms.Appearance.Button
-        Me.optBtnHarderInvaders.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
-        Me.optBtnHarderInvaders.FlatAppearance.BorderSize = 0
-        Me.optBtnHarderInvaders.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
-        Me.optBtnHarderInvaders.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(225,Byte),Integer), CType(CType(210,Byte),Integer), CType(CType(165,Byte),Integer))
-        Me.optBtnHarderInvaders.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.optBtnHarderInvaders.ForeColor = System.Drawing.Color.FromArgb(CType(CType(248,Byte),Integer), CType(CType(248,Byte),Integer), CType(CType(242,Byte),Integer))
-        Me.optBtnHarderInvaders.Image = CType(resources.GetObject("optBtnHarderInvaders.Image"),System.Drawing.Image)
-        Me.optBtnHarderInvaders.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.optBtnHarderInvaders.Location = New System.Drawing.Point(5, 251)
-        Me.optBtnHarderInvaders.Margin = New System.Windows.Forms.Padding(1)
-        Me.optBtnHarderInvaders.Name = "optBtnHarderInvaders"
-        OptionSingleReplace171.disabledValue = "!NOHARDERINVADER!"
-        OptionSingleReplace171.enabledValue = "YESHARDERINVADER["
-        FileListManager217.fileNames = New String() {"reaction_masterwork.txt"}
-        OptionSingleReplace171.fileManager = FileListManager217
-        OptionManager217.loadFromDInit = false
-        OptionManager217.loadFromInit = false
-        OptionManager217.loadFromWorldGen = false
-        OptionSingleReplace171.optionManager = OptionManager217
-        OptionSettingManager220.settingName = Nothing
-        OptionSingleReplace171.settingManager = OptionSettingManager220
-        OptionSingleReplace171.tokenName = ""
-        OptionSingleReplace171.updateTileSets = false
-        Me.optBtnHarderInvaders.options = OptionSingleReplace171
-        Me.optBtnHarderInvaders.Size = New System.Drawing.Size(134, 27)
-        Me.optBtnHarderInvaders.TabIndex = 5
-        Me.optBtnHarderInvaders.Text = "Invader Materials"
-        Me.optBtnHarderInvaders.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.ToolTipMaker.SetToolTip(Me.optBtnHarderInvaders, "Adds higher tier materials to invader races.")
-        Me.optBtnHarderInvaders.UseVisualStyleBackColor = false
-        '
         'optBtnBodyguards
         '
         Me.optBtnBodyguards.Appearance = System.Windows.Forms.Appearance.Button
@@ -9367,19 +9294,19 @@ Partial Class MainForm
         Me.optBtnBodyguards.Location = New System.Drawing.Point(5, 164)
         Me.optBtnBodyguards.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBodyguards.Name = "optBtnBodyguards"
-        OptionSingleReplace172.disabledValue = "!NOBODYGUARD!"
-        OptionSingleReplace172.enabledValue = "YESBODYGUARD["
-        FileListManager218.fileNames = New String() {"entity_human.txt", "entity_default.txt", "entity_elf.txt", "entity_drow.txt"}
-        OptionSingleReplace172.fileManager = FileListManager218
-        OptionManager218.loadFromDInit = false
-        OptionManager218.loadFromInit = false
-        OptionManager218.loadFromWorldGen = false
-        OptionSingleReplace172.optionManager = OptionManager218
-        OptionSettingManager221.settingName = Nothing
-        OptionSingleReplace172.settingManager = OptionSettingManager221
-        OptionSingleReplace172.tokenName = ""
-        OptionSingleReplace172.updateTileSets = false
-        Me.optBtnBodyguards.options = OptionSingleReplace172
+        OptionSingleReplace168.disabledValue = "!NOBODYGUARD!"
+        OptionSingleReplace168.enabledValue = "YESBODYGUARD["
+        FileListManager214.fileNames = New String() {"entity_human.txt", "entity_default.txt", "entity_elf.txt", "entity_drow.txt"}
+        OptionSingleReplace168.fileManager = FileListManager214
+        OptionManager214.loadFromDInit = false
+        OptionManager214.loadFromInit = false
+        OptionManager214.loadFromWorldGen = false
+        OptionSingleReplace168.optionManager = OptionManager214
+        OptionSettingManager217.settingName = Nothing
+        OptionSingleReplace168.settingManager = OptionSettingManager217
+        OptionSingleReplace168.tokenName = ""
+        OptionSingleReplace168.updateTileSets = false
+        Me.optBtnBodyguards.options = OptionSingleReplace168
         Me.optBtnBodyguards.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBodyguards.TabIndex = 7
         Me.optBtnBodyguards.Text = "Caravan Escorts"
@@ -9401,19 +9328,19 @@ Partial Class MainForm
         Me.optBtnSecrets.Location = New System.Drawing.Point(5, 193)
         Me.optBtnSecrets.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnSecrets.Name = "optBtnSecrets"
-        OptionSingleReplace173.disabledValue = "!NOSECRET!"
-        OptionSingleReplace173.enabledValue = "YESSECRET["
-        FileListManager219.fileNames = New String() {"creature_standard.txt"}
-        OptionSingleReplace173.fileManager = FileListManager219
-        OptionManager219.loadFromDInit = false
-        OptionManager219.loadFromInit = false
-        OptionManager219.loadFromWorldGen = false
-        OptionSingleReplace173.optionManager = OptionManager219
-        OptionSettingManager222.settingName = Nothing
-        OptionSingleReplace173.settingManager = OptionSettingManager222
-        OptionSingleReplace173.tokenName = ""
-        OptionSingleReplace173.updateTileSets = true
-        Me.optBtnSecrets.options = OptionSingleReplace173
+        OptionSingleReplace169.disabledValue = "!NOSECRET!"
+        OptionSingleReplace169.enabledValue = "YESSECRET["
+        FileListManager215.fileNames = New String() {"creature_standard.txt"}
+        OptionSingleReplace169.fileManager = FileListManager215
+        OptionManager215.loadFromDInit = false
+        OptionManager215.loadFromInit = false
+        OptionManager215.loadFromWorldGen = false
+        OptionSingleReplace169.optionManager = OptionManager215
+        OptionSettingManager218.settingName = Nothing
+        OptionSingleReplace169.settingManager = OptionSettingManager218
+        OptionSingleReplace169.tokenName = ""
+        OptionSingleReplace169.updateTileSets = true
+        Me.optBtnSecrets.options = OptionSingleReplace169
         Me.optBtnSecrets.Size = New System.Drawing.Size(134, 27)
         Me.optBtnSecrets.TabIndex = 8
         Me.optBtnSecrets.Text = "Secret !FUN!"
@@ -9436,19 +9363,19 @@ Partial Class MainForm
         Me.optBtnDiseases.Location = New System.Drawing.Point(5, 222)
         Me.optBtnDiseases.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDiseases.Name = "optBtnDiseases"
-        OptionSingleReplace174.disabledValue = "!NONEWDISEASE!"
-        OptionSingleReplace174.enabledValue = "YESNEWDISEASE["
-        FileListManager220.fileNames = New String() {"creature_standard.txt"}
-        OptionSingleReplace174.fileManager = FileListManager220
-        OptionManager220.loadFromDInit = false
-        OptionManager220.loadFromInit = false
-        OptionManager220.loadFromWorldGen = false
-        OptionSingleReplace174.optionManager = OptionManager220
-        OptionSettingManager223.settingName = Nothing
-        OptionSingleReplace174.settingManager = OptionSettingManager223
-        OptionSingleReplace174.tokenName = ""
-        OptionSingleReplace174.updateTileSets = false
-        Me.optBtnDiseases.options = OptionSingleReplace174
+        OptionSingleReplace170.disabledValue = "!NONEWDISEASE!"
+        OptionSingleReplace170.enabledValue = "YESNEWDISEASE["
+        FileListManager216.fileNames = New String() {"creature_standard.txt"}
+        OptionSingleReplace170.fileManager = FileListManager216
+        OptionManager216.loadFromDInit = false
+        OptionManager216.loadFromInit = false
+        OptionManager216.loadFromWorldGen = false
+        OptionSingleReplace170.optionManager = OptionManager216
+        OptionSettingManager219.settingName = Nothing
+        OptionSingleReplace170.settingManager = OptionSettingManager219
+        OptionSingleReplace170.tokenName = ""
+        OptionSingleReplace170.updateTileSets = false
+        Me.optBtnDiseases.options = OptionSingleReplace170
         Me.optBtnDiseases.Size = New System.Drawing.Size(134, 27)
         Me.optBtnDiseases.TabIndex = 9
         Me.optBtnDiseases.Text = "Diseases"
@@ -9470,14 +9397,14 @@ Partial Class MainForm
         Me.optMultiCavernFlavor.Location = New System.Drawing.Point(5, 19)
         Me.optMultiCavernFlavor.Margin = New System.Windows.Forms.Padding(1)
         Me.optMultiCavernFlavor.Name = "optMultiCavernFlavor"
-        FileListManager221.fileNames = New String() {"plant_grasses.txt"}
-        OptionMulti6.fileManager = FileListManager221
-        OptionManager221.loadFromDInit = false
-        OptionManager221.loadFromInit = false
-        OptionManager221.loadFromWorldGen = false
-        OptionMulti6.optionManager = OptionManager221
-        OptionSettingManager224.settingName = Nothing
-        OptionMulti6.settingManager = OptionSettingManager224
+        FileListManager217.fileNames = New String() {"plant_grasses.txt"}
+        OptionMulti6.fileManager = FileListManager217
+        OptionManager217.loadFromDInit = false
+        OptionManager217.loadFromInit = false
+        OptionManager217.loadFromWorldGen = false
+        OptionMulti6.optionManager = OptionManager217
+        OptionSettingManager220.settingName = Nothing
+        OptionMulti6.settingManager = OptionSettingManager220
         RawToken13.optionOffValue = "!NOCAVERNFLAVOR!"
         RawToken13.optionOnValue = "YESCAVERNFLAVOR["
         RawToken13.tokenName = "Flavor"
@@ -9509,19 +9436,19 @@ Partial Class MainForm
         Me.optBtnRegionalWeather.Location = New System.Drawing.Point(5, 48)
         Me.optBtnRegionalWeather.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnRegionalWeather.Name = "optBtnRegionalWeather"
-        OptionSingleReplace175.disabledValue = "!NOWEATHER!"
-        OptionSingleReplace175.enabledValue = "YESWEATHER["
-        FileListManager222.fileNames = New String() {"interaction_weather.txt"}
-        OptionSingleReplace175.fileManager = FileListManager222
-        OptionManager222.loadFromDInit = false
-        OptionManager222.loadFromInit = false
-        OptionManager222.loadFromWorldGen = false
-        OptionSingleReplace175.optionManager = OptionManager222
-        OptionSettingManager225.settingName = Nothing
-        OptionSingleReplace175.settingManager = OptionSettingManager225
-        OptionSingleReplace175.tokenName = ""
-        OptionSingleReplace175.updateTileSets = false
-        Me.optBtnRegionalWeather.options = OptionSingleReplace175
+        OptionSingleReplace171.disabledValue = "!NOWEATHER!"
+        OptionSingleReplace171.enabledValue = "YESWEATHER["
+        FileListManager218.fileNames = New String() {"interaction_weather.txt"}
+        OptionSingleReplace171.fileManager = FileListManager218
+        OptionManager218.loadFromDInit = false
+        OptionManager218.loadFromInit = false
+        OptionManager218.loadFromWorldGen = false
+        OptionSingleReplace171.optionManager = OptionManager218
+        OptionSettingManager221.settingName = Nothing
+        OptionSingleReplace171.settingManager = OptionSettingManager221
+        OptionSingleReplace171.tokenName = ""
+        OptionSingleReplace171.updateTileSets = false
+        Me.optBtnRegionalWeather.options = OptionSingleReplace171
         Me.optBtnRegionalWeather.Size = New System.Drawing.Size(134, 27)
         Me.optBtnRegionalWeather.TabIndex = 1
         Me.optBtnRegionalWeather.Text = "Regional Weather"
@@ -9543,19 +9470,19 @@ Partial Class MainForm
         Me.optBtnRegionalEffects.Location = New System.Drawing.Point(5, 77)
         Me.optBtnRegionalEffects.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnRegionalEffects.Name = "optBtnRegionalEffects"
-        OptionSingleReplace176.disabledValue = "!NOREGIONALEFFECT!"
-        OptionSingleReplace176.enabledValue = "YESREGIONALEFFECT["
-        FileListManager223.fileNames = New String() {"interaction_regional.txt"}
-        OptionSingleReplace176.fileManager = FileListManager223
-        OptionManager223.loadFromDInit = false
-        OptionManager223.loadFromInit = false
-        OptionManager223.loadFromWorldGen = false
-        OptionSingleReplace176.optionManager = OptionManager223
-        OptionSettingManager226.settingName = Nothing
-        OptionSingleReplace176.settingManager = OptionSettingManager226
-        OptionSingleReplace176.tokenName = ""
-        OptionSingleReplace176.updateTileSets = false
-        Me.optBtnRegionalEffects.options = OptionSingleReplace176
+        OptionSingleReplace172.disabledValue = "!NOREGIONALEFFECT!"
+        OptionSingleReplace172.enabledValue = "YESREGIONALEFFECT["
+        FileListManager219.fileNames = New String() {"interaction_regional.txt"}
+        OptionSingleReplace172.fileManager = FileListManager219
+        OptionManager219.loadFromDInit = false
+        OptionManager219.loadFromInit = false
+        OptionManager219.loadFromWorldGen = false
+        OptionSingleReplace172.optionManager = OptionManager219
+        OptionSettingManager222.settingName = Nothing
+        OptionSingleReplace172.settingManager = OptionSettingManager222
+        OptionSingleReplace172.tokenName = ""
+        OptionSingleReplace172.updateTileSets = false
+        Me.optBtnRegionalEffects.options = OptionSingleReplace172
         Me.optBtnRegionalEffects.Size = New System.Drawing.Size(134, 27)
         Me.optBtnRegionalEffects.TabIndex = 2
         Me.optBtnRegionalEffects.Text = "Regional Effects"
@@ -9578,19 +9505,19 @@ Partial Class MainForm
         Me.optBtnSmokeEffects.Location = New System.Drawing.Point(5, 106)
         Me.optBtnSmokeEffects.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnSmokeEffects.Name = "optBtnSmokeEffects"
-        OptionSingleReplace177.disabledValue = "!NODUST!"
-        OptionSingleReplace177.enabledValue = "YESDUST["
-        FileListManager224.fileNames = New String() {"reaction_glaze.txt", "reaction_kobold.txt", "reaction_masterwork.txt", "reaction_masterwork2.txt", "reaction_other.txt"}
-        OptionSingleReplace177.fileManager = FileListManager224
-        OptionManager224.loadFromDInit = false
-        OptionManager224.loadFromInit = false
-        OptionManager224.loadFromWorldGen = false
-        OptionSingleReplace177.optionManager = OptionManager224
-        OptionSettingManager227.settingName = Nothing
-        OptionSingleReplace177.settingManager = OptionSettingManager227
-        OptionSingleReplace177.tokenName = ""
-        OptionSingleReplace177.updateTileSets = false
-        Me.optBtnSmokeEffects.options = OptionSingleReplace177
+        OptionSingleReplace173.disabledValue = "!NODUST!"
+        OptionSingleReplace173.enabledValue = "YESDUST["
+        FileListManager220.fileNames = New String() {"reaction_glaze.txt", "reaction_kobold.txt", "reaction_masterwork.txt", "reaction_masterwork2.txt", "reaction_other.txt"}
+        OptionSingleReplace173.fileManager = FileListManager220
+        OptionManager220.loadFromDInit = false
+        OptionManager220.loadFromInit = false
+        OptionManager220.loadFromWorldGen = false
+        OptionSingleReplace173.optionManager = OptionManager220
+        OptionSettingManager223.settingName = Nothing
+        OptionSingleReplace173.settingManager = OptionSettingManager223
+        OptionSingleReplace173.tokenName = ""
+        OptionSingleReplace173.updateTileSets = false
+        Me.optBtnSmokeEffects.options = OptionSingleReplace173
         Me.optBtnSmokeEffects.Size = New System.Drawing.Size(134, 27)
         Me.optBtnSmokeEffects.TabIndex = 3
         Me.optBtnSmokeEffects.Text = "Smoke Effects"
@@ -9613,19 +9540,19 @@ Partial Class MainForm
         Me.optBtnNobles.Location = New System.Drawing.Point(5, 135)
         Me.optBtnNobles.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnNobles.Name = "optBtnNobles"
-        OptionSingleReplace178.disabledValue = "!NOREL!"
-        OptionSingleReplace178.enabledValue = "YESREL["
-        FileListManager225.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace178.fileManager = FileListManager225
-        OptionManager225.loadFromDInit = false
-        OptionManager225.loadFromInit = false
-        OptionManager225.loadFromWorldGen = false
-        OptionSingleReplace178.optionManager = OptionManager225
-        OptionSettingManager228.settingName = Nothing
-        OptionSingleReplace178.settingManager = OptionSettingManager228
-        OptionSingleReplace178.tokenName = ""
-        OptionSingleReplace178.updateTileSets = false
-        Me.optBtnNobles.options = OptionSingleReplace178
+        OptionSingleReplace174.disabledValue = "!NOREL!"
+        OptionSingleReplace174.enabledValue = "YESREL["
+        FileListManager221.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace174.fileManager = FileListManager221
+        OptionManager221.loadFromDInit = false
+        OptionManager221.loadFromInit = false
+        OptionManager221.loadFromWorldGen = false
+        OptionSingleReplace174.optionManager = OptionManager221
+        OptionSettingManager224.settingName = Nothing
+        OptionSingleReplace174.settingManager = OptionSettingManager224
+        OptionSingleReplace174.tokenName = ""
+        OptionSingleReplace174.updateTileSets = false
+        Me.optBtnNobles.options = OptionSingleReplace174
         Me.optBtnNobles.Size = New System.Drawing.Size(134, 27)
         Me.optBtnNobles.TabIndex = 4
         Me.optBtnNobles.Text = "New Nobles"
@@ -9649,19 +9576,19 @@ Partial Class MainForm
         Me.optBtnBattlecries.Location = New System.Drawing.Point(5, 164)
         Me.optBtnBattlecries.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBattlecries.Name = "optBtnBattlecries"
-        OptionSingleReplace179.disabledValue = "!NOBATTLECRY!"
-        OptionSingleReplace179.enabledValue = "YESBATTLECRY["
-        FileListManager226.fileNames = New String() {"creature_fortdefense.txt", "creature_gnome.txt", "creature_masterwork.txt", "creature_masterwork_eviltwins.txt", "creature_mercs.txt", "creature_standard.txt", "creature_subterranean.txt"}
-        OptionSingleReplace179.fileManager = FileListManager226
-        OptionManager226.loadFromDInit = false
-        OptionManager226.loadFromInit = false
-        OptionManager226.loadFromWorldGen = false
-        OptionSingleReplace179.optionManager = OptionManager226
-        OptionSettingManager229.settingName = Nothing
-        OptionSingleReplace179.settingManager = OptionSettingManager229
-        OptionSingleReplace179.tokenName = ""
-        OptionSingleReplace179.updateTileSets = true
-        Me.optBtnBattlecries.options = OptionSingleReplace179
+        OptionSingleReplace175.disabledValue = "!NOBATTLECRY!"
+        OptionSingleReplace175.enabledValue = "YESBATTLECRY["
+        FileListManager222.fileNames = New String() {"creature_fortdefense.txt", "creature_gnome.txt", "creature_masterwork.txt", "creature_masterwork_eviltwins.txt", "creature_mercs.txt", "creature_standard.txt", "creature_subterranean.txt"}
+        OptionSingleReplace175.fileManager = FileListManager222
+        OptionManager222.loadFromDInit = false
+        OptionManager222.loadFromInit = false
+        OptionManager222.loadFromWorldGen = false
+        OptionSingleReplace175.optionManager = OptionManager222
+        OptionSettingManager225.settingName = Nothing
+        OptionSingleReplace175.settingManager = OptionSettingManager225
+        OptionSingleReplace175.tokenName = ""
+        OptionSingleReplace175.updateTileSets = true
+        Me.optBtnBattlecries.options = OptionSingleReplace175
         Me.optBtnBattlecries.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBattlecries.TabIndex = 5
         Me.optBtnBattlecries.Text = "Battlecries"
@@ -9684,19 +9611,19 @@ Partial Class MainForm
         Me.optBtnDiplomats.Location = New System.Drawing.Point(5, 193)
         Me.optBtnDiplomats.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDiplomats.Name = "optBtnDiplomats"
-        OptionSingleReplace180.disabledValue = "!NODIPLOMAT!"
-        OptionSingleReplace180.enabledValue = "YESDIPLOMAT["
-        FileListManager227.fileNames = New String() {"entity_human.txt", "entity_drow.txt", "entity_elf.txt"}
-        OptionSingleReplace180.fileManager = FileListManager227
-        OptionManager227.loadFromDInit = false
-        OptionManager227.loadFromInit = false
-        OptionManager227.loadFromWorldGen = false
-        OptionSingleReplace180.optionManager = OptionManager227
-        OptionSettingManager230.settingName = Nothing
-        OptionSingleReplace180.settingManager = OptionSettingManager230
-        OptionSingleReplace180.tokenName = ""
-        OptionSingleReplace180.updateTileSets = false
-        Me.optBtnDiplomats.options = OptionSingleReplace180
+        OptionSingleReplace176.disabledValue = "!NODIPLOMAT!"
+        OptionSingleReplace176.enabledValue = "YESDIPLOMAT["
+        FileListManager223.fileNames = New String() {"entity_human.txt", "entity_drow.txt", "entity_elf.txt"}
+        OptionSingleReplace176.fileManager = FileListManager223
+        OptionManager223.loadFromDInit = false
+        OptionManager223.loadFromInit = false
+        OptionManager223.loadFromWorldGen = false
+        OptionSingleReplace176.optionManager = OptionManager223
+        OptionSettingManager226.settingName = Nothing
+        OptionSingleReplace176.settingManager = OptionSettingManager226
+        OptionSingleReplace176.tokenName = ""
+        OptionSingleReplace176.updateTileSets = false
+        Me.optBtnDiplomats.options = OptionSingleReplace176
         Me.optBtnDiplomats.Size = New System.Drawing.Size(134, 27)
         Me.optBtnDiplomats.TabIndex = 6
         Me.optBtnDiplomats.Text = "Diplomats"
@@ -9719,19 +9646,19 @@ Partial Class MainForm
         Me.optBtnEnglishDwarves.Location = New System.Drawing.Point(5, 221)
         Me.optBtnEnglishDwarves.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnEnglishDwarves.Name = "optBtnEnglishDwarves"
-        OptionSingleReplace181.disabledValue = "NOENGLISH[TRANSLATION:DWARF_M]"
-        OptionSingleReplace181.enabledValue = "YESENGLISH[TRANSLATION:ENGLISH]"
-        FileListManager228.fileNames = New String() {"entity_default.txt"}
-        OptionSingleReplace181.fileManager = FileListManager228
-        OptionManager228.loadFromDInit = false
-        OptionManager228.loadFromInit = false
-        OptionManager228.loadFromWorldGen = false
-        OptionSingleReplace181.optionManager = OptionManager228
-        OptionSettingManager231.settingName = Nothing
-        OptionSingleReplace181.settingManager = OptionSettingManager231
-        OptionSingleReplace181.tokenName = ""
-        OptionSingleReplace181.updateTileSets = false
-        Me.optBtnEnglishDwarves.options = OptionSingleReplace181
+        OptionSingleReplace177.disabledValue = "NOENGLISH[TRANSLATION:DWARF_M]"
+        OptionSingleReplace177.enabledValue = "YESENGLISH[TRANSLATION:ENGLISH]"
+        FileListManager224.fileNames = New String() {"entity_default.txt"}
+        OptionSingleReplace177.fileManager = FileListManager224
+        OptionManager224.loadFromDInit = false
+        OptionManager224.loadFromInit = false
+        OptionManager224.loadFromWorldGen = false
+        OptionSingleReplace177.optionManager = OptionManager224
+        OptionSettingManager227.settingName = Nothing
+        OptionSingleReplace177.settingManager = OptionSettingManager227
+        OptionSingleReplace177.tokenName = ""
+        OptionSingleReplace177.updateTileSets = false
+        Me.optBtnEnglishDwarves.options = OptionSingleReplace177
         Me.optBtnEnglishDwarves.Size = New System.Drawing.Size(134, 27)
         Me.optBtnEnglishDwarves.TabIndex = 7
         Me.optBtnEnglishDwarves.Text = "English Names"
@@ -9753,19 +9680,19 @@ Partial Class MainForm
         Me.optBtnBuildDimensions.Location = New System.Drawing.Point(5, 250)
         Me.optBtnBuildDimensions.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnBuildDimensions.Name = "optBtnBuildDimensions"
-        OptionSingleReplace182.disabledValue = "!NODIMENSION!"
-        OptionSingleReplace182.enabledValue = "YESDIMENSION["
-        FileListManager229.fileNames = New String() {"building_furnaces_masterwork.txt", "building_masterwork.txt"}
-        OptionSingleReplace182.fileManager = FileListManager229
-        OptionManager229.loadFromDInit = false
-        OptionManager229.loadFromInit = false
-        OptionManager229.loadFromWorldGen = false
-        OptionSingleReplace182.optionManager = OptionManager229
-        OptionSettingManager232.settingName = Nothing
-        OptionSingleReplace182.settingManager = OptionSettingManager232
-        OptionSingleReplace182.tokenName = ""
-        OptionSingleReplace182.updateTileSets = false
-        Me.optBtnBuildDimensions.options = OptionSingleReplace182
+        OptionSingleReplace178.disabledValue = "!NODIMENSION!"
+        OptionSingleReplace178.enabledValue = "YESDIMENSION["
+        FileListManager225.fileNames = New String() {"building_furnaces_masterwork.txt", "building_masterwork.txt"}
+        OptionSingleReplace178.fileManager = FileListManager225
+        OptionManager225.loadFromDInit = false
+        OptionManager225.loadFromInit = false
+        OptionManager225.loadFromWorldGen = false
+        OptionSingleReplace178.optionManager = OptionManager225
+        OptionSettingManager228.settingName = Nothing
+        OptionSingleReplace178.settingManager = OptionSettingManager228
+        OptionSingleReplace178.tokenName = ""
+        OptionSingleReplace178.updateTileSets = false
+        Me.optBtnBuildDimensions.options = OptionSingleReplace178
         Me.optBtnBuildDimensions.Size = New System.Drawing.Size(134, 27)
         Me.optBtnBuildDimensions.TabIndex = 8
         Me.optBtnBuildDimensions.Text = "Build Dimension"
@@ -9789,19 +9716,19 @@ Partial Class MainForm
         Me.optBtnCombatLogs.Location = New System.Drawing.Point(5, 279)
         Me.optBtnCombatLogs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnCombatLogs.Name = "optBtnCombatLogs"
-        OptionSingleReplace183.disabledValue = "!NOMOREATTACKS!"
-        OptionSingleReplace183.enabledValue = "YESMOREATTACKS["
-        FileListManager230.fileNames = New String() {"item_weapon.txt", "item_weapon_guns.txt", "item_weapon_human_tech.txt", "item_weapon_masterwork.txt", "item_weapon_throwing.txt", "item_weapon_magic.txt"}
-        OptionSingleReplace183.fileManager = FileListManager230
-        OptionManager230.loadFromDInit = false
-        OptionManager230.loadFromInit = false
-        OptionManager230.loadFromWorldGen = false
-        OptionSingleReplace183.optionManager = OptionManager230
-        OptionSettingManager233.settingName = Nothing
-        OptionSingleReplace183.settingManager = OptionSettingManager233
-        OptionSingleReplace183.tokenName = ""
-        OptionSingleReplace183.updateTileSets = false
-        Me.optBtnCombatLogs.options = OptionSingleReplace183
+        OptionSingleReplace179.disabledValue = "!NOMOREATTACKS!"
+        OptionSingleReplace179.enabledValue = "YESMOREATTACKS["
+        FileListManager226.fileNames = New String() {"item_weapon.txt", "item_weapon_guns.txt", "item_weapon_human_tech.txt", "item_weapon_masterwork.txt", "item_weapon_throwing.txt", "item_weapon_magic.txt"}
+        OptionSingleReplace179.fileManager = FileListManager226
+        OptionManager226.loadFromDInit = false
+        OptionManager226.loadFromInit = false
+        OptionManager226.loadFromWorldGen = false
+        OptionSingleReplace179.optionManager = OptionManager226
+        OptionSettingManager229.settingName = Nothing
+        OptionSingleReplace179.settingManager = OptionSettingManager229
+        OptionSingleReplace179.tokenName = ""
+        OptionSingleReplace179.updateTileSets = false
+        Me.optBtnCombatLogs.options = OptionSingleReplace179
         Me.optBtnCombatLogs.Size = New System.Drawing.Size(134, 27)
         Me.optBtnCombatLogs.TabIndex = 9
         Me.optBtnCombatLogs.Text = "Combat Logs"
@@ -9824,19 +9751,19 @@ Partial Class MainForm
         Me.optBtnMoreTrees.Location = New System.Drawing.Point(5, 19)
         Me.optBtnMoreTrees.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreTrees.Name = "optBtnMoreTrees"
-        OptionSingleReplace184.disabledValue = "!NOFF!"
-        OptionSingleReplace184.enabledValue = "YESFF["
-        FileListManager231.fileNames = New String() {"plant_trees_ff.txt"}
-        OptionSingleReplace184.fileManager = FileListManager231
-        OptionManager231.loadFromDInit = false
-        OptionManager231.loadFromInit = false
-        OptionManager231.loadFromWorldGen = false
-        OptionSingleReplace184.optionManager = OptionManager231
-        OptionSettingManager234.settingName = Nothing
-        OptionSingleReplace184.settingManager = OptionSettingManager234
-        OptionSingleReplace184.tokenName = ""
-        OptionSingleReplace184.updateTileSets = true
-        Me.optBtnMoreTrees.options = OptionSingleReplace184
+        OptionSingleReplace180.disabledValue = "!NOFF!"
+        OptionSingleReplace180.enabledValue = "YESFF["
+        FileListManager227.fileNames = New String() {"plant_trees_ff.txt"}
+        OptionSingleReplace180.fileManager = FileListManager227
+        OptionManager227.loadFromDInit = false
+        OptionManager227.loadFromInit = false
+        OptionManager227.loadFromWorldGen = false
+        OptionSingleReplace180.optionManager = OptionManager227
+        OptionSettingManager230.settingName = Nothing
+        OptionSingleReplace180.settingManager = OptionSettingManager230
+        OptionSingleReplace180.tokenName = ""
+        OptionSingleReplace180.updateTileSets = true
+        Me.optBtnMoreTrees.options = OptionSingleReplace180
         Me.optBtnMoreTrees.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreTrees.TabIndex = 0
         Me.optBtnMoreTrees.Text = "Tree Variety"
@@ -9858,19 +9785,19 @@ Partial Class MainForm
         Me.optBtnMorePlants.Location = New System.Drawing.Point(5, 48)
         Me.optBtnMorePlants.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMorePlants.Name = "optBtnMorePlants"
-        OptionSingleReplace185.disabledValue = "!NOFF!"
-        OptionSingleReplace185.enabledValue = "YESFF["
-        FileListManager232.fileNames = New String() {"plant_florafauna_ff.txt"}
-        OptionSingleReplace185.fileManager = FileListManager232
-        OptionManager232.loadFromDInit = false
-        OptionManager232.loadFromInit = false
-        OptionManager232.loadFromWorldGen = false
-        OptionSingleReplace185.optionManager = OptionManager232
-        OptionSettingManager235.settingName = Nothing
-        OptionSingleReplace185.settingManager = OptionSettingManager235
-        OptionSingleReplace185.tokenName = ""
-        OptionSingleReplace185.updateTileSets = true
-        Me.optBtnMorePlants.options = OptionSingleReplace185
+        OptionSingleReplace181.disabledValue = "!NOFF!"
+        OptionSingleReplace181.enabledValue = "YESFF["
+        FileListManager228.fileNames = New String() {"plant_florafauna_ff.txt"}
+        OptionSingleReplace181.fileManager = FileListManager228
+        OptionManager228.loadFromDInit = false
+        OptionManager228.loadFromInit = false
+        OptionManager228.loadFromWorldGen = false
+        OptionSingleReplace181.optionManager = OptionManager228
+        OptionSettingManager231.settingName = Nothing
+        OptionSingleReplace181.settingManager = OptionSettingManager231
+        OptionSingleReplace181.tokenName = ""
+        OptionSingleReplace181.updateTileSets = true
+        Me.optBtnMorePlants.options = OptionSingleReplace181
         Me.optBtnMorePlants.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMorePlants.TabIndex = 1
         Me.optBtnMorePlants.Text = "Plant Variety"
@@ -9892,19 +9819,19 @@ Partial Class MainForm
         Me.optBtnFoodNames.Location = New System.Drawing.Point(5, 77)
         Me.optBtnFoodNames.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFoodNames.Name = "optBtnFoodNames"
-        OptionSingleReplace186.disabledValue = "NOFOOD!"
-        OptionSingleReplace186.enabledValue = "YESFOOD["
-        FileListManager233.fileNames = New String() {"item_food_Masterwork.txt"}
-        OptionSingleReplace186.fileManager = FileListManager233
-        OptionManager233.loadFromDInit = false
-        OptionManager233.loadFromInit = false
-        OptionManager233.loadFromWorldGen = false
-        OptionSingleReplace186.optionManager = OptionManager233
-        OptionSettingManager236.settingName = Nothing
-        OptionSingleReplace186.settingManager = OptionSettingManager236
-        OptionSingleReplace186.tokenName = ""
-        OptionSingleReplace186.updateTileSets = false
-        Me.optBtnFoodNames.options = OptionSingleReplace186
+        OptionSingleReplace182.disabledValue = "NOFOOD!"
+        OptionSingleReplace182.enabledValue = "YESFOOD["
+        FileListManager229.fileNames = New String() {"item_food_Masterwork.txt"}
+        OptionSingleReplace182.fileManager = FileListManager229
+        OptionManager229.loadFromDInit = false
+        OptionManager229.loadFromInit = false
+        OptionManager229.loadFromWorldGen = false
+        OptionSingleReplace182.optionManager = OptionManager229
+        OptionSettingManager232.settingName = Nothing
+        OptionSingleReplace182.settingManager = OptionSettingManager232
+        OptionSingleReplace182.tokenName = ""
+        OptionSingleReplace182.updateTileSets = false
+        Me.optBtnFoodNames.options = OptionSingleReplace182
         Me.optBtnFoodNames.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFoodNames.TabIndex = 2
         Me.optBtnFoodNames.Text = "Food Variety"
@@ -9926,19 +9853,19 @@ Partial Class MainForm
         Me.optBtnFearTheNight.Location = New System.Drawing.Point(5, 106)
         Me.optBtnFearTheNight.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnFearTheNight.Name = "optBtnFearTheNight"
-        OptionSingleReplace187.disabledValue = "!NOFEARTHENIGHT!"
-        OptionSingleReplace187.enabledValue = "YESFEARTHENIGHT["
-        FileListManager234.fileNames = New String() {"interaction_fearthenight.txt", "creature_fearthenight.txt"}
-        OptionSingleReplace187.fileManager = FileListManager234
-        OptionManager234.loadFromDInit = false
-        OptionManager234.loadFromInit = false
-        OptionManager234.loadFromWorldGen = false
-        OptionSingleReplace187.optionManager = OptionManager234
-        OptionSettingManager237.settingName = Nothing
-        OptionSingleReplace187.settingManager = OptionSettingManager237
-        OptionSingleReplace187.tokenName = ""
-        OptionSingleReplace187.updateTileSets = false
-        Me.optBtnFearTheNight.options = OptionSingleReplace187
+        OptionSingleReplace183.disabledValue = "!NOFEARTHENIGHT!"
+        OptionSingleReplace183.enabledValue = "YESFEARTHENIGHT["
+        FileListManager230.fileNames = New String() {"interaction_fearthenight.txt", "creature_fearthenight.txt"}
+        OptionSingleReplace183.fileManager = FileListManager230
+        OptionManager230.loadFromDInit = false
+        OptionManager230.loadFromInit = false
+        OptionManager230.loadFromWorldGen = false
+        OptionSingleReplace183.optionManager = OptionManager230
+        OptionSettingManager233.settingName = Nothing
+        OptionSingleReplace183.settingManager = OptionSettingManager233
+        OptionSingleReplace183.tokenName = ""
+        OptionSingleReplace183.updateTileSets = false
+        Me.optBtnFearTheNight.options = OptionSingleReplace183
         Me.optBtnFearTheNight.Size = New System.Drawing.Size(134, 27)
         Me.optBtnFearTheNight.TabIndex = 3
         Me.optBtnFearTheNight.Text = "Fear the Night"
@@ -9960,19 +9887,19 @@ Partial Class MainForm
         Me.optBtnDiggingCivs.Location = New System.Drawing.Point(5, 203)
         Me.optBtnDiggingCivs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnDiggingCivs.Name = "optBtnDiggingCivs"
-        OptionSingleReplace188.disabledValue = "#removed"
-        OptionSingleReplace188.enabledValue = "diggingInvaders"
-        FileListManager235.fileNames = New String() {"dfhack.init"}
-        OptionSingleReplace188.fileManager = FileListManager235
-        OptionManager235.loadFromDInit = false
-        OptionManager235.loadFromInit = false
-        OptionManager235.loadFromWorldGen = false
-        OptionSingleReplace188.optionManager = OptionManager235
-        OptionSettingManager238.settingName = Nothing
-        OptionSingleReplace188.settingManager = OptionSettingManager238
-        OptionSingleReplace188.tokenName = ""
-        OptionSingleReplace188.updateTileSets = false
-        Me.optBtnDiggingCivs.options = OptionSingleReplace188
+        OptionSingleReplace184.disabledValue = "#removed"
+        OptionSingleReplace184.enabledValue = "diggingInvaders"
+        FileListManager231.fileNames = New String() {"dfhack.init"}
+        OptionSingleReplace184.fileManager = FileListManager231
+        OptionManager231.loadFromDInit = false
+        OptionManager231.loadFromInit = false
+        OptionManager231.loadFromWorldGen = false
+        OptionSingleReplace184.optionManager = OptionManager231
+        OptionSettingManager234.settingName = Nothing
+        OptionSingleReplace184.settingManager = OptionSettingManager234
+        OptionSingleReplace184.tokenName = ""
+        OptionSingleReplace184.updateTileSets = false
+        Me.optBtnDiggingCivs.options = OptionSingleReplace184
         Me.optBtnDiggingCivs.Size = New System.Drawing.Size(134, 27)
         Me.optBtnDiggingCivs.TabIndex = 6
         Me.optBtnDiggingCivs.Text = "Digging Civs"
@@ -9995,19 +9922,19 @@ Partial Class MainForm
         Me.optBtnRazingCivs.Location = New System.Drawing.Point(5, 232)
         Me.optBtnRazingCivs.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnRazingCivs.Name = "optBtnRazingCivs"
-        OptionSingleReplace189.disabledValue = "#removed"
-        OptionSingleReplace189.enabledValue = "diggingInvaders"
-        FileListManager236.fileNames = New String() {"dfhack.init"}
-        OptionSingleReplace189.fileManager = FileListManager236
-        OptionManager236.loadFromDInit = false
-        OptionManager236.loadFromInit = false
-        OptionManager236.loadFromWorldGen = false
-        OptionSingleReplace189.optionManager = OptionManager236
-        OptionSettingManager239.settingName = Nothing
-        OptionSingleReplace189.settingManager = OptionSettingManager239
-        OptionSingleReplace189.tokenName = ""
-        OptionSingleReplace189.updateTileSets = false
-        Me.optBtnRazingCivs.options = OptionSingleReplace189
+        OptionSingleReplace185.disabledValue = "#removed"
+        OptionSingleReplace185.enabledValue = "diggingInvaders"
+        FileListManager232.fileNames = New String() {"dfhack.init"}
+        OptionSingleReplace185.fileManager = FileListManager232
+        OptionManager232.loadFromDInit = false
+        OptionManager232.loadFromInit = false
+        OptionManager232.loadFromWorldGen = false
+        OptionSingleReplace185.optionManager = OptionManager232
+        OptionSettingManager235.settingName = Nothing
+        OptionSingleReplace185.settingManager = OptionSettingManager235
+        OptionSingleReplace185.tokenName = ""
+        OptionSingleReplace185.updateTileSets = false
+        Me.optBtnRazingCivs.options = OptionSingleReplace185
         Me.optBtnRazingCivs.Size = New System.Drawing.Size(134, 27)
         Me.optBtnRazingCivs.TabIndex = 7
         Me.optBtnRazingCivs.Text = "Razing Civs"
@@ -10029,19 +9956,19 @@ Partial Class MainForm
         Me.optBtnRendermax.Location = New System.Drawing.Point(5, 164)
         Me.optBtnRendermax.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnRendermax.Name = "optBtnRendermax"
-        OptionSingleReplace190.disabledValue = "#norendermax"
-        OptionSingleReplace190.enabledValue = "rendermax light"
-        FileListManager237.fileNames = New String() {"dfhack.init"}
-        OptionSingleReplace190.fileManager = FileListManager237
-        OptionManager237.loadFromDInit = false
-        OptionManager237.loadFromInit = false
-        OptionManager237.loadFromWorldGen = false
-        OptionSingleReplace190.optionManager = OptionManager237
-        OptionSettingManager240.settingName = Nothing
-        OptionSingleReplace190.settingManager = OptionSettingManager240
-        OptionSingleReplace190.tokenName = ""
-        OptionSingleReplace190.updateTileSets = false
-        Me.optBtnRendermax.options = OptionSingleReplace190
+        OptionSingleReplace186.disabledValue = "#norendermax"
+        OptionSingleReplace186.enabledValue = "rendermax light"
+        FileListManager233.fileNames = New String() {"dfhack.init"}
+        OptionSingleReplace186.fileManager = FileListManager233
+        OptionManager233.loadFromDInit = false
+        OptionManager233.loadFromInit = false
+        OptionManager233.loadFromWorldGen = false
+        OptionSingleReplace186.optionManager = OptionManager233
+        OptionSettingManager236.settingName = Nothing
+        OptionSingleReplace186.settingManager = OptionSettingManager236
+        OptionSingleReplace186.tokenName = ""
+        OptionSingleReplace186.updateTileSets = false
+        Me.optBtnRendermax.options = OptionSingleReplace186
         Me.optBtnRendermax.Size = New System.Drawing.Size(134, 27)
         Me.optBtnRendermax.TabIndex = 5
         Me.optBtnRendermax.Text = "Rendermax"
@@ -10062,14 +9989,14 @@ Partial Class MainForm
         Me.optNumMineralScarcity.Maximum = New Decimal(New Integer() {10000, 0, 0, 0})
         Me.optNumMineralScarcity.Minimum = New Decimal(New Integer() {100, 0, 0, 0})
         Me.optNumMineralScarcity.Name = "optNumMineralScarcity"
-        FileListManager238.fileNames = Nothing
-        OptionSingle38.fileManager = FileListManager238
-        OptionManager238.loadFromDInit = false
-        OptionManager238.loadFromInit = false
-        OptionManager238.loadFromWorldGen = true
-        OptionSingle38.optionManager = OptionManager238
-        OptionSettingManager241.settingName = Nothing
-        OptionSingle38.settingManager = OptionSettingManager241
+        FileListManager234.fileNames = Nothing
+        OptionSingle38.fileManager = FileListManager234
+        OptionManager234.loadFromDInit = false
+        OptionManager234.loadFromInit = false
+        OptionManager234.loadFromWorldGen = true
+        OptionSingle38.optionManager = OptionManager234
+        OptionSettingManager237.settingName = Nothing
+        OptionSingle38.settingManager = OptionSettingManager237
         OptionSingle38.tokenName = "MINERAL_SCARCITY"
         OptionSingle38.updateTileSets = false
         Me.optNumMineralScarcity.options = OptionSingle38
@@ -10089,14 +10016,14 @@ Partial Class MainForm
         Me.optNumCivNumber.Location = New System.Drawing.Point(140, 20)
         Me.optNumCivNumber.Maximum = New Decimal(New Integer() {300, 0, 0, 0})
         Me.optNumCivNumber.Name = "optNumCivNumber"
-        FileListManager239.fileNames = Nothing
-        OptionSingle39.fileManager = FileListManager239
-        OptionManager239.loadFromDInit = false
-        OptionManager239.loadFromInit = false
-        OptionManager239.loadFromWorldGen = true
-        OptionSingle39.optionManager = OptionManager239
-        OptionSettingManager242.settingName = Nothing
-        OptionSingle39.settingManager = OptionSettingManager242
+        FileListManager235.fileNames = Nothing
+        OptionSingle39.fileManager = FileListManager235
+        OptionManager235.loadFromDInit = false
+        OptionManager235.loadFromInit = false
+        OptionManager235.loadFromWorldGen = true
+        OptionSingle39.optionManager = OptionManager235
+        OptionSettingManager238.settingName = Nothing
+        OptionSingle39.settingManager = OptionSettingManager238
         OptionSingle39.tokenName = "TOTAL_CIV_NUMBER"
         OptionSingle39.updateTileSets = false
         Me.optNumCivNumber.options = OptionSingle39
@@ -10116,14 +10043,14 @@ Partial Class MainForm
         Me.optNumEmbarkPoints.Location = New System.Drawing.Point(140, 46)
         Me.optNumEmbarkPoints.Maximum = New Decimal(New Integer() {10000, 0, 0, 0})
         Me.optNumEmbarkPoints.Name = "optNumEmbarkPoints"
-        FileListManager240.fileNames = Nothing
-        OptionSingle40.fileManager = FileListManager240
-        OptionManager240.loadFromDInit = false
-        OptionManager240.loadFromInit = false
-        OptionManager240.loadFromWorldGen = true
-        OptionSingle40.optionManager = OptionManager240
-        OptionSettingManager243.settingName = Nothing
-        OptionSingle40.settingManager = OptionSettingManager243
+        FileListManager236.fileNames = Nothing
+        OptionSingle40.fileManager = FileListManager236
+        OptionManager236.loadFromDInit = false
+        OptionManager236.loadFromInit = false
+        OptionManager236.loadFromWorldGen = true
+        OptionSingle40.optionManager = OptionManager236
+        OptionSettingManager239.settingName = Nothing
+        OptionSingle40.settingManager = OptionSettingManager239
         OptionSingle40.tokenName = "EMBARK_POINTS"
         OptionSingle40.updateTileSets = false
         Me.optNumEmbarkPoints.options = OptionSingle40
@@ -10144,14 +10071,14 @@ Partial Class MainForm
         Me.optNumEndYear.Maximum = New Decimal(New Integer() {10000, 0, 0, 0})
         Me.optNumEndYear.Minimum = New Decimal(New Integer() {2, 0, 0, 0})
         Me.optNumEndYear.Name = "optNumEndYear"
-        FileListManager241.fileNames = Nothing
-        OptionSingle41.fileManager = FileListManager241
-        OptionManager241.loadFromDInit = false
-        OptionManager241.loadFromInit = false
-        OptionManager241.loadFromWorldGen = true
-        OptionSingle41.optionManager = OptionManager241
-        OptionSettingManager244.settingName = Nothing
-        OptionSingle41.settingManager = OptionSettingManager244
+        FileListManager237.fileNames = Nothing
+        OptionSingle41.fileManager = FileListManager237
+        OptionManager237.loadFromDInit = false
+        OptionManager237.loadFromInit = false
+        OptionManager237.loadFromWorldGen = true
+        OptionSingle41.optionManager = OptionManager237
+        OptionSettingManager240.settingName = Nothing
+        OptionSingle41.settingManager = OptionSettingManager240
         OptionSingle41.tokenName = "END_YEAR"
         OptionSingle41.updateTileSets = false
         Me.optNumEndYear.options = OptionSingle41
@@ -10172,14 +10099,14 @@ Partial Class MainForm
         Me.optNumPopSize.Maximum = New Decimal(New Integer() {100000, 0, 0, 0})
         Me.optNumPopSize.Minimum = New Decimal(New Integer() {1, 0, 0, -2147483648})
         Me.optNumPopSize.Name = "optNumPopSize"
-        FileListManager242.fileNames = Nothing
-        OptionSingle42.fileManager = FileListManager242
-        OptionManager242.loadFromDInit = false
-        OptionManager242.loadFromInit = false
-        OptionManager242.loadFromWorldGen = true
-        OptionSingle42.optionManager = OptionManager242
-        OptionSettingManager245.settingName = Nothing
-        OptionSingle42.settingManager = OptionSettingManager245
+        FileListManager238.fileNames = Nothing
+        OptionSingle42.fileManager = FileListManager238
+        OptionManager238.loadFromDInit = false
+        OptionManager238.loadFromInit = false
+        OptionManager238.loadFromWorldGen = true
+        OptionSingle42.optionManager = OptionManager238
+        OptionSettingManager241.settingName = Nothing
+        OptionSingle42.settingManager = OptionSettingManager241
         OptionSingle42.tokenName = "TOTAL_CIV_POPULATION"
         OptionSingle42.updateTileSets = false
         Me.optNumPopSize.options = OptionSingle42
@@ -10201,14 +10128,14 @@ Partial Class MainForm
         Me.optNumCaveSizeMin.Maximum = New Decimal(New Integer() {500, 0, 0, 0})
         Me.optNumCaveSizeMin.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
         Me.optNumCaveSizeMin.Name = "optNumCaveSizeMin"
-        FileListManager243.fileNames = Nothing
-        OptionSingle43.fileManager = FileListManager243
-        OptionManager243.loadFromDInit = false
-        OptionManager243.loadFromInit = false
-        OptionManager243.loadFromWorldGen = true
-        OptionSingle43.optionManager = OptionManager243
-        OptionSettingManager246.settingName = Nothing
-        OptionSingle43.settingManager = OptionSettingManager246
+        FileListManager239.fileNames = Nothing
+        OptionSingle43.fileManager = FileListManager239
+        OptionManager239.loadFromDInit = false
+        OptionManager239.loadFromInit = false
+        OptionManager239.loadFromWorldGen = true
+        OptionSingle43.optionManager = OptionManager239
+        OptionSettingManager242.settingName = Nothing
+        OptionSingle43.settingManager = OptionSettingManager242
         OptionSingle43.tokenName = "CAVE_MIN_SIZE"
         OptionSingle43.updateTileSets = false
         Me.optNumCaveSizeMin.options = OptionSingle43
@@ -10229,14 +10156,14 @@ Partial Class MainForm
         Me.optNumCaveSizeMax.Maximum = New Decimal(New Integer() {500, 0, 0, 0})
         Me.optNumCaveSizeMax.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
         Me.optNumCaveSizeMax.Name = "optNumCaveSizeMax"
-        FileListManager244.fileNames = Nothing
-        OptionSingle44.fileManager = FileListManager244
-        OptionManager244.loadFromDInit = false
-        OptionManager244.loadFromInit = false
-        OptionManager244.loadFromWorldGen = true
-        OptionSingle44.optionManager = OptionManager244
-        OptionSettingManager247.settingName = Nothing
-        OptionSingle44.settingManager = OptionSettingManager247
+        FileListManager240.fileNames = Nothing
+        OptionSingle44.fileManager = FileListManager240
+        OptionManager240.loadFromDInit = false
+        OptionManager240.loadFromInit = false
+        OptionManager240.loadFromWorldGen = true
+        OptionSingle44.optionManager = OptionManager240
+        OptionSettingManager243.settingName = Nothing
+        OptionSingle44.settingManager = OptionSettingManager243
         OptionSingle44.tokenName = "CAVE_MAX_SIZE"
         OptionSingle44.updateTileSets = false
         Me.optNumCaveSizeMax.options = OptionSingle44
@@ -10256,14 +10183,14 @@ Partial Class MainForm
         Me.optNumMountainCaves.Location = New System.Drawing.Point(135, 45)
         Me.optNumMountainCaves.Maximum = New Decimal(New Integer() {800, 0, 0, 0})
         Me.optNumMountainCaves.Name = "optNumMountainCaves"
-        FileListManager245.fileNames = Nothing
-        OptionSingle45.fileManager = FileListManager245
-        OptionManager245.loadFromDInit = false
-        OptionManager245.loadFromInit = false
-        OptionManager245.loadFromWorldGen = true
-        OptionSingle45.optionManager = OptionManager245
-        OptionSettingManager248.settingName = Nothing
-        OptionSingle45.settingManager = OptionSettingManager248
+        FileListManager241.fileNames = Nothing
+        OptionSingle45.fileManager = FileListManager241
+        OptionManager241.loadFromDInit = false
+        OptionManager241.loadFromInit = false
+        OptionManager241.loadFromWorldGen = true
+        OptionSingle45.optionManager = OptionManager241
+        OptionSettingManager244.settingName = Nothing
+        OptionSingle45.settingManager = OptionSettingManager244
         OptionSingle45.tokenName = "MOUNTAIN_CAVE_MIN"
         OptionSingle45.updateTileSets = false
         Me.optNumMountainCaves.options = OptionSingle45
@@ -10282,14 +10209,14 @@ Partial Class MainForm
         Me.optNumOtherCaves.Location = New System.Drawing.Point(135, 71)
         Me.optNumOtherCaves.Maximum = New Decimal(New Integer() {800, 0, 0, 0})
         Me.optNumOtherCaves.Name = "optNumOtherCaves"
-        FileListManager246.fileNames = Nothing
-        OptionSingle46.fileManager = FileListManager246
-        OptionManager246.loadFromDInit = false
-        OptionManager246.loadFromInit = false
-        OptionManager246.loadFromWorldGen = true
-        OptionSingle46.optionManager = OptionManager246
-        OptionSettingManager249.settingName = Nothing
-        OptionSingle46.settingManager = OptionSettingManager249
+        FileListManager242.fileNames = Nothing
+        OptionSingle46.fileManager = FileListManager242
+        OptionManager242.loadFromDInit = false
+        OptionManager242.loadFromInit = false
+        OptionManager242.loadFromWorldGen = true
+        OptionSingle46.optionManager = OptionManager242
+        OptionSettingManager245.settingName = Nothing
+        OptionSingle46.settingManager = OptionSettingManager245
         OptionSingle46.tokenName = "NON_MOUNTAIN_CAVE_MIN"
         OptionSingle46.updateTileSets = false
         Me.optNumOtherCaves.options = OptionSingle46
@@ -10310,19 +10237,19 @@ Partial Class MainForm
         Me.optBtnVisibleCaves.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.optBtnVisibleCaves.Location = New System.Drawing.Point(64, 98)
         Me.optBtnVisibleCaves.Name = "optBtnVisibleCaves"
-        OptionSingleReplace191.disabledValue = "0"
-        OptionSingleReplace191.enabledValue = "1"
-        FileListManager247.fileNames = Nothing
-        OptionSingleReplace191.fileManager = FileListManager247
-        OptionManager247.loadFromDInit = false
-        OptionManager247.loadFromInit = false
-        OptionManager247.loadFromWorldGen = true
-        OptionSingleReplace191.optionManager = OptionManager247
-        OptionSettingManager250.settingName = Nothing
-        OptionSingleReplace191.settingManager = OptionSettingManager250
-        OptionSingleReplace191.tokenName = "ALL_CAVES_VISIBLE"
-        OptionSingleReplace191.updateTileSets = false
-        Me.optBtnVisibleCaves.options = OptionSingleReplace191
+        OptionSingleReplace187.disabledValue = "0"
+        OptionSingleReplace187.enabledValue = "1"
+        FileListManager243.fileNames = Nothing
+        OptionSingleReplace187.fileManager = FileListManager243
+        OptionManager243.loadFromDInit = false
+        OptionManager243.loadFromInit = false
+        OptionManager243.loadFromWorldGen = true
+        OptionSingleReplace187.optionManager = OptionManager243
+        OptionSettingManager246.settingName = Nothing
+        OptionSingleReplace187.settingManager = OptionSettingManager246
+        OptionSingleReplace187.tokenName = "ALL_CAVES_VISIBLE"
+        OptionSingleReplace187.updateTileSets = false
+        Me.optBtnVisibleCaves.options = OptionSingleReplace187
         Me.optBtnVisibleCaves.Size = New System.Drawing.Size(117, 24)
         Me.optBtnVisibleCaves.TabIndex = 7
         Me.optBtnVisibleCaves.Text = "Caves Visible"
@@ -10339,14 +10266,14 @@ Partial Class MainForm
         Me.optNumCaverns.Location = New System.Drawing.Point(161, 24)
         Me.optNumCaverns.Maximum = New Decimal(New Integer() {3, 0, 0, 0})
         Me.optNumCaverns.Name = "optNumCaverns"
-        FileListManager248.fileNames = Nothing
-        OptionSingle47.fileManager = FileListManager248
-        OptionManager248.loadFromDInit = false
-        OptionManager248.loadFromInit = false
-        OptionManager248.loadFromWorldGen = true
-        OptionSingle47.optionManager = OptionManager248
-        OptionSettingManager251.settingName = Nothing
-        OptionSingle47.settingManager = OptionSettingManager251
+        FileListManager244.fileNames = Nothing
+        OptionSingle47.fileManager = FileListManager244
+        OptionManager244.loadFromDInit = false
+        OptionManager244.loadFromInit = false
+        OptionManager244.loadFromWorldGen = true
+        OptionSingle47.optionManager = OptionManager244
+        OptionSettingManager247.settingName = Nothing
+        OptionSingle47.settingManager = OptionSettingManager247
         OptionSingle47.tokenName = "CAVERN_LAYER_COUNT"
         OptionSingle47.updateTileSets = false
         Me.optNumCaverns.options = OptionSingle47
@@ -10366,14 +10293,14 @@ Partial Class MainForm
         Me.optNumOpenMin.Increment = New Decimal(New Integer() {25, 0, 0, 0})
         Me.optNumOpenMin.Location = New System.Drawing.Point(161, 49)
         Me.optNumOpenMin.Name = "optNumOpenMin"
-        FileListManager249.fileNames = Nothing
-        OptionSingle48.fileManager = FileListManager249
-        OptionManager249.loadFromDInit = false
-        OptionManager249.loadFromInit = false
-        OptionManager249.loadFromWorldGen = true
-        OptionSingle48.optionManager = OptionManager249
-        OptionSettingManager252.settingName = Nothing
-        OptionSingle48.settingManager = OptionSettingManager252
+        FileListManager245.fileNames = Nothing
+        OptionSingle48.fileManager = FileListManager245
+        OptionManager245.loadFromDInit = false
+        OptionManager245.loadFromInit = false
+        OptionManager245.loadFromWorldGen = true
+        OptionSingle48.optionManager = OptionManager245
+        OptionSettingManager248.settingName = Nothing
+        OptionSingle48.settingManager = OptionSettingManager248
         OptionSingle48.tokenName = "CAVERN_LAYER_OPENNESS_MIN"
         OptionSingle48.updateTileSets = false
         Me.optNumOpenMin.options = OptionSingle48
@@ -10391,14 +10318,14 @@ Partial Class MainForm
         Me.optNumOpenMax.Increment = New Decimal(New Integer() {25, 0, 0, 0})
         Me.optNumOpenMax.Location = New System.Drawing.Point(210, 49)
         Me.optNumOpenMax.Name = "optNumOpenMax"
-        FileListManager250.fileNames = Nothing
-        OptionSingle49.fileManager = FileListManager250
-        OptionManager250.loadFromDInit = false
-        OptionManager250.loadFromInit = false
-        OptionManager250.loadFromWorldGen = true
-        OptionSingle49.optionManager = OptionManager250
-        OptionSettingManager253.settingName = Nothing
-        OptionSingle49.settingManager = OptionSettingManager253
+        FileListManager246.fileNames = Nothing
+        OptionSingle49.fileManager = FileListManager246
+        OptionManager246.loadFromDInit = false
+        OptionManager246.loadFromInit = false
+        OptionManager246.loadFromWorldGen = true
+        OptionSingle49.optionManager = OptionManager246
+        OptionSettingManager249.settingName = Nothing
+        OptionSingle49.settingManager = OptionSettingManager249
         OptionSingle49.tokenName = "CAVERN_LAYER_OPENNESS_MAX"
         OptionSingle49.updateTileSets = false
         Me.optNumOpenMax.options = OptionSingle49
@@ -10416,14 +10343,14 @@ Partial Class MainForm
         Me.optNumMazeMin.Increment = New Decimal(New Integer() {25, 0, 0, 0})
         Me.optNumMazeMin.Location = New System.Drawing.Point(161, 75)
         Me.optNumMazeMin.Name = "optNumMazeMin"
-        FileListManager251.fileNames = Nothing
-        OptionSingle50.fileManager = FileListManager251
-        OptionManager251.loadFromDInit = false
-        OptionManager251.loadFromInit = false
-        OptionManager251.loadFromWorldGen = true
-        OptionSingle50.optionManager = OptionManager251
-        OptionSettingManager254.settingName = Nothing
-        OptionSingle50.settingManager = OptionSettingManager254
+        FileListManager247.fileNames = Nothing
+        OptionSingle50.fileManager = FileListManager247
+        OptionManager247.loadFromDInit = false
+        OptionManager247.loadFromInit = false
+        OptionManager247.loadFromWorldGen = true
+        OptionSingle50.optionManager = OptionManager247
+        OptionSettingManager250.settingName = Nothing
+        OptionSingle50.settingManager = OptionSettingManager250
         OptionSingle50.tokenName = "CAVERN_LAYER_PASSAGE_DENSITY_MIN"
         OptionSingle50.updateTileSets = false
         Me.optNumMazeMin.options = OptionSingle50
@@ -10441,14 +10368,14 @@ Partial Class MainForm
         Me.optNumMazeMax.Increment = New Decimal(New Integer() {25, 0, 0, 0})
         Me.optNumMazeMax.Location = New System.Drawing.Point(210, 75)
         Me.optNumMazeMax.Name = "optNumMazeMax"
-        FileListManager252.fileNames = Nothing
-        OptionSingle51.fileManager = FileListManager252
-        OptionManager252.loadFromDInit = false
-        OptionManager252.loadFromInit = false
-        OptionManager252.loadFromWorldGen = true
-        OptionSingle51.optionManager = OptionManager252
-        OptionSettingManager255.settingName = Nothing
-        OptionSingle51.settingManager = OptionSettingManager255
+        FileListManager248.fileNames = Nothing
+        OptionSingle51.fileManager = FileListManager248
+        OptionManager248.loadFromDInit = false
+        OptionManager248.loadFromInit = false
+        OptionManager248.loadFromWorldGen = true
+        OptionSingle51.optionManager = OptionManager248
+        OptionSettingManager251.settingName = Nothing
+        OptionSingle51.settingManager = OptionSettingManager251
         OptionSingle51.tokenName = "CAVERN_LAYER_PASSAGE_DENSITY_MAX"
         OptionSingle51.updateTileSets = false
         Me.optNumMazeMax.options = OptionSingle51
@@ -10466,14 +10393,14 @@ Partial Class MainForm
         Me.optNumWaterMin.Increment = New Decimal(New Integer() {25, 0, 0, 0})
         Me.optNumWaterMin.Location = New System.Drawing.Point(161, 100)
         Me.optNumWaterMin.Name = "optNumWaterMin"
-        FileListManager253.fileNames = Nothing
-        OptionSingle52.fileManager = FileListManager253
-        OptionManager253.loadFromDInit = false
-        OptionManager253.loadFromInit = false
-        OptionManager253.loadFromWorldGen = true
-        OptionSingle52.optionManager = OptionManager253
-        OptionSettingManager256.settingName = Nothing
-        OptionSingle52.settingManager = OptionSettingManager256
+        FileListManager249.fileNames = Nothing
+        OptionSingle52.fileManager = FileListManager249
+        OptionManager249.loadFromDInit = false
+        OptionManager249.loadFromInit = false
+        OptionManager249.loadFromWorldGen = true
+        OptionSingle52.optionManager = OptionManager249
+        OptionSettingManager252.settingName = Nothing
+        OptionSingle52.settingManager = OptionSettingManager252
         OptionSingle52.tokenName = "CAVERN_LAYER_WATER_MIN"
         OptionSingle52.updateTileSets = false
         Me.optNumWaterMin.options = OptionSingle52
@@ -10491,14 +10418,14 @@ Partial Class MainForm
         Me.optNumWaterMax.Increment = New Decimal(New Integer() {25, 0, 0, 0})
         Me.optNumWaterMax.Location = New System.Drawing.Point(210, 100)
         Me.optNumWaterMax.Name = "optNumWaterMax"
-        FileListManager254.fileNames = Nothing
-        OptionSingle53.fileManager = FileListManager254
-        OptionManager254.loadFromDInit = false
-        OptionManager254.loadFromInit = false
-        OptionManager254.loadFromWorldGen = true
-        OptionSingle53.optionManager = OptionManager254
-        OptionSettingManager257.settingName = Nothing
-        OptionSingle53.settingManager = OptionSettingManager257
+        FileListManager250.fileNames = Nothing
+        OptionSingle53.fileManager = FileListManager250
+        OptionManager250.loadFromDInit = false
+        OptionManager250.loadFromInit = false
+        OptionManager250.loadFromWorldGen = true
+        OptionSingle53.optionManager = OptionManager250
+        OptionSettingManager253.settingName = Nothing
+        OptionSingle53.settingManager = OptionSettingManager253
         OptionSingle53.tokenName = "CAVERN_LAYER_WATER_MAX"
         OptionSingle53.updateTileSets = false
         Me.optNumWaterMax.options = OptionSingle53
@@ -10518,14 +10445,14 @@ Partial Class MainForm
         Me.optNumAboveCav1.Maximum = New Decimal(New Integer() {99, 0, 0, 0})
         Me.optNumAboveCav1.Minimum = New Decimal(New Integer() {5, 0, 0, 0})
         Me.optNumAboveCav1.Name = "optNumAboveCav1"
-        FileListManager255.fileNames = Nothing
-        OptionSingle54.fileManager = FileListManager255
-        OptionManager255.loadFromDInit = false
-        OptionManager255.loadFromInit = false
-        OptionManager255.loadFromWorldGen = true
-        OptionSingle54.optionManager = OptionManager255
-        OptionSettingManager258.settingName = Nothing
-        OptionSingle54.settingManager = OptionSettingManager258
+        FileListManager251.fileNames = Nothing
+        OptionSingle54.fileManager = FileListManager251
+        OptionManager251.loadFromDInit = false
+        OptionManager251.loadFromInit = false
+        OptionManager251.loadFromWorldGen = true
+        OptionSingle54.optionManager = OptionManager251
+        OptionSettingManager254.settingName = Nothing
+        OptionSingle54.settingManager = OptionSettingManager254
         OptionSingle54.tokenName = "LEVELS_ABOVE_LAYER_1"
         OptionSingle54.updateTileSets = false
         Me.optNumAboveCav1.options = OptionSingle54
@@ -10546,14 +10473,14 @@ Partial Class MainForm
         Me.optNumAboveCav2.Maximum = New Decimal(New Integer() {99, 0, 0, 0})
         Me.optNumAboveCav2.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
         Me.optNumAboveCav2.Name = "optNumAboveCav2"
-        FileListManager256.fileNames = Nothing
-        OptionSingle55.fileManager = FileListManager256
-        OptionManager256.loadFromDInit = false
-        OptionManager256.loadFromInit = false
-        OptionManager256.loadFromWorldGen = true
-        OptionSingle55.optionManager = OptionManager256
-        OptionSettingManager259.settingName = Nothing
-        OptionSingle55.settingManager = OptionSettingManager259
+        FileListManager252.fileNames = Nothing
+        OptionSingle55.fileManager = FileListManager252
+        OptionManager252.loadFromDInit = false
+        OptionManager252.loadFromInit = false
+        OptionManager252.loadFromWorldGen = true
+        OptionSingle55.optionManager = OptionManager252
+        OptionSettingManager255.settingName = Nothing
+        OptionSingle55.settingManager = OptionSettingManager255
         OptionSingle55.tokenName = "LEVELS_ABOVE_LAYER_2"
         OptionSingle55.updateTileSets = false
         Me.optNumAboveCav2.options = OptionSingle55
@@ -10575,14 +10502,14 @@ Partial Class MainForm
         Me.optNumAboveCav3.Maximum = New Decimal(New Integer() {99, 0, 0, 0})
         Me.optNumAboveCav3.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
         Me.optNumAboveCav3.Name = "optNumAboveCav3"
-        FileListManager257.fileNames = Nothing
-        OptionSingle56.fileManager = FileListManager257
-        OptionManager257.loadFromDInit = false
-        OptionManager257.loadFromInit = false
-        OptionManager257.loadFromWorldGen = true
-        OptionSingle56.optionManager = OptionManager257
-        OptionSettingManager260.settingName = Nothing
-        OptionSingle56.settingManager = OptionSettingManager260
+        FileListManager253.fileNames = Nothing
+        OptionSingle56.fileManager = FileListManager253
+        OptionManager253.loadFromDInit = false
+        OptionManager253.loadFromInit = false
+        OptionManager253.loadFromWorldGen = true
+        OptionSingle56.optionManager = OptionManager253
+        OptionSettingManager256.settingName = Nothing
+        OptionSingle56.settingManager = OptionSettingManager256
         OptionSingle56.tokenName = "LEVELS_ABOVE_LAYER_3"
         OptionSingle56.updateTileSets = false
         Me.optNumAboveCav3.options = OptionSingle56
@@ -10604,14 +10531,14 @@ Partial Class MainForm
         Me.optNumAboveMagma.Maximum = New Decimal(New Integer() {99, 0, 0, 0})
         Me.optNumAboveMagma.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
         Me.optNumAboveMagma.Name = "optNumAboveMagma"
-        FileListManager258.fileNames = Nothing
-        OptionSingle57.fileManager = FileListManager258
-        OptionManager258.loadFromDInit = false
-        OptionManager258.loadFromInit = false
-        OptionManager258.loadFromWorldGen = true
-        OptionSingle57.optionManager = OptionManager258
-        OptionSettingManager261.settingName = Nothing
-        OptionSingle57.settingManager = OptionSettingManager261
+        FileListManager254.fileNames = Nothing
+        OptionSingle57.fileManager = FileListManager254
+        OptionManager254.loadFromDInit = false
+        OptionManager254.loadFromInit = false
+        OptionManager254.loadFromWorldGen = true
+        OptionSingle57.optionManager = OptionManager254
+        OptionSettingManager257.settingName = Nothing
+        OptionSingle57.settingManager = OptionSettingManager257
         OptionSingle57.tokenName = "LEVELS_ABOVE_LAYER_4"
         OptionSingle57.updateTileSets = false
         Me.optNumAboveMagma.options = OptionSingle57
@@ -10633,14 +10560,14 @@ Partial Class MainForm
         Me.optNumAboveHFS.Maximum = New Decimal(New Integer() {99, 0, 0, 0})
         Me.optNumAboveHFS.Minimum = New Decimal(New Integer() {2, 0, 0, 0})
         Me.optNumAboveHFS.Name = "optNumAboveHFS"
-        FileListManager259.fileNames = Nothing
-        OptionSingle58.fileManager = FileListManager259
-        OptionManager259.loadFromDInit = false
-        OptionManager259.loadFromInit = false
-        OptionManager259.loadFromWorldGen = true
-        OptionSingle58.optionManager = OptionManager259
-        OptionSettingManager262.settingName = Nothing
-        OptionSingle58.settingManager = OptionSettingManager262
+        FileListManager255.fileNames = Nothing
+        OptionSingle58.fileManager = FileListManager255
+        OptionManager255.loadFromDInit = false
+        OptionManager255.loadFromInit = false
+        OptionManager255.loadFromWorldGen = true
+        OptionSingle58.optionManager = OptionManager255
+        OptionSettingManager258.settingName = Nothing
+        OptionSingle58.settingManager = OptionSettingManager258
         OptionSingle58.tokenName = "LEVELS_ABOVE_LAYER_5"
         OptionSingle58.updateTileSets = false
         Me.optNumAboveHFS.options = OptionSingle58
@@ -10663,19 +10590,19 @@ Partial Class MainForm
         Me.optBtnMagmaLake.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.optBtnMagmaLake.Location = New System.Drawing.Point(66, 357)
         Me.optBtnMagmaLake.Name = "optBtnMagmaLake"
-        OptionSingleReplace192.disabledValue = "0"
-        OptionSingleReplace192.enabledValue = "1"
-        FileListManager260.fileNames = Nothing
-        OptionSingleReplace192.fileManager = FileListManager260
-        OptionManager260.loadFromDInit = false
-        OptionManager260.loadFromInit = false
-        OptionManager260.loadFromWorldGen = true
-        OptionSingleReplace192.optionManager = OptionManager260
-        OptionSettingManager263.settingName = Nothing
-        OptionSingleReplace192.settingManager = OptionSettingManager263
-        OptionSingleReplace192.tokenName = "HAVE_BOTTOM_LAYER_1"
-        OptionSingleReplace192.updateTileSets = false
-        Me.optBtnMagmaLake.options = OptionSingleReplace192
+        OptionSingleReplace188.disabledValue = "0"
+        OptionSingleReplace188.enabledValue = "1"
+        FileListManager256.fileNames = Nothing
+        OptionSingleReplace188.fileManager = FileListManager256
+        OptionManager256.loadFromDInit = false
+        OptionManager256.loadFromInit = false
+        OptionManager256.loadFromWorldGen = true
+        OptionSingleReplace188.optionManager = OptionManager256
+        OptionSettingManager259.settingName = Nothing
+        OptionSingleReplace188.settingManager = OptionSettingManager259
+        OptionSingleReplace188.tokenName = "HAVE_BOTTOM_LAYER_1"
+        OptionSingleReplace188.updateTileSets = false
+        Me.optBtnMagmaLake.options = OptionSingleReplace188
         Me.optBtnMagmaLake.Size = New System.Drawing.Size(129, 24)
         Me.optBtnMagmaLake.TabIndex = 22
         Me.optBtnMagmaLake.Text = "Magma Lake"
@@ -10695,19 +10622,19 @@ Partial Class MainForm
         Me.optBtnHFS.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.optBtnHFS.Location = New System.Drawing.Point(66, 387)
         Me.optBtnHFS.Name = "optBtnHFS"
-        OptionSingleReplace193.disabledValue = "0"
-        OptionSingleReplace193.enabledValue = "1"
-        FileListManager261.fileNames = Nothing
-        OptionSingleReplace193.fileManager = FileListManager261
-        OptionManager261.loadFromDInit = false
-        OptionManager261.loadFromInit = false
-        OptionManager261.loadFromWorldGen = true
-        OptionSingleReplace193.optionManager = OptionManager261
-        OptionSettingManager264.settingName = Nothing
-        OptionSingleReplace193.settingManager = OptionSettingManager264
-        OptionSingleReplace193.tokenName = "HAVE_BOTTOM_LAYER_2"
-        OptionSingleReplace193.updateTileSets = false
-        Me.optBtnHFS.options = OptionSingleReplace193
+        OptionSingleReplace189.disabledValue = "0"
+        OptionSingleReplace189.enabledValue = "1"
+        FileListManager257.fileNames = Nothing
+        OptionSingleReplace189.fileManager = FileListManager257
+        OptionManager257.loadFromDInit = false
+        OptionManager257.loadFromInit = false
+        OptionManager257.loadFromWorldGen = true
+        OptionSingleReplace189.optionManager = OptionManager257
+        OptionSettingManager260.settingName = Nothing
+        OptionSingleReplace189.settingManager = OptionSettingManager260
+        OptionSingleReplace189.tokenName = "HAVE_BOTTOM_LAYER_2"
+        OptionSingleReplace189.updateTileSets = false
+        Me.optBtnHFS.options = OptionSingleReplace189
         Me.optBtnHFS.Size = New System.Drawing.Size(129, 23)
         Me.optBtnHFS.TabIndex = 23
         Me.optBtnHFS.Text = "HFS"
@@ -10722,14 +10649,14 @@ Partial Class MainForm
         Me.optMaskGoodAreas.Location = New System.Drawing.Point(103, 49)
         Me.optMaskGoodAreas.Name = "optMaskGoodAreas"
         Me.optMaskGoodAreas.niceFormat = "###:###:### (0-500)"
-        FileListManager262.fileNames = Nothing
-        OptionSingle59.fileManager = FileListManager262
-        OptionManager262.loadFromDInit = false
-        OptionManager262.loadFromInit = false
-        OptionManager262.loadFromWorldGen = true
-        OptionSingle59.optionManager = OptionManager262
-        OptionSettingManager265.settingName = Nothing
-        OptionSingle59.settingManager = OptionSettingManager265
+        FileListManager258.fileNames = Nothing
+        OptionSingle59.fileManager = FileListManager258
+        OptionManager258.loadFromDInit = false
+        OptionManager258.loadFromInit = false
+        OptionManager258.loadFromWorldGen = true
+        OptionSingle59.optionManager = OptionManager258
+        OptionSettingManager261.settingName = Nothing
+        OptionSingle59.settingManager = OptionSettingManager261
         OptionSingle59.tokenName = "GOOD_SQ_COUNTS"
         OptionSingle59.updateTileSets = false
         Me.optMaskGoodAreas.options = OptionSingle59
@@ -10747,14 +10674,14 @@ Partial Class MainForm
         Me.optMaskEvilAreas.Location = New System.Drawing.Point(103, 24)
         Me.optMaskEvilAreas.Name = "optMaskEvilAreas"
         Me.optMaskEvilAreas.niceFormat = "###:###:### (0-500)"
-        FileListManager263.fileNames = Nothing
-        OptionSingle60.fileManager = FileListManager263
-        OptionManager263.loadFromDInit = false
-        OptionManager263.loadFromInit = false
-        OptionManager263.loadFromWorldGen = true
-        OptionSingle60.optionManager = OptionManager263
-        OptionSettingManager266.settingName = Nothing
-        OptionSingle60.settingManager = OptionSettingManager266
+        FileListManager259.fileNames = Nothing
+        OptionSingle60.fileManager = FileListManager259
+        OptionManager259.loadFromDInit = false
+        OptionManager259.loadFromInit = false
+        OptionManager259.loadFromWorldGen = true
+        OptionSingle60.optionManager = OptionManager259
+        OptionSettingManager262.settingName = Nothing
+        OptionSingle60.settingManager = OptionSettingManager262
         OptionSingle60.tokenName = "EVIL_SQ_COUNTS"
         OptionSingle60.updateTileSets = false
         Me.optMaskEvilAreas.options = OptionSingle60
@@ -10765,6 +10692,54 @@ Partial Class MainForm
         Me.optMaskEvilAreas.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
         Me.ToolTipMaker.SetToolTip(Me.optMaskEvilAreas, "The amount of evil tiles on the map.")
         '
+        'optCbStartingLabors
+        '
+        Me.optCbStartingLabors.DropDownWidth = 150
+        Me.optCbStartingLabors.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.optCbStartingLabors.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.optCbStartingLabors.FormattingEnabled = true
+        Me.optCbStartingLabors.Location = New System.Drawing.Point(92, 315)
+        Me.optCbStartingLabors.Name = "optCbStartingLabors"
+        FileListManager260.fileNames = Nothing
+        OptionList5.fileManager = FileListManager260
+        ComboItem33.display = "No"
+        ComboItem33.value = "NO"
+        ComboItem34.display = "Unit Type"
+        ComboItem34.value = "UNIT_TYPE"
+        ComboItem35.display = "Skills"
+        ComboItem35.value = "SKILLS"
+        OptionList5.itemList.Add(ComboItem33)
+        OptionList5.itemList.Add(ComboItem34)
+        OptionList5.itemList.Add(ComboItem35)
+        OptionManager260.loadFromDInit = true
+        OptionManager260.loadFromInit = false
+        OptionManager260.loadFromWorldGen = false
+        OptionList5.optionManager = OptionManager260
+        OptionSettingManager263.settingName = Nothing
+        OptionList5.settingManager = OptionSettingManager263
+        OptionList5.tokenName = "SET_LABOR_LISTS"
+        OptionList5.updateTileSets = false
+        Me.optCbStartingLabors.options = OptionList5
+        Me.optCbStartingLabors.Size = New System.Drawing.Size(59, 23)
+        Me.optCbStartingLabors.TabIndex = 1
+        Me.ToolTipMaker.SetToolTip(Me.optCbStartingLabors, resources.GetString("optCbStartingLabors.ToolTip"))
+        '
+        'lblPlayableFort
+        '
+        Me.lblPlayableFort.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom)  _
+            Or System.Windows.Forms.AnchorStyles.Left)  _
+            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.lblPlayableFort.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.lblPlayableFort.ForeColor = System.Drawing.Color.White
+        Me.lblPlayableFort.Location = New System.Drawing.Point(163, 1)
+        Me.lblPlayableFort.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
+        Me.lblPlayableFort.Name = "lblPlayableFort"
+        Me.lblPlayableFort.Size = New System.Drawing.Size(76, 30)
+        Me.lblPlayableFort.TabIndex = 16
+        Me.lblPlayableFort.Text = "Playable (Fortress)"
+        Me.lblPlayableFort.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.ToolTipMaker.SetToolTip(Me.lblPlayableFort, "Sets the civilization to playable.")
+        '
         'lblHFSLevels
         '
         Me.lblHFSLevels.Location = New System.Drawing.Point(7, 308)
@@ -10793,19 +10768,20 @@ Partial Class MainForm
         Me.panCivTable.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.panCivTable.Controls.Add(Me.tableLayoutCivs)
         Me.panCivTable.ForeColor = System.Drawing.Color.White
-        Me.panCivTable.Location = New System.Drawing.Point(198, 42)
+        Me.panCivTable.Location = New System.Drawing.Point(154, 41)
         Me.panCivTable.Name = "panCivTable"
-        Me.panCivTable.Size = New System.Drawing.Size(628, 532)
+        Me.panCivTable.Size = New System.Drawing.Size(717, 534)
         Me.panCivTable.TabIndex = 18
         '
         'tableLayoutCivs
         '
         Me.tableLayoutCivs.BackColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.tableLayoutCivs.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.tableLayoutCivs.ColumnCount = 9
+        Me.tableLayoutCivs.ColumnCount = 10
         Me.tableLayoutCivs.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle())
         Me.tableLayoutCivs.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 57!))
-        Me.tableLayoutCivs.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70!))
+        Me.tableLayoutCivs.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 82!))
+        Me.tableLayoutCivs.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 82!))
         Me.tableLayoutCivs.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 82!))
         Me.tableLayoutCivs.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 82!))
         Me.tableLayoutCivs.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 52!))
@@ -10827,16 +10803,13 @@ Partial Class MainForm
         Me.tableLayoutCivs.Controls.Add(Me.lblCivActive, 1, 0)
         Me.tableLayoutCivs.Controls.Add(Me.optBtnCivDwarves, 1, 1)
         Me.tableLayoutCivs.Controls.Add(Me.optBtnCivOrcs, 1, 2)
-        Me.tableLayoutCivs.Controls.Add(Me.optBtnPlayableDwarves, 2, 1)
-        Me.tableLayoutCivs.Controls.Add(Me.optBtnPlayableOrcs, 2, 2)
-        Me.tableLayoutCivs.Controls.Add(Me.optBtnPlayableKobolds, 2, 3)
         Me.tableLayoutCivs.Controls.Add(Me.optBtnCivKobolds, 1, 3)
-        Me.tableLayoutCivs.Controls.Add(Me.lblCivBabySnatcher, 5, 0)
-        Me.tableLayoutCivs.Controls.Add(Me.lblCivInvasions, 4, 0)
-        Me.tableLayoutCivs.Controls.Add(Me.lblCivCaravans, 3, 0)
-        Me.tableLayoutCivs.Controls.Add(Me.lblCivPlayable, 2, 0)
-        Me.tableLayoutCivs.Controls.Add(Me.lblCivMaterials, 6, 0)
-        Me.tableLayoutCivs.Controls.Add(Me.lblCivSkills, 7, 0)
+        Me.tableLayoutCivs.Controls.Add(Me.lblCivBabySnatcher, 6, 0)
+        Me.tableLayoutCivs.Controls.Add(Me.lblCivInvasions, 5, 0)
+        Me.tableLayoutCivs.Controls.Add(Me.lblCivCaravans, 4, 0)
+        Me.tableLayoutCivs.Controls.Add(Me.lblCivPlayableAdv, 3, 0)
+        Me.tableLayoutCivs.Controls.Add(Me.lblCivMaterials, 7, 0)
+        Me.tableLayoutCivs.Controls.Add(Me.lblCivSkills, 8, 0)
         Me.tableLayoutCivs.Controls.Add(Me.lblCivDwarf, 0, 1)
         Me.tableLayoutCivs.Controls.Add(Me.lblCivTaigaOrcs, 0, 2)
         Me.tableLayoutCivs.Controls.Add(Me.lblCivKoboldCamp, 0, 3)
@@ -10862,12 +10835,14 @@ Partial Class MainForm
         Me.tableLayoutCivs.Controls.Add(Me.lblCivEvilElf, 0, 20)
         Me.tableLayoutCivs.Controls.Add(Me.optBtnEvilElves, 1, 20)
         Me.tableLayoutCivs.Controls.Add(Me.optBtnEvilDrow, 1, 19)
+        Me.tableLayoutCivs.Controls.Add(Me.lblPlayableFort, 2, 0)
         Me.tableLayoutCivs.Dock = System.Windows.Forms.DockStyle.Fill
         Me.tableLayoutCivs.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize
         Me.tableLayoutCivs.Location = New System.Drawing.Point(0, 0)
         Me.tableLayoutCivs.Margin = New System.Windows.Forms.Padding(1)
         Me.tableLayoutCivs.Name = "tableLayoutCivs"
         Me.tableLayoutCivs.RowCount = 21
+        Me.tableLayoutCivs.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32!))
         Me.tableLayoutCivs.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25!))
         Me.tableLayoutCivs.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25!))
         Me.tableLayoutCivs.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25!))
@@ -10888,8 +10863,7 @@ Partial Class MainForm
         Me.tableLayoutCivs.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25!))
         Me.tableLayoutCivs.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25!))
         Me.tableLayoutCivs.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25!))
-        Me.tableLayoutCivs.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25!))
-        Me.tableLayoutCivs.Size = New System.Drawing.Size(626, 530)
+        Me.tableLayoutCivs.Size = New System.Drawing.Size(715, 532)
         Me.tableLayoutCivs.TabIndex = 16
         '
         'lblCivInvasions
@@ -10899,10 +10873,10 @@ Partial Class MainForm
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.lblCivInvasions.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivInvasions.ForeColor = System.Drawing.Color.White
-        Me.lblCivInvasions.Location = New System.Drawing.Point(315, 1)
+        Me.lblCivInvasions.Location = New System.Drawing.Point(409, 1)
         Me.lblCivInvasions.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
         Me.lblCivInvasions.Name = "lblCivInvasions"
-        Me.lblCivInvasions.Size = New System.Drawing.Size(76, 23)
+        Me.lblCivInvasions.Size = New System.Drawing.Size(76, 30)
         Me.lblCivInvasions.TabIndex = 6
         Me.lblCivInvasions.Text = "Invasions"
         Me.lblCivInvasions.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -10914,23 +10888,24 @@ Partial Class MainForm
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.lblCivCaravans.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivCaravans.ForeColor = System.Drawing.Color.White
-        Me.lblCivCaravans.Location = New System.Drawing.Point(233, 1)
+        Me.lblCivCaravans.Location = New System.Drawing.Point(327, 1)
         Me.lblCivCaravans.Margin = New System.Windows.Forms.Padding(3, 1, 3, 1)
         Me.lblCivCaravans.Name = "lblCivCaravans"
-        Me.lblCivCaravans.Size = New System.Drawing.Size(76, 23)
+        Me.lblCivCaravans.Size = New System.Drawing.Size(76, 30)
         Me.lblCivCaravans.TabIndex = 6
         Me.lblCivCaravans.Text = "Caravans"
         Me.lblCivCaravans.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'lblCivDwarf
         '
+        Me.lblCivDwarf.advTag = "ADVD"
         Me.lblCivDwarf.creatureFileName = "creature_standard.txt"
         Me.lblCivDwarf.entityFileName = "entity_default.txt"
         Me.lblCivDwarf.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivDwarf.ForeColor = System.Drawing.Color.White
-        Me.lblCivDwarf.Location = New System.Drawing.Point(1, 26)
+        Me.lblCivDwarf.fortTag = "CIVD"
+        Me.lblCivDwarf.Location = New System.Drawing.Point(1, 33)
         Me.lblCivDwarf.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivDwarf.materialsTag = Nothing
         Me.lblCivDwarf.Name = "lblCivDwarf"
         Me.lblCivDwarf.Size = New System.Drawing.Size(96, 22)
         Me.lblCivDwarf.skillsTag = "YESHARDERINVADER_DWARF"
@@ -10941,13 +10916,14 @@ Partial Class MainForm
         '
         'lblCivTaigaOrcs
         '
+        Me.lblCivTaigaOrcs.advTag = "ADVORC_TAIGA"
         Me.lblCivTaigaOrcs.creatureFileName = "creature_orcfort_taigaorc.txt"
         Me.lblCivTaigaOrcs.entityFileName = "entity_orcfort_taigaorc.txt"
         Me.lblCivTaigaOrcs.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivTaigaOrcs.ForeColor = System.Drawing.Color.White
-        Me.lblCivTaigaOrcs.Location = New System.Drawing.Point(1, 51)
+        Me.lblCivTaigaOrcs.fortTag = "CIVO"
+        Me.lblCivTaigaOrcs.Location = New System.Drawing.Point(1, 58)
         Me.lblCivTaigaOrcs.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivTaigaOrcs.materialsTag = Nothing
         Me.lblCivTaigaOrcs.Name = "lblCivTaigaOrcs"
         Me.lblCivTaigaOrcs.Size = New System.Drawing.Size(96, 22)
         Me.lblCivTaigaOrcs.skillsTag = "YESHARDERINVADER_TAIGAORC"
@@ -10958,13 +10934,14 @@ Partial Class MainForm
         '
         'lblCivKoboldCamp
         '
+        Me.lblCivKoboldCamp.advTag = "ADVKOBOLD_CAMP"
         Me.lblCivKoboldCamp.creatureFileName = "creature_kobold_camp.txt"
         Me.lblCivKoboldCamp.entityFileName = "entity_kobold_camp.txt"
         Me.lblCivKoboldCamp.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivKoboldCamp.ForeColor = System.Drawing.Color.White
-        Me.lblCivKoboldCamp.Location = New System.Drawing.Point(1, 76)
+        Me.lblCivKoboldCamp.fortTag = "CIVK"
+        Me.lblCivKoboldCamp.Location = New System.Drawing.Point(1, 83)
         Me.lblCivKoboldCamp.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivKoboldCamp.materialsTag = Nothing
         Me.lblCivKoboldCamp.Name = "lblCivKoboldCamp"
         Me.lblCivKoboldCamp.Size = New System.Drawing.Size(96, 22)
         Me.lblCivKoboldCamp.skillsTag = "YESHARDERINVADER_KOBOLDCAMP"
@@ -10975,13 +10952,14 @@ Partial Class MainForm
         '
         'lblCivHuman
         '
+        Me.lblCivHuman.advTag = "ADVHUMAN"
         Me.lblCivHuman.creatureFileName = "creature_standard.txt"
         Me.lblCivHuman.entityFileName = "entity_human.txt"
         Me.lblCivHuman.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivHuman.ForeColor = System.Drawing.Color.White
-        Me.lblCivHuman.Location = New System.Drawing.Point(1, 101)
+        Me.lblCivHuman.fortTag = Nothing
+        Me.lblCivHuman.Location = New System.Drawing.Point(1, 108)
         Me.lblCivHuman.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivHuman.materialsTag = Nothing
         Me.lblCivHuman.Name = "lblCivHuman"
         Me.lblCivHuman.Size = New System.Drawing.Size(96, 22)
         Me.lblCivHuman.skillsTag = "YESHARDERINVADER_HUMAN"
@@ -10992,13 +10970,14 @@ Partial Class MainForm
         '
         'lblCivElf
         '
+        Me.lblCivElf.advTag = "ADVELF"
         Me.lblCivElf.creatureFileName = "creature_standard.txt"
         Me.lblCivElf.entityFileName = "entity_elf.txt"
         Me.lblCivElf.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivElf.ForeColor = System.Drawing.Color.White
-        Me.lblCivElf.Location = New System.Drawing.Point(1, 126)
+        Me.lblCivElf.fortTag = Nothing
+        Me.lblCivElf.Location = New System.Drawing.Point(1, 133)
         Me.lblCivElf.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivElf.materialsTag = Nothing
         Me.lblCivElf.Name = "lblCivElf"
         Me.lblCivElf.Size = New System.Drawing.Size(96, 22)
         Me.lblCivElf.skillsTag = "YESHARDERINVADER_ELF"
@@ -11009,13 +10988,14 @@ Partial Class MainForm
         '
         'lblCivDrow
         '
+        Me.lblCivDrow.advTag = "ADVDROW"
         Me.lblCivDrow.creatureFileName = "creature_masterwork.txt"
         Me.lblCivDrow.entityFileName = "entity_drow.txt"
         Me.lblCivDrow.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivDrow.ForeColor = System.Drawing.Color.White
-        Me.lblCivDrow.Location = New System.Drawing.Point(1, 151)
+        Me.lblCivDrow.fortTag = Nothing
+        Me.lblCivDrow.Location = New System.Drawing.Point(1, 158)
         Me.lblCivDrow.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivDrow.materialsTag = ""
         Me.lblCivDrow.Name = "lblCivDrow"
         Me.lblCivDrow.Size = New System.Drawing.Size(96, 22)
         Me.lblCivDrow.skillsTag = "YESHARDERINVADER_DROW"
@@ -11026,13 +11006,14 @@ Partial Class MainForm
         '
         'lblCivGnome
         '
+        Me.lblCivGnome.advTag = "ADVGNOMES"
         Me.lblCivGnome.creatureFileName = "creature_gnome.txt"
         Me.lblCivGnome.entityFileName = "entity_gnome.txt"
         Me.lblCivGnome.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivGnome.ForeColor = System.Drawing.Color.White
-        Me.lblCivGnome.Location = New System.Drawing.Point(1, 176)
+        Me.lblCivGnome.fortTag = Nothing
+        Me.lblCivGnome.Location = New System.Drawing.Point(1, 183)
         Me.lblCivGnome.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivGnome.materialsTag = Nothing
         Me.lblCivGnome.Name = "lblCivGnome"
         Me.lblCivGnome.Size = New System.Drawing.Size(96, 22)
         Me.lblCivGnome.skillsTag = "YESHARDERINVADER"
@@ -11043,13 +11024,14 @@ Partial Class MainForm
         '
         'lblCivKobold
         '
+        Me.lblCivKobold.advTag = "ADVKOBOLD"
         Me.lblCivKobold.creatureFileName = "creature_standard.txt"
         Me.lblCivKobold.entityFileName = "entity_kobold.txt"
         Me.lblCivKobold.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivKobold.ForeColor = System.Drawing.Color.White
-        Me.lblCivKobold.Location = New System.Drawing.Point(1, 201)
+        Me.lblCivKobold.fortTag = Nothing
+        Me.lblCivKobold.Location = New System.Drawing.Point(1, 208)
         Me.lblCivKobold.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivKobold.materialsTag = Nothing
         Me.lblCivKobold.Name = "lblCivKobold"
         Me.lblCivKobold.Size = New System.Drawing.Size(96, 22)
         Me.lblCivKobold.skillsTag = "YESHARDERINVADER_KOBOLD"
@@ -11060,13 +11042,14 @@ Partial Class MainForm
         '
         'lblCivGoblin
         '
+        Me.lblCivGoblin.advTag = "ADVGOBLIN"
         Me.lblCivGoblin.creatureFileName = "creature_standard.txt"
         Me.lblCivGoblin.entityFileName = "entity_goblin.txt"
         Me.lblCivGoblin.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivGoblin.ForeColor = System.Drawing.Color.White
-        Me.lblCivGoblin.Location = New System.Drawing.Point(1, 226)
+        Me.lblCivGoblin.fortTag = Nothing
+        Me.lblCivGoblin.Location = New System.Drawing.Point(1, 233)
         Me.lblCivGoblin.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivGoblin.materialsTag = Nothing
         Me.lblCivGoblin.Name = "lblCivGoblin"
         Me.lblCivGoblin.Size = New System.Drawing.Size(96, 22)
         Me.lblCivGoblin.skillsTag = "YESHARDERINVADER_GOBLIN"
@@ -11077,13 +11060,14 @@ Partial Class MainForm
         '
         'lblCivOrc
         '
+        Me.lblCivOrc.advTag = "ADVORC"
         Me.lblCivOrc.creatureFileName = "creature_masterwork.txt"
         Me.lblCivOrc.entityFileName = "entity_orc.txt"
         Me.lblCivOrc.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivOrc.ForeColor = System.Drawing.Color.White
-        Me.lblCivOrc.Location = New System.Drawing.Point(1, 251)
+        Me.lblCivOrc.fortTag = Nothing
+        Me.lblCivOrc.Location = New System.Drawing.Point(1, 258)
         Me.lblCivOrc.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivOrc.materialsTag = ""
         Me.lblCivOrc.Name = "lblCivOrc"
         Me.lblCivOrc.Size = New System.Drawing.Size(96, 22)
         Me.lblCivOrc.skillsTag = "YESHARDERINVADER_ORC"
@@ -11094,13 +11078,14 @@ Partial Class MainForm
         '
         'lblCivFrostGiant
         '
+        Me.lblCivFrostGiant.advTag = "ADVFROST_GIANT"
         Me.lblCivFrostGiant.creatureFileName = "creature_masterwork.txt"
         Me.lblCivFrostGiant.entityFileName = "entity_frost_giant.txt"
         Me.lblCivFrostGiant.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivFrostGiant.ForeColor = System.Drawing.Color.White
-        Me.lblCivFrostGiant.Location = New System.Drawing.Point(1, 276)
+        Me.lblCivFrostGiant.fortTag = Nothing
+        Me.lblCivFrostGiant.Location = New System.Drawing.Point(1, 283)
         Me.lblCivFrostGiant.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivFrostGiant.materialsTag = Nothing
         Me.lblCivFrostGiant.Name = "lblCivFrostGiant"
         Me.lblCivFrostGiant.Size = New System.Drawing.Size(96, 22)
         Me.lblCivFrostGiant.skillsTag = "YESHARDERINVADER_FROST"
@@ -11111,13 +11096,14 @@ Partial Class MainForm
         '
         'lblCivWarlock
         '
+        Me.lblCivWarlock.advTag = "ADVWARLOCK"
         Me.lblCivWarlock.creatureFileName = "creature_masterwork.txt"
         Me.lblCivWarlock.entityFileName = "entity_warlock.txt"
         Me.lblCivWarlock.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivWarlock.ForeColor = System.Drawing.Color.White
-        Me.lblCivWarlock.Location = New System.Drawing.Point(1, 301)
+        Me.lblCivWarlock.fortTag = Nothing
+        Me.lblCivWarlock.Location = New System.Drawing.Point(1, 308)
         Me.lblCivWarlock.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivWarlock.materialsTag = Nothing
         Me.lblCivWarlock.Name = "lblCivWarlock"
         Me.lblCivWarlock.Size = New System.Drawing.Size(96, 22)
         Me.lblCivWarlock.skillsTag = "YESHARDERINVADER_WARLOCK"
@@ -11128,13 +11114,14 @@ Partial Class MainForm
         '
         'lblCivAutomaton
         '
+        Me.lblCivAutomaton.advTag = "ADVAUT"
         Me.lblCivAutomaton.creatureFileName = "creature_masterwork.txt"
         Me.lblCivAutomaton.entityFileName = "entity_automaton.txt"
         Me.lblCivAutomaton.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivAutomaton.ForeColor = System.Drawing.Color.White
-        Me.lblCivAutomaton.Location = New System.Drawing.Point(1, 326)
+        Me.lblCivAutomaton.fortTag = Nothing
+        Me.lblCivAutomaton.Location = New System.Drawing.Point(1, 333)
         Me.lblCivAutomaton.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivAutomaton.materialsTag = Nothing
         Me.lblCivAutomaton.Name = "lblCivAutomaton"
         Me.lblCivAutomaton.Size = New System.Drawing.Size(96, 22)
         Me.lblCivAutomaton.skillsTag = "YESHARDERINVADER_AUTO"
@@ -11145,13 +11132,14 @@ Partial Class MainForm
         '
         'lblCivGremlin
         '
+        Me.lblCivGremlin.advTag = "ADVGREMLIN"
         Me.lblCivGremlin.creatureFileName = "creature_standard.txt"
         Me.lblCivGremlin.entityFileName = "entity_gremlin.txt"
         Me.lblCivGremlin.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivGremlin.ForeColor = System.Drawing.Color.White
-        Me.lblCivGremlin.Location = New System.Drawing.Point(1, 351)
+        Me.lblCivGremlin.fortTag = Nothing
+        Me.lblCivGremlin.Location = New System.Drawing.Point(1, 358)
         Me.lblCivGremlin.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivGremlin.materialsTag = Nothing
         Me.lblCivGremlin.Name = "lblCivGremlin"
         Me.lblCivGremlin.Size = New System.Drawing.Size(96, 22)
         Me.lblCivGremlin.skillsTag = "YESHARDERINVADER_GREMLIN"
@@ -11162,13 +11150,14 @@ Partial Class MainForm
         '
         'lblCivTroglodyte
         '
+        Me.lblCivTroglodyte.advTag = "ADVTROG"
         Me.lblCivTroglodyte.creatureFileName = "creature_subterranean.txt"
         Me.lblCivTroglodyte.entityFileName = "entity_troglodyte.txt"
         Me.lblCivTroglodyte.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivTroglodyte.ForeColor = System.Drawing.Color.White
-        Me.lblCivTroglodyte.Location = New System.Drawing.Point(1, 376)
+        Me.lblCivTroglodyte.fortTag = Nothing
+        Me.lblCivTroglodyte.Location = New System.Drawing.Point(1, 383)
         Me.lblCivTroglodyte.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivTroglodyte.materialsTag = Nothing
         Me.lblCivTroglodyte.Name = "lblCivTroglodyte"
         Me.lblCivTroglodyte.Size = New System.Drawing.Size(96, 22)
         Me.lblCivTroglodyte.skillsTag = "YESHARDERINVADER_TROG"
@@ -11179,13 +11168,14 @@ Partial Class MainForm
         '
         'lblCivAntmen
         '
+        Me.lblCivAntmen.advTag = "ADVANT"
         Me.lblCivAntmen.creatureFileName = "creature_subterranean.txt"
         Me.lblCivAntmen.entityFileName = "entity_antmen.txt"
         Me.lblCivAntmen.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivAntmen.ForeColor = System.Drawing.Color.White
-        Me.lblCivAntmen.Location = New System.Drawing.Point(1, 401)
+        Me.lblCivAntmen.fortTag = Nothing
+        Me.lblCivAntmen.Location = New System.Drawing.Point(1, 408)
         Me.lblCivAntmen.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivAntmen.materialsTag = Nothing
         Me.lblCivAntmen.Name = "lblCivAntmen"
         Me.lblCivAntmen.Size = New System.Drawing.Size(96, 22)
         Me.lblCivAntmen.skillsTag = "YESHARDERINVADER_ANTMEN"
@@ -11196,13 +11186,14 @@ Partial Class MainForm
         '
         'lblCivEvilDwarf
         '
+        Me.lblCivEvilDwarf.advTag = "ADVD_EVIL"
         Me.lblCivEvilDwarf.creatureFileName = "creature_masterwork_eviltwins.txt"
         Me.lblCivEvilDwarf.entityFileName = "entity_dwarf_evil.txt"
         Me.lblCivEvilDwarf.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivEvilDwarf.ForeColor = System.Drawing.Color.White
-        Me.lblCivEvilDwarf.Location = New System.Drawing.Point(1, 426)
+        Me.lblCivEvilDwarf.fortTag = Nothing
+        Me.lblCivEvilDwarf.Location = New System.Drawing.Point(1, 433)
         Me.lblCivEvilDwarf.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivEvilDwarf.materialsTag = Nothing
         Me.lblCivEvilDwarf.Name = "lblCivEvilDwarf"
         Me.lblCivEvilDwarf.Size = New System.Drawing.Size(96, 22)
         Me.lblCivEvilDwarf.skillsTag = "YESHARDERINVADER_EVILDWARF"
@@ -11213,13 +11204,14 @@ Partial Class MainForm
         '
         'lblCivEvilHuman
         '
+        Me.lblCivEvilHuman.advTag = "ADVHUMAN_EVIL"
         Me.lblCivEvilHuman.creatureFileName = "creature_masterwork_eviltwins.txt"
         Me.lblCivEvilHuman.entityFileName = "entity_human_evil.txt"
         Me.lblCivEvilHuman.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivEvilHuman.ForeColor = System.Drawing.Color.White
-        Me.lblCivEvilHuman.Location = New System.Drawing.Point(1, 451)
+        Me.lblCivEvilHuman.fortTag = Nothing
+        Me.lblCivEvilHuman.Location = New System.Drawing.Point(1, 458)
         Me.lblCivEvilHuman.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivEvilHuman.materialsTag = Nothing
         Me.lblCivEvilHuman.Name = "lblCivEvilHuman"
         Me.lblCivEvilHuman.Size = New System.Drawing.Size(96, 22)
         Me.lblCivEvilHuman.skillsTag = "YESHARDERINVADER_EVILHUMAN"
@@ -11230,13 +11222,14 @@ Partial Class MainForm
         '
         'lblCivEvilDrow
         '
+        Me.lblCivEvilDrow.advTag = "ADVDROW_EVIL"
         Me.lblCivEvilDrow.creatureFileName = "creature_masterwork_eviltwins.txt"
         Me.lblCivEvilDrow.entityFileName = "entity_drow_evil.txt"
         Me.lblCivEvilDrow.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivEvilDrow.ForeColor = System.Drawing.Color.White
-        Me.lblCivEvilDrow.Location = New System.Drawing.Point(1, 476)
+        Me.lblCivEvilDrow.fortTag = Nothing
+        Me.lblCivEvilDrow.Location = New System.Drawing.Point(1, 483)
         Me.lblCivEvilDrow.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivEvilDrow.materialsTag = Nothing
         Me.lblCivEvilDrow.Name = "lblCivEvilDrow"
         Me.lblCivEvilDrow.Size = New System.Drawing.Size(96, 22)
         Me.lblCivEvilDrow.skillsTag = "YESHARDERINVADER_EVILDROW"
@@ -11247,13 +11240,14 @@ Partial Class MainForm
         '
         'lblCivEvilElf
         '
+        Me.lblCivEvilElf.advTag = "ADVELF_EVIL"
         Me.lblCivEvilElf.creatureFileName = "creature_masterwork_eviltwins.txt"
         Me.lblCivEvilElf.entityFileName = "entity_elf_evil.txt"
         Me.lblCivEvilElf.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.lblCivEvilElf.ForeColor = System.Drawing.Color.White
-        Me.lblCivEvilElf.Location = New System.Drawing.Point(1, 501)
+        Me.lblCivEvilElf.fortTag = Nothing
+        Me.lblCivEvilElf.Location = New System.Drawing.Point(1, 508)
         Me.lblCivEvilElf.Margin = New System.Windows.Forms.Padding(1, 1, 6, 0)
-        Me.lblCivEvilElf.materialsTag = Nothing
         Me.lblCivEvilElf.Name = "lblCivEvilElf"
         Me.lblCivEvilElf.Size = New System.Drawing.Size(96, 22)
         Me.lblCivEvilElf.skillsTag = "YESHARDERINVADER_EVILELF"
@@ -11298,19 +11292,19 @@ Partial Class MainForm
         Me.optBtnMoreAnimals.Location = New System.Drawing.Point(5, 48)
         Me.optBtnMoreAnimals.Margin = New System.Windows.Forms.Padding(1)
         Me.optBtnMoreAnimals.Name = "optBtnMoreAnimals"
-        OptionSingleReplace194.disabledValue = "!NOFF!"
-        OptionSingleReplace194.enabledValue = "YESFF["
-        FileListManager264.fileNames = New String() {"creature_ff.txt", "creature_mountain_new.txt", "creature_desert_new.txt", "creature_riverlakepool_new.txt", "creature_small_mammal_new.txt", "creature_temperate_new.txt", "creature_tropical_new.txt", "creature_tundra_taiga_new.txt", "creature_bug_slug_new.txt"}
-        OptionSingleReplace194.fileManager = FileListManager264
-        OptionManager264.loadFromDInit = false
-        OptionManager264.loadFromInit = false
-        OptionManager264.loadFromWorldGen = false
-        OptionSingleReplace194.optionManager = OptionManager264
-        OptionSettingManager267.settingName = Nothing
-        OptionSingleReplace194.settingManager = OptionSettingManager267
-        OptionSingleReplace194.tokenName = ""
-        OptionSingleReplace194.updateTileSets = false
-        Me.optBtnMoreAnimals.options = OptionSingleReplace194
+        OptionSingleReplace190.disabledValue = "!NOFF!"
+        OptionSingleReplace190.enabledValue = "YESFF["
+        FileListManager261.fileNames = New String() {"creature_ff.txt", "creature_mountain_new.txt", "creature_desert_new.txt", "creature_riverlakepool_new.txt", "creature_small_mammal_new.txt", "creature_temperate_new.txt", "creature_tropical_new.txt", "creature_tundra_taiga_new.txt", "creature_bug_slug_new.txt"}
+        OptionSingleReplace190.fileManager = FileListManager261
+        OptionManager261.loadFromDInit = false
+        OptionManager261.loadFromInit = false
+        OptionManager261.loadFromWorldGen = false
+        OptionSingleReplace190.optionManager = OptionManager261
+        OptionSettingManager264.settingName = Nothing
+        OptionSingleReplace190.settingManager = OptionSettingManager264
+        OptionSingleReplace190.tokenName = ""
+        OptionSingleReplace190.updateTileSets = false
+        Me.optBtnMoreAnimals.options = OptionSingleReplace190
         Me.optBtnMoreAnimals.Size = New System.Drawing.Size(134, 27)
         Me.optBtnMoreAnimals.TabIndex = 1
         Me.optBtnMoreAnimals.Text = "Animals"
@@ -11830,7 +11824,6 @@ Partial Class MainForm
         Me.grpBalancing.Controls.Add(Me.optMultiHarderFarming)
         Me.grpBalancing.Controls.Add(Me.optBtnHarderMining)
         Me.grpBalancing.Controls.Add(Me.optBtnHarderLearning)
-        Me.grpBalancing.Controls.Add(Me.optBtnHarderInvaders)
         Me.grpBalancing.Controls.Add(Me.optBtnBodyguards)
         Me.grpBalancing.Controls.Add(Me.optBtnSecrets)
         Me.grpBalancing.Controls.Add(Me.optBtnDiseases)
@@ -12209,6 +12202,7 @@ Partial Class MainForm
         'grpWorldSettings
         '
         Me.grpWorldSettings.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.grpWorldSettings.Controls.Add(Me.optCbStartingLabors)
         Me.grpWorldSettings.Controls.Add(Me.optBtnTemperature)
         Me.grpWorldSettings.Controls.Add(Me.optBtnWeather)
         Me.grpWorldSettings.Controls.Add(Me.optBtnCaveins)
@@ -12221,10 +12215,11 @@ Partial Class MainForm
         Me.grpWorldSettings.Controls.Add(Me.optMaskChildBabyCap)
         Me.grpWorldSettings.Controls.Add(Me.lblPopCap)
         Me.grpWorldSettings.Controls.Add(Me.lblChildCap)
+        Me.grpWorldSettings.Controls.Add(Me.lblStartingLabor)
         Me.grpWorldSettings.ForeColor = System.Drawing.SystemColors.Window
         Me.grpWorldSettings.Location = New System.Drawing.Point(81, 99)
         Me.grpWorldSettings.Name = "grpWorldSettings"
-        Me.grpWorldSettings.Size = New System.Drawing.Size(169, 322)
+        Me.grpWorldSettings.Size = New System.Drawing.Size(169, 346)
         Me.grpWorldSettings.TabIndex = 0
         Me.grpWorldSettings.TabStop = false
         Me.grpWorldSettings.Text = "World Settings"
@@ -12234,13 +12229,25 @@ Partial Class MainForm
         Me.lblPopCap.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.lblPopCap.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblPopCap.ForeColor = System.Drawing.SystemColors.Window
-        Me.lblPopCap.Location = New System.Drawing.Point(-3, 259)
+        Me.lblPopCap.Location = New System.Drawing.Point(-3, 256)
         Me.lblPopCap.Name = "lblPopCap"
         Me.lblPopCap.Size = New System.Drawing.Size(94, 20)
         Me.lblPopCap.TabIndex = 8
         Me.lblPopCap.Text = "Population Cap"
         Me.lblPopCap.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         '
+        'lblStartingLabor
+        '
+        Me.lblStartingLabor.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblStartingLabor.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.lblStartingLabor.ForeColor = System.Drawing.SystemColors.Window
+        Me.lblStartingLabor.Location = New System.Drawing.Point(0, 315)
+        Me.lblStartingLabor.Name = "lblStartingLabor"
+        Me.lblStartingLabor.Size = New System.Drawing.Size(91, 20)
+        Me.lblStartingLabor.TabIndex = 0
+        Me.lblStartingLabor.Text = "Migrant Labors"
+        Me.lblStartingLabor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
         'grpSaveSettings
         '
         Me.grpSaveSettings.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
@@ -12267,26 +12274,26 @@ Partial Class MainForm
         Me.optCbAutoSave.FormattingEnabled = true
         Me.optCbAutoSave.Location = New System.Drawing.Point(76, 22)
         Me.optCbAutoSave.Name = "optCbAutoSave"
-        FileListManager265.fileNames = Nothing
-        OptionList4.fileManager = FileListManager265
-        ComboItem17.display = "Never"
-        ComboItem17.value = "NONE"
-        ComboItem18.display = "Seasonal"
-        ComboItem18.value = "SEASONAL"
-        ComboItem19.display = "Yearly"
-        ComboItem19.value = "YEARLY"
-        OptionList4.itemList.Add(ComboItem17)
-        OptionList4.itemList.Add(ComboItem18)
-        OptionList4.itemList.Add(ComboItem19)
-        OptionManager265.loadFromDInit = true
-        OptionManager265.loadFromInit = false
-        OptionManager265.loadFromWorldGen = false
-        OptionList4.optionManager = OptionManager265
-        OptionSettingManager268.settingName = Nothing
-        OptionList4.settingManager = OptionSettingManager268
-        OptionList4.tokenName = "AUTOSAVE"
-        OptionList4.updateTileSets = false
-        Me.optCbAutoSave.options = OptionList4
+        FileListManager262.fileNames = Nothing
+        OptionList6.fileManager = FileListManager262
+        ComboItem36.display = "Never"
+        ComboItem36.value = "NONE"
+        ComboItem37.display = "Seasonal"
+        ComboItem37.value = "SEASONAL"
+        ComboItem38.display = "Yearly"
+        ComboItem38.value = "YEARLY"
+        OptionList6.itemList.Add(ComboItem36)
+        OptionList6.itemList.Add(ComboItem37)
+        OptionList6.itemList.Add(ComboItem38)
+        OptionManager262.loadFromDInit = true
+        OptionManager262.loadFromInit = false
+        OptionManager262.loadFromWorldGen = false
+        OptionList6.optionManager = OptionManager262
+        OptionSettingManager265.settingName = Nothing
+        OptionList6.settingManager = OptionSettingManager265
+        OptionList6.tokenName = "AUTOSAVE"
+        OptionList6.updateTileSets = false
+        Me.optCbAutoSave.options = OptionList6
         Me.optCbAutoSave.Size = New System.Drawing.Size(75, 23)
         Me.optCbAutoSave.TabIndex = 1
         '
@@ -12377,9 +12384,9 @@ Partial Class MainForm
         Me.grpGraphics.Controls.Add(Me.optCbColors)
         Me.grpGraphics.Controls.Add(Me.optCbPrintMode)
         Me.grpGraphics.Controls.Add(Me.optBtnSprites)
-        Me.grpGraphics.Controls.Add(Me.optBtnTruetype)
         Me.grpGraphics.Controls.Add(Me.lblFonts)
         Me.grpGraphics.Controls.Add(Me.optCbFonts)
+        Me.grpGraphics.Controls.Add(Me.optBtnTruetype)
         Me.grpGraphics.Controls.Add(Me.lblGraphicsPack)
         Me.grpGraphics.Controls.Add(Me.cmbTileSets)
         Me.grpGraphics.Controls.Add(Me.btnTilesetPreview)
@@ -12388,7 +12395,7 @@ Partial Class MainForm
         Me.grpGraphics.ForeColor = System.Drawing.SystemColors.Window
         Me.grpGraphics.Location = New System.Drawing.Point(431, 99)
         Me.grpGraphics.Name = "grpGraphics"
-        Me.grpGraphics.Size = New System.Drawing.Size(169, 322)
+        Me.grpGraphics.Size = New System.Drawing.Size(169, 346)
         Me.grpGraphics.TabIndex = 3
         Me.grpGraphics.TabStop = false
         Me.grpGraphics.Text = "Graphic Settings"
@@ -12398,20 +12405,20 @@ Partial Class MainForm
         Me.lblColors.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
         Me.lblColors.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblColors.ForeColor = System.Drawing.SystemColors.Window
-        Me.lblColors.Location = New System.Drawing.Point(8, 21)
+        Me.lblColors.Location = New System.Drawing.Point(54, 22)
         Me.lblColors.Name = "lblColors"
         Me.lblColors.Size = New System.Drawing.Size(61, 20)
         Me.lblColors.TabIndex = 0
         Me.lblColors.Text = "Color"
-        Me.lblColors.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.lblColors.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'optCbColors
         '
         Me.optCbColors.DropDownWidth = 150
         Me.optCbColors.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.optCbColors.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.optCbColors.FormattingEnabled = true
-        Me.optCbColors.Location = New System.Drawing.Point(72, 22)
+        Me.optCbColors.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.optCbColors.FormattingEnabled = True
+        Me.optCbColors.Location = New System.Drawing.Point(17, 44)
         Me.optCbColors.MaxDropDownItems = 50
         Me.optCbColors.Name = "optCbColors"
         OptionSingleFileReplace4.fileName = "colors.txt"
@@ -12503,76 +12510,76 @@ Partial Class MainForm
         OptionSingleFileReplace4.itemList.Add(ComboFileItem26)
         OptionSingleFileReplace4.itemList.Add(ComboFileItem27)
         OptionSingleFileReplace4.itemList.Add(ComboFileItem28)
-        OptionSettingManager269.settingName = "COLORS"
-        OptionSingleFileReplace4.settingManager = OptionSettingManager269
+        OptionSettingManager266.settingName = "COLORS"
+        OptionSingleFileReplace4.settingManager = OptionSettingManager266
         Me.optCbColors.options = OptionSingleFileReplace4
-        Me.optCbColors.Size = New System.Drawing.Size(91, 23)
+        Me.optCbColors.Size = New System.Drawing.Size(134, 23)
         Me.optCbColors.TabIndex = 1
         '
         'lblFonts
         '
-        Me.lblFonts.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblFonts.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.lblFonts.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblFonts.ForeColor = System.Drawing.SystemColors.Window
-        Me.lblFonts.Location = New System.Drawing.Point(21, 72)
+        Me.lblFonts.Location = New System.Drawing.Point(60, 119)
         Me.lblFonts.Name = "lblFonts"
         Me.lblFonts.Size = New System.Drawing.Size(48, 20)
         Me.lblFonts.TabIndex = 4
         Me.lblFonts.Text = "Font"
-        Me.lblFonts.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.lblFonts.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'lblGraphicsPack
         '
-        Me.lblGraphicsPack.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblGraphicsPack.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.lblGraphicsPack.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblGraphicsPack.ForeColor = System.Drawing.SystemColors.Window
-        Me.lblGraphicsPack.Location = New System.Drawing.Point(8, 197)
+        Me.lblGraphicsPack.Location = New System.Drawing.Point(54, 169)
         Me.lblGraphicsPack.Name = "lblGraphicsPack"
         Me.lblGraphicsPack.Size = New System.Drawing.Size(61, 20)
         Me.lblGraphicsPack.TabIndex = 8
         Me.lblGraphicsPack.Text = "Tileset"
-        Me.lblGraphicsPack.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.lblGraphicsPack.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'cmbTileSets
         '
         Me.cmbTileSets.DropDownWidth = 150
         Me.cmbTileSets.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.cmbTileSets.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.cmbTileSets.FormattingEnabled = true
-        Me.cmbTileSets.Location = New System.Drawing.Point(72, 197)
+        Me.cmbTileSets.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cmbTileSets.FormattingEnabled = True
+        Me.cmbTileSets.Location = New System.Drawing.Point(17, 192)
         Me.cmbTileSets.Name = "cmbTileSets"
-        Me.cmbTileSets.Size = New System.Drawing.Size(91, 23)
+        Me.cmbTileSets.Size = New System.Drawing.Size(134, 23)
         Me.cmbTileSets.TabIndex = 9
         '
         'btnTilesetPreview
         '
-        Me.btnTilesetPreview.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.btnTilesetPreview.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.btnTilesetPreview.FlatAppearance.BorderSize = 0
         Me.btnTilesetPreview.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnTilesetPreview.ForeColor = System.Drawing.Color.White
-        Me.btnTilesetPreview.Location = New System.Drawing.Point(17, 229)
+        Me.btnTilesetPreview.Location = New System.Drawing.Point(17, 219)
         Me.btnTilesetPreview.Margin = New System.Windows.Forms.Padding(1)
         Me.btnTilesetPreview.Name = "btnTilesetPreview"
         Me.btnTilesetPreview.Size = New System.Drawing.Size(134, 27)
         Me.btnTilesetPreview.TabIndex = 11
         Me.btnTilesetPreview.Text = "Tilesets Preview"
-        Me.btnTilesetPreview.UseVisualStyleBackColor = false
+        Me.btnTilesetPreview.UseVisualStyleBackColor = False
         '
         'lblPrintMode
         '
-        Me.lblPrintMode.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblPrintMode.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.lblPrintMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblPrintMode.ForeColor = System.Drawing.SystemColors.Window
-        Me.lblPrintMode.Location = New System.Drawing.Point(3, 47)
+        Me.lblPrintMode.Location = New System.Drawing.Point(51, 70)
         Me.lblPrintMode.Name = "lblPrintMode"
         Me.lblPrintMode.Size = New System.Drawing.Size(66, 20)
         Me.lblPrintMode.TabIndex = 2
         Me.lblPrintMode.Text = "Print Mode"
-        Me.lblPrintMode.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.lblPrintMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'grpFps
         '
-        Me.grpFps.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.grpFps.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.grpFps.Controls.Add(Me.optBtnFps)
         Me.grpFps.Controls.Add(Me.lblGraphicsCap)
         Me.grpFps.Controls.Add(Me.optNumGFPS)
@@ -12583,12 +12590,12 @@ Partial Class MainForm
         Me.grpFps.Name = "grpFps"
         Me.grpFps.Size = New System.Drawing.Size(169, 100)
         Me.grpFps.TabIndex = 6
-        Me.grpFps.TabStop = false
+        Me.grpFps.TabStop = False
         Me.grpFps.Text = "FPS Settings"
         '
         'lblGraphicsCap
         '
-        Me.lblGraphicsCap.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblGraphicsCap.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.lblGraphicsCap.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblGraphicsCap.ForeColor = System.Drawing.SystemColors.Window
         Me.lblGraphicsCap.Location = New System.Drawing.Point(6, 48)
@@ -12600,7 +12607,7 @@ Partial Class MainForm
         '
         'lblFpsCap
         '
-        Me.lblFpsCap.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblFpsCap.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.lblFpsCap.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblFpsCap.ForeColor = System.Drawing.SystemColors.Window
         Me.lblFpsCap.Location = New System.Drawing.Point(6, 72)
@@ -12612,7 +12619,7 @@ Partial Class MainForm
         '
         'grpSound
         '
-        Me.grpSound.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.grpSound.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.grpSound.Controls.Add(Me.optBtnSound)
         Me.grpSound.Controls.Add(Me.lblVolume)
         Me.grpSound.Controls.Add(Me.optNumVolume)
@@ -12621,12 +12628,12 @@ Partial Class MainForm
         Me.grpSound.Name = "grpSound"
         Me.grpSound.Size = New System.Drawing.Size(169, 81)
         Me.grpSound.TabIndex = 7
-        Me.grpSound.TabStop = false
+        Me.grpSound.TabStop = False
         Me.grpSound.Text = "Sound Settings"
         '
         'lblVolume
         '
-        Me.lblVolume.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblVolume.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.lblVolume.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblVolume.ForeColor = System.Drawing.SystemColors.Window
         Me.lblVolume.Location = New System.Drawing.Point(6, 48)
@@ -12638,24 +12645,24 @@ Partial Class MainForm
         '
         'optNumVolume
         '
-        Me.optNumVolume.BackColor = System.Drawing.Color.FromArgb(CType(CType(225,Byte),Integer), CType(CType(210,Byte),Integer), CType(CType(165,Byte),Integer))
+        Me.optNumVolume.BackColor = System.Drawing.Color.FromArgb(CType(CType(225, Byte), Integer), CType(CType(210, Byte), Integer), CType(CType(165, Byte), Integer))
         Me.optNumVolume.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.optNumVolume.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.optNumVolume.ForeColor = System.Drawing.Color.FromArgb(CType(CType(21,Byte),Integer), CType(CType(66,Byte),Integer), CType(CType(139,Byte),Integer))
+        Me.optNumVolume.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.optNumVolume.ForeColor = System.Drawing.Color.FromArgb(CType(CType(21, Byte), Integer), CType(CType(66, Byte), Integer), CType(CType(139, Byte), Integer))
         Me.optNumVolume.Increment = New Decimal(New Integer() {10, 0, 0, 0})
         Me.optNumVolume.Location = New System.Drawing.Point(100, 49)
         Me.optNumVolume.Maximum = New Decimal(New Integer() {255, 0, 0, 0})
         Me.optNumVolume.Name = "optNumVolume"
-        FileListManager266.fileNames = Nothing
-        OptionSingle61.fileManager = FileListManager266
-        OptionManager266.loadFromDInit = false
-        OptionManager266.loadFromInit = true
-        OptionManager266.loadFromWorldGen = false
-        OptionSingle61.optionManager = OptionManager266
-        OptionSettingManager270.settingName = Nothing
-        OptionSingle61.settingManager = OptionSettingManager270
+        FileListManager263.fileNames = Nothing
+        OptionSingle61.fileManager = FileListManager263
+        OptionManager263.loadFromDInit = False
+        OptionManager263.loadFromInit = True
+        OptionManager263.loadFromWorldGen = False
+        OptionSingle61.optionManager = OptionManager263
+        OptionSettingManager267.settingName = Nothing
+        OptionSingle61.settingManager = OptionSettingManager267
         OptionSingle61.tokenName = "VOLUME"
-        OptionSingle61.updateTileSets = false
+        OptionSingle61.updateTileSets = False
         Me.optNumVolume.options = OptionSingle61
         Me.optNumVolume.Size = New System.Drawing.Size(51, 19)
         Me.optNumVolume.TabIndex = 2
@@ -12663,24 +12670,24 @@ Partial Class MainForm
         '
         'grpEmbark
         '
-        Me.grpEmbark.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.grpEmbark.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.grpEmbark.Controls.Add(Me.optBtnEmbarkWarn)
         Me.grpEmbark.Controls.Add(Me.lblEmbarkSize)
         Me.grpEmbark.Controls.Add(Me.optMaskEmbarkSize)
         Me.grpEmbark.ForeColor = System.Drawing.SystemColors.Window
         Me.grpEmbark.Location = New System.Drawing.Point(606, 321)
         Me.grpEmbark.Name = "grpEmbark"
-        Me.grpEmbark.Size = New System.Drawing.Size(169, 100)
+        Me.grpEmbark.Size = New System.Drawing.Size(169, 124)
         Me.grpEmbark.TabIndex = 5
-        Me.grpEmbark.TabStop = false
+        Me.grpEmbark.TabStop = False
         Me.grpEmbark.Text = "Embark Settings"
         '
         'lblEmbarkSize
         '
-        Me.lblEmbarkSize.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.lblEmbarkSize.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.lblEmbarkSize.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.lblEmbarkSize.ForeColor = System.Drawing.SystemColors.Window
-        Me.lblEmbarkSize.Location = New System.Drawing.Point(10, 58)
+        Me.lblEmbarkSize.Location = New System.Drawing.Point(5, 73)
         Me.lblEmbarkSize.Name = "lblEmbarkSize"
         Me.lblEmbarkSize.Size = New System.Drawing.Size(74, 21)
         Me.lblEmbarkSize.TabIndex = 1
@@ -12689,34 +12696,34 @@ Partial Class MainForm
         '
         'grpAnnouncements
         '
-        Me.grpAnnouncements.BackColor = System.Drawing.Color.FromArgb(CType(CType(130,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer), CType(CType(0,Byte),Integer))
+        Me.grpAnnouncements.BackColor = System.Drawing.Color.FromArgb(CType(CType(130, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
         Me.grpAnnouncements.Controls.Add(Me.optBtnTransformMsgs)
         Me.grpAnnouncements.Controls.Add(Me.optBtnDigStop)
         Me.grpAnnouncements.ForeColor = System.Drawing.SystemColors.Window
         Me.grpAnnouncements.Location = New System.Drawing.Point(256, 331)
         Me.grpAnnouncements.Name = "grpAnnouncements"
-        Me.grpAnnouncements.Size = New System.Drawing.Size(169, 90)
+        Me.grpAnnouncements.Size = New System.Drawing.Size(169, 114)
         Me.grpAnnouncements.TabIndex = 2
-        Me.grpAnnouncements.TabStop = false
+        Me.grpAnnouncements.TabStop = False
         Me.grpAnnouncements.Text = "Announcement Settings"
         '
         'tileSetColorPreviewer
         '
         Me.tileSetColorPreviewer.AccessibleRole = System.Windows.Forms.AccessibleRole.None
         Me.tileSetColorPreviewer.BackColor = System.Drawing.SystemColors.ControlDarkDark
-        Me.tileSetColorPreviewer.CausesValidation = false
-        Me.tileSetColorPreviewer.Location = New System.Drawing.Point(399, 427)
+        Me.tileSetColorPreviewer.CausesValidation = False
+        Me.tileSetColorPreviewer.Location = New System.Drawing.Point(402, 509)
         Me.tileSetColorPreviewer.Name = "tileSetColorPreviewer"
         Me.tileSetColorPreviewer.Size = New System.Drawing.Size(240, 60)
         Me.tileSetColorPreviewer.TabIndex = 173
-        Me.tileSetColorPreviewer.Visible = false
+        Me.tileSetColorPreviewer.Visible = False
         '
         'ribbonMain
         '
-        Me.ribbonMain.CaptionBarVisible = false
-        Me.ribbonMain.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.ribbonMain.CaptionBarVisible = False
+        Me.ribbonMain.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.ribbonMain.Location = New System.Drawing.Point(0, 0)
-        Me.ribbonMain.Minimized = false
+        Me.ribbonMain.Minimized = False
         Me.ribbonMain.Name = "ribbonMain"
         '
         '
@@ -12729,9 +12736,9 @@ Partial Class MainForm
         Me.ribbonMain.OrbImage = Nothing
         Me.ribbonMain.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013
         Me.ribbonMain.OrbText = "MDF"
-        Me.ribbonMain.OrbVisible = false
+        Me.ribbonMain.OrbVisible = False
         Me.ribbonMain.PanelCaptionHeight = 0
-        Me.ribbonMain.RibbonTabFont = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.ribbonMain.RibbonTabFont = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.ribbonMain.Size = New System.Drawing.Size(1026, 72)
         Me.ribbonMain.TabIndex = 100
         Me.ribbonMain.Tabs.Add(Me.rTabGeneral)
@@ -12746,8 +12753,8 @@ Partial Class MainForm
         '
         'rPanelGeneral
         '
-        Me.rPanelGeneral.ButtonMoreEnabled = false
-        Me.rPanelGeneral.ButtonMoreVisible = false
+        Me.rPanelGeneral.ButtonMoreEnabled = False
+        Me.rPanelGeneral.ButtonMoreVisible = False
         Me.rPanelGeneral.Items.Add(Me.rBtnPlayDF)
         Me.rPanelGeneral.Items.Add(Me.RibbonSeparator1)
         Me.rPanelGeneral.Items.Add(Me.rBtnOpenFolders)
@@ -12766,7 +12773,7 @@ Partial Class MainForm
         '
         Me.rBtnPlayDF.Image = Global.MasterworkDwarfFortress.My.Resources.Resources.DF
         Me.rBtnPlayDF.MinimumSize = New System.Drawing.Size(50, 0)
-        Me.rBtnPlayDF.SmallImage = CType(resources.GetObject("rBtnPlayDF.SmallImage"),System.Drawing.Image)
+        Me.rBtnPlayDF.SmallImage = CType(resources.GetObject("rBtnPlayDF.SmallImage"), System.Drawing.Image)
         Me.rBtnPlayDF.Tag = ""
         Me.rBtnPlayDF.Text = "DF"
         Me.rBtnPlayDF.ToolTip = "Launch Dwarf Fortress!"
@@ -12778,7 +12785,7 @@ Partial Class MainForm
         Me.rBtnOpenFolders.DropDownItems.Add(Me.rBtnOpenSaves)
         Me.rBtnOpenFolders.DropDownItems.Add(Me.rBtnOpenUtilities)
         Me.rBtnOpenFolders.Image = Global.MasterworkDwarfFortress.My.Resources.Resources.folder_open
-        Me.rBtnOpenFolders.SmallImage = CType(resources.GetObject("rBtnOpenFolders.SmallImage"),System.Drawing.Image)
+        Me.rBtnOpenFolders.SmallImage = CType(resources.GetObject("rBtnOpenFolders.SmallImage"), System.Drawing.Image)
         Me.rBtnOpenFolders.Style = System.Windows.Forms.RibbonButtonStyle.DropDown
         Me.rBtnOpenFolders.Text = "Open"
         Me.rBtnOpenFolders.ToolTip = "Open various Masterwork related folders."
@@ -12787,21 +12794,21 @@ Partial Class MainForm
         'rBtnOpenDwarfFortress
         '
         Me.rBtnOpenDwarfFortress.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnOpenDwarfFortress.Image = CType(resources.GetObject("rBtnOpenDwarfFortress.Image"),System.Drawing.Image)
+        Me.rBtnOpenDwarfFortress.Image = CType(resources.GetObject("rBtnOpenDwarfFortress.Image"), System.Drawing.Image)
         Me.rBtnOpenDwarfFortress.SmallImage = Global.MasterworkDwarfFortress.My.Resources.Resources.folder_horizontal_open
         Me.rBtnOpenDwarfFortress.Text = "Dwarf Fortress"
         '
         'rBtnOpenSaves
         '
         Me.rBtnOpenSaves.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnOpenSaves.Image = CType(resources.GetObject("rBtnOpenSaves.Image"),System.Drawing.Image)
+        Me.rBtnOpenSaves.Image = CType(resources.GetObject("rBtnOpenSaves.Image"), System.Drawing.Image)
         Me.rBtnOpenSaves.SmallImage = Global.MasterworkDwarfFortress.My.Resources.Resources.folders_stack
         Me.rBtnOpenSaves.Text = "Saves"
         '
         'rBtnOpenUtilities
         '
         Me.rBtnOpenUtilities.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnOpenUtilities.Image = CType(resources.GetObject("rBtnOpenUtilities.Image"),System.Drawing.Image)
+        Me.rBtnOpenUtilities.Image = CType(resources.GetObject("rBtnOpenUtilities.Image"), System.Drawing.Image)
         Me.rBtnOpenUtilities.SmallImage = Global.MasterworkDwarfFortress.My.Resources.Resources.toolbox
         Me.rBtnOpenUtilities.Text = "Utilities"
         '
@@ -12811,7 +12818,7 @@ Partial Class MainForm
         Me.rBtnManuals.DropDownItems.Add(Me.rBtnManualKobold)
         Me.rBtnManuals.DropDownItems.Add(Me.rBtnManualOrc)
         Me.rBtnManuals.Image = Global.MasterworkDwarfFortress.My.Resources.Resources.books_stack
-        Me.rBtnManuals.SmallImage = CType(resources.GetObject("rBtnManuals.SmallImage"),System.Drawing.Image)
+        Me.rBtnManuals.SmallImage = CType(resources.GetObject("rBtnManuals.SmallImage"), System.Drawing.Image)
         Me.rBtnManuals.Style = System.Windows.Forms.RibbonButtonStyle.DropDown
         Me.rBtnManuals.Text = "Manuals"
         Me.rBtnManuals.ToolTip = "Manual links for the playable Masterwork races."
@@ -12844,11 +12851,11 @@ Partial Class MainForm
         Me.rBtnLinks.DropDownItems.Add(Me.rBtnMdfForums)
         Me.rBtnLinks.DropDownItems.Add(Me.rBtnUtilityThreads)
         Me.rBtnLinks.Image = Global.MasterworkDwarfFortress.My.Resources.Resources.globe__arrow
-        Me.rBtnLinks.SmallImage = CType(resources.GetObject("rBtnLinks.SmallImage"),System.Drawing.Image)
+        Me.rBtnLinks.SmallImage = CType(resources.GetObject("rBtnLinks.SmallImage"), System.Drawing.Image)
         Me.rBtnLinks.Style = System.Windows.Forms.RibbonButtonStyle.SplitDropDown
         Me.rBtnLinks.Tag = "http://www.bay12forums.com/smf/index.php?board=24.0"
         Me.rBtnLinks.Text = "Links"
-        Me.rBtnLinks.ToolTip = "Links to wikis, Masterwork and utility thread topics. Click here for the Bay 12 M"& _ 
+        Me.rBtnLinks.ToolTip = "Links to wikis, Masterwork and utility thread topics. Click here for the Bay 12 M" & _
     "asterwork sub-forum."
         Me.rBtnLinks.ToolTipTitle = "Links"
         '
@@ -12857,7 +12864,7 @@ Partial Class MainForm
         Me.rBtnWiki.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
         Me.rBtnWiki.DropDownItems.Add(Me.rBtnDfWiki)
         Me.rBtnWiki.DropDownItems.Add(Me.rBtnMdfWiki)
-        Me.rBtnWiki.Image = CType(resources.GetObject("rBtnWiki.Image"),System.Drawing.Image)
+        Me.rBtnWiki.Image = CType(resources.GetObject("rBtnWiki.Image"), System.Drawing.Image)
         Me.rBtnWiki.SmallImage = Global.MasterworkDwarfFortress.My.Resources.Resources.wiki
         Me.rBtnWiki.Style = System.Windows.Forms.RibbonButtonStyle.DropDown
         Me.rBtnWiki.Text = "Wiki"
@@ -12865,16 +12872,16 @@ Partial Class MainForm
         'rBtnDfWiki
         '
         Me.rBtnDfWiki.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnDfWiki.Image = CType(resources.GetObject("rBtnDfWiki.Image"),System.Drawing.Image)
-        Me.rBtnDfWiki.SmallImage = CType(resources.GetObject("rBtnDfWiki.SmallImage"),System.Drawing.Image)
+        Me.rBtnDfWiki.Image = CType(resources.GetObject("rBtnDfWiki.Image"), System.Drawing.Image)
+        Me.rBtnDfWiki.SmallImage = CType(resources.GetObject("rBtnDfWiki.SmallImage"), System.Drawing.Image)
         Me.rBtnDfWiki.Tag = "http://dwarffortresswiki.org/index.php/Main_Page"
         Me.rBtnDfWiki.Text = "Dwarf Fortress"
         '
         'rBtnMdfWiki
         '
         Me.rBtnMdfWiki.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnMdfWiki.Image = CType(resources.GetObject("rBtnMdfWiki.Image"),System.Drawing.Image)
-        Me.rBtnMdfWiki.SmallImage = CType(resources.GetObject("rBtnMdfWiki.SmallImage"),System.Drawing.Image)
+        Me.rBtnMdfWiki.Image = CType(resources.GetObject("rBtnMdfWiki.Image"), System.Drawing.Image)
+        Me.rBtnMdfWiki.SmallImage = CType(resources.GetObject("rBtnMdfWiki.SmallImage"), System.Drawing.Image)
         Me.rBtnMdfWiki.Tag = "http://dwarffortresswiki.org/index.php/Masterwork:Main_Page"
         Me.rBtnMdfWiki.Text = "Masterwork"
         '
@@ -12884,7 +12891,7 @@ Partial Class MainForm
         Me.rBtnMdfForums.DropDownItems.Add(Me.rBtnMdfThreadDwarf)
         Me.rBtnMdfForums.DropDownItems.Add(Me.rBtnMdfThreadKobold)
         Me.rBtnMdfForums.DropDownItems.Add(Me.rBtnMdfThreadOrc)
-        Me.rBtnMdfForums.Image = CType(resources.GetObject("rBtnMdfForums.Image"),System.Drawing.Image)
+        Me.rBtnMdfForums.Image = CType(resources.GetObject("rBtnMdfForums.Image"), System.Drawing.Image)
         Me.rBtnMdfForums.SmallImage = Global.MasterworkDwarfFortress.My.Resources.Resources.bay12
         Me.rBtnMdfForums.Style = System.Windows.Forms.RibbonButtonStyle.DropDown
         Me.rBtnMdfForums.Tag = "http://www.bay12forums.com/smf/index.php?board=24.0"
@@ -12893,24 +12900,24 @@ Partial Class MainForm
         'rBtnMdfThreadDwarf
         '
         Me.rBtnMdfThreadDwarf.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnMdfThreadDwarf.Image = CType(resources.GetObject("rBtnMdfThreadDwarf.Image"),System.Drawing.Image)
-        Me.rBtnMdfThreadDwarf.SmallImage = CType(resources.GetObject("rBtnMdfThreadDwarf.SmallImage"),System.Drawing.Image)
+        Me.rBtnMdfThreadDwarf.Image = CType(resources.GetObject("rBtnMdfThreadDwarf.Image"), System.Drawing.Image)
+        Me.rBtnMdfThreadDwarf.SmallImage = CType(resources.GetObject("rBtnMdfThreadDwarf.SmallImage"), System.Drawing.Image)
         Me.rBtnMdfThreadDwarf.Tag = "http://www.bay12forums.com/smf/index.php?topic=125633.0"
         Me.rBtnMdfThreadDwarf.Text = "Dwarf Mode"
         '
         'rBtnMdfThreadKobold
         '
         Me.rBtnMdfThreadKobold.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnMdfThreadKobold.Image = CType(resources.GetObject("rBtnMdfThreadKobold.Image"),System.Drawing.Image)
-        Me.rBtnMdfThreadKobold.SmallImage = CType(resources.GetObject("rBtnMdfThreadKobold.SmallImage"),System.Drawing.Image)
+        Me.rBtnMdfThreadKobold.Image = CType(resources.GetObject("rBtnMdfThreadKobold.Image"), System.Drawing.Image)
+        Me.rBtnMdfThreadKobold.SmallImage = CType(resources.GetObject("rBtnMdfThreadKobold.SmallImage"), System.Drawing.Image)
         Me.rBtnMdfThreadKobold.Tag = "http://www.bay12forums.com/smf/index.php?topic=125631.0"
         Me.rBtnMdfThreadKobold.Text = "Kobold Mode"
         '
         'rBtnMdfThreadOrc
         '
         Me.rBtnMdfThreadOrc.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnMdfThreadOrc.Image = CType(resources.GetObject("rBtnMdfThreadOrc.Image"),System.Drawing.Image)
-        Me.rBtnMdfThreadOrc.SmallImage = CType(resources.GetObject("rBtnMdfThreadOrc.SmallImage"),System.Drawing.Image)
+        Me.rBtnMdfThreadOrc.Image = CType(resources.GetObject("rBtnMdfThreadOrc.Image"), System.Drawing.Image)
+        Me.rBtnMdfThreadOrc.SmallImage = CType(resources.GetObject("rBtnMdfThreadOrc.SmallImage"), System.Drawing.Image)
         Me.rBtnMdfThreadOrc.Tag = "http://www.bay12forums.com/smf/index.php?topic=113621.0"
         Me.rBtnMdfThreadOrc.Text = "Orc Mode"
         '
@@ -12932,95 +12939,95 @@ Partial Class MainForm
         Me.rBtnUtilityThreads.SmallImage = Global.MasterworkDwarfFortress.My.Resources.Resources.toolbox
         Me.rBtnUtilityThreads.Style = System.Windows.Forms.RibbonButtonStyle.DropDown
         Me.rBtnUtilityThreads.Text = "Utilities"
-        Me.rBtnUtilityThreads.ToolTip = "A collection of forum threads for the various utilities packaged with Masterwork "& _ 
+        Me.rBtnUtilityThreads.ToolTip = "A collection of forum threads for the various utilities packaged with Masterwork " & _
     "Dwarf Fortress."
         Me.rBtnUtilityThreads.ToolTipTitle = "Utility Forums"
         '
         'rBtnDfHack
         '
         Me.rBtnDfHack.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnDfHack.Image = CType(resources.GetObject("rBtnDfHack.Image"),System.Drawing.Image)
-        Me.rBtnDfHack.SmallImage = CType(resources.GetObject("rBtnDfHack.SmallImage"),System.Drawing.Image)
+        Me.rBtnDfHack.Image = CType(resources.GetObject("rBtnDfHack.Image"), System.Drawing.Image)
+        Me.rBtnDfHack.SmallImage = CType(resources.GetObject("rBtnDfHack.SmallImage"), System.Drawing.Image)
         Me.rBtnDfHack.Tag = "http://www.bay12forums.com/smf/index.php?topic=91166.0"
         Me.rBtnDfHack.Text = "DFHack"
         '
         'rBtnDwarfTherapist
         '
         Me.rBtnDwarfTherapist.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnDwarfTherapist.Image = CType(resources.GetObject("rBtnDwarfTherapist.Image"),System.Drawing.Image)
-        Me.rBtnDwarfTherapist.SmallImage = CType(resources.GetObject("rBtnDwarfTherapist.SmallImage"),System.Drawing.Image)
+        Me.rBtnDwarfTherapist.Image = CType(resources.GetObject("rBtnDwarfTherapist.Image"), System.Drawing.Image)
+        Me.rBtnDwarfTherapist.SmallImage = CType(resources.GetObject("rBtnDwarfTherapist.SmallImage"), System.Drawing.Image)
         Me.rBtnDwarfTherapist.Tag = "http://www.bay12forums.com/smf/index.php?topic=132010.0"
         Me.rBtnDwarfTherapist.Text = "Dwarf Therapist"
         '
         'rBtnEmbarkEverywhere
         '
         Me.rBtnEmbarkEverywhere.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnEmbarkEverywhere.Image = CType(resources.GetObject("rBtnEmbarkEverywhere.Image"),System.Drawing.Image)
-        Me.rBtnEmbarkEverywhere.SmallImage = CType(resources.GetObject("rBtnEmbarkEverywhere.SmallImage"),System.Drawing.Image)
+        Me.rBtnEmbarkEverywhere.Image = CType(resources.GetObject("rBtnEmbarkEverywhere.Image"), System.Drawing.Image)
+        Me.rBtnEmbarkEverywhere.SmallImage = CType(resources.GetObject("rBtnEmbarkEverywhere.SmallImage"), System.Drawing.Image)
         Me.rBtnEmbarkEverywhere.Tag = "http://www.bay12forums.com/smf/index.php?topic=71007.0"
         Me.rBtnEmbarkEverywhere.Text = "Embark Everywhere"
         '
         'rBtnIsoWorld
         '
         Me.rBtnIsoWorld.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnIsoWorld.Image = CType(resources.GetObject("rBtnIsoWorld.Image"),System.Drawing.Image)
-        Me.rBtnIsoWorld.SmallImage = CType(resources.GetObject("rBtnIsoWorld.SmallImage"),System.Drawing.Image)
+        Me.rBtnIsoWorld.Image = CType(resources.GetObject("rBtnIsoWorld.Image"), System.Drawing.Image)
+        Me.rBtnIsoWorld.SmallImage = CType(resources.GetObject("rBtnIsoWorld.SmallImage"), System.Drawing.Image)
         Me.rBtnIsoWorld.Tag = "http://www.bay12forums.com/smf/index.php?topic=70700.0"
         Me.rBtnIsoWorld.Text = "IsoWorld"
         '
         'rBtnLegendsViewer
         '
         Me.rBtnLegendsViewer.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnLegendsViewer.Image = CType(resources.GetObject("rBtnLegendsViewer.Image"),System.Drawing.Image)
-        Me.rBtnLegendsViewer.SmallImage = CType(resources.GetObject("rBtnLegendsViewer.SmallImage"),System.Drawing.Image)
+        Me.rBtnLegendsViewer.Image = CType(resources.GetObject("rBtnLegendsViewer.Image"), System.Drawing.Image)
+        Me.rBtnLegendsViewer.SmallImage = CType(resources.GetObject("rBtnLegendsViewer.SmallImage"), System.Drawing.Image)
         Me.rBtnLegendsViewer.Tag = "http://www.bay12forums.com/smf/index.php?topic=72702.0"
         Me.rBtnLegendsViewer.Text = "Legends Viewer"
         '
         'rBtnNanoFortress
         '
         Me.rBtnNanoFortress.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnNanoFortress.Image = CType(resources.GetObject("rBtnNanoFortress.Image"),System.Drawing.Image)
-        Me.rBtnNanoFortress.SmallImage = CType(resources.GetObject("rBtnNanoFortress.SmallImage"),System.Drawing.Image)
+        Me.rBtnNanoFortress.Image = CType(resources.GetObject("rBtnNanoFortress.Image"), System.Drawing.Image)
+        Me.rBtnNanoFortress.SmallImage = CType(resources.GetObject("rBtnNanoFortress.SmallImage"), System.Drawing.Image)
         Me.rBtnNanoFortress.Tag = "http://www.bay12forums.com/smf/index.php?topic=21601.0"
         Me.rBtnNanoFortress.Text = "Nano Fortress"
         '
         'rBtnPerfectWorld
         '
         Me.rBtnPerfectWorld.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnPerfectWorld.Image = CType(resources.GetObject("rBtnPerfectWorld.Image"),System.Drawing.Image)
-        Me.rBtnPerfectWorld.SmallImage = CType(resources.GetObject("rBtnPerfectWorld.SmallImage"),System.Drawing.Image)
+        Me.rBtnPerfectWorld.Image = CType(resources.GetObject("rBtnPerfectWorld.Image"), System.Drawing.Image)
+        Me.rBtnPerfectWorld.SmallImage = CType(resources.GetObject("rBtnPerfectWorld.SmallImage"), System.Drawing.Image)
         Me.rBtnPerfectWorld.Tag = "http://www.bay12forums.com/smf/index.php?topic=57428.0"
         Me.rBtnPerfectWorld.Text = "PerfectWorldDF"
         '
         'rBtnQuickFort
         '
         Me.rBtnQuickFort.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnQuickFort.Image = CType(resources.GetObject("rBtnQuickFort.Image"),System.Drawing.Image)
-        Me.rBtnQuickFort.SmallImage = CType(resources.GetObject("rBtnQuickFort.SmallImage"),System.Drawing.Image)
+        Me.rBtnQuickFort.Image = CType(resources.GetObject("rBtnQuickFort.Image"), System.Drawing.Image)
+        Me.rBtnQuickFort.SmallImage = CType(resources.GetObject("rBtnQuickFort.SmallImage"), System.Drawing.Image)
         Me.rBtnQuickFort.Tag = "http://www.bay12forums.com/smf/index.php?topic=35931.550"
         Me.rBtnQuickFort.Text = "Quickfort"
         '
         'rBtnRandCreatures
         '
         Me.rBtnRandCreatures.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnRandCreatures.Image = CType(resources.GetObject("rBtnRandCreatures.Image"),System.Drawing.Image)
-        Me.rBtnRandCreatures.SmallImage = CType(resources.GetObject("rBtnRandCreatures.SmallImage"),System.Drawing.Image)
+        Me.rBtnRandCreatures.Image = CType(resources.GetObject("rBtnRandCreatures.Image"), System.Drawing.Image)
+        Me.rBtnRandCreatures.SmallImage = CType(resources.GetObject("rBtnRandCreatures.SmallImage"), System.Drawing.Image)
         Me.rBtnRandCreatures.Tag = "http://www.bay12forums.com/smf/index.php?topic=119625.msg3823414"
         Me.rBtnRandCreatures.Text = "Random Creatures"
         '
         'rBtnSoundSense
         '
         Me.rBtnSoundSense.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnSoundSense.Image = CType(resources.GetObject("rBtnSoundSense.Image"),System.Drawing.Image)
-        Me.rBtnSoundSense.SmallImage = CType(resources.GetObject("rBtnSoundSense.SmallImage"),System.Drawing.Image)
+        Me.rBtnSoundSense.Image = CType(resources.GetObject("rBtnSoundSense.Image"), System.Drawing.Image)
+        Me.rBtnSoundSense.SmallImage = CType(resources.GetObject("rBtnSoundSense.SmallImage"), System.Drawing.Image)
         Me.rBtnSoundSense.Tag = "http://www.bay12forums.com/smf/index.php?topic=60287.0"
         Me.rBtnSoundSense.Text = "SoundSense"
         '
         'rBtnStoneSense
         '
         Me.rBtnStoneSense.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnStoneSense.Image = CType(resources.GetObject("rBtnStoneSense.Image"),System.Drawing.Image)
-        Me.rBtnStoneSense.SmallImage = CType(resources.GetObject("rBtnStoneSense.SmallImage"),System.Drawing.Image)
+        Me.rBtnStoneSense.Image = CType(resources.GetObject("rBtnStoneSense.Image"), System.Drawing.Image)
+        Me.rBtnStoneSense.SmallImage = CType(resources.GetObject("rBtnStoneSense.SmallImage"), System.Drawing.Image)
         Me.rBtnStoneSense.Tag = "http://www.bay12forums.com/smf/index.php?topic=106497.0"
         Me.rBtnStoneSense.Text = "Stonesense"
         '
@@ -13036,15 +13043,15 @@ Partial Class MainForm
         Me.rBtnMoreMods.Style = System.Windows.Forms.RibbonButtonStyle.SplitDropDown
         Me.rBtnMoreMods.Tag = "http://www.bay12forums.com/smf/index.php?topic=28829.0"
         Me.rBtnMoreMods.Text = "Mods+"
-        Me.rBtnMoreMods.ToolTip = "A collection of other Dwarf Fortress community created mods. Click here for a com"& _ 
+        Me.rBtnMoreMods.ToolTip = "A collection of other Dwarf Fortress community created mods. Click here for a com" & _
     "munity mod listing."
         Me.rBtnMoreMods.ToolTipTitle = "Community Mods"
         '
         'rBtnStarterPack
         '
         Me.rBtnStarterPack.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnStarterPack.Image = CType(resources.GetObject("rBtnStarterPack.Image"),System.Drawing.Image)
-        Me.rBtnStarterPack.SmallImage = CType(resources.GetObject("rBtnStarterPack.SmallImage"),System.Drawing.Image)
+        Me.rBtnStarterPack.Image = CType(resources.GetObject("rBtnStarterPack.Image"), System.Drawing.Image)
+        Me.rBtnStarterPack.SmallImage = CType(resources.GetObject("rBtnStarterPack.SmallImage"), System.Drawing.Image)
         Me.rBtnStarterPack.Tag = "http://www.bay12forums.com/smf/index.php?topic=126076.0"
         Me.rBtnStarterPack.Text = "Starter Pack"
         '
@@ -13065,48 +13072,48 @@ Partial Class MainForm
         Me.rBtnModsMajor.DropDownItems.Add(Me.rBtnModMajorGenesis)
         Me.rBtnModsMajor.DropDownItems.Add(Me.rBtnModMajorForlorn)
         Me.rBtnModsMajor.DropDownItems.Add(Me.rBtnModMajorRegeneration)
-        Me.rBtnModsMajor.Image = CType(resources.GetObject("rBtnModsMajor.Image"),System.Drawing.Image)
-        Me.rBtnModsMajor.SmallImage = CType(resources.GetObject("rBtnModsMajor.SmallImage"),System.Drawing.Image)
+        Me.rBtnModsMajor.Image = CType(resources.GetObject("rBtnModsMajor.Image"), System.Drawing.Image)
+        Me.rBtnModsMajor.SmallImage = CType(resources.GetObject("rBtnModsMajor.SmallImage"), System.Drawing.Image)
         Me.rBtnModsMajor.Style = System.Windows.Forms.RibbonButtonStyle.DropDown
         Me.rBtnModsMajor.Text = "Major Mods"
         '
         'rBtnModMajorCivForge
         '
         Me.rBtnModMajorCivForge.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMajorCivForge.Image = CType(resources.GetObject("rBtnModMajorCivForge.Image"),System.Drawing.Image)
-        Me.rBtnModMajorCivForge.SmallImage = CType(resources.GetObject("rBtnModMajorCivForge.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMajorCivForge.Image = CType(resources.GetObject("rBtnModMajorCivForge.Image"), System.Drawing.Image)
+        Me.rBtnModMajorCivForge.SmallImage = CType(resources.GetObject("rBtnModMajorCivForge.SmallImage"), System.Drawing.Image)
         Me.rBtnModMajorCivForge.Tag = "http://www.bay12forums.com/smf/index.php?topic=31157.0"
         Me.rBtnModMajorCivForge.Text = "Civilization Forge"
         '
         'rBtnModMajorFortressComplete
         '
         Me.rBtnModMajorFortressComplete.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMajorFortressComplete.Image = CType(resources.GetObject("rBtnModMajorFortressComplete.Image"),System.Drawing.Image)
-        Me.rBtnModMajorFortressComplete.SmallImage = CType(resources.GetObject("rBtnModMajorFortressComplete.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMajorFortressComplete.Image = CType(resources.GetObject("rBtnModMajorFortressComplete.Image"), System.Drawing.Image)
+        Me.rBtnModMajorFortressComplete.SmallImage = CType(resources.GetObject("rBtnModMajorFortressComplete.SmallImage"), System.Drawing.Image)
         Me.rBtnModMajorFortressComplete.Tag = "http://www.bay12forums.com/smf/index.php?topic=116200.0"
         Me.rBtnModMajorFortressComplete.Text = "Fortress Complete"
         '
         'rBtnModMajorGenesis
         '
         Me.rBtnModMajorGenesis.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMajorGenesis.Image = CType(resources.GetObject("rBtnModMajorGenesis.Image"),System.Drawing.Image)
-        Me.rBtnModMajorGenesis.SmallImage = CType(resources.GetObject("rBtnModMajorGenesis.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMajorGenesis.Image = CType(resources.GetObject("rBtnModMajorGenesis.Image"), System.Drawing.Image)
+        Me.rBtnModMajorGenesis.SmallImage = CType(resources.GetObject("rBtnModMajorGenesis.SmallImage"), System.Drawing.Image)
         Me.rBtnModMajorGenesis.Tag = "http://www.bay12forums.com/smf/index.php?topic=109846.0"
         Me.rBtnModMajorGenesis.Text = "Genesis Reborn"
         '
         'rBtnModMajorForlorn
         '
         Me.rBtnModMajorForlorn.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMajorForlorn.Image = CType(resources.GetObject("rBtnModMajorForlorn.Image"),System.Drawing.Image)
-        Me.rBtnModMajorForlorn.SmallImage = CType(resources.GetObject("rBtnModMajorForlorn.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMajorForlorn.Image = CType(resources.GetObject("rBtnModMajorForlorn.Image"), System.Drawing.Image)
+        Me.rBtnModMajorForlorn.SmallImage = CType(resources.GetObject("rBtnModMajorForlorn.SmallImage"), System.Drawing.Image)
         Me.rBtnModMajorForlorn.Tag = "http://www.bay12forums.com/smf/index.php?topic=84186"
         Me.rBtnModMajorForlorn.Text = "Legends of Forlorn Realms"
         '
         'rBtnModMajorRegeneration
         '
         Me.rBtnModMajorRegeneration.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMajorRegeneration.Image = CType(resources.GetObject("rBtnModMajorRegeneration.Image"),System.Drawing.Image)
-        Me.rBtnModMajorRegeneration.SmallImage = CType(resources.GetObject("rBtnModMajorRegeneration.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMajorRegeneration.Image = CType(resources.GetObject("rBtnModMajorRegeneration.Image"), System.Drawing.Image)
+        Me.rBtnModMajorRegeneration.SmallImage = CType(resources.GetObject("rBtnModMajorRegeneration.SmallImage"), System.Drawing.Image)
         Me.rBtnModMajorRegeneration.Tag = "http://www.bay12forums.com/smf/index.php?topic=111008.0"
         Me.rBtnModMajorRegeneration.Text = "Regeneration: Forced Evolution"
         '
@@ -13118,48 +13125,48 @@ Partial Class MainForm
         Me.rBtnModsMinor.DropDownItems.Add(Me.rBtnModMinorFortressDefense)
         Me.rBtnModsMinor.DropDownItems.Add(Me.rBtnModMinorAccelModest)
         Me.rBtnModsMinor.DropDownItems.Add(Me.rBtnModMinorLeather)
-        Me.rBtnModsMinor.Image = CType(resources.GetObject("rBtnModsMinor.Image"),System.Drawing.Image)
-        Me.rBtnModsMinor.SmallImage = CType(resources.GetObject("rBtnModsMinor.SmallImage"),System.Drawing.Image)
+        Me.rBtnModsMinor.Image = CType(resources.GetObject("rBtnModsMinor.Image"), System.Drawing.Image)
+        Me.rBtnModsMinor.SmallImage = CType(resources.GetObject("rBtnModsMinor.SmallImage"), System.Drawing.Image)
         Me.rBtnModsMinor.Style = System.Windows.Forms.RibbonButtonStyle.DropDown
         Me.rBtnModsMinor.Text = "Minor Mods"
         '
         'rBtnModMinorHigherLearning
         '
         Me.rBtnModMinorHigherLearning.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMinorHigherLearning.Image = CType(resources.GetObject("rBtnModMinorHigherLearning.Image"),System.Drawing.Image)
-        Me.rBtnModMinorHigherLearning.SmallImage = CType(resources.GetObject("rBtnModMinorHigherLearning.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMinorHigherLearning.Image = CType(resources.GetObject("rBtnModMinorHigherLearning.Image"), System.Drawing.Image)
+        Me.rBtnModMinorHigherLearning.SmallImage = CType(resources.GetObject("rBtnModMinorHigherLearning.SmallImage"), System.Drawing.Image)
         Me.rBtnModMinorHigherLearning.Tag = "http://www.bay12forums.com/smf/index.php?topic=60853.0"
         Me.rBtnModMinorHigherLearning.Text = "Dwarven Higher Learning"
         '
         'rBtnModMinorFearTheNight
         '
         Me.rBtnModMinorFearTheNight.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMinorFearTheNight.Image = CType(resources.GetObject("rBtnModMinorFearTheNight.Image"),System.Drawing.Image)
-        Me.rBtnModMinorFearTheNight.SmallImage = CType(resources.GetObject("rBtnModMinorFearTheNight.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMinorFearTheNight.Image = CType(resources.GetObject("rBtnModMinorFearTheNight.Image"), System.Drawing.Image)
+        Me.rBtnModMinorFearTheNight.SmallImage = CType(resources.GetObject("rBtnModMinorFearTheNight.SmallImage"), System.Drawing.Image)
         Me.rBtnModMinorFearTheNight.Tag = "http://www.bay12forums.com/smf/index.php?topic=103747.0"
         Me.rBtnModMinorFearTheNight.Text = "Fear the Night!"
         '
         'rBtnModMinorFortressDefense
         '
         Me.rBtnModMinorFortressDefense.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMinorFortressDefense.Image = CType(resources.GetObject("rBtnModMinorFortressDefense.Image"),System.Drawing.Image)
-        Me.rBtnModMinorFortressDefense.SmallImage = CType(resources.GetObject("rBtnModMinorFortressDefense.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMinorFortressDefense.Image = CType(resources.GetObject("rBtnModMinorFortressDefense.Image"), System.Drawing.Image)
+        Me.rBtnModMinorFortressDefense.SmallImage = CType(resources.GetObject("rBtnModMinorFortressDefense.SmallImage"), System.Drawing.Image)
         Me.rBtnModMinorFortressDefense.Tag = "http://www.bay12forums.com/smf/index.php?topic=62874.0"
         Me.rBtnModMinorFortressDefense.Text = "Fortress Defense"
         '
         'rBtnModMinorAccelModest
         '
         Me.rBtnModMinorAccelModest.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMinorAccelModest.Image = CType(resources.GetObject("rBtnModMinorAccelModest.Image"),System.Drawing.Image)
-        Me.rBtnModMinorAccelModest.SmallImage = CType(resources.GetObject("rBtnModMinorAccelModest.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMinorAccelModest.Image = CType(resources.GetObject("rBtnModMinorAccelModest.Image"), System.Drawing.Image)
+        Me.rBtnModMinorAccelModest.SmallImage = CType(resources.GetObject("rBtnModMinorAccelModest.SmallImage"), System.Drawing.Image)
         Me.rBtnModMinorAccelModest.Tag = "http://www.bay12forums.com/smf/index.php?topic=117954.0"
         Me.rBtnModMinorAccelModest.Text = "Modest/Accelerated"
         '
         'rBtnModMinorLeather
         '
         Me.rBtnModMinorLeather.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnModMinorLeather.Image = CType(resources.GetObject("rBtnModMinorLeather.Image"),System.Drawing.Image)
-        Me.rBtnModMinorLeather.SmallImage = CType(resources.GetObject("rBtnModMinorLeather.SmallImage"),System.Drawing.Image)
+        Me.rBtnModMinorLeather.Image = CType(resources.GetObject("rBtnModMinorLeather.Image"), System.Drawing.Image)
+        Me.rBtnModMinorLeather.SmallImage = CType(resources.GetObject("rBtnModMinorLeather.SmallImage"), System.Drawing.Image)
         Me.rBtnModMinorLeather.Tag = "http://www.bay12forums.com/smf/index.php?topic=121654.0"
         Me.rBtnModMinorLeather.Text = "Upgradable Leather Armor Tiers"
         '
@@ -13176,78 +13183,78 @@ Partial Class MainForm
         Me.rBtnModsOverhauls.DropDownItems.Add(Me.rBtnModOverhaulElderScrolls)
         Me.rBtnModsOverhauls.DropDownItems.Add(Me.rBtnModOverhaulUnderhive)
         Me.rBtnModsOverhauls.DropDownItems.Add(Me.rBtnModOverhaulWarhammer)
-        Me.rBtnModsOverhauls.Image = CType(resources.GetObject("rBtnModsOverhauls.Image"),System.Drawing.Image)
-        Me.rBtnModsOverhauls.SmallImage = CType(resources.GetObject("rBtnModsOverhauls.SmallImage"),System.Drawing.Image)
+        Me.rBtnModsOverhauls.Image = CType(resources.GetObject("rBtnModsOverhauls.Image"), System.Drawing.Image)
+        Me.rBtnModsOverhauls.SmallImage = CType(resources.GetObject("rBtnModsOverhauls.SmallImage"), System.Drawing.Image)
         Me.rBtnModsOverhauls.Style = System.Windows.Forms.RibbonButtonStyle.DropDown
         Me.rBtnModsOverhauls.Text = "Complete Overhauls"
         '
         'rBtnModOverhaulCorrosion
         '
-        Me.rBtnModOverhaulCorrosion.Image = CType(resources.GetObject("rBtnModOverhaulCorrosion.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulCorrosion.SmallImage = CType(resources.GetObject("rBtnModOverhaulCorrosion.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulCorrosion.Image = CType(resources.GetObject("rBtnModOverhaulCorrosion.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulCorrosion.SmallImage = CType(resources.GetObject("rBtnModOverhaulCorrosion.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulCorrosion.Tag = "http://www.bay12forums.com/smf/index.php?topic=81068.0"
         Me.rBtnModOverhaulCorrosion.Text = "Corrosion"
         '
         'rBtnModOverhaulChoco
         '
-        Me.rBtnModOverhaulChoco.Image = CType(resources.GetObject("rBtnModOverhaulChoco.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulChoco.SmallImage = CType(resources.GetObject("rBtnModOverhaulChoco.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulChoco.Image = CType(resources.GetObject("rBtnModOverhaulChoco.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulChoco.SmallImage = CType(resources.GetObject("rBtnModOverhaulChoco.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulChoco.Tag = "http://www.bay12forums.com/smf/index.php?topic=104833.0"
         Me.rBtnModOverhaulChoco.Text = "Dwarf Chocolate"
         '
         'rBtnModOverhaulFallout
         '
-        Me.rBtnModOverhaulFallout.Image = CType(resources.GetObject("rBtnModOverhaulFallout.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulFallout.SmallImage = CType(resources.GetObject("rBtnModOverhaulFallout.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulFallout.Image = CType(resources.GetObject("rBtnModOverhaulFallout.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulFallout.SmallImage = CType(resources.GetObject("rBtnModOverhaulFallout.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulFallout.Tag = "http://www.bay12forums.com/smf/index.php?topic=122578.0"
         Me.rBtnModOverhaulFallout.Text = "Fallout"
         '
         'rBtnModOverhaulFalloutEquest
         '
-        Me.rBtnModOverhaulFalloutEquest.Image = CType(resources.GetObject("rBtnModOverhaulFalloutEquest.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulFalloutEquest.SmallImage = CType(resources.GetObject("rBtnModOverhaulFalloutEquest.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulFalloutEquest.Image = CType(resources.GetObject("rBtnModOverhaulFalloutEquest.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulFalloutEquest.SmallImage = CType(resources.GetObject("rBtnModOverhaulFalloutEquest.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulFalloutEquest.Tag = "http://www.bay12forums.com/smf/index.php?topic=118893.0"
         Me.rBtnModOverhaulFalloutEquest.Text = "Fallout: Equestria"
         '
         'rBtnModOverhaulFortbent
         '
-        Me.rBtnModOverhaulFortbent.Image = CType(resources.GetObject("rBtnModOverhaulFortbent.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulFortbent.SmallImage = CType(resources.GetObject("rBtnModOverhaulFortbent.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulFortbent.Image = CType(resources.GetObject("rBtnModOverhaulFortbent.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulFortbent.SmallImage = CType(resources.GetObject("rBtnModOverhaulFortbent.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulFortbent.Tag = "http://www.bay12forums.com/smf/index.php?topic=89267.0"
         Me.rBtnModOverhaulFortbent.Text = "Fortbent: Homestruck"
         '
         'rBtnModOverhaulZelda
         '
-        Me.rBtnModOverhaulZelda.Image = CType(resources.GetObject("rBtnModOverhaulZelda.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulZelda.SmallImage = CType(resources.GetObject("rBtnModOverhaulZelda.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulZelda.Image = CType(resources.GetObject("rBtnModOverhaulZelda.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulZelda.SmallImage = CType(resources.GetObject("rBtnModOverhaulZelda.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulZelda.Tag = "http://www.bay12forums.com/smf/index.php?topic=123486.0"
         Me.rBtnModOverhaulZelda.Text = "Legends of Zelda: Earthward Pick"
         '
         'rBtnModOverhaulMyLittleFortress
         '
-        Me.rBtnModOverhaulMyLittleFortress.Image = CType(resources.GetObject("rBtnModOverhaulMyLittleFortress.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulMyLittleFortress.SmallImage = CType(resources.GetObject("rBtnModOverhaulMyLittleFortress.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulMyLittleFortress.Image = CType(resources.GetObject("rBtnModOverhaulMyLittleFortress.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulMyLittleFortress.SmallImage = CType(resources.GetObject("rBtnModOverhaulMyLittleFortress.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulMyLittleFortress.Tag = "http://www.bay12forums.com/smf/index.php?topic=121116.0"
         Me.rBtnModOverhaulMyLittleFortress.Text = "My Little Fortress - Friendship is Magma"
         '
         'rBtnModOverhaulElderScrolls
         '
-        Me.rBtnModOverhaulElderScrolls.Image = CType(resources.GetObject("rBtnModOverhaulElderScrolls.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulElderScrolls.SmallImage = CType(resources.GetObject("rBtnModOverhaulElderScrolls.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulElderScrolls.Image = CType(resources.GetObject("rBtnModOverhaulElderScrolls.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulElderScrolls.SmallImage = CType(resources.GetObject("rBtnModOverhaulElderScrolls.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulElderScrolls.Tag = "http://www.bay12forums.com/smf/index.php?topic=83992.0"
         Me.rBtnModOverhaulElderScrolls.Text = "Nchardahrk - An Elder Scrolls Mod"
         '
         'rBtnModOverhaulUnderhive
         '
-        Me.rBtnModOverhaulUnderhive.Image = CType(resources.GetObject("rBtnModOverhaulUnderhive.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulUnderhive.SmallImage = CType(resources.GetObject("rBtnModOverhaulUnderhive.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulUnderhive.Image = CType(resources.GetObject("rBtnModOverhaulUnderhive.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulUnderhive.SmallImage = CType(resources.GetObject("rBtnModOverhaulUnderhive.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulUnderhive.Tag = "http://www.bay12forums.com/smf/index.php?topic=120494.0"
         Me.rBtnModOverhaulUnderhive.Text = "Warhammer 40k: Underhive Settlement"
         '
         'rBtnModOverhaulWarhammer
         '
-        Me.rBtnModOverhaulWarhammer.Image = CType(resources.GetObject("rBtnModOverhaulWarhammer.Image"),System.Drawing.Image)
-        Me.rBtnModOverhaulWarhammer.SmallImage = CType(resources.GetObject("rBtnModOverhaulWarhammer.SmallImage"),System.Drawing.Image)
+        Me.rBtnModOverhaulWarhammer.Image = CType(resources.GetObject("rBtnModOverhaulWarhammer.Image"), System.Drawing.Image)
+        Me.rBtnModOverhaulWarhammer.SmallImage = CType(resources.GetObject("rBtnModOverhaulWarhammer.SmallImage"), System.Drawing.Image)
         Me.rBtnModOverhaulWarhammer.Tag = "http://www.bay12forums.com/smf/index.php?topic=93254.0"
         Me.rBtnModOverhaulWarhammer.Text = "Warhammer: Fortress"
         '
@@ -13280,8 +13287,8 @@ Partial Class MainForm
         'rBtnThemeDefault
         '
         Me.rBtnThemeDefault.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnThemeDefault.Image = CType(resources.GetObject("rBtnThemeDefault.Image"),System.Drawing.Image)
-        Me.rBtnThemeDefault.SmallImage = CType(resources.GetObject("rBtnThemeDefault.SmallImage"),System.Drawing.Image)
+        Me.rBtnThemeDefault.Image = CType(resources.GetObject("rBtnThemeDefault.Image"), System.Drawing.Image)
+        Me.rBtnThemeDefault.SmallImage = CType(resources.GetObject("rBtnThemeDefault.SmallImage"), System.Drawing.Image)
         Me.rBtnThemeDefault.Tag = "DEFAULT"
         Me.rBtnThemeDefault.Text = "Default"
         Me.rBtnThemeDefault.ToolTip = "Original dark theme with transparent backgrounds."
@@ -13289,8 +13296,8 @@ Partial Class MainForm
         'rBtnThemeBlue
         '
         Me.rBtnThemeBlue.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left
-        Me.rBtnThemeBlue.Image = CType(resources.GetObject("rBtnThemeBlue.Image"),System.Drawing.Image)
-        Me.rBtnThemeBlue.SmallImage = CType(resources.GetObject("rBtnThemeBlue.SmallImage"),System.Drawing.Image)
+        Me.rBtnThemeBlue.Image = CType(resources.GetObject("rBtnThemeBlue.Image"), System.Drawing.Image)
+        Me.rBtnThemeBlue.SmallImage = CType(resources.GetObject("rBtnThemeBlue.SmallImage"), System.Drawing.Image)
         Me.rBtnThemeBlue.Tag = "BLUE"
         Me.rBtnThemeBlue.Text = "Blue"
         Me.rBtnThemeBlue.ToolTip = "Opaque white backgrounds with blue highlights."
@@ -13302,8 +13309,8 @@ Partial Class MainForm
         '
         'rPanelUtilities
         '
-        Me.rPanelUtilities.ButtonMoreEnabled = false
-        Me.rPanelUtilities.ButtonMoreVisible = false
+        Me.rPanelUtilities.ButtonMoreEnabled = False
+        Me.rPanelUtilities.ButtonMoreVisible = False
         Me.rPanelUtilities.Items.Add(Me.rBtnUtilAnnounceFilter)
         Me.rPanelUtilities.Items.Add(Me.rBtnUtilDfInit)
         Me.rPanelUtilities.Items.Add(Me.rBtnUtilEmbark)
@@ -13370,7 +13377,7 @@ Partial Class MainForm
         Me.rBtnUtilLegends.SmallImage = Global.MasterworkDwarfFortress.My.Resources.Resources.application
         Me.rBtnUtilLegends.Tag = "LegendsViewer.exe"
         Me.rBtnUtilLegends.Text = "Legends"
-        Me.rBtnUtilLegends.ToolTip = "After exporting world data, browse the history, creatures and civilizations of a "& _ 
+        Me.rBtnUtilLegends.ToolTip = "After exporting world data, browse the history, creatures and civilizations of a " & _
     "generated world."
         Me.rBtnUtilLegends.ToolTipTitle = "Legends Viewer"
         '
@@ -13425,7 +13432,7 @@ Partial Class MainForm
         Me.rBtnUtilDwarfTherapist.SmallImage = Global.MasterworkDwarfFortress.My.Resources.Resources.therapist
         Me.rBtnUtilDwarfTherapist.Tag = "DwarfTherapist.exe"
         Me.rBtnUtilDwarfTherapist.Text = "Therapist"
-        Me.rBtnUtilDwarfTherapist.ToolTip = "Manage and optimize labour, view fortress populations' thoughts, preferences, ski"& _ 
+        Me.rBtnUtilDwarfTherapist.ToolTip = "Manage and optimize labour, view fortress populations' thoughts, preferences, ski" & _
     "lls, attributes and more."
         Me.rBtnUtilDwarfTherapist.ToolTipTitle = "Dwarf Therapist"
         '
@@ -13446,16 +13453,16 @@ Partial Class MainForm
         Me.optNumHFSLevels.Maximum = New Decimal(New Integer() {99, 0, 0, 0})
         Me.optNumHFSLevels.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
         Me.optNumHFSLevels.Name = "optNumHFSLevels"
-        FileListManager267.fileNames = Nothing
-        OptionSingle62.fileManager = FileListManager267
-        OptionManager267.loadFromDInit = false
-        OptionManager267.loadFromInit = false
-        OptionManager267.loadFromWorldGen = true
-        OptionSingle62.optionManager = OptionManager267
-        OptionSettingManager271.settingName = Nothing
-        OptionSingle62.settingManager = OptionSettingManager271
+        FileListManager264.fileNames = Nothing
+        OptionSingle62.fileManager = FileListManager264
+        OptionManager264.loadFromDInit = False
+        OptionManager264.loadFromInit = False
+        OptionManager264.loadFromWorldGen = True
+        OptionSingle62.optionManager = OptionManager264
+        OptionSettingManager268.settingName = Nothing
+        OptionSingle62.settingManager = OptionSettingManager268
         OptionSingle62.tokenName = "LEVELS_AT_BOTTOM"
-        OptionSingle62.updateTileSets = false
+        OptionSingle62.updateTileSets = False
         Me.optNumHFSLevels.options = OptionSingle62
         Me.optNumHFSLevels.Size = New System.Drawing.Size(43, 20)
         Me.optNumHFSLevels.TabIndex = 194
@@ -13464,7 +13471,7 @@ Partial Class MainForm
         '
         'tabMain
         '
-        Me.tabMain.AllowDrop = true
+        Me.tabMain.AllowDrop = True
         Me.tabMain.BackgroundColor = System.Drawing.Color.Black
         Me.tabMain.BackgroundHatcher.HatchType = System.Drawing.Drawing2D.HatchStyle.DashedVertical
         Me.tabMain.BorderColor = System.Drawing.Color.Black
@@ -13476,9 +13483,9 @@ Partial Class MainForm
         Me.tabMain.Controls.Add(Me.tabMisc)
         Me.tabMain.Controls.Add(Me.tabWorldGen)
         Me.tabMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.tabMain.Font = New System.Drawing.Font("Segoe UI", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.tabMain.IsCaptionVisible = false
-        Me.tabMain.IsDocumentTabStyle = true
+        Me.tabMain.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.tabMain.IsCaptionVisible = False
+        Me.tabMain.IsDocumentTabStyle = True
         Me.tabMain.IsUserInteraction = False
         Me.tabMain.ItemSize = New System.Drawing.Size(0, 26)
         Me.tabMain.Location = New System.Drawing.Point(0, 72)
@@ -13771,9 +13778,6 @@ End Sub
     Friend WithEvents optBtnCivKobolds As MasterworkDwarfFortress.optionSingleReplaceButton
     Friend WithEvents optBtnCivOrcs As MasterworkDwarfFortress.optionSingleReplaceButton
     Friend WithEvents optBtnCivDwarves As MasterworkDwarfFortress.optionSingleReplaceButton
-    Friend WithEvents optBtnPlayableKobolds As MasterworkDwarfFortress.optionSingleReplaceButton
-    Friend WithEvents optBtnPlayableOrcs As MasterworkDwarfFortress.optionSingleReplaceButton
-    Friend WithEvents optBtnPlayableDwarves As MasterworkDwarfFortress.optionSingleReplaceButton
     Friend WithEvents grpFortressDefense As MasterworkDwarfFortress.mwGroupBox
     Friend WithEvents lblFortDefEasyTitle As System.Windows.Forms.Label
     Friend WithEvents lblFortDefNote As System.Windows.Forms.Label
@@ -13967,7 +13971,6 @@ End Sub
     Friend WithEvents optMultiHarderFarming As MasterworkDwarfFortress.optionMultiButton
     Friend WithEvents optBtnHarderMining As MasterworkDwarfFortress.optionSingleReplaceButton
     Friend WithEvents optBtnHarderLearning As MasterworkDwarfFortress.optionSingleReplaceButton
-    Friend WithEvents optBtnHarderInvaders As MasterworkDwarfFortress.optionSingleReplaceButton
     Friend WithEvents optBtnBodyguards As MasterworkDwarfFortress.optionSingleReplaceButton
     Friend WithEvents optBtnSecrets As MasterworkDwarfFortress.optionSingleReplaceButton
     Friend WithEvents lblRendermaxNote As System.Windows.Forms.Label
@@ -14214,7 +14217,7 @@ End Sub
     Friend WithEvents lblCivCaravans As System.Windows.Forms.Label
     Friend WithEvents lblCivInvasions As System.Windows.Forms.Label
     Friend WithEvents lblCivBabySnatcher As System.Windows.Forms.Label
-    Friend WithEvents lblCivPlayable As System.Windows.Forms.Label
+    Friend WithEvents lblCivPlayableAdv As System.Windows.Forms.Label
     Friend WithEvents lblCivMaterials As System.Windows.Forms.Label
     Friend WithEvents lblCivSkills As System.Windows.Forms.Label
     Friend WithEvents lblCivDwarf As MasterworkDwarfFortress.mwCivLabel
@@ -14248,5 +14251,8 @@ End Sub
     Friend WithEvents tabFurnaces As KRBTabControl.TabPageEx
     Friend WithEvents tabMisc As KRBTabControl.TabPageEx
     Friend WithEvents tabWorldGen As KRBTabControl.TabPageEx
+    Friend WithEvents optCbStartingLabors As MasterworkDwarfFortress.optionComboBoxToken
+    Friend WithEvents lblStartingLabor As System.Windows.Forms.Label
+    Friend WithEvents lblPlayableFort As System.Windows.Forms.Label
 
 End Class
diff --git a/Settings Source/MainForm.resx b/Settings Source/MainForm.resx
index 91261e03..94c1e20f 100644
--- a/Settings Source/MainForm.resx	
+++ b/Settings Source/MainForm.resx	
@@ -559,36 +559,6 @@
         9dz0FSucKZDkHceik8wz2fIVKxwo7PnSjvIrisScR6BzyluwpfBlTpJnGIrODTBbs1/mLVBhxR9QTh7t
         tphT+9wFLQoLyvcgEJ0RXzaznpu+Ygeg0QPGU8oBMGSu94GR5i4wYW6afnrHCkCRVEmNVEiBlIyubPrp
         nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="optBtnPlayableDwarves.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADeSURBVDhPpY69DgFBFIXPE/iJQkRWwhuIjkIr2UKv
-        tBqlZDulDiUlQkh4l30JnVKpcp27UcxsJlkTxZebc+abOwMR+Qtn6YOz9MFZ+uAsfbDCFcANGJBE5yWT
-        9dz0FSucKZDkHceik8wz2fIVKxwo7PnSjvIrisScR6BzyluwpfBlTpJnGIrODTBbs1/mLVBhxR9QTh7t
-        tphT+9wFLQoLyvcgEJ0RXzaznpu+Ygeg0QPGU8oBMGSu94GR5i4wYW6afnrHCkCRVEmNVEiBlIyubPrp
-        nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="optBtnPlayableOrcs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADeSURBVDhPpY69DgFBFIXPE/iJQkRWwhuIjkIr2UKv
-        tBqlZDulDiUlQkh4l30JnVKpcp27UcxsJlkTxZebc+abOwMR+Qtn6YOz9MFZ+uAsfbDCFcANGJBE5yWT
-        9dz0FSucKZDkHceik8wz2fIVKxwo7PnSjvIrisScR6BzyluwpfBlTpJnGIrODTBbs1/mLVBhxR9QTh7t
-        tphT+9wFLQoLyvcgEJ0RXzaznpu+Ygeg0QPGU8oBMGSu94GR5i4wYW6afnrHCkCRVEmNVEiBlIyubPrp
-        nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="optBtnPlayableKobolds.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADeSURBVDhPpY69DgFBFIXPE/iJQkRWwhuIjkIr2UKv
-        tBqlZDulDiUlQkh4l30JnVKpcp27UcxsJlkTxZebc+abOwMR+Qtn6YOz9MFZ+uAsfbDCFcANGJBE5yWT
-        9dz0FSucKZDkHceik8wz2fIVKxwo7PnSjvIrisScR6BzyluwpfBlTpJnGIrODTBbs1/mLVBhxR9QTh7t
-        tphT+9wFLQoLyvcgEJ0RXzaznpu+Ygeg0QPGU8oBMGSu94GR5i4wYW6afnrHCkCRVEmNVEiBlIyubPrp
-        nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="optBtnCivKobolds.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -2059,16 +2029,6 @@
         9dz0FSucKZDkHceik8wz2fIVKxwo7PnSjvIrisScR6BzyluwpfBlTpJnGIrODTBbs1/mLVBhxR9QTh7t
         tphT+9wFLQoLyvcgEJ0RXzaznpu+Ygeg0QPGU8oBMGSu94GR5i4wYW6afnrHCkCRVEmNVEiBlIyubPrp
         nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="optBtnHarderInvaders.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADeSURBVDhPpY69DgFBFIXPE/iJQkRWwhuIjkIr2UKv
-        tBqlZDulDiUlQkh4l30JnVKpcp27UcxsJlkTxZebc+abOwMR+Qtn6YOz9MFZ+uAsfbDCFcANGJBE5yWT
-        9dz0FSucKZDkHceik8wz2fIVKxwo7PnSjvIrisScR6BzyluwpfBlTpJnGIrODTBbs1/mLVBhxR9QTh7t
-        tphT+9wFLQoLyvcgEJ0RXzaznpu+Ygeg0QPGU8oBMGSu94GR5i4wYW6afnrHCkCRVEmNVEiBlIyubPrp
-        nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="optBtnBodyguards.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -2301,6 +2261,9 @@
         nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
 </value>
   </data>
+  <data name="optCbStartingLabors.ToolTip" xml:space="preserve">
+    <value>You can have your dwarves start/arrive without any labor types enabled here by setting this to NO.  You can also set it to SKILLS to make the labor list set by skill, or BY_UNIT_TYPE to have it done by overall unit type.</value>
+  </data>
   <data name="optBtnMoreAnimals.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
diff --git a/Settings Source/MainForm.vb b/Settings Source/MainForm.vb
index 5a527f1d..cf38f870 100644
--- a/Settings Source/MainForm.vb	
+++ b/Settings Source/MainForm.vb	
@@ -445,12 +445,13 @@ Imports System.ComponentModel
 
     Private Sub loadCivTable()
         'column indexes
-        Dim idxPlayable As Integer = 2
-        Dim idxCaravan As Integer = 3
-        Dim idxInvasion As Integer = 4
-        Dim idxHostile As Integer = 5
-        Dim idxMaterials As Integer = 6
-        Dim idxSkills As Integer = 7
+        Dim idxPlaybleFort As Integer = 2
+        Dim idxPlayableAdv As Integer = 3
+        Dim idxCaravan As Integer = 4
+        Dim idxInvasion As Integer = 5
+        Dim idxHostile As Integer = 6
+        Dim idxMaterials As Integer = 7
+        Dim idxSkills As Integer = 8
 
         'width/height based on table cell sizes
         Dim intCtrlHeight As Integer = Me.tableLayoutCivs.GetControlFromPosition(1, 1).Height
@@ -476,21 +477,21 @@ Imports System.ComponentModel
                 civName = StrConv(civName, VbStrConv.ProperCase)
                 civName = civName.Replace(" ", "")
 
-                intCtrlWidth = Me.tableLayoutCivs.GetControlFromPosition(idxPlayable, 0).Width
-                If idxRow >= 4 Then
-                    'add a disabled placeholder for playable race
-                    Dim btnPlayable As New optionSingleReplaceButton
-                    btnPlayable.Name = "optBtnPlayablePlaceholder" & civName
-                    btnPlayable.ImageAlign = ContentAlignment.MiddleCenter
-                    btnPlayable.Text = ""
-                    btnPlayable.Enabled = False
-                    formatCivTableControl(btnPlayable, intCtrlWidth, intCtrlHeight)
-                    Me.tableLayoutCivs.Controls.Add(btnPlayable, idxPlayable, idxRow)
-                Else
-                    'exiting playable button, just resize it to ensure it fits in the cell
-                    Dim btnPlayable As optionSingleReplaceButton = Me.tableLayoutCivs.GetControlFromPosition(idxPlayable, idxRow)
-                    formatCivTableControl(btnPlayable, intCtrlWidth, intCtrlHeight)
-                End If
+                'add playable fortress mode option
+                intCtrlWidth = Me.tableLayoutCivs.GetControlFromPosition(idxPlaybleFort, 0).Width                
+                Dim btnPlayFort As New optionSingleReplaceButton
+                btnPlayFort.Name = "optBtnPlayFort" & civName
+                buildPlayableOption(btnPlayFort, civLabel.entityFileName, civLabel.fortTag)
+                formatCivTableControl(btnPlayFort, intCtrlWidth, intCtrlHeight)
+                Me.tableLayoutCivs.Controls.Add(btnPlayFort, idxPlaybleFort, idxRow)
+
+                'add playable adventure mode option
+                intCtrlWidth = Me.tableLayoutCivs.GetControlFromPosition(idxPlayableAdv, 0).Width
+                Dim btnPlayAdv As New optionSingleReplaceButton
+                btnPlayAdv.Name = "optBtnPlayFort" & civName
+                buildPlayableOption(btnPlayAdv, civLabel.entityFileName, civLabel.advTag)
+                formatCivTableControl(btnPlayAdv, intCtrlWidth, intCtrlHeight)
+                Me.tableLayoutCivs.Controls.Add(btnPlayAdv, idxPlayableAdv, idxRow)
 
                 'add a caravan option
                 intCtrlWidth = Me.tableLayoutCivs.GetControlFromPosition(idxCaravan, 0).Width
@@ -522,11 +523,11 @@ Imports System.ComponentModel
 
                 'add a material option (placeholder, currently disabled)
                 intCtrlWidth = Me.tableLayoutCivs.GetControlFromPosition(idxMaterials, 0).Width
-                Dim cbTemp As New optionComboBoxMulti
-                cbTemp.Name = "temp1" & civName
-                cbTemp.Enabled = False
-                formatCivTableControl(cbTemp, intCtrlWidth, intCtrlHeight)
-                Me.tableLayoutCivs.Controls.Add(cbTemp, idxMaterials, idxRow)
+                Dim cbMats As optionComboPatternToken = New optionComboPatternToken
+                cbMats.Name = "optCbPatternMats" & civName
+                formatCivTableControl(cbMats, intCtrlWidth, intCtrlHeight)
+                buildMatOption(cbMats, civLabel.entityFileName)
+                Me.tableLayoutCivs.Controls.Add(cbMats, idxMaterials, idxRow)
 
                 'add a skill option
                 intCtrlWidth = Me.tableLayoutCivs.GetControlFromPosition(idxSkills, 0).Width
@@ -548,13 +549,29 @@ Imports System.ComponentModel
         c.Anchor = AnchorStyles.Top
     End Sub
 
+    Private Sub buildPlayableOption(ByRef btn As optionSingleReplaceButton, ByVal entityFileName As String, ByVal tag As String)
+        If tag = "" Then
+            btn.Enabled = False
+        Else
+            btn.options.enabledValue = String.Format("YES{0}[", tag)
+            btn.options.disabledValue = String.Format("!NO{0}!", tag)
+            btn.options.fileManager.fileNames = New String() {entityFileName}
+        End If
+
+        btn.ImageAlign = ContentAlignment.MiddleCenter
+        btn.Text = ""
+    End Sub
+
     Private Sub buildSkillOption(ByRef cb As optionComboPatternToken, ByVal creatureFileName As String, ByVal tag As String)
+        Dim skillComboItems As New comboItemCollection
         For i As Integer = 0 To 15
-            cb.Items.Add(CStr(i))
+            skillComboItems.Add(New comboItem(CStr(i), CStr(i)))
         Next
+
+        cb.options.itemList = skillComboItems
         cb.options.fileManager.fileNames = New String() {creatureFileName}
-        If tag Is Nothing OrElse tag.Trim <> "" Then
-            cb.pattern = "(\[NATURAL_SKILL:.*:)(?<value>\d+)(\]" & tag & ")"
+        If tag Is Nothing OrElse tag.Trim <> "" Then            
+            cb.pattern = "(\[NATURAL_SKILL:.*:)(?<value>\d+)(\]" & tag & "\b)"
             cb.replace = "${1}${value}${2}"
         Else
             cb.Enabled = False
@@ -562,6 +579,22 @@ Imports System.ComponentModel
         cb.options.updateTileSets = True
     End Sub
 
+    Private Sub buildMatOption(ByRef cb As optionComboPatternToken, ByVal entityFile As String)
+        Dim matComboItems As New comboItemCollection
+        matComboItems.Add(New comboItem("DEFAULT", "Default"))
+        matComboItems.Add(New comboItem("WEAK", "Weak"))
+        matComboItems.Add(New comboItem("NORMAL", "Normal"))
+        matComboItems.Add(New comboItem("STRONG", "Strong"))
+
+        cb.options.itemList = matComboItems
+        cb.options.fileManager.fileNames = New String() {entityFile}
+
+        cb.pattern = "(\[PERMITTED_REACTION:MATERIALS_)(?<value>[A-Z]*)\]"
+        cb.replace = "${1}${value}]"
+
+        cb.options.updateTileSets = False
+    End Sub
+
     Private Sub buildTriggerOption(ByRef cb As optionComboBoxMulti, ByVal entityFileName As String, ByVal tokenList As List(Of String))
         'add the combobox items and associated values 0-5
         loadTriggerItems(cb)
diff --git a/Settings Source/My Project/AssemblyInfo.vb b/Settings Source/My Project/AssemblyInfo.vb
index f8d882a9..97a0d7e1 100644
--- a/Settings Source/My Project/AssemblyInfo.vb	
+++ b/Settings Source/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.0.0.4")> 
-<Assembly: AssemblyFileVersion("2.0.0.4")> 
+<Assembly: AssemblyVersion("2.0.0.5")> 
+<Assembly: AssemblyFileVersion("2.0.0.5")> 
diff --git a/Settings Source/custom control backend/comboItem.vb b/Settings Source/custom control backend/comboItem.vb
index e46609b9..aa605819 100644
--- a/Settings Source/custom control backend/comboItem.vb	
+++ b/Settings Source/custom control backend/comboItem.vb	
@@ -8,6 +8,11 @@ Public Class comboItem
     Public Sub New()
     End Sub
 
+    Public Sub New(ByVal value As String, ByVal display As String)
+        m_value = value
+        m_text = display
+    End Sub
+
     Public Overrides Function ToString() As String
         Return m_value & " " & m_text
     End Function
diff --git a/Settings Source/custom controls/mwCivLabel.vb b/Settings Source/custom controls/mwCivLabel.vb
index 43b1f4a6..518e874a 100644
--- a/Settings Source/custom controls/mwCivLabel.vb	
+++ b/Settings Source/custom controls/mwCivLabel.vb	
@@ -6,7 +6,8 @@ Public Class mwCivLabel
     Private m_entityFileName As String
     Private m_creatureFileName As String
     Private m_skillsTag As String
-    Private m_materialsTag As String
+    Private m_advTag As String
+    Private m_fortTag As String
 
     <DisplayNameAttribute("Entity file"), _
     CategoryAttribute("~MASTERWORK"), _
@@ -44,15 +45,27 @@ Public Class mwCivLabel
         End Set
     End Property
 
-    <DisplayNameAttribute("Materials Tag"), _
+    <DisplayNameAttribute("Fortress Tag"), _
     CategoryAttribute("~MASTERWORK"), _
-    DescriptionAttribute("The tag identifier for this civilization's creatures' materials.")> _
-    Public Overridable Property materialsTag As String
+    DescriptionAttribute("The tag identifier to play this civilization in fortress mode.")> _
+    Public Overridable Property fortTag As String
         Get
-            Return m_materialsTag
+            Return m_fortTag
         End Get
         Set(value As String)
-            m_materialsTag = value
+            m_fortTag = value
+        End Set
+    End Property
+
+    <DisplayNameAttribute("Adventurer Tag"), _
+    CategoryAttribute("~MASTERWORK"), _
+    DescriptionAttribute("The tag identifier to play this civilization in adventurer mode.")> _
+    Public Overridable Property advTag As String
+        Get
+            Return m_advTag
+        End Get
+        Set(value As String)
+            m_advTag = value
         End Set
     End Property
 
diff --git a/Settings Source/custom controls/optionComboPatternToken.vb b/Settings Source/custom controls/optionComboPatternToken.vb
index 2c2cf0fd..4605cb70 100644
--- a/Settings Source/custom controls/optionComboPatternToken.vb	
+++ b/Settings Source/custom controls/optionComboPatternToken.vb	
@@ -12,7 +12,7 @@ Public Class optionComboPatternToken
     Private m_replace As String
     Private m_value As String
 
-    Private m_opt As New optionBase
+    Private m_opt As New optionList
 
     Public Sub New()
 
@@ -20,34 +20,48 @@ Public Class optionComboPatternToken
         InitializeComponent()
 
         ' Add any initialization after the InitializeComponent() call.
-
     End Sub
 
     Public Sub loadOption() Implements iToken.loadOption
+        m_opt.valueUpdatingPaused = True
         Try
-            Me.SelectedItem = m_opt.optionManager.loadPatternValue(m_pattern, m_opt.fileManager.getFilePaths)
-            m_value = Me.SelectedItem.ToString
+            If Me.DataSource Is Nothing Then
+                If LicenseManager.UsageMode <> LicenseUsageMode.Designtime Then
+                    Me.DataSource = m_opt.itemList
+                    Me.DisplayMember = "display"
+                    Me.ValueMember = "value"
+                End If
+            End If
+
+            Me.SelectedValue = m_opt.optionManager.loadPatternValue(m_pattern, m_opt.fileManager.getFilePaths)
+            m_value = Me.SelectedValue
+
         Catch ex As Exception
             Me.SelectedIndex = -1
+        Finally
+            m_opt.valueUpdatingPaused = False
         End Try
     End Sub
 
     Public Sub saveOption() Implements iToken.saveOption
+        If m_opt.valueUpdatingPaused Or Me.DesignMode Then Exit Sub
+
         If Not m_replace.Contains("${value}") Then
             MsgBox("Unable to save, replacement pattern is in an invalid format!", MsgBoxStyle.Critical + MsgBoxStyle.OkOnly)
         Else
             Dim r As String = m_replace.Replace("${value}", m_value)
             If Not m_opt.optionManager.replacePatternsInFiles(m_pattern, r, m_opt.fileManager, m_opt.updateTileSets) Then
-                MsgBox("Failed to save changes!", MsgBoxStyle.Exclamation + MsgBoxStyle.OkOnly)
+                MsgBox("Failed to save changes for " & Me.Name & "!", MsgBoxStyle.Exclamation + MsgBoxStyle.OkOnly)
             End If
         End If
+        m_opt.valueUpdatingPaused = False
     End Sub
 
-    Public Property options As optionBase
+    Public Property options As optionList
         Get
             Return m_opt
         End Get
-        Set(value As optionBase)
+        Set(value As optionList)
             m_opt = value
         End Set
     End Property
@@ -77,16 +91,16 @@ Public Class optionComboPatternToken
         End Set
     End Property
 
-    Private Sub optionComboPatternToken_SelectionChangeCommitted(sender As Object, e As EventArgs) Handles Me.SelectionChangeCommitted
-        m_value = Me.SelectedItem
+    Private Sub optionComboPatternToken_SelectionChangeCommitted(sender As Object, e As EventArgs) Handles Me.SelectionChangeCommitted        
+        m_value = Me.SelectedValue
         saveOption()
     End Sub
 
     Public Sub runtTest() Implements iTest.runTest
         For i As Integer = 0 To Me.Items.Count
-            If Me.Items(i) <> Me.SelectedItem Then
+            If Not Me.Items(i).Equals(Me.SelectedItem) Then
                 Me.SelectedItem = Me.Items(i)
-                m_value = Me.SelectedItem
+                m_value = Me.SelectedValue
                 Exit For
             End If
         Next