--- a/src/BootstrapSelectorWidget.ui
+++ b/src/BootstrapSelectorWidget.ui
@@ -13,20 +13,11 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="leftMargin" >
-    <number>16</number>
-   </property>
-   <property name="topMargin" >
+   <property name="margin" >
     <number>16</number>
    </property>
-   <property name="rightMargin" >
-    <number>16</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>16</number>
+   <property name="spacing" >
+    <number>6</number>
    </property>
    <item>
     <widget class="QLabel" name="label" >
--- a/src/DiagnosticsDialog.ui
+++ b/src/DiagnosticsDialog.ui
@@ -25,8 +25,20 @@
    <string>Diagnostics</string>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item>
     <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <widget class="QTabWidget" name="tabWidget" >
        <property name="minimumSize" >
@@ -46,12 +58,26 @@
          <string>Scrobbling</string>
         </attribute>
         <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>9</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
          <item>
           <layout class="QGridLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
            <item row="0" column="1" >
             <widget class="QLabel" name="submissionServerStatusLabel" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>0</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -80,7 +106,9 @@
            <item row="1" column="1" >
             <widget class="QLabel" name="lastConnectionStatusLabel" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>0</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -104,6 +132,9 @@
          </item>
          <item>
           <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
            <property name="spacing" >
             <number>2</number>
            </property>
@@ -123,7 +154,9 @@
            <item>
             <widget class="QTreeWidget" name="cachedTracksList" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>7</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -166,7 +199,9 @@
               <bool>false</bool>
              </property>
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>7</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -195,8 +230,20 @@
          <string>Radio</string>
         </attribute>
         <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>9</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
          <item>
           <layout class="QHBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
            <item>
             <widget class="QLabel" name="radioServerLabel" >
              <property name="text" >
@@ -210,7 +257,9 @@
            <item>
             <widget class="QLabel" name="radioServerStatusLabel" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>0</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -230,6 +279,12 @@
          </item>
          <item>
           <layout class="QGridLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
            <item row="2" column="2" >
             <widget class="QLabel" name="outputBufferLabel" >
              <property name="minimumSize" >
@@ -360,15 +415,26 @@
          <string>Fingerprinting</string>
         </attribute>
         <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>9</number>
+         </property>
          <property name="spacing" >
-          <number>-1</number>
+          <number>6</number>
          </property>
          <item>
           <layout class="QGridLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
            <item row="0" column="0" >
             <widget class="QLabel" name="submissionServerLabel_2" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>7</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -381,7 +447,9 @@
            <item row="0" column="1" >
             <widget class="QLabel" name="fpQueueSizeLabel" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>0</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -410,7 +478,9 @@
            <item row="1" column="1" >
             <widget class="QLabel" name="fpCurrentTrackLabel" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>0</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -430,6 +500,9 @@
          </item>
          <item>
           <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
            <property name="spacing" >
             <number>2</number>
            </property>
@@ -449,7 +522,9 @@
            <item>
             <widget class="QTreeWidget" name="fingerprintedTracksList" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+              <sizepolicy>
+               <hsizetype>0</hsizetype>
+               <vsizetype>0</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -495,12 +570,26 @@
          <string>iPod Scrobbling</string>
         </attribute>
         <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>9</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
          <item>
           <layout class="QHBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
            <item>
             <widget class="QComboBox" name="iPodScrobbleType" >
              <property name="sizePolicy" >
-              <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <sizepolicy>
+               <hsizetype>7</hsizetype>
+               <vsizetype>0</vsizetype>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -545,6 +634,12 @@
         <bool>true</bool>
        </property>
        <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>9</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
          <widget class="QPushButton" name="viewLogButton" >
           <property name="text" >
@@ -582,6 +677,12 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <widget class="QPushButton" name="refreshButton" >
        <property name="text" >
--- a/src/MediaDeviceConfirmDialog.ui
+++ b/src/MediaDeviceConfirmDialog.ui
@@ -22,37 +22,19 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="leftMargin" >
-    <number>16</number>
-   </property>
-   <property name="topMargin" >
+   <property name="margin" >
     <number>16</number>
    </property>
-   <property name="rightMargin" >
-    <number>16</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>16</number>
+   <property name="spacing" >
+    <number>6</number>
    </property>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
+     <property name="margin" >
       <number>0</number>
      </property>
-     <property name="bottomMargin" >
-      <number>0</number>
+     <property name="spacing" >
+      <number>6</number>
      </property>
      <item>
       <widget class="QLabel" name="messageLabel" >
@@ -139,25 +121,18 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
+     <property name="margin" >
       <number>0</number>
      </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
+     <property name="spacing" >
+      <number>6</number>
      </property>
      <item>
       <widget class="QPushButton" name="toggle" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -182,6 +157,9 @@
      </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
        <property name="standardButtons" >
         <set>QDialogButtonBox::Ok</set>
        </property>
--- a/src/MetaDataWidget.ui
+++ b/src/MetaDataWidget.ui
@@ -54,7 +54,9 @@
     </rect>
    </property>
    <property name="sizePolicy" >
-    <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <sizepolicy>
+     <hsizetype>5</hsizetype>
+     <vsizetype>5</vsizetype>
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
@@ -76,7 +78,9 @@
     </rect>
    </property>
    <property name="sizePolicy" >
-    <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <sizepolicy>
+     <hsizetype>5</hsizetype>
+     <vsizetype>5</vsizetype>
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
@@ -98,7 +102,9 @@
     </rect>
    </property>
    <property name="sizePolicy" >
-    <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+    <sizepolicy>
+     <hsizetype>0</hsizetype>
+     <vsizetype>0</vsizetype>
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
@@ -132,7 +138,9 @@
     </rect>
    </property>
    <property name="sizePolicy" >
-    <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+    <sizepolicy>
+     <hsizetype>0</hsizetype>
+     <vsizetype>0</vsizetype>
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
@@ -283,7 +291,9 @@
     </rect>
    </property>
    <property name="sizePolicy" >
-    <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+    <sizepolicy>
+     <hsizetype>0</hsizetype>
+     <vsizetype>0</vsizetype>
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
@@ -314,7 +324,9 @@
     </rect>
    </property>
    <property name="sizePolicy" >
-    <sizepolicy vsizetype="Ignored" hsizetype="Ignored" >
+    <sizepolicy>
+     <hsizetype>13</hsizetype>
+     <vsizetype>13</vsizetype>
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
--- a/src/MetaDataWidgetTuningIn.ui
+++ b/src/MetaDataWidgetTuningIn.ui
@@ -16,6 +16,12 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item>
     <spacer>
      <property name="orientation" >
@@ -44,6 +50,12 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <spacer>
        <property name="orientation" >
@@ -60,7 +72,9 @@
      <item>
       <widget class="SpinnerLabel" name="spinnerLabel" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>5</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
--- a/src/RestStateWidget.ui
+++ b/src/RestStateWidget.ui
@@ -196,6 +196,9 @@
        </item>
        <item>
         <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
          <property name="spacing" >
           <number>5</number>
          </property>
@@ -216,7 +219,9 @@
          <item>
           <widget class="QLineEdit" name="edit" >
            <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+            <sizepolicy>
+             <hsizetype>3</hsizetype>
+             <vsizetype>0</vsizetype>
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
--- a/src/aboutdialog.ui
+++ b/src/aboutdialog.ui
@@ -37,19 +37,10 @@
    <bool>false</bool>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="margin" >
     <number>0</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="spacing" >
     <number>0</number>
    </property>
    <item>
@@ -70,6 +61,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
      <property name="spacing" >
       <number>0</number>
      </property>
@@ -92,7 +86,9 @@
      <item>
       <widget class="QLabel" name="labelInfo" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>3</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -222,16 +218,10 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="leftMargin" >
-      <number>6</number>
-     </property>
-     <property name="topMargin" >
+     <property name="margin" >
       <number>6</number>
      </property>
-     <property name="rightMargin" >
-      <number>6</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="spacing" >
       <number>6</number>
      </property>
      <item>
--- a/src/addplayerdialog.ui
+++ b/src/addplayerdialog.ui
@@ -19,42 +19,26 @@
    <string>Add Player</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="margin" >
     <number>0</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="spacing" >
     <number>0</number>
    </property>
    <item>
     <layout class="QVBoxLayout" >
-     <property name="spacing" >
-      <number>7</number>
-     </property>
-     <property name="leftMargin" >
-      <number>9</number>
-     </property>
-     <property name="topMargin" >
+     <property name="margin" >
       <number>9</number>
      </property>
-     <property name="rightMargin" >
-      <number>9</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>9</number>
+     <property name="spacing" >
+      <number>7</number>
      </property>
      <item>
       <widget class="QLabel" name="label" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -69,10 +53,10 @@
      </item>
      <item>
       <layout class="QGridLayout" >
-       <property name="horizontalSpacing" >
-        <number>7</number>
+       <property name="margin" >
+        <number>0</number>
        </property>
-       <property name="verticalSpacing" >
+       <property name="spacing" >
         <number>7</number>
        </property>
        <item row="0" column="1" colspan="2" >
@@ -146,17 +130,11 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="leftMargin" >
+     <property name="margin" >
       <number>5</number>
      </property>
-     <property name="topMargin" >
-      <number>5</number>
-     </property>
-     <property name="rightMargin" >
-      <number>5</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>5</number>
+     <property name="spacing" >
+      <number>6</number>
      </property>
      <item>
       <spacer>
--- a/src/confirmwidget.ui
+++ b/src/confirmwidget.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>3</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,20 +21,11 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>12</number>
-   </property>
-   <property name="leftMargin" >
-    <number>16</number>
-   </property>
-   <property name="topMargin" >
-    <number>16</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="margin" >
     <number>16</number>
    </property>
-   <property name="bottomMargin" >
-    <number>16</number>
+   <property name="spacing" >
+    <number>12</number>
    </property>
    <item>
     <widget class="QLabel" name="topLabel" >
@@ -46,6 +39,12 @@
    </item>
    <item>
     <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <widget class="QRadioButton" name="yesButton" >
        <property name="text" >
--- a/src/container.ui
+++ b/src/container.ui
@@ -29,19 +29,10 @@
     <bool>true</bool>
    </property>
    <layout class="QVBoxLayout" >
-    <property name="spacing" >
-     <number>0</number>
-    </property>
-    <property name="leftMargin" >
+    <property name="margin" >
      <number>0</number>
     </property>
-    <property name="topMargin" >
-     <number>0</number>
-    </property>
-    <property name="rightMargin" >
-     <number>0</number>
-    </property>
-    <property name="bottomMargin" >
+    <property name="spacing" >
      <number>0</number>
     </property>
     <item>
@@ -54,7 +45,9 @@
       </property>
       <widget class="QFrame" name="sidebarFrame" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>5</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -72,25 +65,19 @@
         <enum>QFrame::Raised</enum>
        </property>
        <layout class="QHBoxLayout" >
-        <property name="spacing" >
-         <number>0</number>
-        </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>0</number>
         </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
+        <property name="spacing" >
          <number>0</number>
         </property>
        </layout>
       </widget>
       <widget class="QWidget" name="widget" >
        <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>0</number>
         </property>
@@ -112,13 +99,18 @@
         </item>
         <item>
          <layout class="QVBoxLayout" >
+          <property name="margin" >
+           <number>0</number>
+          </property>
           <property name="spacing" >
            <number>5</number>
           </property>
           <item>
            <widget class="TrackProgressFrame" name="songTimeBar" >
             <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+             <sizepolicy>
+              <hsizetype>7</hsizetype>
+              <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -146,7 +138,9 @@
           <item>
            <widget class="ProgressFrame" name="stationTimeBar" >
             <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+             <sizepolicy>
+              <hsizetype>7</hsizetype>
+              <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -313,7 +307,7 @@
     <bool>false</bool>
    </property>
    <property name="allowedAreas" >
-    <set>Qt::TopToolBarArea</set>
+    <enum>Qt::TopToolBarArea</enum>
    </property>
    <property name="orientation" >
     <enum>Qt::Horizontal</enum>
@@ -328,10 +322,7 @@
     <enum>Qt::ToolButtonTextUnderIcon</enum>
    </property>
    <attribute name="toolBarArea" >
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak" >
-    <bool>false</bool>
+    <number>4</number>
    </attribute>
    <addaction name="actionMyProfile" />
    <addaction name="separator" />
--- a/src/deleteuserdialog.ui
+++ b/src/deleteuserdialog.ui
@@ -19,20 +19,20 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
+   <property name="margin" >
     <number>0</number>
    </property>
-   <property name="margin" >
+   <property name="spacing" >
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>9</number>
-     </property>
      <property name="margin" >
       <number>16</number>
      </property>
+     <property name="spacing" >
+      <number>9</number>
+     </property>
      <item>
       <widget class="QLabel" name="label" >
        <property name="text" >
@@ -46,7 +46,9 @@
      <item>
       <widget class="QComboBox" name="userCombo" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+        <sizepolicy>
+         <hsizetype>3</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -63,7 +65,7 @@
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>218</width>
        <height>0</height>
@@ -80,18 +82,18 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>9</number>
-     </property>
      <property name="margin" >
       <number>7</number>
      </property>
+     <property name="spacing" >
+      <number>9</number>
+     </property>
      <item>
       <spacer>
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" >
         <size>
          <width>131</width>
          <height>31</height>
@@ -101,8 +103,11 @@
      </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
        <property name="standardButtons" >
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
--- a/src/failedlogindialog.ui
+++ b/src/failedlogindialog.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+   <sizepolicy>
+    <hsizetype>1</hsizetype>
+    <vsizetype>1</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,34 +21,19 @@
    <string>Connection Error</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="leftMargin" >
+   <property name="margin" >
     <number>0</number>
    </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
+   <property name="spacing" >
+    <number>6</number>
    </property>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>12</number>
-     </property>
-     <property name="leftMargin" >
-      <number>16</number>
-     </property>
-     <property name="topMargin" >
-      <number>16</number>
-     </property>
-     <property name="rightMargin" >
+     <property name="margin" >
       <number>16</number>
      </property>
-     <property name="bottomMargin" >
-      <number>16</number>
+     <property name="spacing" >
+      <number>12</number>
      </property>
      <item>
       <widget class="QLabel" name="imgLabel" >
@@ -61,7 +48,9 @@
      <item>
       <widget class="QLabel" name="errorLabel" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>5</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -78,6 +67,12 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <spacer>
        <property name="orientation" >
@@ -126,7 +121,9 @@
    <item>
     <widget class="QFrame" name="proxyFrame" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>1</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -144,8 +141,20 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item row="1" column="1" colspan="3" >
        <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
          <widget class="QLineEdit" name="proxyUsernameEdit" />
         </item>
@@ -171,7 +180,9 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>5</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -203,7 +214,9 @@
       <item row="0" column="3" >
        <widget class="QLineEdit" name="proxyPortEdit" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -225,7 +238,9 @@
       <item row="1" column="0" >
        <widget class="QLabel" name="label_3" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+         <sizepolicy>
+          <hsizetype>5</hsizetype>
+          <vsizetype>5</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -253,6 +268,12 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <spacer>
        <property name="orientation" >
--- a/src/loginwidget.ui
+++ b/src/loginwidget.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>3</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,17 +21,11 @@
    <string/>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="leftMargin" >
+   <property name="margin" >
     <number>16</number>
    </property>
-   <property name="topMargin" >
-    <number>16</number>
-   </property>
-   <property name="rightMargin" >
-    <number>16</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>16</number>
+   <property name="spacing" >
+    <number>6</number>
    </property>
    <item>
     <widget class="QLabel" name="enterLabel" >
@@ -62,10 +58,18 @@
    </item>
    <item>
     <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item row="0" column="0" >
       <widget class="QLabel" name="label_2" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+        <sizepolicy>
+         <hsizetype>4</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -81,7 +85,9 @@
      <item row="0" column="1" >
       <widget class="QStackedWidget" name="stack" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+        <sizepolicy>
+         <hsizetype>4</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -97,25 +103,18 @@
        </property>
        <widget class="QWidget" name="page" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <sizepolicy>
+          <hsizetype>5</hsizetype>
+          <vsizetype>0</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <layout class="QVBoxLayout" >
-         <property name="spacing" >
-          <number>0</number>
-         </property>
-         <property name="leftMargin" >
-          <number>0</number>
-         </property>
-         <property name="topMargin" >
+         <property name="margin" >
           <number>0</number>
          </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
+         <property name="spacing" >
           <number>0</number>
          </property>
          <item>
@@ -135,7 +134,9 @@
        </widget>
        <widget class="QWidget" name="page_2" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+         <sizepolicy>
+          <hsizetype>5</hsizetype>
+          <vsizetype>0</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -147,19 +148,10 @@
          </size>
         </property>
         <layout class="QVBoxLayout" >
-         <property name="spacing" >
-          <number>0</number>
-         </property>
-         <property name="leftMargin" >
+         <property name="margin" >
           <number>0</number>
          </property>
-         <property name="topMargin" >
-          <number>0</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
+         <property name="spacing" >
           <number>0</number>
          </property>
          <item>
@@ -185,7 +177,9 @@
      <item row="1" column="0" >
       <widget class="QLabel" name="label_3" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+        <sizepolicy>
+         <hsizetype>4</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -201,7 +195,9 @@
      <item row="1" column="1" >
       <widget class="QLineEdit" name="passwordEdit" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+        <sizepolicy>
+         <hsizetype>4</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
--- a/src/mediaDeviceConfirmWidget.ui
+++ b/src/mediaDeviceConfirmWidget.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>3</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,20 +21,11 @@
    <string/>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>10</number>
-   </property>
-   <property name="leftMargin" >
-    <number>16</number>
-   </property>
-   <property name="topMargin" >
-    <number>16</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="margin" >
     <number>16</number>
    </property>
-   <property name="bottomMargin" >
-    <number>16</number>
+   <property name="spacing" >
+    <number>10</number>
    </property>
    <item>
     <widget class="QLabel" name="topLabel" >
@@ -46,6 +39,12 @@
    </item>
    <item>
     <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <widget class="QRadioButton" name="yesButton" >
        <property name="text" >
--- a/src/mediadevices/ipod/IpodDevice.cpp
+++ b/src/mediadevices/ipod/IpodDevice.cpp
@@ -113,8 +113,13 @@
             continue;
 
         // This requires some recent libgpod!
+      #ifdef ITDB_MEDIATYPE_AUDIO
         if ( track->mediatype != 0 && // old ipods
              track->mediatype != ITDB_MEDIATYPE_AUDIO && track->mediatype != ITDB_MEDIATYPE_MUSICVIDEO )
+      #else
+        if ( track->unk208 != 0 && // old ipods
+             track->unk208 != 0x0001 && track->unk208 != 0x0020 )
+      #endif
         {
 //             qDebug() << "Skipping, not a music track:" << track->artist << "-" << track->title << "- type:" << track->mediatype;
             continue;
--- a/src/playcontrols.ui
+++ b/src/playcontrols.ui
@@ -13,37 +13,19 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
+   <property name="margin" >
     <number>0</number>
    </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
+   <property name="spacing" >
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>0</number>
-     </property>
-     <property name="leftMargin" >
-      <number>2</number>
-     </property>
-     <property name="topMargin" >
-      <number>2</number>
-     </property>
-     <property name="rightMargin" >
+     <property name="margin" >
       <number>2</number>
      </property>
-     <property name="bottomMargin" >
-      <number>2</number>
+     <property name="spacing" >
+      <number>0</number>
      </property>
      <item>
       <spacer>
@@ -60,6 +42,9 @@
      </item>
      <item>
       <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
        <property name="spacing" >
         <number>0</number>
        </property>
@@ -79,7 +64,9 @@
        <item>
         <widget class="VolumeSlider" name="volume" >
          <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <sizepolicy>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
--- a/src/progresswidget.ui
+++ b/src/progresswidget.ui
@@ -13,20 +13,11 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>8</number>
-   </property>
-   <property name="leftMargin" >
-    <number>16</number>
-   </property>
-   <property name="topMargin" >
+   <property name="margin" >
     <number>16</number>
    </property>
-   <property name="rightMargin" >
-    <number>16</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>16</number>
+   <property name="spacing" >
+    <number>8</number>
    </property>
    <item>
     <widget class="QLabel" name="topLabel" >
--- a/src/selectpluginwidget.ui
+++ b/src/selectpluginwidget.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>3</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,20 +21,11 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>12</number>
-   </property>
-   <property name="leftMargin" >
-    <number>16</number>
-   </property>
-   <property name="topMargin" >
-    <number>16</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="margin" >
     <number>16</number>
    </property>
-   <property name="bottomMargin" >
-    <number>16</number>
+   <property name="spacing" >
+    <number>12</number>
    </property>
    <item>
     <widget class="QLabel" name="label" >
@@ -43,6 +36,12 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <widget class="QListWidget" name="pluginList" >
        <property name="tabKeyNavigation" >
@@ -52,6 +51,12 @@
      </item>
      <item>
       <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
        <item>
         <widget class="QPushButton" name="addButton" >
          <property name="text" >
--- a/src/selectupdateswidget.ui
+++ b/src/selectupdateswidget.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,20 +21,11 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>12</number>
-   </property>
-   <property name="leftMargin" >
-    <number>16</number>
-   </property>
-   <property name="topMargin" >
+   <property name="margin" >
     <number>16</number>
    </property>
-   <property name="rightMargin" >
-    <number>16</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>16</number>
+   <property name="spacing" >
+    <number>12</number>
    </property>
    <item>
     <widget class="QLabel" name="label" >
@@ -47,7 +40,9 @@
    <item>
     <widget class="QListWidget" name="updatesList" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>7</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -1,9 +1,6 @@
 <ui version="4.0" >
  <class>SettingsDialog</class>
  <widget class="QDialog" name="SettingsDialog" >
-  <property name="windowModality" >
-   <enum>Qt::ApplicationModal</enum>
-  </property>
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -13,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -31,12 +30,26 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <widget class="QListWidget" name="pageList" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Fixed" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>3</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -109,8 +122,7 @@
          <string>Account</string>
         </property>
         <property name="icon" >
-         <iconset>
-          <normaloff>../data/icon.png</normaloff>../data/icon.png</iconset>
+         <iconset>../data/icon.png</iconset>
         </property>
        </item>
        <item>
@@ -128,8 +140,7 @@
          <string>Connection</string>
         </property>
         <property name="icon" >
-         <iconset>
-          <normaloff>../data/icon.png</normaloff>../data/icon.png</iconset>
+         <iconset>../data/icon.png</iconset>
         </property>
        </item>
        <item>
@@ -142,31 +153,33 @@
      <item>
       <widget class="QStackedWidget" name="pageStack" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>5</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <widget class="QWidget" name="page" >
-        <property name="geometry" >
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>471</width>
-          <height>468</height>
-         </rect>
-        </property>
-       </widget>
+       <widget class="QWidget" name="page" />
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
        <property name="standardButtons" >
-        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
--- a/src/settingsdialog_account.ui
+++ b/src/settingsdialog_account.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+   <sizepolicy>
+    <hsizetype>3</hsizetype>
+    <vsizetype>3</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,6 +21,9 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
    <property name="spacing" >
     <number>6</number>
    </property>
@@ -42,7 +47,9 @@
    <item>
     <widget class="QGroupBox" name="accountBox" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -57,20 +64,11 @@
       <string>Last.fm Account</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="leftMargin" >
-       <number>9</number>
-      </property>
-      <property name="topMargin" >
+      <property name="margin" >
        <number>9</number>
       </property>
-      <property name="rightMargin" >
-       <number>9</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>9</number>
+      <property name="spacing" >
+       <number>6</number>
       </property>
      </layout>
     </widget>
@@ -81,24 +79,18 @@
       <string>Preferences</string>
      </property>
      <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item row="0" column="0" >
        <layout class="QGridLayout" >
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
+        <property name="margin" >
          <number>0</number>
         </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>6</number>
-        </property>
-        <property name="verticalSpacing" >
+        <property name="spacing" >
          <number>6</number>
         </property>
         <item row="1" column="0" >
@@ -147,7 +139,9 @@
         <item row="0" column="1" >
          <widget class="QComboBox" name="colourCombo" >
           <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+           <sizepolicy>
+            <hsizetype>5</hsizetype>
+            <vsizetype>0</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
--- a/src/settingsdialog_connection.ui
+++ b/src/settingsdialog_connection.ui
@@ -13,6 +13,9 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
    <property name="spacing" >
     <number>6</number>
    </property>
@@ -36,7 +39,9 @@
    <item>
     <widget class="QGroupBox" name="proxyBox" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+      <sizepolicy>
+       <hsizetype>3</hsizetype>
+       <vsizetype>5</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -51,20 +56,11 @@
       <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="leftMargin" >
+      <property name="margin" >
        <number>9</number>
       </property>
-      <property name="topMargin" >
-       <number>9</number>
-      </property>
-      <property name="rightMargin" >
-       <number>9</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>9</number>
+      <property name="spacing" >
+       <number>6</number>
       </property>
       <item>
        <widget class="QRadioButton" name="automaticProxyButton" >
@@ -85,22 +81,10 @@
       </item>
       <item>
        <layout class="QGridLayout" >
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
+        <property name="margin" >
          <number>0</number>
         </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>4</number>
-        </property>
-        <property name="verticalSpacing" >
+        <property name="spacing" >
          <number>4</number>
         </property>
         <item row="0" column="0" >
@@ -122,20 +106,11 @@
         </item>
         <item row="0" column="1" >
          <layout class="QHBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>0</number>
-          </property>
-          <property name="topMargin" >
+          <property name="margin" >
            <number>0</number>
           </property>
-          <property name="rightMargin" >
-           <number>0</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>0</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QLineEdit" name="proxyHostEdit" >
@@ -214,42 +189,26 @@
       <string>Bandwidth Usage</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="leftMargin" >
-       <number>9</number>
-      </property>
-      <property name="topMargin" >
+      <property name="margin" >
        <number>9</number>
       </property>
-      <property name="rightMargin" >
-       <number>9</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>9</number>
+      <property name="spacing" >
+       <number>6</number>
       </property>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
+        <property name="margin" >
          <number>0</number>
         </property>
-        <property name="bottomMargin" >
-         <number>0</number>
+        <property name="spacing" >
+         <number>6</number>
         </property>
         <item>
          <widget class="QCheckBox" name="downloadMetadataCheck" >
           <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+           <sizepolicy>
+            <hsizetype>7</hsizetype>
+            <vsizetype>0</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
--- a/src/settingsdialog_radio.ui
+++ b/src/settingsdialog_radio.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+   <sizepolicy>
+    <hsizetype>3</hsizetype>
+    <vsizetype>3</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,6 +21,9 @@
    <string/>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
    <property name="spacing" >
     <number>6</number>
    </property>
@@ -42,7 +47,9 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -51,20 +58,11 @@
       <string>Preferences</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="leftMargin" >
-       <number>9</number>
-      </property>
-      <property name="topMargin" >
+      <property name="margin" >
        <number>9</number>
       </property>
-      <property name="rightMargin" >
-       <number>9</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>9</number>
+      <property name="spacing" >
+       <number>6</number>
       </property>
       <item>
        <widget class="QCheckBox" name="resumeCheckBox" >
@@ -82,39 +80,18 @@
       <string>Audio</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="leftMargin" >
+      <property name="margin" >
        <number>9</number>
       </property>
-      <property name="topMargin" >
-       <number>9</number>
-      </property>
-      <property name="rightMargin" >
-       <number>9</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>9</number>
+      <property name="spacing" >
+       <number>6</number>
       </property>
       <item>
        <layout class="QGridLayout" >
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
+        <property name="margin" >
          <number>0</number>
         </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>6</number>
-        </property>
-        <property name="verticalSpacing" >
+        <property name="spacing" >
          <number>6</number>
         </property>
         <item row="0" column="0" >
@@ -134,7 +111,9 @@
         <item row="1" column="1" >
          <widget class="QComboBox" name="systemBox" >
           <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+           <sizepolicy>
+            <hsizetype>7</hsizetype>
+            <vsizetype>0</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -143,20 +122,11 @@
         </item>
         <item row="4" column="1" >
          <layout class="QHBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>0</number>
-          </property>
-          <property name="topMargin" >
-           <number>0</number>
-          </property>
-          <property name="rightMargin" >
+          <property name="margin" >
            <number>0</number>
           </property>
-          <property name="bottomMargin" >
-           <number>0</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QLabel" name="label_4" >
@@ -209,7 +179,9 @@
         <item row="0" column="1" >
          <widget class="QComboBox" name="cardBox" >
           <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+           <sizepolicy>
+            <hsizetype>7</hsizetype>
+            <vsizetype>0</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -253,6 +225,12 @@
       <string>Stream in external player</string>
      </property>
      <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
        <widget class="QLabel" name="label_6" >
         <property name="text" >
--- a/src/settingsdialog_scrobbling.ui
+++ b/src/settingsdialog_scrobbling.ui
@@ -10,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+   <sizepolicy>
+    <hsizetype>3</hsizetype>
+    <vsizetype>3</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,6 +21,9 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
    <property name="spacing" >
     <number>6</number>
    </property>
@@ -42,7 +47,9 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -51,8 +58,17 @@
       <string>Preferences</string>
      </property>
      <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
        <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <property name="spacing" >
          <number>4</number>
         </property>
@@ -117,7 +133,9 @@
         <item>
          <widget class="QLabel" name="scrobblePointLabel" >
           <property name="sizePolicy" >
-           <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+           <sizepolicy>
+            <hsizetype>0</hsizetype>
+            <vsizetype>5</vsizetype>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -162,6 +180,12 @@
       <string>Scrobble directories</string>
      </property>
      <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
        <widget class="QLabel" name="label_2" >
         <property name="text" >
--- a/src/tagdialog.ui
+++ b/src/tagdialog.ui
@@ -13,7 +13,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -25,23 +27,34 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
    <property name="spacing" >
     <number>16</number>
    </property>
    <item>
     <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
      <property name="spacing" >
       <number>6</number>
      </property>
      <item>
       <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
        <property name="spacing" >
         <number>12</number>
        </property>
        <item>
         <widget class="QComboBox" name="tagTypeBox" >
          <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+          <sizepolicy>
+           <hsizetype>1</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -69,7 +82,9 @@
           <bool>true</bool>
          </property>
          <property name="sizePolicy" >
-          <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+          <sizepolicy>
+           <hsizetype>7</hsizetype>
+           <vsizetype>5</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -77,9 +92,6 @@
          <property name="text" >
           <string/>
          </property>
-         <property name="textInteractionFlags" >
-          <set>Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextSelectableByMouse</set>
-         </property>
         </widget>
        </item>
        <item>
@@ -104,10 +116,10 @@
    </item>
    <item>
     <layout class="QGridLayout" >
-     <property name="horizontalSpacing" >
-      <number>4</number>
+     <property name="margin" >
+      <number>0</number>
      </property>
-     <property name="verticalSpacing" >
+     <property name="spacing" >
       <number>4</number>
      </property>
      <item row="1" column="2" >
@@ -134,7 +146,9 @@
      <item row="1" column="0" >
       <widget class="TagListWidget" name="personalTagsList" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>7</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -204,20 +218,11 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>12</number>
-     </property>
-     <property name="leftMargin" >
+     <property name="margin" >
       <number>0</number>
      </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
+     <property name="spacing" >
+      <number>12</number>
      </property>
      <item>
       <spacer>
@@ -234,6 +239,9 @@
      </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
        <property name="standardButtons" >
         <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
        </property>
--- a/src/wizarddialog_mac.ui
+++ b/src/wizarddialog_mac.ui
@@ -1,9 +1,6 @@
 <ui version="4.0" >
  <class>WizardDialog</class>
  <widget class="QDialog" name="WizardDialog" >
-  <property name="windowModality" >
-   <enum>Qt::ApplicationModal</enum>
-  </property>
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -13,7 +10,9 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+   <sizepolicy>
+    <hsizetype>0</hsizetype>
+    <vsizetype>0</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -37,36 +36,18 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="bottomMargin" >
-    <number>9</number>
+   <property name="spacing" >
+    <number>6</number>
    </property>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
+     <property name="margin" >
       <number>0</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="spacing" >
       <number>0</number>
      </property>
      <item>
--- a/src/wizardshell_mac.ui
+++ b/src/wizardshell_mac.ui
@@ -16,6 +16,12 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="autoFillBackground" >
@@ -25,6 +31,12 @@
       <string/>
      </property>
      <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
        <widget class="QLabel" name="headerLabel" >
         <property name="font" >
@@ -41,7 +53,9 @@
       <item>
        <widget class="QFrame" name="pageFrame" >
         <property name="sizePolicy" >
-         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+         <sizepolicy>
+          <hsizetype>5</hsizetype>
+          <vsizetype>3</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -56,19 +70,10 @@
          <enum>QFrame::Plain</enum>
         </property>
         <layout class="QVBoxLayout" >
-         <property name="spacing" >
-          <number>0</number>
-         </property>
-         <property name="leftMargin" >
-          <number>0</number>
-         </property>
-         <property name="topMargin" >
-          <number>0</number>
-         </property>
-         <property name="rightMargin" >
+         <property name="margin" >
           <number>0</number>
          </property>
-         <property name="bottomMargin" >
+         <property name="spacing" >
           <number>0</number>
          </property>
         </layout>
--- a/src/settingsdialog_mediadevices.ui
+++ b/src/settingsdialog_mediadevices.ui
@@ -13,20 +13,11 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="bottomMargin" >
-    <number>9</number>
+   <property name="spacing" >
+    <number>6</number>
    </property>
    <item>
     <widget class="QLabel" name="label" >
@@ -97,6 +88,12 @@
       <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
        <widget class="QTreeWidget" name="deviceWidget" >
         <property name="focusPolicy" >
@@ -142,6 +139,12 @@
       </item>
       <item>
        <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
          <spacer>
           <property name="orientation" >
--- a/src/MediaDeviceScrobbler.cpp
+++ b/src/MediaDeviceScrobbler.cpp
@@ -336,7 +336,7 @@
         //FIXME I couldn't do this->isActiveWindow() as we aren't active yet
         //      so this code breaks if we're the active application on osx
         //      but the window is hidden :(
-        qApp->alert( this );
+        //qApp->alert( this );
         
     QDialog::showEvent( e );
 }