diff --git a/src/addalternativesui.ui b/src/addalternativesui.ui
index 813fa65..439f016 100644
--- a/src/addalternativesui.ui
+++ b/src/addalternativesui.ui
@@ -1,108 +1,118 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>AddAlternatives</class>
- <widget class="QWidget" name="AddAlternatives" >
-  <property name="geometry" >
+ <widget class="QWidget" name="AddAlternatives">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>386</width>
-    <height>193</height>
+    <height>198</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QFormLayout" name="formLayout" >
-     <item row="0" column="0" >
-      <widget class="QLabel" name="textLabel1" >
-       <property name="text" >
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="textLabel1">
+       <property name="text">
         <string>Path:</string>
        </property>
-       <property name="wordWrap" >
+       <property name="wordWrap">
         <bool>false</bool>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="KUrlRequester" name="m_Path" />
+     <item row="0" column="1">
+      <widget class="KUrlRequester" name="m_Path"/>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="textLabel2" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="textLabel2">
+       <property name="text">
         <string>Priority:</string>
        </property>
-       <property name="wordWrap" >
+       <property name="wordWrap">
         <bool>false</bool>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="KIntSpinBox" name="m_Priority" >
-       <property name="value" >
+     <item row="1" column="1">
+      <widget class="KIntSpinBox" name="m_Priority">
+       <property name="value">
         <number>20</number>
        </property>
-       <property name="maxValue" stdset="0" >
+       <property name="maxValue" stdset="0">
         <number>1000</number>
        </property>
-       <property name="minValue" stdset="0" >
+       <property name="minValue" stdset="0">
         <number>-1000</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="m_slavesGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="m_slavesGroup">
+     <property name="title">
       <string>Slaves:</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
-      <property name="margin" >
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <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>
       <item>
-       <widget class="QScrollArea" name="m_slavesArea" >
-        <property name="frameShape" >
+       <widget class="QScrollArea" name="m_slavesArea">
+        <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
-        <property name="widgetResizable" >
+        <property name="widgetResizable">
          <bool>true</bool>
         </property>
-        <widget class="QWidget" name="scrollAreaWidgetContents" >
-         <property name="geometry" >
+        <widget class="QWidget" name="scrollAreaWidgetContents">
+         <property name="geometry">
           <rect>
            <x>0</x>
            <y>0</y>
            <width>364</width>
            <height>90</height>
           </rect>
          </property>
         </widget>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>KIntSpinBox</class>
    <extends>QSpinBox</extends>
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 0641672..9d131e8 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1,275 +1,275 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QWidget" name="MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>615</width>
     <height>490</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QSplitter" name="m_mainSplitter">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <widget class="QWidget" name="layout6">
       <layout class="QVBoxLayout">
        <item>
         <widget class="QTreeView" name="m_altList">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="whatsThis">
           <string>This is a list of the available alternative groups.</string>
          </property>
          <property name="alternatingRowColors">
           <bool>true</bool>
          </property>
          <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox3">
          <property name="title">
           <string>Options</string>
          </property>
          <layout class="QGridLayout" name="_2">
           <item row="0" column="0">
            <widget class="QCheckBox" name="m_hideAlt">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="whatsThis">
              <string>If this option is active, all the alternative groups with only one alternative available will be hidden from the list.</string>
             </property>
             <property name="text">
              <string extracomment="Hide useless alternatives">&amp;Hide useless</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="layout24">
       <layout class="QVBoxLayout">
        <item>
         <layout class="QHBoxLayout">
          <item>
           <layout class="QVBoxLayout">
            <item>
             <widget class="QLabel" name="textLabel1">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="font">
               <font>
                <weight>75</weight>
                <bold>true</bold>
               </font>
              </property>
              <property name="text">
               <string>Status:</string>
              </property>
              <property name="wordWrap">
               <bool>false</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KComboBox" name="m_statusCombo">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="whatsThis">
               <string>&lt;qt&gt;The status of the current alternative:
 &lt;ul&gt;
 &lt;li&gt;Automatic: the alternative system will always choose the alternative with the highest priority, updating it (if necessary) when an alternative is installed or removed&lt;/li&gt;
 &lt;li&gt;Manual: the choice is done manually, updated by the alternative system only when it is uninstalled&lt;/li&gt;
 &lt;/ul&gt;
 &lt;/qt&gt;
 </string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item>
           <spacer name="spacer6">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>88</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QLabel" name="m_altTilte">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="font">
             <font>
              <pointsize>14</pointsize>
              <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
            <property name="text">
             <string comment="KDE::DoNotExtract">Automake</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="spacer5">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>88</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QTreeView" name="m_optionsList">
          <property name="whatsThis">
           <string>This shows the alternatives available for the selected group.</string>
          </property>
          <property name="alternatingRowColors">
           <bool>true</bool>
          </property>
          <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
          <property name="sortingEnabled">
           <bool>true</bool>
          </property>
          <property name="allColumnsShowFocus">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout">
          <item>
           <spacer name="spacer3">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="KPushButton" name="m_bAdd">
            <property name="text">
             <string>&amp;Add</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KPushButton" name="m_bProperties">
            <property name="text">
             <string>&amp;Properties</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KPushButton" name="m_bDelete">
            <property name="text">
             <string>&amp;Delete</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
-  <customwidget>
-   <class>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
-  </customwidget>
   <customwidget>
    <class>KPushButton</class>
    <extends>QPushButton</extends>
    <header>kpushbutton.h</header>
   </customwidget>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
  </customwidgets>
  <includes>
   <include location="local">kcombobox.h</include>
   <include location="local">kpushbutton.h</include>
   <include location="local">kpushbutton.h</include>
   <include location="local">kpushbutton.h</include>
  </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/propertieswindow.ui b/src/propertieswindow.ui
index f0c78f9..b75092d 100644
--- a/src/propertieswindow.ui
+++ b/src/propertieswindow.ui
@@ -1,104 +1,105 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PropertiesWindow</class>
- <widget class="QWidget" name="PropertiesWindow" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PropertiesWindow">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>391</width>
-    <height>225</height>
+    <height>226</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Alternative Properties</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QFormLayout" name="formLayout" >
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>Path:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QLabel" name="labelPath" >
-       <property name="text" >
-        <string comment="KDE::DoNotExtract" >/usr/bin/kde</string>
+     <item row="0" column="1">
+      <widget class="QLabel" name="labelPath">
+       <property name="text">
+        <string comment="KDE::DoNotExtract">/usr/bin/kde</string>
        </property>
-       <property name="textInteractionFlags" >
+       <property name="textInteractionFlags">
         <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
         <string>Description:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="KSqueezedTextLabel" name="labelDescription" >
-       <property name="text" >
-        <string comment="KDE::DoNotExtract" >KSqueezedTextLabel</string>
+     <item row="1" column="1">
+      <widget class="KSqueezedTextLabel" name="labelDescription">
+       <property name="text">
+        <string comment="KDE::DoNotExtract">KSqueezedTextLabel</string>
        </property>
-       <property name="textInteractionFlags" >
+       <property name="textInteractionFlags">
         <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
        </property>
       </widget>
      </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
         <string>Priority:</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1" >
-      <widget class="QLabel" name="labelPriority" >
-       <property name="text" >
-        <string comment="KDE::DoNotExtract" >100</string>
+     <item row="2" column="1">
+      <widget class="QLabel" name="labelPriority">
+       <property name="text">
+        <string comment="KDE::DoNotExtract">100</string>
        </property>
-       <property name="textInteractionFlags" >
+       <property name="textInteractionFlags">
         <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="slavesGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="slavesGroup">
+     <property name="title">
       <string>Slaves</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QTreeView" name="slaveView" >
-        <property name="alternatingRowColors" >
+       <widget class="QTreeView" name="slaveView">
+        <property name="alternatingRowColors">
          <bool>true</bool>
         </property>
-        <property name="rootIsDecorated" >
+        <property name="rootIsDecorated">
          <bool>false</bool>
         </property>
-        <property name="allColumnsShowFocus" >
+        <property name="allColumnsShowFocus">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KSqueezedTextLabel</class>
    <extends>QLabel</extends>
    <header>ksqueezedtextlabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/slavewidget.ui b/src/slavewidget.ui
index fc745ff..0bd9083 100644
--- a/src/slavewidget.ui
+++ b/src/slavewidget.ui
@@ -1,47 +1,48 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SlaveWidgetUi</class>
- <widget class="QWidget" name="SlaveWidgetUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="SlaveWidgetUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>378</width>
     <height>73</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="m_slaveText" >
-     <property name="text" >
-      <string comment="KDE::DoNotExtract" >Slave link for qtconfig.1.gz:</string>
+    <widget class="QLabel" name="m_slaveText">
+     <property name="text">
+      <string comment="KDE::DoNotExtract">Slave link for qtconfig.1.gz:</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="KUrlRequester" name="m_slavePath" />
+    <widget class="KUrlRequester" name="m_slavePath"/>
    </item>
    <item>
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
+    <spacer name="verticalSpacer">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>1</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>