diff --git a/kcms/style/stylepreview.ui b/kcms/style/stylepreview.ui
index f7aa15aad..f3dff8aaf 100644
--- a/kcms/style/stylepreview.ui
+++ b/kcms/style/stylepreview.ui
@@ -1,164 +1,164 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>StylePreview</class>
  <widget class="QWidget" name="StylePreview">
   <layout class="QVBoxLayout">
    <item>
     <widget class="QTabWidget" name="TabWidget2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
        <horstretch>1</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>Tab 1</string>
       </attribute>
       <layout class="QVBoxLayout">
        <item>
         <layout class="QHBoxLayout">
          <item>
           <layout class="QVBoxLayout" name="verticalLayout">
            <item>
             <widget class="QGroupBox" name="GroupBox1">
              <property name="title">
               <string>Group Box</string>
              </property>
              <layout class="QVBoxLayout" name="_2">
               <item>
                <widget class="QRadioButton" name="RadioButton1">
                 <property name="text">
                  <string>Radio button</string>
                 </property>
                 <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QRadioButton" name="RadioButton2">
                 <property name="text">
                  <string>Radio button</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="Line" name="Line1">
                 <property name="frameShape">
                  <enum>QFrame::HLine</enum>
                 </property>
                 <property name="frameShadow">
                  <enum>QFrame::Sunken</enum>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QCheckBox" name="CheckBox1">
                 <property name="text">
                  <string>Checkbox</string>
                 </property>
                 <property name="checked">
                  <bool>true</bool>
                 </property>
                 <property name="tristate">
                  <bool>false</bool>
                 </property>
                </widget>
               </item>
              </layout>
             </widget>
            </item>
            <item>
             <spacer name="verticalSpacer">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
          <item>
           <layout class="QVBoxLayout">
            <item>
             <widget class="QProgressBar" name="ProgressBar1">
              <property name="value">
               <number>70</number>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QSlider" name="Slider1">
              <property name="value">
               <number>30</number>
              </property>
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
             </widget>
            </item>
            <item>
             <layout class="QHBoxLayout">
              <item>
               <widget class="QSpinBox" name="SpinBox1">
                <property name="maximum">
                 <number>999999</number>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QPushButton" name="PushButton1">
                <property name="text">
                 <string>Button</string>
                </property>
               </widget>
              </item>
             </layout>
            </item>
            <item>
             <widget class="QComboBox" name="ComboBox1">
              <item>
               <property name="text">
                <string>Combobox</string>
               </property>
              </item>
             </widget>
            </item>
            <item>
             <spacer>
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
          <item>
           <widget class="QScrollBar" name="ScrollBar1">
            <property name="maximum">
             <number>19</number>
            </property>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
           </widget>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="tab2">
       <attribute name="title">
        <string>Tab 2</string>
       </attribute>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index 16437bfbe..8901eb9e9 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -1,404 +1,404 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KNetAttach</class>
  <widget class="QWizard" name="KNetAttach">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>722</width>
     <height>475</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Network Folder Wizard</string>
   </property>
   <widget class="QWizardPage" name="_folderType">
    <property name="title">
     <string>Add Network Folder</string>
    </property>
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <widget class="QLabel" name="textLabel1_2">
       <property name="text">
        <string>Select the type of network folder you wish to connect to and press the Next button.</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignVCenter</set>
       </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
      </widget>
     </item>
     <item>
      <spacer name="spacer20">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
       <property name="sizeType">
        <enum>QSizePolicy::Fixed</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>
         <width>653</width>
         <height>18</height>
        </size>
       </property>
      </spacer>
     </item>
     <item>
      <widget class="KButtonGroup" name="buttonGroup1">
       <property name="title">
        <string/>
       </property>
       <property name="flat">
        <bool>true</bool>
       </property>
       <layout class="QGridLayout">
        <property name="margin">
         <number>0</number>
        </property>
        <item row="4" column="0">
         <widget class="QRadioButton" name="_recent">
          <property name="text">
           <string>&amp;Recent connection:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="0" colspan="2">
         <widget class="QRadioButton" name="_webfolder">
          <property name="text">
           <string>&amp;WebFolder (webdav)</string>
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="3" column="0" colspan="2">
         <widget class="QRadioButton" name="_fish">
          <property name="text">
           <string>&amp;Secure shell (ssh)</string>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item row="4" column="1">
         <widget class="KComboBox" name="_recentConnectionName">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>1</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>250</width>
            <height>0</height>
           </size>
          </property>
         </widget>
        </item>
        <item row="1" column="0" colspan="2">
         <widget class="QRadioButton" name="_ftp">
          <property name="text">
           <string>FT&amp;P</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0" colspan="2">
         <widget class="QRadioButton" name="_smb">
          <property name="text">
           <string>&amp;Microsoft® Windows® network drive</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </item>
     <item>
      <spacer name="spacer2_2">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
       <property name="sizeType">
        <enum>QSizePolicy::Expanding</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>
         <width>653</width>
         <height>184</height>
        </size>
       </property>
      </spacer>
     </item>
    </layout>
   </widget>
   <widget class="QWizardPage" name="_folderParameters">
    <property name="title">
     <string>Network Folder Information</string>
    </property>
-   <layout class="QGridLayout" name="gridLayout">
+   <layout class="QGridLayout" name="gridLayout2">
     <item row="0" column="0" colspan="3">
      <widget class="QLabel" name="_informationText">
       <property name="alignment">
        <set>Qt::AlignVCenter</set>
       </property>
       <property name="wordWrap">
        <bool>true</bool>
       </property>
      </widget>
     </item>
     <item row="1" column="2">
      <spacer name="spacer20_2">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
       <property name="sizeType">
        <enum>QSizePolicy::Fixed</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>
         <width>282</width>
         <height>18</height>
        </size>
       </property>
      </spacer>
     </item>
     <item row="2" column="0">
      <widget class="QLabel" name="textLabel4_2">
       <property name="text">
        <string>&amp;Name:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
       <property name="buddy">
        <cstring>_connectionName</cstring>
       </property>
      </widget>
     </item>
     <item row="2" column="1" colspan="2">
      <widget class="KLineEdit" name="_connectionName"/>
     </item>
     <item row="3" column="0">
      <widget class="QLabel" name="_userText">
       <property name="text">
        <string>&amp;User:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
       <property name="buddy">
        <cstring>_user</cstring>
       </property>
      </widget>
     </item>
     <item row="3" column="1" colspan="2">
      <widget class="KLineEdit" name="_user">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
         <horstretch>10</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
      </widget>
     </item>
     <item row="4" column="0">
      <widget class="QLabel" name="textLabel1">
       <property name="text">
        <string>Se&amp;rver:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
       <property name="buddy">
        <cstring>_host</cstring>
       </property>
      </widget>
     </item>
     <item row="4" column="1" colspan="2">
      <widget class="KLineEdit" name="_host">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
         <horstretch>10</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
      </widget>
     </item>
     <item row="5" column="0">
      <widget class="QLabel" name="_portText">
       <property name="text">
        <string>&amp;Port:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
       <property name="buddy">
        <cstring>_port</cstring>
       </property>
      </widget>
     </item>
     <item row="5" column="1">
      <widget class="QSpinBox" name="_port">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
         <horstretch>1</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="minimum">
        <number>1</number>
       </property>
       <property name="maximum">
        <number>65535</number>
       </property>
      </widget>
     </item>
     <item row="6" column="0">
      <widget class="QLabel" name="_protocol">
       <property name="text">
        <string>&amp;Protocol:</string>
       </property>
       <property name="alignment">
 	<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
       <property name="buddy">
        <cstring>_port</cstring>
       </property>
      </widget>
     </item>
     <item row="6" column="1">
      <widget class="KComboBox" name="_protocolText">
       <item>
        <property name="text">
         <string notr="true">sftp</string>
        </property>
       </item>
       <item>
        <property name="text">
         <string notr="true">fish</string>
        </property>
       </item>
      </widget>
     </item>
     <item row="7" column="0">
      <widget class="QLabel" name="textLabel3">
       <property name="text">
        <string>&amp;Folder:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="wordWrap">
        <bool>false</bool>
       </property>
       <property name="buddy">
        <cstring>_path</cstring>
       </property>
      </widget>
     </item>
     <item row="7" column="1" colspan="2">
      <widget class="KLineEdit" name="_path"/>
     </item>
     <item row="8" column="0">
      <widget class="QLabel" name="_encodingText">
       <property name="enabled">
        <bool>true</bool>
       </property>
       <property name="text">
        <string>Encoding:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="buddy">
        <cstring>_encoding</cstring>
       </property>
      </widget>
     </item>
     <item row="8" column="1">
      <widget class="KComboBox" name="_encoding"/>
     </item>
     <item row="9" column="1" colspan="2">
      <widget class="QCheckBox" name="_createIcon">
       <property name="text">
        <string>Cr&amp;eate an icon for this remote folder</string>
       </property>
       <property name="checked">
        <bool>true</bool>
       </property>
      </widget>
     </item>
     <item row="10" column="1">
      <widget class="QCheckBox" name="_useEncryption">
       <property name="text">
        <string>&amp;Use encryption</string>
       </property>
      </widget>
     </item>
     <item row="11" column="0" colspan="3">
      <spacer name="spacer5">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
       <property name="sizeType">
        <enum>QSizePolicy::Expanding</enum>
       </property>
       <property name="sizeHint" stdset="0">
        <size>
         <width>653</width>
         <height>56</height>
        </size>
       </property>
      </spacer>
     </item>
    </layout>
   </widget>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KButtonGroup</class>
    <extends>QGroupBox</extends>
    <header>kbuttongroup.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>