diff --git a/OSBindings/Qt/mainwindow.ui b/OSBindings/Qt/mainwindow.ui
index 2bbbc29a2..3d05cc783 100644
--- a/OSBindings/Qt/mainwindow.ui
+++ b/OSBindings/Qt/mainwindow.ui
@@ -33,13 +33,13 @@
        <attribute name="title">
         <string>Amiga</string>
        </attribute>
-       <layout class="QVBoxLayout" name="amigaLayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="amigaHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="amigaFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="amigaChipRAMLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Chip RAM:</string>
               </property>
@@ -65,7 +65,7 @@
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="amigaFastRAMLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Fast RAM:</string>
               </property>
@@ -103,7 +103,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="amigaHSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -123,13 +123,13 @@
        <attribute name="title">
         <string>Apple II</string>
        </attribute>
-       <layout class="QVBoxLayout" name="appleIILayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="appleIIHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="appleIIFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="appleIIModelLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Model:</string>
               </property>
@@ -160,7 +160,7 @@
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="appleIIDiskControllerLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Disk Controller:</string>
               </property>
@@ -188,7 +188,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="appleIIHSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -208,13 +208,13 @@
        <attribute name="title">
         <string>Apple IIgs</string>
        </attribute>
-       <layout class="QVBoxLayout" name="appleIIgsLayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="appleIIgsHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="appleIIgsFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="appleIIgsModelLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Model:</string>
               </property>
@@ -240,7 +240,7 @@
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="appleIIgsMemorySizeLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Memory Size:</string>
               </property>
@@ -268,7 +268,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="appleIIgsHSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -288,13 +288,13 @@
        <attribute name="title">
         <string>Amstrad CPC</string>
        </attribute>
-       <layout class="QVBoxLayout" name="amstradCPCLayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="amstradCPCHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="amstradCPCFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="amstradCPCModelLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Model:</string>
               </property>
@@ -322,7 +322,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="amstradCPCHSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -342,9 +342,9 @@
        <attribute name="title">
         <string>Atari ST</string>
        </attribute>
-       <layout class="QVBoxLayout" name="atariSTLayout">
+       <layout class="QVBoxLayout">
         <item alignment="Qt::AlignTop">
-         <widget class="QLabel" name="atariSTLabel">
+         <widget class="QLabel">
           <property name="text">
            <string>At present only a 512k Atari ST is supported.</string>
           </property>
@@ -356,7 +356,7 @@
        <attribute name="title">
         <string>Electron</string>
        </attribute>
-       <layout class="QVBoxLayout" name="electronLayout">
+       <layout class="QVBoxLayout">
         <item>
          <widget class="QCheckBox" name="electronDFSCheckBox">
           <property name="text">
@@ -386,7 +386,7 @@
          </widget>
         </item>
         <item>
-         <spacer name="verticalSpacer">
+         <spacer>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -404,13 +404,13 @@
        <attribute name="title">
         <string>Enterprise</string>
        </attribute>
-       <layout class="QVBoxLayout" name="enterpriseLayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="enterpriseHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="enterpriseFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="enterpriseModelLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Model:</string>
               </property>
@@ -436,7 +436,7 @@
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="enterpriseSpeedLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Speed:</string>
               </property>
@@ -457,7 +457,7 @@
              </widget>
             </item>
             <item row="2" column="0">
-             <widget class="QLabel" name="enterpriseEXOSLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>EXOS:</string>
               </property>
@@ -483,7 +483,7 @@
              </widget>
             </item>
             <item row="3" column="0">
-             <widget class="QLabel" name="enterpriseBASICLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>BASIC:</string>
               </property>
@@ -514,7 +514,7 @@
              </widget>
             </item>
             <item row="4" column="0">
-             <widget class="QLabel" name="enterpriseDOSLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>DOS:</string>
               </property>
@@ -537,7 +537,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="enterpriseHSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -557,13 +557,13 @@
        <attribute name="title">
         <string>Macintosh</string>
        </attribute>
-       <layout class="QVBoxLayout" name="macintoshLayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="macintoshHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="macintoshFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="macintoshModelLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Model:</string>
               </property>
@@ -596,7 +596,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="macintoshSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -616,13 +616,13 @@
        <attribute name="title">
         <string>MSX</string>
        </attribute>
-       <layout class="QVBoxLayout" name="msxLayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="msxHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="msxFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="msxRegionLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Region</string>
               </property>
@@ -650,7 +650,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="msxSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -672,7 +672,7 @@
          </widget>
         </item>
         <item>
-         <spacer name="verticalSpacer_2">
+         <spacer>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -690,13 +690,13 @@
        <attribute name="title">
         <string>Oric</string>
        </attribute>
-       <layout class="QVBoxLayout" name="oricLayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="oricHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="oricFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="oricModelLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Model:</string>
               </property>
@@ -722,7 +722,7 @@
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="oricDiskInterfaceLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Disk Interface:</string>
               </property>
@@ -760,7 +760,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="oricHSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -780,13 +780,13 @@
        <attribute name="title">
         <string>Vic-20</string>
        </attribute>
-       <layout class="QVBoxLayout" name="vic20Layout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="vic20HorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="vic20FormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="vic20RegionLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Region:</string>
               </property>
@@ -822,7 +822,7 @@
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="vic20MemorySizeLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Memory Size:</string>
               </property>
@@ -850,7 +850,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="vic20HSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -872,7 +872,7 @@
          </widget>
         </item>
         <item>
-         <spacer name="vic20VSpacer">
+         <spacer>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -890,13 +890,13 @@
        <attribute name="title">
         <string>ZX80</string>
        </attribute>
-       <layout class="QVBoxLayout" name="zx80Layout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="zx80HorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="zx80FormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="zx80MemorySizeLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Memory Size:</string>
               </property>
@@ -919,7 +919,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="zx80HSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -941,7 +941,7 @@
          </widget>
         </item>
         <item>
-         <spacer name="zx81VSpacer">
+         <spacer>
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -959,13 +959,13 @@
        <attribute name="title">
         <string>ZX81</string>
        </attribute>
-       <layout class="QVBoxLayout" name="zx81Layout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="zx81HorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="zx81FormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="zx81MemorySizeLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Memory Size:</string>
               </property>
@@ -988,7 +988,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="zx81Spacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -1008,13 +1008,13 @@
        <attribute name="title">
         <string>ZX Spectrum</string>
        </attribute>
-       <layout class="QVBoxLayout" name="spectrumLayout">
+       <layout class="QVBoxLayout">
         <item>
-         <layout class="QHBoxLayout" name="spectrumHorizontalLayout">
+         <layout class="QHBoxLayout">
           <item>
-           <layout class="QFormLayout" name="spectrumFormLayout">
+           <layout class="QFormLayout">
             <item row="0" column="0">
-             <widget class="QLabel" name="spectrumModelLabel">
+             <widget class="QLabel">
               <property name="text">
                <string>Model:</string>
               </property>
@@ -1057,7 +1057,7 @@
            </layout>
           </item>
           <item>
-           <spacer name="spectrumHSpacer">
+           <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -1101,7 +1101,7 @@
        <bool>true</bool>
       </property>
       <property name="plainText">
-       <string>Clock Signal requires you to provide images of the system ROMs for this machine.  They will be stored permanently; you need do this only once.
+       <string>Clock Signal requires you to provide images of the system ROMs for this machine. They will be stored permanently; you need do this only once.
 
 Please drag and drop over this window</string>
       </property>