diff --git a/tycho/ui/mapprops.ui b/tycho/ui/mapprops.ui
index fb726d7..d846647 100644
--- a/tycho/ui/mapprops.ui
+++ b/tycho/ui/mapprops.ui
@@ -43,7 +43,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QLineEdit" name="lineEdit">
+       <widget class="QLineEdit" name="mapName">
         <property name="toolTip">
          <string>The name of the map. This is used in the level selection menu.</string>
         </property>
@@ -63,7 +63,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QComboBox" name="comboBox">
+       <widget class="QComboBox" name="textureSet">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -111,7 +111,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="QComboBox" name="comboBox_2">
+       <widget class="QComboBox" name="landscape">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -154,7 +154,7 @@
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="QSpinBox" name="spinBox">
+       <widget class="QSpinBox" name="musicNo">
         <property name="enabled">
          <bool>false</bool>
         </property>
@@ -187,7 +187,7 @@
        </property>
        <layout class="QGridLayout" name="gridLayout">
         <item row="2" column="0">
-         <widget class="QCheckBox" name="checkBox_3">
+         <widget class="QCheckBox" name="carnage">
           <property name="toolTip">
            <string>The map can be played in the Carnage game mode.</string>
           </property>
@@ -197,7 +197,7 @@
          </widget>
         </item>
         <item row="3" column="0">
-         <widget class="QCheckBox" name="checkBox_4">
+         <widget class="QCheckBox" name="ktmwtb">
           <property name="toolTip">
            <string>The map can be played in the Kill The Man With The Ball game mode.</string>
           </property>
@@ -207,7 +207,7 @@
          </widget>
         </item>
         <item row="1" column="0">
-         <widget class="QCheckBox" name="checkBox_2">
+         <widget class="QCheckBox" name="coOperative">
           <property name="toolTip">
            <string>The map can be played in co-operative multi-player.</string>
           </property>
@@ -217,7 +217,7 @@
          </widget>
         </item>
         <item row="0" column="0">
-         <widget class="QCheckBox" name="checkBox">
+         <widget class="QCheckBox" name="solo">
           <property name="toolTip">
            <string>The map can be played single-player.</string>
           </property>
@@ -227,7 +227,7 @@
          </widget>
         </item>
         <item row="0" column="1">
-         <widget class="QCheckBox" name="checkBox_5">
+         <widget class="QCheckBox" name="kingOfTheHill">
           <property name="toolTip">
            <string>The map can be played in the King of the Hill game mode.</string>
           </property>
@@ -237,7 +237,7 @@
          </widget>
         </item>
         <item row="1" column="1">
-         <widget class="QCheckBox" name="checkBox_6">
+         <widget class="QCheckBox" name="defense">
           <property name="toolTip">
            <string>The map can be played in the Defense game mode.</string>
           </property>
@@ -247,7 +247,7 @@
          </widget>
         </item>
         <item row="2" column="1">
-         <widget class="QCheckBox" name="checkBox_7">
+         <widget class="QCheckBox" name="rugby">
           <property name="toolTip">
            <string>The map can be played in the Rugby game mode.</string>
           </property>
@@ -257,7 +257,7 @@
          </widget>
         </item>
         <item row="3" column="1">
-         <widget class="QCheckBox" name="checkBox_8">
+         <widget class="QCheckBox" name="captureTheFlag">
           <property name="toolTip">
            <string>The map can be played in the Capture the Flag game mode.</string>
           </property>
@@ -279,7 +279,7 @@
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_4">
         <item>
-         <widget class="QCheckBox" name="checkBox_17">
+         <widget class="QCheckBox" name="vacuum">
           <property name="toolTip">
            <string>This flag makes it so most weapons don't work, and the player's oxygen slowly depletes.</string>
           </property>
@@ -289,7 +289,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_18">
+         <widget class="QCheckBox" name="magnetic">
           <property name="toolTip">
            <string>This flag makes the motion sensor extremely glitchy.</string>
           </property>
@@ -299,7 +299,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_19">
+         <widget class="QCheckBox" name="rebellion">
           <property name="toolTip">
            <string>This flag strips the player's items and health, and makes S'pht friendly.</string>
           </property>
@@ -309,7 +309,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_20">
+         <widget class="QCheckBox" name="lowGravity">
           <property name="toolTip">
            <string>This flag lowers gravity significantly.</string>
           </property>
@@ -319,7 +319,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_21">
+         <widget class="QCheckBox" name="marathon1Glue">
           <property name="toolTip">
            <string>This flag makes glue polygons handle like they did in Marathon 1.</string>
           </property>
@@ -329,7 +329,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_22">
+         <widget class="QCheckBox" name="lavaFloor">
           <property name="toolTip">
            <string>This flag makes floors damage the player.</string>
           </property>
@@ -339,7 +339,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_23">
+         <widget class="QCheckBox" name="rebellionNoStrip">
           <property name="toolTip">
            <string>This flag makes S'pht friendly.</string>
           </property>
@@ -349,7 +349,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_24">
+         <widget class="QCheckBox" name="music">
           <property name="toolTip">
            <string>This flag enables music in the level.</string>
           </property>
@@ -359,7 +359,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_25">
+         <widget class="QCheckBox" name="terminalsStopTime">
           <property name="toolTip">
            <string>This flag makes reading terminals stop time in single-player.</string>
           </property>
@@ -369,7 +369,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_26">
+         <widget class="QCheckBox" name="m1MonsterLimits">
           <property name="toolTip">
            <string>This flag sets monster activation limits to Marathon 1's.</string>
           </property>
@@ -379,7 +379,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_27">
+         <widget class="QCheckBox" name="m1WeaponDifferences">
           <property name="toolTip">
            <string>This flag changes weapon pickups on Total Carnage and makes grenades low gravity.</string>
           </property>
@@ -402,7 +402,7 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
-         <widget class="QCheckBox" name="checkBox_9">
+         <widget class="QCheckBox" name="extermination">
           <property name="toolTip">
            <string>The player must kill all monsters on the map, allowing for only up to 8 of them to still be alive.</string>
           </property>
@@ -412,7 +412,7 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
          </widget>
         </item>
         <item row="1" column="0">
-         <widget class="QCheckBox" name="checkBox_10">
+         <widget class="QCheckBox" name="exploration">
           <property name="toolTip">
            <string>The player must stand in polygons marked as explorable.</string>
           </property>
@@ -422,7 +422,7 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
          </widget>
         </item>
         <item row="3" column="0">
-         <widget class="QCheckBox" name="checkBox_12">
+         <widget class="QCheckBox" name="repair">
           <property name="toolTip">
            <string>The player must flip switches marked as repairable.</string>
           </property>
@@ -432,7 +432,7 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
          </widget>
         </item>
         <item row="2" column="0">
-         <widget class="QCheckBox" name="checkBox_11">
+         <widget class="QCheckBox" name="retrieval">
           <property name="toolTip">
            <string>The player must grab items marked as retreivable.</string>
           </property>
@@ -442,7 +442,7 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
          </widget>
         </item>
         <item row="0" column="1">
-         <widget class="QCheckBox" name="checkBox_13">
+         <widget class="QCheckBox" name="rescue">
           <property name="toolTip">
            <string>The player must keep half of the BoBs in the level alive. Failure will be set if more than half are killed.</string>
           </property>
@@ -452,7 +452,7 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
          </widget>
         </item>
         <item row="1" column="1">
-         <widget class="QCheckBox" name="checkBox_14">
+         <widget class="QCheckBox" name="m1Exploration">
           <property name="toolTip">
            <string>The player must look at polygons marked as explorable.</string>
           </property>
@@ -462,7 +462,7 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
          </widget>
         </item>
         <item row="2" column="1">
-         <widget class="QCheckBox" name="checkBox_15">
+         <widget class="QCheckBox" name="m1Rescue">
           <property name="toolTip">
            <string>The player must flip the last (by side index) switch marked as repairable.</string>
           </property>
@@ -472,7 +472,7 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
          </widget>
         </item>
         <item row="3" column="1">
-         <widget class="QCheckBox" name="checkBox_16">
+         <widget class="QCheckBox" name="m1Repair">
           <property name="toolTip">
            <string>The exact same as Repair, but uses the internal ID for Marathon 1 BoBs instead.</string>
           </property>
@@ -491,9 +491,9 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
  <resources/>
  <connections>
   <connection>
-   <sender>checkBox_24</sender>
+   <sender>music</sender>
    <signal>toggled(bool)</signal>
-   <receiver>spinBox</receiver>
+   <receiver>musicNo</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
@@ -507,9 +507,9 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
    </hints>
   </connection>
   <connection>
-   <sender>checkBox_24</sender>
+   <sender>music</sender>
    <signal>toggled(bool)</signal>
-   <receiver>comboBox_2</receiver>
+   <receiver>landscape</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">