diff --git a/rsrc/scenarios/busywork/out/out0~0.xml b/rsrc/scenarios/busywork/out/out0~0.xml
index 37ab4f19..7b62166b 100644
--- a/rsrc/scenarios/busywork/out/out0~0.xml
+++ b/rsrc/scenarios/busywork/out/out0~0.xml
@@ -53,7 +53,7 @@
     <sign id="0">
         <![CDATA[Cavala - 10 more miles up road]]>
     </sign>
-    <area top="15" left="35" bottom="21" right="39">Near Cavala                  </area>
+    <area top="15" left="35" bottom="21" right="39">Near Cavala</area>
     <string id="0">
         <![CDATA[A band of maybe 10 to 12 people was camped here recently. There's plenty of tracks, horse droppings, and gnawed chicken bones. No sign, however, of who they were or where they went.]]>
     </string>
diff --git a/rsrc/scenarios/busywork/out/out0~2.xml b/rsrc/scenarios/busywork/out/out0~2.xml
index 710ed91a..95803365 100644
--- a/rsrc/scenarios/busywork/out/out0~2.xml
+++ b/rsrc/scenarios/busywork/out/out0~2.xml
@@ -53,8 +53,8 @@
     <sign id="0">
         <![CDATA[WELCOME TO MRRNAH HOLLOW|Cavala - 20 miles north]]>
     </sign>
-    <area top="36" left="19" bottom="46" right="27">Near Valley Entrance         </area>
-    <area top="28" left="28" bottom="30" right="30">By Small Hut                 </area>
+    <area top="36" left="19" bottom="46" right="27">Near Valley Entrance</area>
+    <area top="28" left="28" bottom="30" right="30">By Small Hut</area>
     <string id="0">
         <![CDATA[The road to the south leads up and out of Mrrnah Hollow. If you've completed your investigation to your satisfaction, you can leave now. Are you done here?]]>
     </string>
diff --git a/rsrc/scenarios/busywork/towns/town0.xml b/rsrc/scenarios/busywork/towns/town0.xml
index 27983a1f..09be56d6 100644
--- a/rsrc/scenarios/busywork/towns/town0.xml
+++ b/rsrc/scenarios/busywork/towns/town0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Cavala                       </name>
+    <name>Cavala</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -557,13 +557,13 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="8" left="10" bottom="26" right="17">Ilona&apos;s Offices &amp; Barracks   </area>
-    <area top="17" left="27" bottom="21" right="31">Cameron&apos;s Smithy             </area>
-    <area top="17" left="33" bottom="21" right="40">Cameron&apos;s Quarters           </area>
-    <area top="10" left="29" bottom="12" right="34">Dusty Temple                 </area>
-    <area top="31" left="9" bottom="37" right="17">Cavala Barracks              </area>
-    <area top="26" left="27" bottom="33" right="31">City Hall                    </area>
-    <area top="26" left="32" bottom="28" right="36">City Hall                    </area>
+    <area top="8" left="10" bottom="26" right="17">Ilona&apos;s Offices &amp; Barracks</area>
+    <area top="17" left="27" bottom="21" right="31">Cameron&apos;s Smithy</area>
+    <area top="17" left="33" bottom="21" right="40">Cameron&apos;s Quarters</area>
+    <area top="10" left="29" bottom="12" right="34">Dusty Temple</area>
+    <area top="31" left="9" bottom="37" right="17">Cavala Barracks</area>
+    <area top="26" left="27" bottom="33" right="31">City Hall</area>
+    <area top="26" left="32" bottom="28" right="36">City Hall</area>
     <sign id="0">
         <![CDATA[Caravan Quarters]]>
     </sign>
diff --git a/rsrc/scenarios/busywork/towns/town1.xml b/rsrc/scenarios/busywork/towns/town1.xml
index 2914a6f6..4c183ec2 100644
--- a/rsrc/scenarios/busywork/towns/town1.xml
+++ b/rsrc/scenarios/busywork/towns/town1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Abandoned Shack              </name>
+    <name>Abandoned Shack</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/busywork/towns/town2.xml b/rsrc/scenarios/busywork/towns/town2.xml
index 94d1080b..bb8b5fa4 100644
--- a/rsrc/scenarios/busywork/towns/town2.xml
+++ b/rsrc/scenarios/busywork/towns/town2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Under Cavala                 </name>
+    <name>Under Cavala</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/busywork/towns/town3.xml b/rsrc/scenarios/busywork/towns/town3.xml
index f7d3be6e..68625fb1 100644
--- a/rsrc/scenarios/busywork/towns/town3.xml
+++ b/rsrc/scenarios/busywork/towns/town3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Bandit Hideout               </name>
+    <name>Bandit Hideout</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -545,15 +545,15 @@
         <personality>-1</personality>
         <face>-1</face>
     </creature>
-    <area top="40" left="22" bottom="42" right="28">Throg&apos;s Lair                 </area>
-    <area top="28" left="32" bottom="45" right="40">Totem Caverns                </area>
-    <area top="1" left="36" bottom="8" right="44">Worm Lair                    </area>
-    <area top="1" left="1" bottom="11" right="13">Bandit Cavern                </area>
-    <area top="30" left="1" bottom="32" right="17">Hall of Archers              </area>
-    <area top="40" left="22" bottom="42" right="29">Ogre Lair                    </area>
-    <area top="21" left="25" bottom="28" right="31">Cameron&apos;s Chambers           </area>
-    <area top="33" left="9" bottom="39" right="16">Training Room                </area>
-    <area top="34" left="1" bottom="46" right="7">Dining Hall                  </area>
+    <area top="40" left="22" bottom="42" right="28">Throg&apos;s Lair</area>
+    <area top="28" left="32" bottom="45" right="40">Totem Caverns</area>
+    <area top="1" left="36" bottom="8" right="44">Worm Lair</area>
+    <area top="1" left="1" bottom="11" right="13">Bandit Cavern</area>
+    <area top="30" left="1" bottom="32" right="17">Hall of Archers</area>
+    <area top="40" left="22" bottom="42" right="29">Ogre Lair</area>
+    <area top="21" left="25" bottom="28" right="31">Cameron&apos;s Chambers</area>
+    <area top="33" left="9" bottom="39" right="16">Training Room</area>
+    <area top="34" left="1" bottom="46" right="7">Dining Hall</area>
     <string id="0">
         <![CDATA[You finally make your way into the Bandit's Hideout. It was well concealed ... mounds of brush were heaped in front of the entrance, and dirt was piles onto the brush. You were only able to see it from right outside.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/items.xml b/rsrc/scenarios/stealth/items.xml
index 4e02f3c4..fb7a5974 100644
--- a/rsrc/scenarios/stealth/items.xml
+++ b/rsrc/scenarios/stealth/items.xml
@@ -7371,7 +7371,7 @@
         <protection>0</protection>
         <weapon-type>edged</weapon-type>
         <pic>32</pic>
-        <name>Shining Green </name>
+        <name>Shining Green</name>
         <full-name>Korthrax</full-name>
         <treasure>0</treasure>
         <value>10000</value>
diff --git a/rsrc/scenarios/stealth/out/out0~0.xml b/rsrc/scenarios/stealth/out/out0~0.xml
index 946d3a4c..130db774 100644
--- a/rsrc/scenarios/stealth/out/out0~0.xml
+++ b/rsrc/scenarios/stealth/out/out0~0.xml
@@ -24,9 +24,9 @@
     <sign id="1">
         <![CDATA[Zaskiva Ferry|10 gold]]>
     </sign>
-    <area top="8" left="21" bottom="11" right="23">Near Zaskiva                 </area>
-    <area top="3" left="7" bottom="25" right="38">Zaskiva Isle                 </area>
-    <area top="24" left="38" bottom="27" right="41">Near Zaskiva Ferry           </area>
+    <area top="8" left="21" bottom="11" right="23">Near Zaskiva</area>
+    <area top="3" left="7" bottom="25" right="38">Zaskiva Isle</area>
+    <area top="24" left="38" bottom="27" right="41">Near Zaskiva Ferry</area>
     <string id="0">
         <![CDATA[This is the ferry to the Zaskiva Isle, a smaller island to the northeast, where the capital of Morrow's Isle sits, secure and protected. There are a good number of guards, checking to make sure that nobody unwelcome manages to use the ferry.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/out/out0~1.xml b/rsrc/scenarios/stealth/out/out0~1.xml
index 0fe15f91..ebb1cdb6 100644
--- a/rsrc/scenarios/stealth/out/out0~1.xml
+++ b/rsrc/scenarios/stealth/out/out0~1.xml
@@ -75,7 +75,7 @@
     <sign id="2">
         <![CDATA[BEWARE - This area is uncontrolled!|Travel with extreme caution!]]>
     </sign>
-    <area top="29" left="33" bottom="33" right="39">Gravel Valley                </area>
+    <area top="29" left="33" bottom="33" right="39">Gravel Valley</area>
     <string id="0">
         <![CDATA[You find the remains of a mage who crash landed while flying over these mountains. The wand at his side is still intact. Most everything else has been eaten by bears.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/out/out1~0.xml b/rsrc/scenarios/stealth/out/out1~0.xml
index ca710de8..48fc3777 100644
--- a/rsrc/scenarios/stealth/out/out1~0.xml
+++ b/rsrc/scenarios/stealth/out/out1~0.xml
@@ -88,9 +88,9 @@
     <sign id="1">
         <![CDATA[SELATHNI - 80 miles south]]>
     </sign>
-    <area top="32" left="36" bottom="35" right="39">Near Muck                    </area>
-    <area top="8" left="3" bottom="31" right="45">Morrow Marsh                 </area>
-    <area top="24" left="11" bottom="38" right="41">Morrow Marsh                 </area>
+    <area top="32" left="36" bottom="35" right="39">Near Muck</area>
+    <area top="8" left="3" bottom="31" right="45">Morrow Marsh</area>
+    <area top="24" left="11" bottom="38" right="41">Morrow Marsh</area>
     <string id="0">
         <![CDATA[You notice some unusual plants growing at the base of this large boulder. You look closer. They're alchemical ingredients!]]>
     </string>
diff --git a/rsrc/scenarios/stealth/out/out1~1.xml b/rsrc/scenarios/stealth/out/out1~1.xml
index e5c838a1..023f083a 100644
--- a/rsrc/scenarios/stealth/out/out1~1.xml
+++ b/rsrc/scenarios/stealth/out/out1~1.xml
@@ -126,10 +126,10 @@
     <sign id="3">
         <![CDATA[NOTE: Northwest Morrow's Isle is now SEALED territory (as per Empire decree DIP34A). Please be prepared to identify yourself upon departure.]]>
     </sign>
-    <area top="18" left="15" bottom="30" right="22">Ogre Hills                   </area>
-    <area top="29" left="10" bottom="33" right="13">Abandoned Valley             </area>
-    <area top="2" left="30" bottom="15" right="46">Fields of Rubble             </area>
-    <area top="2" left="21" bottom="5" right="23">Guarded Bridge               </area>
+    <area top="18" left="15" bottom="30" right="22">Ogre Hills</area>
+    <area top="29" left="10" bottom="33" right="13">Abandoned Valley</area>
+    <area top="2" left="30" bottom="15" right="46">Fields of Rubble</area>
+    <area top="2" left="21" bottom="5" right="23">Guarded Bridge</area>
     <string id="0">
         <![CDATA[As you start to climb down into a small valley, on your way through this rocky area, you suddenly get a strange feeling. Maybe things are a little too quiet, or a little too enclosed, but there's something about this place that makes you uncomfortable.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/out/out1~2.xml b/rsrc/scenarios/stealth/out/out1~2.xml
index 8b1b71a6..e0862c9d 100644
--- a/rsrc/scenarios/stealth/out/out1~2.xml
+++ b/rsrc/scenarios/stealth/out/out1~2.xml
@@ -97,10 +97,10 @@
     <sign id="4">
         <![CDATA[Don't be stupid! Watch out for rebels! Travel in groups!|Helpful Empire Message HEM104H]]>
     </sign>
-    <area top="10" left="18" bottom="13" right="24">Near Selathni                </area>
-    <area top="5" left="11" bottom="13" right="28">Farmlands Around Selathni    </area>
-    <area top="33" left="12" bottom="39" right="19">Gooey Fen                    </area>
-    <area top="20" left="40" bottom="37" right="46">Farmlands                    </area>
+    <area top="10" left="18" bottom="13" right="24">Near Selathni</area>
+    <area top="5" left="11" bottom="13" right="28">Farmlands Around Selathni</area>
+    <area top="33" left="12" bottom="39" right="19">Gooey Fen</area>
+    <area top="20" left="40" bottom="37" right="46">Farmlands</area>
     <string id="0">
         <![CDATA[As you enter the countryside of Morrow's Isle, you idly put your hand in your pocket. There's something unfamiliar there! You pull it out. It's a piece of paper. (A special item. To see it, click on the 'Spec' button on the items screen.)]]>
     </string>
diff --git a/rsrc/scenarios/stealth/out/out2~1.xml b/rsrc/scenarios/stealth/out/out2~1.xml
index 18ea9692..87f3c55e 100644
--- a/rsrc/scenarios/stealth/out/out2~1.xml
+++ b/rsrc/scenarios/stealth/out/out2~1.xml
@@ -75,9 +75,9 @@
     <sign id="2">
         <![CDATA[EMPIRE SCUM STAY AWAY! THIS IS HILL RUNNER TERRITORY!]]>
     </sign>
-    <area top="28" left="23" bottom="34" right="28">Clearing Around Fahl         </area>
-    <area top="6" left="36" bottom="11" right="41">Near Buzzard                 </area>
-    <area top="1" left="26" bottom="18" right="46">Hill Runner Lands            </area>
+    <area top="28" left="23" bottom="34" right="28">Clearing Around Fahl</area>
+    <area top="6" left="36" bottom="11" right="41">Near Buzzard</area>
+    <area top="1" left="26" bottom="18" right="46">Hill Runner Lands</area>
     <string id="0">
         <![CDATA[If it wasn't for your sharp Woodsman's senses, you never would have noticed it. There's a large path heading north into the woods, surprisingly well concealed considering its size.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/out/out2~2.xml b/rsrc/scenarios/stealth/out/out2~2.xml
index ba2a64e2..2c45c403 100644
--- a/rsrc/scenarios/stealth/out/out2~2.xml
+++ b/rsrc/scenarios/stealth/out/out2~2.xml
@@ -5,11 +5,11 @@
     <sign id="0">
         <![CDATA[Morrow Marshes - east]]>
     </sign>
-    <area top="26" left="0" bottom="31" right="4">Near Willow                  </area>
-    <area top="23" left="34" bottom="28" right="38">Near Liam                    </area>
-    <area top="26" left="1" bottom="31" right="4">Near Willow                  </area>
-    <area top="19" left="1" bottom="37" right="16">Farmlands                    </area>
-    <area top="20" left="28" bottom="34" right="42">Farmlands                    </area>
+    <area top="26" left="0" bottom="31" right="4">Near Willow</area>
+    <area top="23" left="34" bottom="28" right="38">Near Liam</area>
+    <area top="26" left="1" bottom="31" right="4">Near Willow</area>
+    <area top="19" left="1" bottom="37" right="16">Farmlands</area>
+    <area top="20" left="28" bottom="34" right="42">Farmlands</area>
     <string id="0">
         <![CDATA[Although much of Morrow's Isle seems to be run feudally, these farmers, at least, own their own farms. They're arranged in a neat, tight clusters, and surrounded by a small number of moderately armed guards.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/out/out3~0.xml b/rsrc/scenarios/stealth/out/out3~0.xml
index 49bd5902..57913e4b 100644
--- a/rsrc/scenarios/stealth/out/out3~0.xml
+++ b/rsrc/scenarios/stealth/out/out3~0.xml
@@ -18,7 +18,7 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </encounter>
-    <area top="9" left="25" bottom="18" right="35">Rebel Valley                 </area>
+    <area top="9" left="25" bottom="18" right="35">Rebel Valley</area>
     <string id="0">
         <![CDATA[Someone shouts from the hills "Keep going! You're almost to someone who can help you along!" You look up, but can't see who yelled it.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/towns/town0.xml b/rsrc/scenarios/stealth/towns/town0.xml
index 06d9cfc9..5ef36e05 100644
--- a/rsrc/scenarios/stealth/towns/town0.xml
+++ b/rsrc/scenarios/stealth/towns/town0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Willow                       </name>
+    <name>Willow</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -562,9 +562,9 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="7" left="5" bottom="15" right="12">City Hall                    </area>
-    <area top="17" left="6" bottom="21" right="17">Discipline Cells             </area>
-    <area top="9" left="36" bottom="21" right="41">Serf Barracks                </area>
+    <area top="7" left="5" bottom="15" right="12">City Hall</area>
+    <area top="17" left="6" bottom="21" right="17">Discipline Cells</area>
+    <area top="9" left="36" bottom="21" right="41">Serf Barracks</area>
     <sign id="0">
         <![CDATA[DISCIPLINE CELLS|Enter with permission only!]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town1.xml b/rsrc/scenarios/stealth/towns/town1.xml
index f0583531..8a16a8ee 100644
--- a/rsrc/scenarios/stealth/towns/town1.xml
+++ b/rsrc/scenarios/stealth/towns/town1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>64</size>
-    <name>Selathni                     </name>
+    <name>Selathni</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -756,12 +756,12 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="45" left="8" bottom="50" right="12">Empty Storeroom              </area>
-    <area top="34" left="25" bottom="46" right="38">Sea Wurm Inn                 </area>
-    <area top="24" left="6" bottom="27" right="13">Stables                      </area>
-    <area top="5" left="5" bottom="22" right="14">Purdee&apos;s Resort              </area>
-    <area top="6" left="14" bottom="13" right="20">Purdee&apos;s Resort              </area>
-    <area top="21" left="37" bottom="27" right="44">Small Shrine                 </area>
+    <area top="45" left="8" bottom="50" right="12">Empty Storeroom</area>
+    <area top="34" left="25" bottom="46" right="38">Sea Wurm Inn</area>
+    <area top="24" left="6" bottom="27" right="13">Stables</area>
+    <area top="5" left="5" bottom="22" right="14">Purdee&apos;s Resort</area>
+    <area top="6" left="14" bottom="13" right="20">Purdee&apos;s Resort</area>
+    <area top="21" left="37" bottom="27" right="44">Small Shrine</area>
     <sign id="0">
         <![CDATA[SHRINE OF BLESSED HEALING|Donations accepted]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town10.xml b/rsrc/scenarios/stealth/towns/town10.xml
index 500c27fd..d3dd3a6a 100644
--- a/rsrc/scenarios/stealth/towns/town10.xml
+++ b/rsrc/scenarios/stealth/towns/town10.xml
@@ -462,7 +462,7 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="10" left="14" bottom="16" right="20">Abandoned Barracks           </area>
+    <area top="10" left="14" bottom="16" right="20">Abandoned Barracks</area>
     <sign id="0">
         <![CDATA[To leave - Walk through here.|Remember - be fast! Be vigilant!]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town11.xml b/rsrc/scenarios/stealth/towns/town11.xml
index cc2039fb..a9f86288 100644
--- a/rsrc/scenarios/stealth/towns/town11.xml
+++ b/rsrc/scenarios/stealth/towns/town11.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Fahl                         </name>
+    <name>Fahl</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -572,10 +572,10 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="28" left="27" bottom="38" right="38">Inn of the Fallen Trees      </area>
-    <area top="1" left="1" bottom="13" right="14">Explosion Site               </area>
-    <area top="3" left="34" bottom="14" right="45">Explosion Site               </area>
-    <area top="30" left="9" bottom="38" right="19">Abandoned Homes              </area>
+    <area top="28" left="27" bottom="38" right="38">Inn of the Fallen Trees</area>
+    <area top="1" left="1" bottom="13" right="14">Explosion Site</area>
+    <area top="3" left="34" bottom="14" right="45">Explosion Site</area>
+    <area top="30" left="9" bottom="38" right="19">Abandoned Homes</area>
     <sign id="0">
         <![CDATA[Calidric's Jewelry]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town12.xml b/rsrc/scenarios/stealth/towns/town12.xml
index 9fdb9095..60cb27e4 100644
--- a/rsrc/scenarios/stealth/towns/town12.xml
+++ b/rsrc/scenarios/stealth/towns/town12.xml
@@ -555,9 +555,9 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="8" left="8" bottom="13" right="12">Guard Quarters               </area>
-    <area top="33" left="27" bottom="39" right="32">Guardhouse                   </area>
-    <area top="10" left="31" bottom="22" right="37">BUZZARD INN                  </area>
+    <area top="8" left="8" bottom="13" right="12">Guard Quarters</area>
+    <area top="33" left="27" bottom="39" right="32">Guardhouse</area>
+    <area top="10" left="31" bottom="22" right="37">BUZZARD INN</area>
     <sign id="0">
         <![CDATA[Buzzard City Park|Treat it with respect.]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town13.xml b/rsrc/scenarios/stealth/towns/town13.xml
index aeebb9f2..ce419088 100644
--- a/rsrc/scenarios/stealth/towns/town13.xml
+++ b/rsrc/scenarios/stealth/towns/town13.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Under Buzzard                </name>
+    <name>Under Buzzard</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -474,8 +474,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="3" left="23" bottom="17" right="28">Storage Cave                 </area>
-    <area top="21" left="8" bottom="29" right="19">Old Rebel Barracks           </area>
+    <area top="3" left="23" bottom="17" right="28">Storage Cave</area>
+    <area top="21" left="8" bottom="29" right="19">Old Rebel Barracks</area>
     <string id="0">
         <![CDATA[Back when the rebels were still underground, this was where a good number of them hid out. To the south, you see pallets on the floor. To the north are a number of storage boxes. ]]>
     </string>
diff --git a/rsrc/scenarios/stealth/towns/town14.xml b/rsrc/scenarios/stealth/towns/town14.xml
index 1e0508e4..0d9f4f1c 100644
--- a/rsrc/scenarios/stealth/towns/town14.xml
+++ b/rsrc/scenarios/stealth/towns/town14.xml
@@ -515,18 +515,18 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="38" left="24" bottom="42" right="30">Guard Post                   </area>
-    <area top="35" left="13" bottom="42" right="19">Throne Room                  </area>
-    <area top="17" left="35" bottom="25" right="43">Stables                      </area>
-    <area top="16" left="1" bottom="22" right="12">Quarters                     </area>
-    <area top="15" left="16" bottom="20" right="23">Barracks                     </area>
-    <area top="20" left="24" bottom="25" right="29">Dueling Platform             </area>
-    <area top="29" left="24" bottom="34" right="30">Storeroom                    </area>
-    <area top="26" left="9" bottom="30" right="19">Herb Brewing Chamber         </area>
-    <area top="25" left="1" bottom="33" right="6">Mutant Ogre Cave             </area>
-    <area top="36" left="4" bottom="43" right="8">Treasure Cave                </area>
-    <area top="41" left="35" bottom="43" right="43">Garbage Pit                  </area>
-    <area top="6" left="8" bottom="11" right="13">Guard Room                   </area>
+    <area top="38" left="24" bottom="42" right="30">Guard Post</area>
+    <area top="35" left="13" bottom="42" right="19">Throne Room</area>
+    <area top="17" left="35" bottom="25" right="43">Stables</area>
+    <area top="16" left="1" bottom="22" right="12">Quarters</area>
+    <area top="15" left="16" bottom="20" right="23">Barracks</area>
+    <area top="20" left="24" bottom="25" right="29">Dueling Platform</area>
+    <area top="29" left="24" bottom="34" right="30">Storeroom</area>
+    <area top="26" left="9" bottom="30" right="19">Herb Brewing Chamber</area>
+    <area top="25" left="1" bottom="33" right="6">Mutant Ogre Cave</area>
+    <area top="36" left="4" bottom="43" right="8">Treasure Cave</area>
+    <area top="41" left="35" bottom="43" right="43">Garbage Pit</area>
+    <area top="6" left="8" bottom="11" right="13">Guard Room</area>
     <string id="0">
         <![CDATA[The ogre's lair is a lot quieter now that the demon is gone and his slaves have fled. You still hear grunts and howls from deep inside, and they still sound dangerous. Just not as much.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/towns/town15.xml b/rsrc/scenarios/stealth/towns/town15.xml
index 37ec067b..391d3755 100644
--- a/rsrc/scenarios/stealth/towns/town15.xml
+++ b/rsrc/scenarios/stealth/towns/town15.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Empire Outpost               </name>
+    <name>Empire Outpost</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -530,10 +530,10 @@
         <personality>-1</personality>
         <face>10</face>
     </creature>
-    <area top="27" left="14" bottom="36" right="16">Guard Room                   </area>
-    <area top="31" left="6" bottom="36" right="12">Entry Chamber                </area>
-    <area top="22" left="23" bottom="30" right="38">Barracks                     </area>
-    <area top="1" left="32" bottom="7" right="39">Hot Laboratory               </area>
+    <area top="27" left="14" bottom="36" right="16">Guard Room</area>
+    <area top="31" left="6" bottom="36" right="12">Entry Chamber</area>
+    <area top="22" left="23" bottom="30" right="38">Barracks</area>
+    <area top="1" left="32" bottom="7" right="39">Hot Laboratory</area>
     <sign id="0">
         <![CDATA[EMPIRE LAB|CAUTION!|PROTECTIVE GEAR REQUIRED]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town16.xml b/rsrc/scenarios/stealth/towns/town16.xml
index e4b5a926..97f793ca 100644
--- a/rsrc/scenarios/stealth/towns/town16.xml
+++ b/rsrc/scenarios/stealth/towns/town16.xml
@@ -530,12 +530,12 @@
         <personality>-1</personality>
         <face>-1</face>
     </creature>
-    <area top="1" left="15" bottom="2" right="18">Bomb Chamber                 </area>
-    <area top="6" left="27" bottom="9" right="35">Mage&apos;s Common Room           </area>
-    <area top="1" left="26" bottom="4" right="29">Small Library                </area>
-    <area top="3" left="19" bottom="5" right="24">Storeroom                    </area>
-    <area top="7" left="19" bottom="9" right="26">Lever Room                   </area>
-    <area top="38" left="10" bottom="46" right="14">Cave Filled With Bodies      </area>
+    <area top="1" left="15" bottom="2" right="18">Bomb Chamber</area>
+    <area top="6" left="27" bottom="9" right="35">Mage&apos;s Common Room</area>
+    <area top="1" left="26" bottom="4" right="29">Small Library</area>
+    <area top="3" left="19" bottom="5" right="24">Storeroom</area>
+    <area top="7" left="19" bottom="9" right="26">Lever Room</area>
+    <area top="38" left="10" bottom="46" right="14">Cave Filled With Bodies</area>
     <sign id="0">
         <![CDATA[GOO PITS A|WEST EXIT]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town17.xml b/rsrc/scenarios/stealth/towns/town17.xml
index 1d04c70b..66a88fe2 100644
--- a/rsrc/scenarios/stealth/towns/town17.xml
+++ b/rsrc/scenarios/stealth/towns/town17.xml
@@ -675,11 +675,11 @@
         <personality>-1</personality>
         <face>12</face>
     </creature>
-    <area top="43" left="29" bottom="62" right="41">Fortress Storage             </area>
-    <area top="42" left="51" bottom="62" right="62">Prisons and Interrogation    </area>
-    <area top="22" left="41" bottom="34" right="50">Destroyed Laboratory         </area>
-    <area top="8" left="7" bottom="18" right="21">Stalker&apos;s Throne Room        </area>
-    <area top="1" left="26" bottom="18" right="34">Dining Hall and Common Room  </area>
+    <area top="43" left="29" bottom="62" right="41">Fortress Storage</area>
+    <area top="42" left="51" bottom="62" right="62">Prisons and Interrogation</area>
+    <area top="22" left="41" bottom="34" right="50">Destroyed Laboratory</area>
+    <area top="8" left="7" bottom="18" right="21">Stalker&apos;s Throne Room</area>
+    <area top="1" left="26" bottom="18" right="34">Dining Hall and Common Room</area>
     <sign id="0">
         <![CDATA[HOLDING AND INTERROGATION]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town18.xml b/rsrc/scenarios/stealth/towns/town18.xml
index 993cb09c..841dc1a5 100644
--- a/rsrc/scenarios/stealth/towns/town18.xml
+++ b/rsrc/scenarios/stealth/towns/town18.xml
@@ -721,9 +721,9 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="8" left="7" bottom="18" right="21">Throne Room                  </area>
-    <area top="27" left="7" bottom="37" right="13">Forge                        </area>
-    <area top="43" left="26" bottom="62" right="41">Fortress Storage             </area>
+    <area top="8" left="7" bottom="18" right="21">Throne Room</area>
+    <area top="27" left="7" bottom="37" right="13">Forge</area>
+    <area top="43" left="26" bottom="62" right="41">Fortress Storage</area>
     <sign id="0">
         <![CDATA[HOLDING AND INTERROGATION]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town19.xml b/rsrc/scenarios/stealth/towns/town19.xml
index 0bd7fda1..5b8497fd 100644
--- a/rsrc/scenarios/stealth/towns/town19.xml
+++ b/rsrc/scenarios/stealth/towns/town19.xml
@@ -497,8 +497,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="2" left="8" bottom="19" right="23">Path to Dock                 </area>
-    <area top="21" left="6" bottom="30" right="17">Small Shipyard               </area>
+    <area top="2" left="8" bottom="19" right="23">Path to Dock</area>
+    <area top="21" left="6" bottom="30" right="17">Small Shipyard</area>
     <string id="0">
         <![CDATA[The chest contains all sorts of paperwork. Most of it is simple letters and correspondence. One slender volume, however, contains alchemical recipes.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/towns/town2.xml b/rsrc/scenarios/stealth/towns/town2.xml
index d1baccb9..de795937 100644
--- a/rsrc/scenarios/stealth/towns/town2.xml
+++ b/rsrc/scenarios/stealth/towns/town2.xml
@@ -480,8 +480,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="2" left="2" bottom="7" right="8">Dusty Old Storeroom          </area>
-    <area top="11" left="8" bottom="17" right="12">Questioning Chamber          </area>
+    <area top="2" left="2" bottom="7" right="8">Dusty Old Storeroom</area>
+    <area top="11" left="8" bottom="17" right="12">Questioning Chamber</area>
     <sign id="0">
         <![CDATA[Questioning Chamber|Sit in chair to be judged and commanded.]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town20.xml b/rsrc/scenarios/stealth/towns/town20.xml
index d4aabfdf..af1e00b0 100644
--- a/rsrc/scenarios/stealth/towns/town20.xml
+++ b/rsrc/scenarios/stealth/towns/town20.xml
@@ -715,16 +715,16 @@
         <personality>-1</personality>
         <face>19</face>
     </creature>
-    <area top="39" left="15" bottom="43" right="24">Jaen&apos;s Chambers              </area>
-    <area top="20" left="10" bottom="31" right="24">Jaen&apos;s Central Hall          </area>
-    <area top="20" left="26" bottom="31" right="40">Entry Hall                   </area>
-    <area top="33" left="35" bottom="43" right="39">Interrogation Chamber        </area>
-    <area top="33" left="26" bottom="43" right="33">Main Barracks                </area>
-    <area top="33" left="13" bottom="37" right="24">Library                      </area>
-    <area top="56" left="13" bottom="62" right="18">Trash Pit                    </area>
-    <area top="58" left="23" bottom="62" right="37">Holding Cells                </area>
-    <area top="8" left="26" bottom="18" right="32">Common Room                  </area>
-    <area top="20" left="41" bottom="31" right="44">Front Gates                  </area>
+    <area top="39" left="15" bottom="43" right="24">Jaen&apos;s Chambers</area>
+    <area top="20" left="10" bottom="31" right="24">Jaen&apos;s Central Hall</area>
+    <area top="20" left="26" bottom="31" right="40">Entry Hall</area>
+    <area top="33" left="35" bottom="43" right="39">Interrogation Chamber</area>
+    <area top="33" left="26" bottom="43" right="33">Main Barracks</area>
+    <area top="33" left="13" bottom="37" right="24">Library</area>
+    <area top="56" left="13" bottom="62" right="18">Trash Pit</area>
+    <area top="58" left="23" bottom="62" right="37">Holding Cells</area>
+    <area top="8" left="26" bottom="18" right="32">Common Room</area>
+    <area top="20" left="41" bottom="31" right="44">Front Gates</area>
     <string id="0">
         <![CDATA[When you get close to the door, a keyhole suddenly appears under the handle, surrounded by a circle of flames. On a hunch, you quickly insert Jaen's key into the hole and turn it. The flames disappear, and the door becomes unlocked.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/towns/town3.xml b/rsrc/scenarios/stealth/towns/town3.xml
index 75386cbb..54c473a5 100644
--- a/rsrc/scenarios/stealth/towns/town3.xml
+++ b/rsrc/scenarios/stealth/towns/town3.xml
@@ -563,11 +563,11 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="22" left="19" bottom="29" right="27">Shrine of Lasting Harmony    </area>
-    <area top="19" left="35" bottom="29" right="42">City Hall                    </area>
-    <area top="6" left="28" bottom="13" right="40">Stables                      </area>
-    <area top="34" left="8" bottom="38" right="13">Sage&apos;s Office                </area>
-    <area top="34" left="15" bottom="38" right="20">Canizares&apos; Alchemy            </area>
+    <area top="22" left="19" bottom="29" right="27">Shrine of Lasting Harmony</area>
+    <area top="19" left="35" bottom="29" right="42">City Hall</area>
+    <area top="6" left="28" bottom="13" right="40">Stables</area>
+    <area top="34" left="8" bottom="38" right="13">Sage&apos;s Office</area>
+    <area top="34" left="15" bottom="38" right="20">Canizares&apos; Alchemy</area>
     <sign id="0">
         <![CDATA[CANIZARES|Alchemy]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town4.xml b/rsrc/scenarios/stealth/towns/town4.xml
index 87e083ec..5ad03713 100644
--- a/rsrc/scenarios/stealth/towns/town4.xml
+++ b/rsrc/scenarios/stealth/towns/town4.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Marshy Pit                   </name>
+    <name>Marshy Pit</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -515,9 +515,9 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="25" left="10" bottom="31" right="16">Breeding Pools               </area>
-    <area top="13" left="10" bottom="17" right="16">Religious Room (?)           </area>
-    <area top="29" left="43" bottom="38" right="47">Bunch of Dead Bodies         </area>
+    <area top="25" left="10" bottom="31" right="16">Breeding Pools</area>
+    <area top="13" left="10" bottom="17" right="16">Religious Room (?)</area>
+    <area top="29" left="43" bottom="38" right="47">Bunch of Dead Bodies</area>
     <sign id="0">
         <![CDATA[(Crude etchings of swamp folk have been etched into the side of this obelisk in acid.)]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town5.xml b/rsrc/scenarios/stealth/towns/town5.xml
index 1851b8a5..29c0a85d 100644
--- a/rsrc/scenarios/stealth/towns/town5.xml
+++ b/rsrc/scenarios/stealth/towns/town5.xml
@@ -568,12 +568,12 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="29" left="11" bottom="37" right="18">Barracks                     </area>
-    <area top="39" left="33" bottom="41" right="42">Punishment Cells             </area>
-    <area top="10" left="36" bottom="14" right="42">Small Shrine                 </area>
-    <area top="10" left="10" bottom="18" right="18">Herb Factory                 </area>
-    <area top="20" left="10" bottom="24" right="18">Herb Factory Office          </area>
-    <area top="10" left="25" bottom="15" right="30">Herb Processing              </area>
+    <area top="29" left="11" bottom="37" right="18">Barracks</area>
+    <area top="39" left="33" bottom="41" right="42">Punishment Cells</area>
+    <area top="10" left="36" bottom="14" right="42">Small Shrine</area>
+    <area top="10" left="10" bottom="18" right="18">Herb Factory</area>
+    <area top="20" left="10" bottom="24" right="18">Herb Factory Office</area>
+    <area top="10" left="25" bottom="15" right="30">Herb Processing</area>
     <sign id="0">
         <![CDATA[Dressing Chambers]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town6.xml b/rsrc/scenarios/stealth/towns/town6.xml
index aeac617b..af8cf782 100644
--- a/rsrc/scenarios/stealth/towns/town6.xml
+++ b/rsrc/scenarios/stealth/towns/town6.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Zaskiva                      </name>
+    <name>Zaskiva</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -543,14 +543,14 @@
         <personality>-1</personality>
         <face>10</face>
     </creature>
-    <area top="11" left="1" bottom="16" right="4">Dock Warehouse               </area>
-    <area top="7" left="8" bottom="24" right="10">Private Quarters             </area>
-    <area top="29" left="1" bottom="42" right="7">Zaskiva Arms                 </area>
-    <area top="39" left="7" bottom="42" right="18">Zaskiva Arms                 </area>
-    <area top="29" left="12" bottom="34" right="18">Cartman&apos;s Armory             </area>
-    <area top="29" left="30" bottom="39" right="39">School of Magery             </area>
-    <area top="33" left="44" bottom="36" right="46">Small Shrine                 </area>
-    <area top="4" left="1" bottom="9" right="6">Zaskiva Docks                </area>
+    <area top="11" left="1" bottom="16" right="4">Dock Warehouse</area>
+    <area top="7" left="8" bottom="24" right="10">Private Quarters</area>
+    <area top="29" left="1" bottom="42" right="7">Zaskiva Arms</area>
+    <area top="39" left="7" bottom="42" right="18">Zaskiva Arms</area>
+    <area top="29" left="12" bottom="34" right="18">Cartman&apos;s Armory</area>
+    <area top="29" left="30" bottom="39" right="39">School of Magery</area>
+    <area top="33" left="44" bottom="36" right="46">Small Shrine</area>
+    <area top="4" left="1" bottom="9" right="6">Zaskiva Docks</area>
     <sign id="0">
         <![CDATA[Hall of Memorial Statues|Entry by Keeper Permission Only]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town7.xml b/rsrc/scenarios/stealth/towns/town7.xml
index f53b9ddc..dc42985b 100644
--- a/rsrc/scenarios/stealth/towns/town7.xml
+++ b/rsrc/scenarios/stealth/towns/town7.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Abandoned Fort               </name>
+    <name>Abandoned Fort</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -514,14 +514,14 @@
         <personality>-1</personality>
         <face>23</face>
     </creature>
-    <area top="25" left="43" bottom="31" right="46">Smelly, Gross Area           </area>
-    <area top="3" left="43" bottom="9" right="46">Meat Locker                  </area>
-    <area top="5" left="35" bottom="13" right="39">Locked Barracks              </area>
-    <area top="18" left="35" bottom="26" right="39">Abandoned Planning Room      </area>
-    <area top="18" left="26" bottom="26" right="30">Dining Hall                  </area>
-    <area top="2" left="1" bottom="9" right="12">Sacrifice Area               </area>
-    <area top="23" left="20" bottom="26" right="24">Commander&apos;s Office           </area>
-    <area top="28" left="32" bottom="37" right="39">Training Room                </area>
+    <area top="25" left="43" bottom="31" right="46">Smelly, Gross Area</area>
+    <area top="3" left="43" bottom="9" right="46">Meat Locker</area>
+    <area top="5" left="35" bottom="13" right="39">Locked Barracks</area>
+    <area top="18" left="35" bottom="26" right="39">Abandoned Planning Room</area>
+    <area top="18" left="26" bottom="26" right="30">Dining Hall</area>
+    <area top="2" left="1" bottom="9" right="12">Sacrifice Area</area>
+    <area top="23" left="20" bottom="26" right="24">Commander&apos;s Office</area>
+    <area top="28" left="32" bottom="37" right="39">Training Room</area>
     <sign id="0">
         <![CDATA[Empire Fort MI2]]>
     </sign>
diff --git a/rsrc/scenarios/stealth/towns/town8.xml b/rsrc/scenarios/stealth/towns/town8.xml
index 879b555a..b6c96685 100644
--- a/rsrc/scenarios/stealth/towns/town8.xml
+++ b/rsrc/scenarios/stealth/towns/town8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Icy Tunnels                  </name>
+    <name>Icy Tunnels</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -507,11 +507,11 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="34" left="40" bottom="42" right="46">Below Pit                    </area>
-    <area top="16" left="22" bottom="28" right="29">Hydra Cave                   </area>
-    <area top="30" left="28" bottom="46" right="38">Underground Lake             </area>
-    <area top="4" left="5" bottom="13" right="17">Drake Lair                   </area>
-    <area top="11" left="1" bottom="15" right="7">Drake Treasure Chamber       </area>
+    <area top="34" left="40" bottom="42" right="46">Below Pit</area>
+    <area top="16" left="22" bottom="28" right="29">Hydra Cave</area>
+    <area top="30" left="28" bottom="46" right="38">Underground Lake</area>
+    <area top="4" left="5" bottom="13" right="17">Drake Lair</area>
+    <area top="11" left="1" bottom="15" right="7">Drake Treasure Chamber</area>
     <string id="0">
         <![CDATA[You enter a large chamber. In the ceiling, you see a shaft extending straight up about 30 or 40 feet to a brightly lit chamber. At the top, you see ogres peering down at you, laughing and pointing.]]>
     </string>
diff --git a/rsrc/scenarios/stealth/towns/town9.xml b/rsrc/scenarios/stealth/towns/town9.xml
index 87c5d6aa..779d873d 100644
--- a/rsrc/scenarios/stealth/towns/town9.xml
+++ b/rsrc/scenarios/stealth/towns/town9.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>64</size>
-    <name>Zaskiva Sewers               </name>
+    <name>Zaskiva Sewers</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -672,12 +672,12 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="18" left="17" bottom="28" right="30">Old Brigand&apos;s Lair           </area>
-    <area top="51" left="25" bottom="56" right="30">Control Room C2              </area>
-    <area top="1" left="1" bottom="7" right="6">Subterranean Dock            </area>
-    <area top="1" left="20" bottom="6" right="24">Punishment Cells             </area>
-    <area top="37" left="27" bottom="48" right="49">Roach Caves                  </area>
-    <area top="21" left="43" bottom="43" right="49">Roach Caves                  </area>
+    <area top="18" left="17" bottom="28" right="30">Old Brigand&apos;s Lair</area>
+    <area top="51" left="25" bottom="56" right="30">Control Room C2</area>
+    <area top="1" left="1" bottom="7" right="6">Subterranean Dock</area>
+    <area top="1" left="20" bottom="6" right="24">Punishment Cells</area>
+    <area top="37" left="27" bottom="48" right="49">Roach Caves</area>
+    <area top="21" left="43" bottom="43" right="49">Roach Caves</area>
     <sign id="0">
         <![CDATA[Control Room C2]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/out/out0~0.xml b/rsrc/scenarios/valleydy/out/out0~0.xml
index 7ac3ea70..324dd2c0 100644
--- a/rsrc/scenarios/valleydy/out/out0~0.xml
+++ b/rsrc/scenarios/valleydy/out/out0~0.xml
@@ -107,8 +107,8 @@
     <sign id="2">
         <![CDATA[WARNING! GOBLIN INFESTATION!|Official Empire Notification GoblBISCK129]]>
     </sign>
-    <area top="4" left="6" bottom="18" right="22">Goblin Valley                </area>
-    <area top="33" left="30" bottom="36" right="33">Near Marralis                </area>
+    <area top="4" left="6" bottom="18" right="22">Goblin Valley</area>
+    <area top="33" left="30" bottom="36" right="33">Near Marralis</area>
     <string id="0">
         <![CDATA[At the end of the peaceful forest path, you find that a druid has set herself up a small, pleasant grove. She is kneeling outside, busily planting a small row of comfrey root. Deer graze happily around her.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/out/out0~1.xml b/rsrc/scenarios/valleydy/out/out0~1.xml
index f0cd3d9f..d9edd4ba 100644
--- a/rsrc/scenarios/valleydy/out/out0~1.xml
+++ b/rsrc/scenarios/valleydy/out/out0~1.xml
@@ -107,7 +107,7 @@
     <sign id="2">
         <![CDATA[Valgrak Marsh]]>
     </sign>
-    <area top="29" left="8" bottom="38" right="19">Healthy Valley               </area>
+    <area top="29" left="8" bottom="38" right="19">Healthy Valley</area>
     <string id="0">
         <![CDATA[Sorry, no Easter Eggs in this game.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/out/out0~2.xml b/rsrc/scenarios/valleydy/out/out0~2.xml
index aa91bbd8..15f8ee49 100644
--- a/rsrc/scenarios/valleydy/out/out0~2.xml
+++ b/rsrc/scenarios/valleydy/out/out0~2.xml
@@ -75,12 +75,12 @@
     <sign id="2">
         <![CDATA[PRIMARY WASTE STORAGE|PROTECTIVE GEAR MUST BE WORN!]]>
     </sign>
-    <area top="34" left="24" bottom="41" right="40">By Filth Streams             </area>
-    <area top="38" left="16" bottom="40" right="20">Near School Entrance         </area>
-    <area top="31" left="22" bottom="32" right="25">Subterranean Bridge          </area>
-    <area top="23" left="8" bottom="25" right="10">By Small Cavern              </area>
-    <area top="3" left="12" bottom="8" right="14">Passage to School Entrance   </area>
-    <area top="13" left="28" bottom="22" right="41">Dying Forest                 </area>
+    <area top="34" left="24" bottom="41" right="40">By Filth Streams</area>
+    <area top="38" left="16" bottom="40" right="20">Near School Entrance</area>
+    <area top="31" left="22" bottom="32" right="25">Subterranean Bridge</area>
+    <area top="23" left="8" bottom="25" right="10">By Small Cavern</area>
+    <area top="3" left="12" bottom="8" right="14">Passage to School Entrance</area>
+    <area top="13" left="28" bottom="22" right="41">Dying Forest</area>
     <string id="0">
         <![CDATA[You walk into an enormous cavern, and immediately run back out. The air inside is so bad, so viciously polluted, that it's a struggle merely to breathe. Your skin itches. Your eyes water and burn. You stagger out and spend a while gagging and choking.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/out/out1~0.xml b/rsrc/scenarios/valleydy/out/out1~0.xml
index f4734a1b..11f3332a 100644
--- a/rsrc/scenarios/valleydy/out/out1~0.xml
+++ b/rsrc/scenarios/valleydy/out/out1~0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <sector boes="2.0.0">
-    <name>Northern Vale                 </name>
+    <name>Northern Vale</name>
     <comment>Comment</comment>
     <encounter can-flee="false" force="true">
         <monster>0</monster>
@@ -101,8 +101,8 @@
     <sign id="0">
         <![CDATA[Blinlock - 5 mi. n.|SweetGrove - 30 mi. se.|Marralis - 25 mi. w.]]>
     </sign>
-    <area top="25" left="17" bottom="28" right="22">Near Blinlock                </area>
-    <area top="21" left="20" bottom="23" right="25">Lizard Valley                </area>
+    <area top="25" left="17" bottom="28" right="22">Near Blinlock</area>
+    <area top="21" left="20" bottom="23" right="25">Lizard Valley</area>
     <string id="0">
         <![CDATA[This small bridge spans a river flowing from the large hill to the northeast. Interestingly, you notice that the water from this river lacks the bitter reek of the water to the southwest.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/out/out1~1.xml b/rsrc/scenarios/valleydy/out/out1~1.xml
index e90e92d1..7a29d192 100644
--- a/rsrc/scenarios/valleydy/out/out1~1.xml
+++ b/rsrc/scenarios/valleydy/out/out1~1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <sector boes="2.0.0">
-    <name>Southern Vale                 </name>
+    <name>Southern Vale</name>
     <comment>Comment</comment>
     <encounter can-flee="false" force="true">
         <monster>0</monster>
@@ -66,8 +66,8 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </wandering>
-    <area top="10" left="16" bottom="16" right="23">Village Ruins                </area>
-    <area top="37" left="0" bottom="42" right="25">Remote Valley                </area>
+    <area top="10" left="16" bottom="16" right="23">Village Ruins</area>
+    <area top="37" left="0" bottom="42" right="25">Remote Valley</area>
     <string id="0">
         <![CDATA[You return to the spot where you met the drake. He still hasn't returned. Nothing is left to mark his presence but a few tracks and some carelessly shedded scales.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/out/out1~2.xml b/rsrc/scenarios/valleydy/out/out1~2.xml
index 8a0d2c76..fbcb4760 100644
--- a/rsrc/scenarios/valleydy/out/out1~2.xml
+++ b/rsrc/scenarios/valleydy/out/out1~2.xml
@@ -85,8 +85,8 @@
     <sign id="0">
         <![CDATA[MAIN CONTROL - 3 mi. south]]>
     </sign>
-    <area top="32" left="41" bottom="34" right="45">Near Control Chamber         </area>
-    <area top="3" left="15" bottom="5" right="17">By School Entry              </area>
+    <area top="32" left="41" bottom="34" right="45">Near Control Chamber</area>
+    <area top="3" left="15" bottom="5" right="17">By School Entry</area>
     <string id="0">
         <![CDATA[The alien beasts are dead, but you're afraid there's plenty more waiting for you. You have a long, hard march ahead of you.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/out/out2~0.xml b/rsrc/scenarios/valleydy/out/out2~0.xml
index 00144259..01a324a2 100644
--- a/rsrc/scenarios/valleydy/out/out2~0.xml
+++ b/rsrc/scenarios/valleydy/out/out2~0.xml
@@ -53,9 +53,9 @@
     <sign id="0">
         <![CDATA[Ford River Here|Watch your step!]]>
     </sign>
-    <area top="10" left="30" bottom="18" right="38">River Headwaters             </area>
-    <area top="27" left="10" bottom="40" right="22">Near Round Hill              </area>
-    <area top="4" left="24" bottom="10" right="33">Ghoulish Valley              </area>
+    <area top="10" left="30" bottom="18" right="38">River Headwaters</area>
+    <area top="27" left="10" bottom="40" right="22">Near Round Hill</area>
+    <area top="4" left="24" bottom="10" right="33">Ghoulish Valley</area>
     <string id="0">
         <![CDATA[As you walk along the river, you find a small, comfortable beach. The river flows to the south, and the water flowing by looks very tempting. Do you drink some?]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/out/out2~1.xml b/rsrc/scenarios/valleydy/out/out2~1.xml
index 4f3e4c03..591d1220 100644
--- a/rsrc/scenarios/valleydy/out/out2~1.xml
+++ b/rsrc/scenarios/valleydy/out/out2~1.xml
@@ -69,11 +69,11 @@
     <sign id="0">
         <![CDATA[Fort Talrus - 30 miles south|Blinlock - 45 miles northwest]]>
     </sign>
-    <area top="20" left="19" bottom="24" right="23">By Sweetgrove                </area>
-    <area top="19" left="15" bottom="21" right="17">Pitted Stone Bridge          </area>
-    <area top="32" left="8" bottom="36" right="17">Farmland                     </area>
-    <area top="14" left="23" bottom="35" right="34">Farmland                     </area>
-    <area top="32" left="42" bottom="36" right="45">Narrow Valley                </area>
+    <area top="20" left="19" bottom="24" right="23">By Sweetgrove</area>
+    <area top="19" left="15" bottom="21" right="17">Pitted Stone Bridge</area>
+    <area top="32" left="8" bottom="36" right="17">Farmland</area>
+    <area top="14" left="23" bottom="35" right="34">Farmland</area>
+    <area top="32" left="42" bottom="36" right="45">Narrow Valley</area>
     <string id="0">
         <![CDATA[It looks like someone was camped here recently. Whoever they were, they cleaned up well when they left.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/out/out2~2.xml b/rsrc/scenarios/valleydy/out/out2~2.xml
index 33b0e960..cd5305c1 100644
--- a/rsrc/scenarios/valleydy/out/out2~2.xml
+++ b/rsrc/scenarios/valleydy/out/out2~2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <sector boes="2.0.0">
-    <name>Valley Entry                 </name>
+    <name>Valley Entry</name>
     <comment>Comment</comment>
     <encounter can-flee="false" force="true">
         <monster>0</monster>
diff --git a/rsrc/scenarios/valleydy/scenario.xml b/rsrc/scenarios/valleydy/scenario.xml
index c7c37b6c..3544d304 100644
--- a/rsrc/scenarios/valleydy/scenario.xml
+++ b/rsrc/scenarios/valleydy/scenario.xml
@@ -52,49 +52,49 @@
         <sector-start x="23" y="39" />
         <store-items top="0" left="0" bottom="47" right="47" town="0" />
         <special-item start-with="false" useable="false" special="-1">
-            <name>Runed Stone              </name>
+            <name>Runed Stone</name>
             <description>
                 <![CDATA[This is a black, polished stone sphere, about 4 inches in diameter. It is covered with small, finely etched runes and radiates energy constantly.]]>
             </description>
         </special-item>
         <special-item start-with="false" useable="false" special="-1">
-            <name>Crystal of Power         </name>
+            <name>Crystal of Power</name>
             <description>
                 <![CDATA[This six inch long quartz crystal would seem pretty ordinary were it not for one thing - it's searingly hot to the touch. Someone has somehow stored an amazing amount of power in it.]]>
             </description>
         </special-item>
         <special-item start-with="false" useable="true" special="9">
-            <name>Opening Stone            </name>
+            <name>Opening Stone</name>
             <description>
                 <![CDATA[This is a simple black stone, about three inches long, which has been polished smooth by the rubbing of countless hands.]]>
             </description>
         </special-item>
         <special-item start-with="false" useable="false" special="-1">
-            <name>Stone Tablets            </name>
+            <name>Stone Tablets</name>
             <description>
                 <![CDATA[These old stone tablets contain a variety of information on the subject of mining. You can't understand any of it.]]>
             </description>
         </special-item>
         <special-item start-with="false" useable="false" special="-1">
-            <name>Stone Tablets            </name>
+            <name>Stone Tablets</name>
             <description>
                 <![CDATA[These old stone tablets contain a variety of information on the subject of woodcarving. You can't understand any of it.]]>
             </description>
         </special-item>
         <special-item start-with="false" useable="true" special="8">
-            <name>Healing Scepter       </name>
+            <name>Healing Scepter</name>
             <description>
                 <![CDATA[This is a bronze scepter with fittings of gold, about two feet long. A large, somewhat flawed opal is set into it at one end.]]>
             </description>
         </special-item>
         <special-item start-with="false" useable="false" special="-1">
-            <name>Instructions Scrolls     </name>
+            <name>Instructions Scrolls</name>
             <description>
                 <![CDATA[This sheaf of scrolls explains in some detail how to operate the control panels at the lowest level of the School of Magery.]]>
             </description>
         </special-item>
         <special-item start-with="false" useable="false" special="-1">
-            <name>Drake Fang               </name>
+            <name>Drake Fang</name>
             <description>
                 <![CDATA[This tooth is bone white and about the length of your arm. Its owner was clearly a beast to be reckoned with.]]>
             </description>
diff --git a/rsrc/scenarios/valleydy/towns/town0.xml b/rsrc/scenarios/valleydy/towns/town0.xml
index b9549d26..3ca74087 100644
--- a/rsrc/scenarios/valleydy/towns/town0.xml
+++ b/rsrc/scenarios/valleydy/towns/town0.xml
@@ -587,13 +587,13 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="31" left="14" bottom="38" right="18">Abandoned Barracks           </area>
-    <area top="34" left="6" bottom="38" right="10">Commander&apos;s Office           </area>
-    <area top="6" left="7" bottom="13" right="10">Guest Quarters               </area>
-    <area top="6" left="14" bottom="16" right="18">Storeroom                    </area>
-    <area top="28" left="23" bottom="34" right="33">Dining Hall                  </area>
-    <area top="28" left="35" bottom="34" right="41">Somewhat Used Barracks       </area>
-    <area top="5" left="2" bottom="18" right="5">Rat lair                     </area>
+    <area top="31" left="14" bottom="38" right="18">Abandoned Barracks</area>
+    <area top="34" left="6" bottom="38" right="10">Commander&apos;s Office</area>
+    <area top="6" left="7" bottom="13" right="10">Guest Quarters</area>
+    <area top="6" left="14" bottom="16" right="18">Storeroom</area>
+    <area top="28" left="23" bottom="34" right="33">Dining Hall</area>
+    <area top="28" left="35" bottom="34" right="41">Somewhat Used Barracks</area>
+    <area top="5" left="2" bottom="18" right="5">Rat lair</area>
     <sign id="0">
         <![CDATA[Commander's Office|Cmd. Terrance, Acting Officer]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town1.xml b/rsrc/scenarios/valleydy/towns/town1.xml
index 4692426f..8648f4a8 100644
--- a/rsrc/scenarios/valleydy/towns/town1.xml
+++ b/rsrc/scenarios/valleydy/towns/town1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>64</size>
-    <name>Sweetgrove                   </name>
+    <name>Sweetgrove</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -732,12 +732,12 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="54" left="53" bottom="57" right="57">Abandoned Silo               </area>
-    <area top="37" left="46" bottom="47" right="56">McKean&apos;s Inn                 </area>
-    <area top="17" left="49" bottom="23" right="57">Home of Axel the Sage        </area>
-    <area top="35" left="6" bottom="45" right="16">Sweetgrove Bazaar            </area>
-    <area top="19" left="33" bottom="26" right="40">Abandoned Shop               </area>
-    <area top="6" left="32" bottom="13" right="39">Armory                       </area>
+    <area top="54" left="53" bottom="57" right="57">Abandoned Silo</area>
+    <area top="37" left="46" bottom="47" right="56">McKean&apos;s Inn</area>
+    <area top="17" left="49" bottom="23" right="57">Home of Axel the Sage</area>
+    <area top="35" left="6" bottom="45" right="16">Sweetgrove Bazaar</area>
+    <area top="19" left="33" bottom="26" right="40">Abandoned Shop</area>
+    <area top="6" left="32" bottom="13" right="39">Armory</area>
     <sign id="0">
         <![CDATA[Sweetgrove Bazaar]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town10.xml b/rsrc/scenarios/valleydy/towns/town10.xml
index c699d7ae..5b71598b 100644
--- a/rsrc/scenarios/valleydy/towns/town10.xml
+++ b/rsrc/scenarios/valleydy/towns/town10.xml
@@ -530,9 +530,9 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="2" left="19" bottom="17" right="28">Waste Arrival Chamber        </area>
-    <area top="22" left="21" bottom="24" right="26">Control Chamber              </area>
-    <area top="29" left="22" bottom="37" right="25">Entry Hall                   </area>
+    <area top="2" left="19" bottom="17" right="28">Waste Arrival Chamber</area>
+    <area top="22" left="21" bottom="24" right="26">Control Chamber</area>
+    <area top="29" left="22" bottom="37" right="25">Entry Hall</area>
     <sign id="0">
         <![CDATA[CONTROL CHAMBER]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town11.xml b/rsrc/scenarios/valleydy/towns/town11.xml
index 4473f338..539332f3 100644
--- a/rsrc/scenarios/valleydy/towns/town11.xml
+++ b/rsrc/scenarios/valleydy/towns/town11.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Student Quarters             </name>
+    <name>Student Quarters</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -507,18 +507,18 @@
         <personality>-1</personality>
         <face>-1</face>
     </creature>
-    <area top="29" left="33" bottom="35" right="46">Destroyed Chamber            </area>
-    <area top="18" left="33" bottom="27" right="46">Ransacked Quarters           </area>
-    <area top="16" left="1" bottom="21" right="16">Ransacked Quarters           </area>
-    <area top="8" left="1" bottom="11" right="15">Apothecary                   </area>
-    <area top="4" left="1" bottom="6" right="10">Apothecary Storage           </area>
-    <area top="8" left="34" bottom="16" right="46">Possession Check-In          </area>
-    <area top="29" left="22" bottom="43" right="31">Dining Hall                  </area>
-    <area top="42" left="1" bottom="46" right="4">Small Office                 </area>
-    <area top="23" left="1" bottom="37" right="16">3rd Year Student Cells       </area>
-    <area top="39" left="38" bottom="46" right="41">Old Storeroom                </area>
-    <area top="39" left="33" bottom="46" right="36">Abandoned Kitchen            </area>
-    <area top="39" left="43" bottom="46" right="46">Dusty Barracks               </area>
+    <area top="29" left="33" bottom="35" right="46">Destroyed Chamber</area>
+    <area top="18" left="33" bottom="27" right="46">Ransacked Quarters</area>
+    <area top="16" left="1" bottom="21" right="16">Ransacked Quarters</area>
+    <area top="8" left="1" bottom="11" right="15">Apothecary</area>
+    <area top="4" left="1" bottom="6" right="10">Apothecary Storage</area>
+    <area top="8" left="34" bottom="16" right="46">Possession Check-In</area>
+    <area top="29" left="22" bottom="43" right="31">Dining Hall</area>
+    <area top="42" left="1" bottom="46" right="4">Small Office</area>
+    <area top="23" left="1" bottom="37" right="16">3rd Year Student Cells</area>
+    <area top="39" left="38" bottom="46" right="41">Old Storeroom</area>
+    <area top="39" left="33" bottom="46" right="36">Abandoned Kitchen</area>
+    <area top="39" left="43" bottom="46" right="46">Dusty Barracks</area>
     <sign id="0">
         <![CDATA[PROVOST]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town12.xml b/rsrc/scenarios/valleydy/towns/town12.xml
index d863ca8b..cb4b7672 100644
--- a/rsrc/scenarios/valleydy/towns/town12.xml
+++ b/rsrc/scenarios/valleydy/towns/town12.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Lecture Halls                </name>
+    <name>Lecture Halls</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -499,9 +499,9 @@
         <personality>-1</personality>
         <face>-1</face>
     </creature>
-    <area top="36" left="1" bottom="46" right="9">Lecture Hall                 </area>
-    <area top="1" left="36" bottom="7" right="46">Faculty Offices              </area>
-    <area top="10" left="1" bottom="15" right="3">Faculty Offices              </area>
+    <area top="36" left="1" bottom="46" right="9">Lecture Hall</area>
+    <area top="1" left="36" bottom="7" right="46">Faculty Offices</area>
+    <area top="10" left="1" bottom="15" right="3">Faculty Offices</area>
     <sign id="0">
         <![CDATA[Faculty Offices]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town13.xml b/rsrc/scenarios/valleydy/towns/town13.xml
index 62865e44..fca60294 100644
--- a/rsrc/scenarios/valleydy/towns/town13.xml
+++ b/rsrc/scenarios/valleydy/towns/town13.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Libraries                    </name>
+    <name>Libraries</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -547,8 +547,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="42" left="1" bottom="46" right="29">Reading Rooms                </area>
-    <area top="42" left="30" bottom="46" right="43">Study Carrels                </area>
+    <area top="42" left="1" bottom="46" right="29">Reading Rooms</area>
+    <area top="42" left="30" bottom="46" right="43">Study Carrels</area>
     <sign id="0">
         <![CDATA[THE SCHOOL OF MAGERY LIBRARY|"Free your mind, so that wisdom may enter."]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town14.xml b/rsrc/scenarios/valleydy/towns/town14.xml
index f74599b9..e5577c82 100644
--- a/rsrc/scenarios/valleydy/towns/town14.xml
+++ b/rsrc/scenarios/valleydy/towns/town14.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Experiment Halls             </name>
+    <name>Experiment Halls</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -508,15 +508,15 @@
         <personality>-1</personality>
         <face>-1</face>
     </creature>
-    <area top="20" left="29" bottom="42" right="46">Experimental Laboratories    </area>
-    <area top="32" left="3" bottom="40" right="14">Holding Cell Ruins           </area>
-    <area top="18" left="3" bottom="28" right="20">Storage and Records          </area>
-    <area top="10" left="36" bottom="14" right="41">Punishment Cells             </area>
-    <area top="32" left="18" bottom="40" right="21">Guard Room                   </area>
-    <area top="1" left="33" bottom="4" right="40">Guard Room                   </area>
-    <area top="1" left="4" bottom="5" right="13">Guard Room                   </area>
-    <area top="1" left="15" bottom="8" right="20">Mascot&apos;s Lair                </area>
-    <area top="1" left="26" bottom="8" right="31">Waste Repository             </area>
+    <area top="20" left="29" bottom="42" right="46">Experimental Laboratories</area>
+    <area top="32" left="3" bottom="40" right="14">Holding Cell Ruins</area>
+    <area top="18" left="3" bottom="28" right="20">Storage and Records</area>
+    <area top="10" left="36" bottom="14" right="41">Punishment Cells</area>
+    <area top="32" left="18" bottom="40" right="21">Guard Room</area>
+    <area top="1" left="33" bottom="4" right="40">Guard Room</area>
+    <area top="1" left="4" bottom="5" right="13">Guard Room</area>
+    <area top="1" left="15" bottom="8" right="20">Mascot&apos;s Lair</area>
+    <area top="1" left="26" bottom="8" right="31">Waste Repository</area>
     <sign id="0">
         <![CDATA[WASTE REPOSITORY|HIGH TO NORTH, WEAK TO SOUTH|DISPOSAL ON SUNDAYS]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town15.xml b/rsrc/scenarios/valleydy/towns/town15.xml
index 269b069c..970ee86e 100644
--- a/rsrc/scenarios/valleydy/towns/town15.xml
+++ b/rsrc/scenarios/valleydy/towns/town15.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Vahnatai Caverns             </name>
+    <name>Vahnatai Caverns</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -544,8 +544,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="34" left="32" bottom="39" right="40">Vahnatai Cavern              </area>
-    <area top="18" left="40" bottom="27" right="45">Vahnatai Cavern              </area>
+    <area top="34" left="32" bottom="39" right="40">Vahnatai Cavern</area>
+    <area top="18" left="40" bottom="27" right="45">Vahnatai Cavern</area>
     <string id="0">
         <![CDATA[You see that someone has etched several glyphs in the cave floor just ahead. There's no dust or moss on them, and they're still pretty clean. If you didn't know better, you'd think they were etched here very recently.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/towns/town16.xml b/rsrc/scenarios/valleydy/towns/town16.xml
index ee327c86..ff86549a 100644
--- a/rsrc/scenarios/valleydy/towns/town16.xml
+++ b/rsrc/scenarios/valleydy/towns/town16.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Control Chamber              </name>
+    <name>Control Chamber</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/valleydy/towns/town17.xml b/rsrc/scenarios/valleydy/towns/town17.xml
index 05b23b02..cb74d869 100644
--- a/rsrc/scenarios/valleydy/towns/town17.xml
+++ b/rsrc/scenarios/valleydy/towns/town17.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Vale Infestation             </name>
+    <name>Vale Infestation</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/valleydy/towns/town18.xml b/rsrc/scenarios/valleydy/towns/town18.xml
index 282fe3b4..f15d9612 100644
--- a/rsrc/scenarios/valleydy/towns/town18.xml
+++ b/rsrc/scenarios/valleydy/towns/town18.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Fungal Cavern                </name>
+    <name>Fungal Cavern</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -579,7 +579,7 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="25" left="31" bottom="31" right="39">Concealed Crypt              </area>
+    <area top="25" left="31" bottom="31" right="39">Concealed Crypt</area>
     <sign id="0">
         <![CDATA[Some message is etched into this wall. You can't understand what it says.]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town19.xml b/rsrc/scenarios/valleydy/towns/town19.xml
index 1acbd90b..1d573ad7 100644
--- a/rsrc/scenarios/valleydy/towns/town19.xml
+++ b/rsrc/scenarios/valleydy/towns/town19.xml
@@ -483,8 +483,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="5" left="10" bottom="10" right="17">Troglodyte Lair              </area>
-    <area top="9" left="4" bottom="12" right="7">Trash Pit                    </area>
+    <area top="5" left="10" bottom="10" right="17">Troglodyte Lair</area>
+    <area top="9" left="4" bottom="12" right="7">Trash Pit</area>
     <string id="0">
         <![CDATA[You doubtthat  the troglodytes would leave a treasure chest here without some sort of nice, nasty trap on it ...]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/towns/town2.xml b/rsrc/scenarios/valleydy/towns/town2.xml
index 67c71e1e..41590d8f 100644
--- a/rsrc/scenarios/valleydy/towns/town2.xml
+++ b/rsrc/scenarios/valleydy/towns/town2.xml
@@ -528,12 +528,12 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="36" left="40" bottom="43" right="46">Abandoned Quarters           </area>
-    <area top="30" left="26" bottom="39" right="31">Abandoned Store              </area>
-    <area top="30" left="19" bottom="39" right="24">City Hall                    </area>
-    <area top="2" left="4" bottom="11" right="13">Blinlock Foundry             </area>
-    <area top="1" left="20" bottom="8" right="47">Blinlock Mines               </area>
-    <area top="0" left="40" bottom="25" right="46">Blinlock Mines               </area>
+    <area top="36" left="40" bottom="43" right="46">Abandoned Quarters</area>
+    <area top="30" left="26" bottom="39" right="31">Abandoned Store</area>
+    <area top="30" left="19" bottom="39" right="24">City Hall</area>
+    <area top="2" left="4" bottom="11" right="13">Blinlock Foundry</area>
+    <area top="1" left="20" bottom="8" right="47">Blinlock Mines</area>
+    <area top="0" left="40" bottom="25" right="46">Blinlock Mines</area>
     <sign id="0">
         <![CDATA[Blinlock Foundry]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town20.xml b/rsrc/scenarios/valleydy/towns/town20.xml
index 34fae5c8..c28ac0c1 100644
--- a/rsrc/scenarios/valleydy/towns/town20.xml
+++ b/rsrc/scenarios/valleydy/towns/town20.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Small Cave                   </name>
+    <name>Small Cave</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -463,8 +463,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="14" left="9" bottom="26" right="20">Lava Cavern                  </area>
-    <area top="19" left="1" bottom="25" right="2">Hall of Crystals             </area>
+    <area top="14" left="9" bottom="26" right="20">Lava Cavern</area>
+    <area top="19" left="1" bottom="25" right="2">Hall of Crystals</area>
     <string id="0">
         <![CDATA[You stand at the far end of a long path, leading back down to the lowest depths of the School of Magery.]]>
     </string>
diff --git a/rsrc/scenarios/valleydy/towns/town3.xml b/rsrc/scenarios/valleydy/towns/town3.xml
index d04a7fd6..f076b48d 100644
--- a/rsrc/scenarios/valleydy/towns/town3.xml
+++ b/rsrc/scenarios/valleydy/towns/town3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Marralis                     </name>
+    <name>Marralis</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -583,13 +583,13 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="10" left="13" bottom="18" right="45">Around Failing Crops         </area>
-    <area top="23" left="7" bottom="29" right="13">Private Home                 </area>
-    <area top="23" left="18" bottom="29" right="21">Abandoned Shop               </area>
-    <area top="23" left="26" bottom="29" right="32">Communal Storeroom           </area>
-    <area top="25" left="37" bottom="29" right="41">Private Home                 </area>
-    <area top="36" left="39" bottom="41" right="41">Small Shop                   </area>
-    <area top="35" left="29" bottom="41" right="34">City Hall                    </area>
+    <area top="10" left="13" bottom="18" right="45">Around Failing Crops</area>
+    <area top="23" left="7" bottom="29" right="13">Private Home</area>
+    <area top="23" left="18" bottom="29" right="21">Abandoned Shop</area>
+    <area top="23" left="26" bottom="29" right="32">Communal Storeroom</area>
+    <area top="25" left="37" bottom="29" right="41">Private Home</area>
+    <area top="36" left="39" bottom="41" right="41">Small Shop</area>
+    <area top="35" left="29" bottom="41" right="34">City Hall</area>
     <area top="35" left="6" bottom="41" right="13">Temple of Divine Justice</area>
     <sign id="0">
         <![CDATA[TEMPLE OF DIVINE JUSTICE]]>
diff --git a/rsrc/scenarios/valleydy/towns/town4.xml b/rsrc/scenarios/valleydy/towns/town4.xml
index 2eb3136a..6726100c 100644
--- a/rsrc/scenarios/valleydy/towns/town4.xml
+++ b/rsrc/scenarios/valleydy/towns/town4.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Pangle&apos;s Hut                 </name>
+    <name>Pangle&apos;s Hut</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -484,10 +484,10 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="21" left="5" bottom="25" right="11">Storage Shed                 </area>
-    <area top="6" left="7" bottom="10" right="13">Pangle&apos;s Common Room         </area>
-    <area top="12" left="7" bottom="14" right="13">Pangle&apos;s Bedroom             </area>
-    <area top="22" left="21" bottom="25" right="26">Small Stable                 </area>
+    <area top="21" left="5" bottom="25" right="11">Storage Shed</area>
+    <area top="6" left="7" bottom="10" right="13">Pangle&apos;s Common Room</area>
+    <area top="12" left="7" bottom="14" right="13">Pangle&apos;s Bedroom</area>
+    <area top="22" left="21" bottom="25" right="26">Small Stable</area>
     <sign id="0">
         <![CDATA[SHED]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town5.xml b/rsrc/scenarios/valleydy/towns/town5.xml
index 02fe5fe9..b2077992 100644
--- a/rsrc/scenarios/valleydy/towns/town5.xml
+++ b/rsrc/scenarios/valleydy/towns/town5.xml
@@ -516,11 +516,11 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="8" left="9" bottom="19" right="19">Old Stables                  </area>
-    <area top="8" left="29" bottom="19" right="40">Defunct Storeroom            </area>
-    <area top="15" left="19" bottom="34" right="29">Entry Hall                   </area>
-    <area top="29" left="9" bottom="41" right="19">Temporary Quarters           </area>
-    <area top="29" left="29" bottom="41" right="40">Waste Disposal               </area>
+    <area top="8" left="9" bottom="19" right="19">Old Stables</area>
+    <area top="8" left="29" bottom="19" right="40">Defunct Storeroom</area>
+    <area top="15" left="19" bottom="34" right="29">Entry Hall</area>
+    <area top="29" left="9" bottom="41" right="19">Temporary Quarters</area>
+    <area top="29" left="29" bottom="41" right="40">Waste Disposal</area>
     <sign id="0">
         <![CDATA[Stables]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town6.xml b/rsrc/scenarios/valleydy/towns/town6.xml
index e90e3ab8..078b7e36 100644
--- a/rsrc/scenarios/valleydy/towns/town6.xml
+++ b/rsrc/scenarios/valleydy/towns/town6.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Visitors&apos; Quarters           </name>
+    <name>Visitors&apos; Quarters</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -520,13 +520,13 @@
         <personality>-1</personality>
         <face>44</face>
     </creature>
-    <area top="42" left="9" bottom="46" right="18">Goblin Meat Storage          </area>
-    <area top="35" left="12" bottom="40" right="18">Goblin Mushroom Farm         </area>
-    <area top="4" left="20" bottom="15" right="30">Goblin Temple                </area>
-    <area top="17" left="38" bottom="25" right="44">Goblin Eater Lair            </area>
-    <area top="17" left="20" bottom="23" right="30">Burial Chamber               </area>
-    <area top="35" left="1" bottom="46" right="7">Goblin&apos;s Mess Hall           </area>
-    <area top="35" left="20" bottom="46" right="30">Hall of Audience             </area>
+    <area top="42" left="9" bottom="46" right="18">Goblin Meat Storage</area>
+    <area top="35" left="12" bottom="40" right="18">Goblin Mushroom Farm</area>
+    <area top="4" left="20" bottom="15" right="30">Goblin Temple</area>
+    <area top="17" left="38" bottom="25" right="44">Goblin Eater Lair</area>
+    <area top="17" left="20" bottom="23" right="30">Burial Chamber</area>
+    <area top="35" left="1" bottom="46" right="7">Goblin&apos;s Mess Hall</area>
+    <area top="35" left="20" bottom="46" right="30">Hall of Audience</area>
     <sign id="0">
         <![CDATA[AND HEER WE MAKE SHRINE, AND DREEM OF DAY GATES OPEN AN WEE GO OUT TO BE ON SERFACE AGIN!]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town7.xml b/rsrc/scenarios/valleydy/towns/town7.xml
index 038dd2f5..23b9d4af 100644
--- a/rsrc/scenarios/valleydy/towns/town7.xml
+++ b/rsrc/scenarios/valleydy/towns/town7.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Holding Cells                </name>
+    <name>Holding Cells</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -511,10 +511,10 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="17" left="39" bottom="25" right="42">Control Chamber              </area>
-    <area top="17" left="22" bottom="29" right="33">Viewing Arena                </area>
-    <area top="22" left="1" bottom="30" right="10">Arrival Chamber              </area>
-    <area top="39" left="1" bottom="40" right="15">Purification Hall            </area>
+    <area top="17" left="39" bottom="25" right="42">Control Chamber</area>
+    <area top="17" left="22" bottom="29" right="33">Viewing Arena</area>
+    <area top="22" left="1" bottom="30" right="10">Arrival Chamber</area>
+    <area top="39" left="1" bottom="40" right="15">Purification Hall</area>
     <sign id="0">
         <![CDATA[HOLDING BAYS A - High Longevity]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town8.xml b/rsrc/scenarios/valleydy/towns/town8.xml
index 415d09f7..8b185f43 100644
--- a/rsrc/scenarios/valleydy/towns/town8.xml
+++ b/rsrc/scenarios/valleydy/towns/town8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Storage Level                </name>
+    <name>Storage Level</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -503,16 +503,16 @@
         <face>-1</face>
         <encounter>1</encounter>
     </creature>
-    <area top="1" left="18" bottom="11" right="21">Larvae Chambers              </area>
-    <area top="6" left="11" bottom="11" right="17">Larvae Chambers              </area>
-    <area top="20" left="27" bottom="24" right="38">Meat Locker                  </area>
-    <area top="1" left="27" bottom="18" right="46">Artificial Outdoors          </area>
-    <area top="20" left="40" bottom="24" right="46">Slaughtering Room            </area>
-    <area top="34" left="6" bottom="41" right="15">Prison of Pythras            </area>
-    <area top="29" left="1" bottom="46" right="20">Huge Holding Cell            </area>
-    <area top="1" left="1" bottom="24" right="20">School Storage Rooms         </area>
-    <area top="26" left="27" bottom="46" right="46">Halls of Records             </area>
-    <area top="23" left="22" bottom="29" right="25">By Husks of Goblins          </area>
+    <area top="1" left="18" bottom="11" right="21">Larvae Chambers</area>
+    <area top="6" left="11" bottom="11" right="17">Larvae Chambers</area>
+    <area top="20" left="27" bottom="24" right="38">Meat Locker</area>
+    <area top="1" left="27" bottom="18" right="46">Artificial Outdoors</area>
+    <area top="20" left="40" bottom="24" right="46">Slaughtering Room</area>
+    <area top="34" left="6" bottom="41" right="15">Prison of Pythras</area>
+    <area top="29" left="1" bottom="46" right="20">Huge Holding Cell</area>
+    <area top="1" left="1" bottom="24" right="20">School Storage Rooms</area>
+    <area top="26" left="27" bottom="46" right="46">Halls of Records</area>
+    <area top="23" left="22" bottom="29" right="25">By Husks of Goblins</area>
     <sign id="0">
         <![CDATA[STOREROOMS]]>
     </sign>
diff --git a/rsrc/scenarios/valleydy/towns/town9.xml b/rsrc/scenarios/valleydy/towns/town9.xml
index 2bdeff6e..9babf558 100644
--- a/rsrc/scenarios/valleydy/towns/town9.xml
+++ b/rsrc/scenarios/valleydy/towns/town9.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>64</size>
-    <name>Administration               </name>
+    <name>Administration</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -638,14 +638,14 @@
         <personality>91</personality>
         <face>45</face>
     </creature>
-    <area top="49" left="5" bottom="54" right="13">Barricaded Hall              </area>
-    <area top="1" left="25" bottom="7" right="33">Refuse Filled Cavern         </area>
-    <area top="10" left="40" bottom="18" right="48">Foul Fountain                </area>
-    <area top="33" left="32" bottom="35" right="51">Sealed Passages              </area>
-    <area top="37" left="12" bottom="48" right="23">Abandoned Offices            </area>
-    <area top="39" left="26" bottom="54" right="61">Spider Caves                 </area>
-    <area top="2" left="55" bottom="8" right="62">Gnat Hatchery                </area>
-    <area top="1" left="30" bottom="28" right="61">Gnat Caves                   </area>
+    <area top="49" left="5" bottom="54" right="13">Barricaded Hall</area>
+    <area top="1" left="25" bottom="7" right="33">Refuse Filled Cavern</area>
+    <area top="10" left="40" bottom="18" right="48">Foul Fountain</area>
+    <area top="33" left="32" bottom="35" right="51">Sealed Passages</area>
+    <area top="37" left="12" bottom="48" right="23">Abandoned Offices</area>
+    <area top="39" left="26" bottom="54" right="61">Spider Caves</area>
+    <area top="2" left="55" bottom="8" right="62">Gnat Hatchery</area>
+    <area top="1" left="30" bottom="28" right="61">Gnat Caves</area>
     <sign id="0">
         <![CDATA[ADMINISTRATION LEVEL]]>
     </sign>
diff --git a/rsrc/scenarios/zakhazi/out/out0~0.xml b/rsrc/scenarios/zakhazi/out/out0~0.xml
index c6f3916c..6a3509d8 100644
--- a/rsrc/scenarios/zakhazi/out/out0~0.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~0.xml
@@ -34,9 +34,9 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </encounter>
-    <area top="3" left="3" bottom="13" right="14">Poppy Shroom Cave            </area>
-    <area top="28" left="35" bottom="40" right="42">Fang Cavern                  </area>
-    <area top="6" left="22" bottom="11" right="27">Near Fort Cavalier           </area>
+    <area top="3" left="3" bottom="13" right="14">Poppy Shroom Cave</area>
+    <area top="28" left="35" bottom="40" right="42">Fang Cavern</area>
+    <area top="6" left="22" bottom="11" right="27">Near Fort Cavalier</area>
     <string id="0">
         <![CDATA[You pass through the illusionary wall north of Khoth's fortress, the wall he counted on to keep his fortress hidden. As you move through, however, something strange happens.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~1.xml b/rsrc/scenarios/zakhazi/out/out0~1.xml
index d23fbb62..74e64e08 100644
--- a/rsrc/scenarios/zakhazi/out/out0~1.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~1.xml
@@ -66,9 +66,9 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </wandering>
-    <area top="1" left="20" bottom="4" right="25">Below Khoth&apos;s Fortress       </area>
-    <area top="27" left="36" bottom="30" right="38">Near Broken Fang Clan        </area>
-    <area top="12" left="2" bottom="45" right="31">Slimy Tunnels                </area>
+    <area top="1" left="20" bottom="4" right="25">Below Khoth&apos;s Fortress</area>
+    <area top="27" left="36" bottom="30" right="38">Near Broken Fang Clan</area>
+    <area top="12" left="2" bottom="45" right="31">Slimy Tunnels</area>
     <string id="0">
         <![CDATA[You were starting to take free passage down this river a little bit for granted. Sure, there were rapids and falls, but no places where creatures were actually preventing you from passing. Until now.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~10.xml b/rsrc/scenarios/zakhazi/out/out0~10.xml
index 48535268..101fd830 100644
--- a/rsrc/scenarios/zakhazi/out/out0~10.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~10.xml
@@ -85,8 +85,8 @@
     <sign id="0">
         <![CDATA[LAND OF THE GIANTZ - KEEP WAY OR DIE!!!!]]>
     </sign>
-    <area top="16" left="35" bottom="29" right="42">Giants&apos; Lands                </area>
-    <area top="13" left="35" bottom="15" right="37">Giant Bridge                 </area>
+    <area top="16" left="35" bottom="29" right="42">Giants&apos; Lands</area>
+    <area top="13" left="35" bottom="15" right="37">Giant Bridge</area>
     <string id="0">
         <![CDATA[You find a natural steam vent. It's a steep depression in the cave floor, with cracks belching sulphurous steam at the base. The air is rank and thick with choking mists.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~11.xml b/rsrc/scenarios/zakhazi/out/out0~11.xml
index f3747874..2f0514b7 100644
--- a/rsrc/scenarios/zakhazi/out/out0~11.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~11.xml
@@ -24,8 +24,8 @@
     <sign id="1">
         <![CDATA[GUARDED PASS|NO PASS WITHOUT PAYMENT TO ASSIKVAS]]>
     </sign>
-    <area top="26" left="13" bottom="33" right="21">Near Assikvas                </area>
-    <area top="3" left="22" bottom="8" right="35">Unicorn Cave                 </area>
+    <area top="26" left="13" bottom="33" right="21">Near Assikvas</area>
+    <area top="3" left="22" bottom="8" right="35">Unicorn Cave</area>
     <string id="0">
         <![CDATA[You reach the massive jumble of sharp rocks. Looking just under the surface of the water, you can see them all there, threatening to rip the bottom out of your boat.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~14.xml b/rsrc/scenarios/zakhazi/out/out0~14.xml
index 9d47cca2..cf4646e6 100644
--- a/rsrc/scenarios/zakhazi/out/out0~14.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~14.xml
@@ -53,8 +53,8 @@
     <sign id="0">
         <![CDATA[(The obelisk is ancient and well worn. You are only able to make out one word.)|Za-Khazi]]>
     </sign>
-    <area top="37" left="17" bottom="40" right="21">Near Fort Goodling           </area>
-    <area top="11" left="24" bottom="18" right="28">Set of Falls                 </area>
+    <area top="37" left="17" bottom="40" right="21">Near Fort Goodling</area>
+    <area top="11" left="24" bottom="18" right="28">Set of Falls</area>
     <string id="0">
         <![CDATA[To the west, the river becomes too rough and fast to row against. It looks like you have no choice but to continue down the Za-Khazi Run, to the east.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~2.xml b/rsrc/scenarios/zakhazi/out/out0~2.xml
index cf9d7b1b..976f6fa7 100644
--- a/rsrc/scenarios/zakhazi/out/out0~2.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~2.xml
@@ -34,9 +34,9 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </wandering>
-    <area top="3" left="3" bottom="14" right="12">Unstable Caves               </area>
-    <area top="28" left="36" bottom="45" right="46">Unstable Caves               </area>
-    <area top="33" left="29" bottom="46" right="40">Unstable Caves               </area>
+    <area top="3" left="3" bottom="14" right="12">Unstable Caves</area>
+    <area top="28" left="36" bottom="45" right="46">Unstable Caves</area>
+    <area top="33" left="29" bottom="46" right="40">Unstable Caves</area>
     <string id="0">
         <![CDATA[At the end of this passage, you find the wall is covered with massive clumps of lichen. You almost give it up as a dead end and turn back, until you notice a peculiar design on one exposed section of wall.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~3.xml b/rsrc/scenarios/zakhazi/out/out0~3.xml
index 964e4c94..59ca836a 100644
--- a/rsrc/scenarios/zakhazi/out/out0~3.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~3.xml
@@ -18,8 +18,8 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </encounter>
-    <area top="10" left="8" bottom="20" right="12">Island of Shadows            </area>
-    <area top="36" left="5" bottom="39" right="8">Near Spiraling Crypt         </area>
+    <area top="10" left="8" bottom="20" right="12">Island of Shadows</area>
+    <area top="36" left="5" bottom="39" right="8">Near Spiraling Crypt</area>
     <string id="0">
         <![CDATA[After a long, arduous trip over land, you finally reach another part of the river you began your journey on. Unfortunately, your boat is still many miles behind you.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~4.xml b/rsrc/scenarios/zakhazi/out/out0~4.xml
index 1b243ad5..bd1382bf 100644
--- a/rsrc/scenarios/zakhazi/out/out0~4.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~4.xml
@@ -66,7 +66,7 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </wandering>
-    <area top="4" left="2" bottom="13" right="9">Bubbling Fumarole            </area>
+    <area top="4" left="2" bottom="13" right="9">Bubbling Fumarole</area>
     <string id="0">
         <![CDATA[You detect a peculiar smell in the air. It's sickly sweet, like slightly old fruit. It makes you feel very happy and pleasant, and somewhat light-headed. The farther north you walk, the stronger the smell gets.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~5.xml b/rsrc/scenarios/zakhazi/out/out0~5.xml
index 967c4335..b27a5437 100644
--- a/rsrc/scenarios/zakhazi/out/out0~5.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~5.xml
@@ -72,8 +72,8 @@
     <sign id="1">
         <![CDATA[FORTRESS OF MOROG]]>
     </sign>
-    <area top="21" left="19" bottom="31" right="31">On Plateau                   </area>
-    <area top="16" left="15" bottom="35" right="35">Base of Plateau              </area>
+    <area top="21" left="19" bottom="31" right="31">On Plateau</area>
+    <area top="16" left="15" bottom="35" right="35">Base of Plateau</area>
     <string id="0">
         <![CDATA[The entrance to this narrow valley is marked by a long row of very grisly trophies. They're dead humans. Some wear the uniforms of the Exile armor. Some are dressed like travelers. All have been hanging here for some time.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~6.xml b/rsrc/scenarios/zakhazi/out/out0~6.xml
index 6d916638..34cc7a0c 100644
--- a/rsrc/scenarios/zakhazi/out/out0~6.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~6.xml
@@ -66,7 +66,7 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </wandering>
-    <area top="33" left="24" bottom="35" right="26">By Wurm Pit                  </area>
+    <area top="33" left="24" bottom="35" right="26">By Wurm Pit</area>
     <string id="0">
         <![CDATA[This cavern has many bone chips littering the ground, but this is the first full-sized body you've found. It looks like it's been here for some time, but the specters have sucked it so dry that it didn't rot.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~7.xml b/rsrc/scenarios/zakhazi/out/out0~7.xml
index fb3c4525..8a71c294 100644
--- a/rsrc/scenarios/zakhazi/out/out0~7.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~7.xml
@@ -88,8 +88,8 @@
     <sign id="1">
         <![CDATA[Calamity]]>
     </sign>
-    <area top="33" left="6" bottom="35" right="10">Misty Pools                  </area>
-    <area top="13" left="42" bottom="21" right="44">Rocky Climb                  </area>
+    <area top="33" left="6" bottom="35" right="10">Misty Pools</area>
+    <area top="13" left="42" bottom="21" right="44">Rocky Climb</area>
     <string id="0">
         <![CDATA[As you make your way down this winding path, you notice a glitter from the ground nearby. Looking closer, you find a small, round, iridescent gemstone. ]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~8.xml b/rsrc/scenarios/zakhazi/out/out0~8.xml
index 1c78e4ce..da8c2504 100644
--- a/rsrc/scenarios/zakhazi/out/out0~8.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~8.xml
@@ -114,7 +114,7 @@
         <onflee>-1</onflee>
         <sdf x="-1" y="-1" />
     </wandering>
-    <area top="27" left="6" bottom="31" right="8">Outside Unicorn Gate         </area>
+    <area top="27" left="6" bottom="31" right="8">Outside Unicorn Gate</area>
     <string id="0">
         <![CDATA[You start to enter this large cavern and immediately back away. It's filled with snakes! And not just small snakes either, but huge ones, fifteen feet long, with massive fangs dripping poison.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/out/out0~9.xml b/rsrc/scenarios/zakhazi/out/out0~9.xml
index 11539f53..66949c00 100644
--- a/rsrc/scenarios/zakhazi/out/out0~9.xml
+++ b/rsrc/scenarios/zakhazi/out/out0~9.xml
@@ -2,7 +2,7 @@
 <sector boes="2.0.0">
     <name>Unicorn Caves</name>
     <comment>Comment</comment>
-    <area top="37" left="4" bottom="45" right="11">Unicorn Grove                </area>
+    <area top="37" left="4" bottom="45" right="11">Unicorn Grove</area>
     <string id="0">
         <![CDATA[When you walk into this huge cavern, you have to look twice to make sure your eyes aren't misleading you. So far, the caves of the Za-Khazi run have been your ordinary Exile caverns - rough, wild, filled with fungi and rubble.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/towns/town0.xml b/rsrc/scenarios/zakhazi/towns/town0.xml
index f5c5024a..c58962d9 100644
--- a/rsrc/scenarios/zakhazi/towns/town0.xml
+++ b/rsrc/scenarios/zakhazi/towns/town0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Fort Goodling                </name>
+    <name>Fort Goodling</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/zakhazi/towns/town1.xml b/rsrc/scenarios/zakhazi/towns/town1.xml
index e74adf2f..757245e2 100644
--- a/rsrc/scenarios/zakhazi/towns/town1.xml
+++ b/rsrc/scenarios/zakhazi/towns/town1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Cunning Crypt                </name>
+    <name>Cunning Crypt</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/zakhazi/towns/town10.xml b/rsrc/scenarios/zakhazi/towns/town10.xml
index 28be579a..8aaa4aa9 100644
--- a/rsrc/scenarios/zakhazi/towns/town10.xml
+++ b/rsrc/scenarios/zakhazi/towns/town10.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Deep Caverns                 </name>
+    <name>Deep Caverns</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/zakhazi/towns/town11.xml b/rsrc/scenarios/zakhazi/towns/town11.xml
index 2e2a3203..81d90ee9 100644
--- a/rsrc/scenarios/zakhazi/towns/town11.xml
+++ b/rsrc/scenarios/zakhazi/towns/town11.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Opal Citadel                 </name>
+    <name>Opal Citadel</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -521,14 +521,14 @@
         <personality>-1</personality>
         <face>10</face>
     </creature>
-    <area top="5" left="34" bottom="12" right="40">Opal Shop                    </area>
-    <area top="3" left="16" bottom="9" right="26">Lake of Snipers              </area>
-    <area top="1" left="1" bottom="2" right="4">Filth Pit                    </area>
-    <area top="16" left="4" bottom="18" right="16">Guarded Wall                 </area>
-    <area top="22" left="2" bottom="33" right="8">Mage&apos;s Chambers              </area>
-    <area top="28" left="21" bottom="34" right="31">General Barracks             </area>
-    <area top="19" left="19" bottom="24" right="31">Dining Hall                  </area>
-    <area top="20" left="35" bottom="27" right="43">Temple                       </area>
+    <area top="5" left="34" bottom="12" right="40">Opal Shop</area>
+    <area top="3" left="16" bottom="9" right="26">Lake of Snipers</area>
+    <area top="1" left="1" bottom="2" right="4">Filth Pit</area>
+    <area top="16" left="4" bottom="18" right="16">Guarded Wall</area>
+    <area top="22" left="2" bottom="33" right="8">Mage&apos;s Chambers</area>
+    <area top="28" left="21" bottom="34" right="31">General Barracks</area>
+    <area top="19" left="19" bottom="24" right="31">Dining Hall</area>
+    <area top="20" left="35" bottom="27" right="43">Temple</area>
     <sign id="0">
         <![CDATA[OPAL CITADEL|Fine gemstones, reasonable prices!|Robbery met with death!]]>
     </sign>
diff --git a/rsrc/scenarios/zakhazi/towns/town12.xml b/rsrc/scenarios/zakhazi/towns/town12.xml
index a041667e..fd34cb7e 100644
--- a/rsrc/scenarios/zakhazi/towns/town12.xml
+++ b/rsrc/scenarios/zakhazi/towns/town12.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Opal Mines                   </name>
+    <name>Opal Mines</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -510,12 +510,12 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="42" left="22" bottom="46" right="28">Mine Storeroom               </area>
-    <area top="13" left="38" bottom="18" right="44">Melora Opal Chamber          </area>
-    <area top="3" left="36" bottom="7" right="43">Opal Storage                 </area>
-    <area top="1" left="18" bottom="45" right="46">Opal Mines                   </area>
-    <area top="4" left="1" bottom="19" right="13">Mushroom Farms               </area>
-    <area top="20" left="2" bottom="46" right="18">Mushroom Farms               </area>
+    <area top="42" left="22" bottom="46" right="28">Mine Storeroom</area>
+    <area top="13" left="38" bottom="18" right="44">Melora Opal Chamber</area>
+    <area top="3" left="36" bottom="7" right="43">Opal Storage</area>
+    <area top="1" left="18" bottom="45" right="46">Opal Mines</area>
+    <area top="4" left="1" bottom="19" right="13">Mushroom Farms</area>
+    <area top="20" left="2" bottom="46" right="18">Mushroom Farms</area>
     <string id="0">
         <![CDATA[You are at a stairway leading upward. The steps are large and clumsy, roughly hewn out of granite. Flecks of tiny gemstones in the rock reflect the light.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/towns/town13.xml b/rsrc/scenarios/zakhazi/towns/town13.xml
index 013aa0d9..ebe8442e 100644
--- a/rsrc/scenarios/zakhazi/towns/town13.xml
+++ b/rsrc/scenarios/zakhazi/towns/town13.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Kimzahn&apos;s Caldera            </name>
+    <name>Kimzahn&apos;s Caldera</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -476,7 +476,7 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="7" left="20" bottom="13" right="26">Kimzahn&apos;s Home               </area>
+    <area top="7" left="20" bottom="13" right="26">Kimzahn&apos;s Home</area>
     <string id="0">
         <![CDATA[With his dying breath, Kimzahn shouts out "Please, my brethren! Avenge me!" As he passes away, many other efreeti appear to get revenge.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/towns/town14.xml b/rsrc/scenarios/zakhazi/towns/town14.xml
index 9c7f0e13..0161d550 100644
--- a/rsrc/scenarios/zakhazi/towns/town14.xml
+++ b/rsrc/scenarios/zakhazi/towns/town14.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Spiraling Crypt             </name>
+    <name>Spiraling Crypt</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -460,8 +460,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="11" left="13" bottom="22" right="18">Central Garden               </area>
-    <area top="4" left="13" bottom="9" right="18">Barge Docks                  </area>
+    <area top="11" left="13" bottom="22" right="18">Central Garden</area>
+    <area top="4" left="13" bottom="9" right="18">Barge Docks</area>
     <sign id="0">
         <![CDATA[(You can't understand the writing on this obelisk. You recognize the language, though. It's Vahnatai.)]]>
     </sign>
diff --git a/rsrc/scenarios/zakhazi/towns/town16.xml b/rsrc/scenarios/zakhazi/towns/town16.xml
index 89cfcfea..f34c5b24 100644
--- a/rsrc/scenarios/zakhazi/towns/town16.xml
+++ b/rsrc/scenarios/zakhazi/towns/town16.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Spiraling Crypt             </name>
+    <name>Spiraling Crypt</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/zakhazi/towns/town17.xml b/rsrc/scenarios/zakhazi/towns/town17.xml
index e59a9ca7..c48c8040 100644
--- a/rsrc/scenarios/zakhazi/towns/town17.xml
+++ b/rsrc/scenarios/zakhazi/towns/town17.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Lair of Casser-Bok           </name>
+    <name>Lair of Casser-Bok</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -561,15 +561,15 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="38" left="2" bottom="46" right="14">Casser-Bok&apos;s Chamber         </area>
-    <area top="30" left="2" bottom="36" right="6">Reading Room                 </area>
-    <area top="1" left="1" bottom="17" right="24">Cavern of Many Paths         </area>
-    <area top="38" left="29" bottom="46" right="37">Entry Hall                   </area>
-    <area top="31" left="37" bottom="36" right="41">Treasure Room                </area>
-    <area top="21" left="31" bottom="27" right="43">Portcullis Puzzle            </area>
-    <area top="4" left="28" bottom="13" right="40">Searing &#x0D;Searing Maze        </area>
-    <area top="19" left="2" bottom="28" right="18">Filth Pit                    </area>
-    <area top="18" left="22" bottom="29" right="30">Charnel House                </area>
+    <area top="38" left="2" bottom="46" right="14">Casser-Bok&apos;s Chamber</area>
+    <area top="30" left="2" bottom="36" right="6">Reading Room</area>
+    <area top="1" left="1" bottom="17" right="24">Cavern of Many Paths</area>
+    <area top="38" left="29" bottom="46" right="37">Entry Hall</area>
+    <area top="31" left="37" bottom="36" right="41">Treasure Room</area>
+    <area top="21" left="31" bottom="27" right="43">Portcullis Puzzle</area>
+    <area top="4" left="28" bottom="13" right="40">Searing &#x0D;Searing Maze</area>
+    <area top="19" left="2" bottom="28" right="18">Filth Pit</area>
+    <area top="18" left="22" bottom="29" right="30">Charnel House</area>
     <sign id="0">
         <![CDATA[Enter to Meet the Mighty Casser-Bok]]>
     </sign>
diff --git a/rsrc/scenarios/zakhazi/towns/town18.xml b/rsrc/scenarios/zakhazi/towns/town18.xml
index edc391f8..9f22e343 100644
--- a/rsrc/scenarios/zakhazi/towns/town18.xml
+++ b/rsrc/scenarios/zakhazi/towns/town18.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Broken Fang Clan             </name>
+    <name>Broken Fang Clan</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/zakhazi/towns/town19.xml b/rsrc/scenarios/zakhazi/towns/town19.xml
index 0fd2f064..dbccea6d 100644
--- a/rsrc/scenarios/zakhazi/towns/town19.xml
+++ b/rsrc/scenarios/zakhazi/towns/town19.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Wormy Hollow                 </name>
+    <name>Wormy Hollow</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -560,9 +560,9 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="39" left="16" bottom="45" right="21">Commander&apos;s Office           </area>
-    <area top="37" left="29" bottom="43" right="35">Crystal Soul Chamber         </area>
-    <area top="42" left="36" bottom="47" right="44">Chamber of Contemplation      </area>
+    <area top="39" left="16" bottom="45" right="21">Commander&apos;s Office</area>
+    <area top="37" left="29" bottom="43" right="35">Crystal Soul Chamber</area>
+    <area top="42" left="36" bottom="47" right="44">Chamber of Contemplation</area>
     <sign id="0">
         <![CDATA[(The carvings on this obelisk are in many languages, including yours.)|WORMY HOLLOW OUTPOST]]>
     </sign>
diff --git a/rsrc/scenarios/zakhazi/towns/town2.xml b/rsrc/scenarios/zakhazi/towns/town2.xml
index e6d60aa6..16bf770e 100644
--- a/rsrc/scenarios/zakhazi/towns/town2.xml
+++ b/rsrc/scenarios/zakhazi/towns/town2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Assikvas                     </name>
+    <name>Assikvas</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -529,12 +529,12 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="8" left="21" bottom="14" right="29">Greeting Hall                </area>
-    <area top="34" left="2" bottom="37" right="6">Trash Pit                    </area>
-    <area top="20" left="4" bottom="32" right="11">Chief&apos;s Chambers             </area>
-    <area top="7" left="8" bottom="12" right="12">Library                      </area>
-    <area top="6" left="36" bottom="8" right="39">Small Shrine                 </area>
-    <area top="19" left="32" bottom="26" right="41">Dining Hall                  </area>
+    <area top="8" left="21" bottom="14" right="29">Greeting Hall</area>
+    <area top="34" left="2" bottom="37" right="6">Trash Pit</area>
+    <area top="20" left="4" bottom="32" right="11">Chief&apos;s Chambers</area>
+    <area top="7" left="8" bottom="12" right="12">Library</area>
+    <area top="6" left="36" bottom="8" right="39">Small Shrine</area>
+    <area top="19" left="32" bottom="26" right="41">Dining Hall</area>
     <sign id="0">
         <![CDATA[Our Honored Mothers and Fathers]]>
     </sign>
diff --git a/rsrc/scenarios/zakhazi/towns/town20.xml b/rsrc/scenarios/zakhazi/towns/town20.xml
index 89ef8325..10991e52 100644
--- a/rsrc/scenarios/zakhazi/towns/town20.xml
+++ b/rsrc/scenarios/zakhazi/towns/town20.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>64</size>
-    <name>Palace of Khoth              </name>
+    <name>Palace of Khoth</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -733,8 +733,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="4" left="1" bottom="19" right="21">Chamber of Khoth             </area>
-    <area top="21" left="1" bottom="29" right="17">Pillar Hall                  </area>
+    <area top="4" left="1" bottom="19" right="21">Chamber of Khoth</area>
+    <area top="21" left="1" bottom="29" right="17">Pillar Hall</area>
     <string id="0">
         <![CDATA[When you walk around the corner, the massive iron gates blocking your exit from Khoth's fortress come into view. They're still closed. At first, you get the uncomfortable suspicion that Khoth won't meet his end of the bargain.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/towns/town22.xml b/rsrc/scenarios/zakhazi/towns/town22.xml
index aab814fc..5b481ce9 100644
--- a/rsrc/scenarios/zakhazi/towns/town22.xml
+++ b/rsrc/scenarios/zakhazi/towns/town22.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Fort Cavalier                </name>
+    <name>Fort Cavalier</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/zakhazi/towns/town3.xml b/rsrc/scenarios/zakhazi/towns/town3.xml
index b1faa91e..12865c0d 100644
--- a/rsrc/scenarios/zakhazi/towns/town3.xml
+++ b/rsrc/scenarios/zakhazi/towns/town3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>64</size>
-    <name>Blood Glee Clan              </name>
+    <name>Blood Glee Clan</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -682,15 +682,15 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="50" left="3" bottom="61" right="61">The Test of Giants           </area>
-    <area top="38" left="38" bottom="48" right="51">Common Room                  </area>
-    <area top="36" left="42" bottom="38" right="52">Common Room                  </area>
-    <area top="26" left="29" bottom="36" right="39">By Huge, Smelly Pit          </area>
-    <area top="9" left="18" bottom="12" right="22">Chieftain&apos;s Quarters         </area>
-    <area top="8" left="3" bottom="24" right="13">By Burial Mounds             </area>
-    <area top="41" left="28" bottom="49" right="36">Food Storage                 </area>
-    <area top="13" left="47" bottom="25" right="56">Gross Food Storage           </area>
-    <area top="20" left="24" bottom="24" right="32">Hall of Murals               </area>
+    <area top="50" left="3" bottom="61" right="61">The Test of Giants</area>
+    <area top="38" left="38" bottom="48" right="51">Common Room</area>
+    <area top="36" left="42" bottom="38" right="52">Common Room</area>
+    <area top="26" left="29" bottom="36" right="39">By Huge, Smelly Pit</area>
+    <area top="9" left="18" bottom="12" right="22">Chieftain&apos;s Quarters</area>
+    <area top="8" left="3" bottom="24" right="13">By Burial Mounds</area>
+    <area top="41" left="28" bottom="49" right="36">Food Storage</area>
+    <area top="13" left="47" bottom="25" right="56">Gross Food Storage</area>
+    <area top="20" left="24" bottom="24" right="32">Hall of Murals</area>
     <sign id="0">
         <![CDATA[(This obelisk is carved with some sort of giant art. The carvings are of gleeful giants, beating up a unicorn.)]]>
     </sign>
diff --git a/rsrc/scenarios/zakhazi/towns/town4.xml b/rsrc/scenarios/zakhazi/towns/town4.xml
index 1af8a938..9f3233cf 100644
--- a/rsrc/scenarios/zakhazi/towns/town4.xml
+++ b/rsrc/scenarios/zakhazi/towns/town4.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Worm Caves                   </name>
+    <name>Worm Caves</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -504,9 +504,9 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="1" left="10" bottom="7" right="20">Watering Hole                </area>
-    <area top="40" left="1" bottom="46" right="7">Trophy Room                  </area>
-    <area top="18" left="37" bottom="25" right="44">Outfitting Room              </area>
+    <area top="1" left="10" bottom="7" right="20">Watering Hole</area>
+    <area top="40" left="1" bottom="46" right="7">Trophy Room</area>
+    <area top="18" left="37" bottom="25" right="44">Outfitting Room</area>
     <sign id="0">
         <![CDATA[HALL OF TROPHEES]]>
     </sign>
diff --git a/rsrc/scenarios/zakhazi/towns/town5.xml b/rsrc/scenarios/zakhazi/towns/town5.xml
index e552156d..828a4418 100644
--- a/rsrc/scenarios/zakhazi/towns/town5.xml
+++ b/rsrc/scenarios/zakhazi/towns/town5.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>48</size>
-    <name>Citadel of Unicorns          </name>
+    <name>Citadel of Unicorns</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -560,11 +560,11 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="18" left="20" bottom="29" right="31">Central Chamber              </area>
-    <area top="9" left="11" bottom="15" right="17">Lair of Aetherius            </area>
-    <area top="32" left="11" bottom="38" right="17">Lair of Aeliopol             </area>
-    <area top="32" left="34" bottom="38" right="40">Lair of Aeriassa             </area>
-    <area top="9" left="34" bottom="15" right="40">Lair of Aessoforus           </area>
+    <area top="18" left="20" bottom="29" right="31">Central Chamber</area>
+    <area top="9" left="11" bottom="15" right="17">Lair of Aetherius</area>
+    <area top="32" left="11" bottom="38" right="17">Lair of Aeliopol</area>
+    <area top="32" left="34" bottom="38" right="40">Lair of Aeriassa</area>
+    <area top="9" left="34" bottom="15" right="40">Lair of Aessoforus</area>
     <string id="0">
         <![CDATA[As you start to walk into this wing of the unicorn's dome, the air starts to feel very cold. The farther in you walk, the more uncomfortable you feel. Your skin begins to itch, and you feel like something is watching you.]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/towns/town6.xml b/rsrc/scenarios/zakhazi/towns/town6.xml
index 03c33fe7..5886fee3 100644
--- a/rsrc/scenarios/zakhazi/towns/town6.xml
+++ b/rsrc/scenarios/zakhazi/towns/town6.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Chasm of Fire                </name>
+    <name>Chasm of Fire</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/zakhazi/towns/town7.xml b/rsrc/scenarios/zakhazi/towns/town7.xml
index f7a177b7..33c6a887 100644
--- a/rsrc/scenarios/zakhazi/towns/town7.xml
+++ b/rsrc/scenarios/zakhazi/towns/town7.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>32</size>
-    <name>Unicorn Gate                 </name>
+    <name>Unicorn Gate</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
diff --git a/rsrc/scenarios/zakhazi/towns/town8.xml b/rsrc/scenarios/zakhazi/towns/town8.xml
index d40af9c6..c8be487b 100644
--- a/rsrc/scenarios/zakhazi/towns/town8.xml
+++ b/rsrc/scenarios/zakhazi/towns/town8.xml
@@ -502,8 +502,8 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="20" left="21" bottom="29" right="30">Slime Beast Cavern           </area>
-    <area top="7" left="6" bottom="11" right="12">Mushrooms Cavern             </area>
+    <area top="20" left="21" bottom="29" right="30">Slime Beast Cavern</area>
+    <area top="7" left="6" bottom="11" right="12">Mushrooms Cavern</area>
     <string id="0">
         <![CDATA[Morog eagerly grabs the mushrooms and places them securely in a pouch. "Excellent. Now, as I gave you my word, I will give you your reward."]]>
     </string>
diff --git a/rsrc/scenarios/zakhazi/towns/town9.xml b/rsrc/scenarios/zakhazi/towns/town9.xml
index 6d1a26b5..7a6b2ae6 100644
--- a/rsrc/scenarios/zakhazi/towns/town9.xml
+++ b/rsrc/scenarios/zakhazi/towns/town9.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <town boes="2.0.0">
     <size>64</size>
-    <name>Morog&apos;s Castle               </name>
+    <name>Morog&apos;s Castle</name>
     <comment>Comment 1</comment>
     <comment>Comment 2</comment>
     <comment>Comment 3</comment>
@@ -681,14 +681,14 @@
         <sdf x="0" y="0" />
         <onkill>0</onkill>
     </creature>
-    <area top="36" left="5" bottom="58" right="20">Morog&apos;s Forge                </area>
-    <area top="31" left="26" bottom="58" right="39">Morog&apos;s Throne Room          </area>
-    <area top="4" left="4" bottom="25" right="16">Crypts                       </area>
-    <area top="24" left="9" bottom="29" right="16">Crypts                       </area>
-    <area top="5" left="18" bottom="29" right="29">Morogville                   </area>
-    <area top="5" left="36" bottom="29" right="45">Morog&apos;s Chamber              </area>
-    <area top="11" left="47" bottom="25" right="58">Treacherous Maze             </area>
-    <area top="36" left="45" bottom="58" right="58">Morog&apos;s Laboratories         </area>
+    <area top="36" left="5" bottom="58" right="20">Morog&apos;s Forge</area>
+    <area top="31" left="26" bottom="58" right="39">Morog&apos;s Throne Room</area>
+    <area top="4" left="4" bottom="25" right="16">Crypts</area>
+    <area top="24" left="9" bottom="29" right="16">Crypts</area>
+    <area top="5" left="18" bottom="29" right="29">Morogville</area>
+    <area top="5" left="36" bottom="29" right="45">Morog&apos;s Chamber</area>
+    <area top="11" left="47" bottom="25" right="58">Treacherous Maze</area>
+    <area top="36" left="45" bottom="58" right="58">Morog&apos;s Laboratories</area>
     <sign id="0">
         <![CDATA[Portal to Deep Caverns]]>
     </sign>