diff --git a/directorylistbase.ui b/directorylistbase.ui
index 9827f72b..dea47617 100644
--- a/directorylistbase.ui
+++ b/directorylistbase.ui
@@ -1,204 +1,194 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>DirectoryListBase</class>
  <widget class="QWidget" name="DirectoryListBase">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>440</width>
     <height>332</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">
      <item>
       <widget class="QLabel" name="informationLabel">
        <property name="text">
         <string>Please choose the folders where you keep your music:</string>
        </property>
        <property name="textFormat">
         <enum>Qt::PlainText</enum>
        </property>
        <property name="alignment">
         <set>Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
         <widget class="QListView" name="directoryListView">
          <property name="toolTip">
           <string>These folders will be scanned on startup for new files.</string>
          </property>
          <property name="horizontalScrollBarPolicy">
           <enum>Qt::ScrollBarAlwaysOff</enum>
          </property>
          <property name="editTriggers">
           <set>QAbstractItemView::NoEditTriggers</set>
          </property>
          <property name="alternatingRowColors">
           <bool>true</bool>
          </property>
          <property name="selectionMode">
           <enum>QAbstractItemView::MultiSelection</enum>
          </property>
          <property name="textElideMode">
           <enum>Qt::ElideMiddle</enum>
          </property>
          <property name="layoutMode">
           <enum>QListView::Batched</enum>
          </property>
          <property name="uniformItemSizes">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
-          <widget class="KPushButton" name="addDirectoryButton">
+          <widget class="QPushButton" name="addDirectoryButton">
            <property name="text">
             <string>Add Folder...</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="KPushButton" name="removeDirectoryButton">
+          <widget class="QPushButton" name="removeDirectoryButton">
            <property name="text">
             <string>Remove Folder</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="rightColumnSpacer">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>158</width>
              <height>48</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_4">
      <item>
       <widget class="QLabel" name="ExcludeInformationLabel">
        <property name="text">
         <string>Please choose the folders that should be excluded from music search:</string>
        </property>
        <property name="textFormat">
         <enum>Qt::PlainText</enum>
        </property>
        <property name="alignment">
         <set>Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
         <widget class="QListView" name="excludeDirectoryListView">
          <property name="toolTip">
           <string>These folders will be scanned on startup for new files.</string>
          </property>
          <property name="horizontalScrollBarPolicy">
           <enum>Qt::ScrollBarAlwaysOff</enum>
          </property>
          <property name="editTriggers">
           <set>QAbstractItemView::NoEditTriggers</set>
          </property>
          <property name="alternatingRowColors">
           <bool>true</bool>
          </property>
          <property name="selectionMode">
           <enum>QAbstractItemView::MultiSelection</enum>
          </property>
          <property name="textElideMode">
           <enum>Qt::ElideMiddle</enum>
          </property>
          <property name="layoutMode">
           <enum>QListView::Batched</enum>
          </property>
          <property name="uniformItemSizes">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
-          <widget class="KPushButton" name="addExcludeDirectoryButton">
+          <widget class="QPushButton" name="addExcludeDirectoryButton">
            <property name="text">
             <string>Add Folder...</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="KPushButton" name="removeExcludeDirectoryButton">
+          <widget class="QPushButton" name="removeExcludeDirectoryButton">
            <property name="text">
             <string>Remove Folder</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="rightExcludeColumnSpacer">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>158</width>
              <height>48</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QCheckBox" name="importPlaylistsCheckBox">
      <property name="text">
       <string>Import playlists</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
- </customwidgets>
- <includes>
-  <include location="local">kpushbutton.h</include>
- </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/exampleoptionsbase.ui b/exampleoptionsbase.ui
index 74205040..884b7728 100644
--- a/exampleoptionsbase.ui
+++ b/exampleoptionsbase.ui
@@ -1,456 +1,455 @@
 <ui version="4.0" >
  <class>ExampleOptionsBase</class>
  <widget class="QWidget" name="ExampleOptionsBase" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>404</width>
     <height>473</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Example</string>
   </property>
   <layout class="QGridLayout" >
    <property name="leftMargin" >
     <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>
    <property name="horizontalSpacing" >
     <number>6</number>
    </property>
    <property name="verticalSpacing" >
     <number>6</number>
    </property>
    <item row="0" column="0" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Example Tag Selection</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" >
        <number>9</number>
       </property>
       <property name="bottomMargin" >
        <number>9</number>
       </property>
       <item>
        <widget class="QRadioButton" name="m_fileTagsButton" >
         <property name="text" >
          <string>Get example tags from this file:</string>
         </property>
         <property name="checked" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="KUrlRequester" name="m_exampleFile" >
         <property name="enabled" >
          <bool>false</bool>
         </property>
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="m_manualTagsButton" >
         <property name="text" >
          <string>Enter example tags manually:</string>
         </property>
         <property name="checked" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="m_manualGroup" >
         <property name="title" >
          <string>Example Tags</string>
         </property>
         <property name="flat" >
          <bool>true</bool>
         </property>
         <layout class="QGridLayout" >
          <property name="leftMargin" >
           <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>
          <property name="horizontalSpacing" >
           <number>6</number>
          </property>
          <property name="verticalSpacing" >
           <number>6</number>
          </property>
          <item row="0" column="0" >
           <layout class="QVBoxLayout" >
            <property name="spacing" >
             <number>6</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" >
             <number>0</number>
            </property>
            <item>
             <widget class="QLabel" name="textLabel1" >
              <property name="text" >
               <string comment="song title" >Title:</string>
              </property>
              <property name="wordWrap" >
               <bool>false</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="textLabel2" >
              <property name="text" >
               <string>Artist:</string>
              </property>
              <property name="wordWrap" >
               <bool>false</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="textLabel3" >
              <property name="text" >
               <string>Album:</string>
              </property>
              <property name="wordWrap" >
               <bool>false</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="textLabel4" >
              <property name="text" >
               <string>Genre:</string>
              </property>
              <property name="wordWrap" >
               <bool>false</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="textLabel5" >
              <property name="text" >
               <string>Track number:</string>
              </property>
              <property name="wordWrap" >
               <bool>false</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="textLabel6" >
              <property name="text" >
               <string>Year:</string>
              </property>
              <property name="wordWrap" >
               <bool>false</bool>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item row="0" column="1" >
           <layout class="QVBoxLayout" >
            <property name="spacing" >
             <number>6</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" >
             <number>0</number>
            </property>
            <item>
             <widget class="KLineEdit" name="m_exampleTitle" >
              <property name="text" >
               <string comment="example song title" >Title</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KLineEdit" name="m_exampleArtist" >
              <property name="text" >
               <string>Artist</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KLineEdit" name="m_exampleAlbum" >
              <property name="text" >
               <string>Album</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KLineEdit" name="m_exampleGenre" >
              <property name="text" >
               <string>Genre</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KIntSpinBox" name="m_exampleTrack">
              <property name="value" >
               <number>1</number>
              </property>
             </widget>
            </item>
            <item>
             <widget class="KIntSpinBox" name="m_exampleYear">
              <property name="minimum" >
               <number>1000</number>
              </property>
              <property name="maximum" >
               <number>2999</number>
              </property>
              <property name="value" >
               <number>2007</number>
              </property>
             </widget>
            </item>
           </layout>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <spacer>
         <property name="orientation" >
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" >
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
   <customwidgets>
   <customwidget>
    <class>KIntSpinBox</class>
    <extends>QSpinBox</extends>
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_exampleFile</tabstop>
   <tabstop>m_manualTagsButton</tabstop>
   <tabstop>m_exampleTitle</tabstop>
   <tabstop>m_exampleArtist</tabstop>
   <tabstop>m_exampleAlbum</tabstop>
   <tabstop>m_exampleGenre</tabstop>
   <tabstop>m_exampleTrack</tabstop>
   <tabstop>m_exampleYear</tabstop>
  </tabstops>
  <includes>
   <include location="local" >kurlrequester.h</include>
   <include location="local" >klineedit.h</include>
-  <include location="local" >kpushbutton.h</include>
  </includes>
  <resources/>
  <connections>
   <connection>
    <sender>m_fileTagsButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>m_exampleFile</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_fileTagsButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>ExampleOptionsBase</receiver>
    <slot>exampleSelectionChanged()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_manualTagsButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>ExampleOptionsBase</receiver>
    <slot>exampleSelectionChanged()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_exampleTitle</sender>
    <signal>textChanged(QString)</signal>
    <receiver>ExampleOptionsBase</receiver>
    <slot>exampleDataChanged()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_exampleArtist</sender>
    <signal>textChanged(QString)</signal>
    <receiver>ExampleOptionsBase</receiver>
    <slot>exampleDataChanged()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_exampleAlbum</sender>
    <signal>textChanged(QString)</signal>
    <receiver>ExampleOptionsBase</receiver>
    <slot>exampleDataChanged()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_exampleGenre</sender>
    <signal>textChanged(QString)</signal>
    <receiver>ExampleOptionsBase</receiver>
    <slot>exampleDataChanged()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_exampleTrack</sender>
    <signal>valueChanged(int)</signal>
    <receiver>ExampleOptionsBase</receiver>
    <slot>exampleDataChanged()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_exampleYear</sender>
    <signal>valueChanged(int)</signal>
    <receiver>ExampleOptionsBase</receiver>
    <slot>exampleDataChanged()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>20</x>
      <y>20</y>
     </hint>
     <hint type="destinationlabel" >
      <x>20</x>
      <y>20</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/filerenamerbase.ui b/filerenamerbase.ui
index cc7595fc..cd80e8cd 100644
--- a/filerenamerbase.ui
+++ b/filerenamerbase.ui
@@ -1,347 +1,342 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>FileRenamerBase</class>
  <widget class="QWidget" name="FileRenamerBase">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>489</width>
     <height>579</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>File Renamer Configuration</string>
   </property>
   <layout class="QVBoxLayout">
    <property name="spacing">
     <number>6</number>
    </property>
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <layout class="QGridLayout">
      <property name="margin">
       <number>0</number>
      </property>
      <property name="spacing">
       <number>6</number>
      </property>
      <item row="1" column="1">
       <widget class="KComboBox" name="m_separator">
        <property name="editable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="0" column="0">
       <widget class="QLabel" name="textLabel1_6">
        <property name="text">
         <string>Music folder:</string>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <layout class="QHBoxLayout">
        <property name="spacing">
         <number>6</number>
        </property>
        <property name="margin">
         <number>0</number>
        </property>
        <item>
         <widget class="KComboBox" name="m_category">
          <item>
           <property name="text">
            <string>Album Tag</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Artist Tag</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Genre Tag</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Title Tag</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Track Tag</string>
           </property>
          </item>
          <item>
           <property name="text">
            <string>Year Tag</string>
           </property>
          </item>
         </widget>
        </item>
        <item>
-        <widget class="KPushButton" name="m_insertCategory">
+        <widget class="QPushButton" name="m_insertCategory">
          <property name="text">
           <string>Insert Category</string>
          </property>
         </widget>
        </item>
       </layout>
      </item>
      <item row="0" column="1">
       <widget class="KUrlRequester" name="m_musicFolder"/>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="textLabel1">
        <property name="text">
         <string>Add category:</string>
        </property>
        <property name="buddy">
         <cstring>m_category</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="textLabel1_7">
        <property name="text">
         <string>Separator:</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="Line" name="line1_2">
      <property name="frameShape">
       <enum>QFrame::HLine</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QScrollArea" name="m_mainView">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
      <widget class="QWidget" name="scrollAreaWidgetContents">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
         <width>483</width>
         <height>340</height>
        </rect>
       </property>
      </widget>
     </widget>
    </item>
    <item>
     <widget class="Line" name="line1">
      <property name="frameShape">
       <enum>QFrame::HLine</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Example</string>
      </property>
      <layout class="QVBoxLayout">
       <property name="spacing">
        <number>6</number>
       </property>
       <property name="margin">
        <number>9</number>
       </property>
       <item>
        <layout class="QHBoxLayout">
         <property name="spacing">
          <number>6</number>
         </property>
         <property name="margin">
          <number>0</number>
         </property>
         <item>
          <spacer>
           <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_showExample">
+         <widget class="QPushButton" name="m_showExample">
           <property name="text">
            <string>Show Renamer Test Dialog</string>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
           <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>
        </layout>
       </item>
       <item>
        <widget class="KLineEdit" name="m_exampleText">
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
         <property name="acceptDrops">
          <bool>false</bool>
         </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QFrame</extends>
    <header>kurlrequester.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>
  <tabstops>
   <tabstop>m_musicFolder</tabstop>
   <tabstop>m_separator</tabstop>
   <tabstop>m_category</tabstop>
   <tabstop>m_insertCategory</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>m_musicFolder</sender>
    <signal>textChanged(QString)</signal>
    <receiver>FileRenamerBase</receiver>
    <slot>exampleTextChanged()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>118</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>105</x>
      <y>103</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_separator</sender>
    <signal>textChanged(QString)</signal>
    <receiver>FileRenamerBase</receiver>
    <slot>exampleTextChanged()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>131</x>
      <y>47</y>
     </hint>
     <hint type="destinationlabel">
      <x>144</x>
      <y>102</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_showExample</sender>
    <signal>clicked()</signal>
    <receiver>FileRenamerBase</receiver>
    <slot>toggleExampleDialog()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>173</x>
      <y>514</y>
     </hint>
     <hint type="destinationlabel">
      <x>144</x>
      <y>462</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_insertCategory</sender>
    <signal>clicked()</signal>
    <receiver>FileRenamerBase</receiver>
    <slot>insertCategory()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>340</x>
      <y>81</y>
     </hint>
     <hint type="destinationlabel">
      <x>340</x>
      <y>105</y>
     </hint>
    </hints>
   </connection>
  </connections>
  <slots>
   <slot>exampleTextChanged()</slot>
   <slot>toggleExampleDialog()</slot>
   <slot>insertCategory()</slot>
  </slots>
 </ui>
diff --git a/tagguesserconfigdlgwidget.ui b/tagguesserconfigdlgwidget.ui
index 11569d69..21c44a06 100644
--- a/tagguesserconfigdlgwidget.ui
+++ b/tagguesserconfigdlgwidget.ui
@@ -1,146 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <author>Frerich Raabe &lt;raabe@kde.org&gt;</author>
  <class>TagGuesserConfigDlgWidget</class>
  <widget class="QWidget" name="TagGuesserConfigDlgWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>671</width>
     <height>530</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0" rowspan="6">
     <widget class="QTreeView" name="lvSchemes">
      <property name="toolTip">
       <string>Currently used file name schemes</string>
      </property>
      <property name="whatsThis">
       <string>Here you can see the currently configured file name schemes which the &quot;Guess Tag Information From File Name&quot; entry in the song's context menu uses to extract tag information from a file name. Each string may contain one of the following placeholders:&lt;ul&gt;
 &lt;li&gt;%t: Title&lt;/li&gt;
 &lt;li&gt;%a: Artist&lt;/li&gt;
 &lt;li&gt;%A: Album&lt;/li&gt;
 &lt;li&gt;%T: Track&lt;/li&gt;
 &lt;li&gt;%c: Comment&lt;/li&gt;
 &lt;/ul&gt;
 For example, the file name scheme &quot;[%T] %a - %t&quot; would match &quot;[01] Deep Purple - Smoke on the water&quot; but not &quot;(Deep Purple) Smoke on the water&quot;. For that second name, you would use the scheme &quot;(%a) %t&quot;.&lt;p/&gt;
 Note that the order in which the schemes appear in the list is relevant, since the tag guesser will go through the list from the top to the bottom, and use the first matching scheme.</string>
      </property>
      <property name="rootIsDecorated">
       <bool>false</bool>
      </property>
      <property name="expandsOnDoubleClick">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QToolButton" name="bMoveUp">
      <property name="toolTip">
       <string>Move scheme up</string>
      </property>
      <property name="whatsThis">
       <string>Press this button to move the currently selected scheme one step upwards.</string>
      </property>
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="0" column="3">
     <widget class="QToolButton" name="bMoveDown">
      <property name="toolTip">
       <string>Move scheme down</string>
      </property>
      <property name="whatsThis">
       <string>Press this button to move the currently selected scheme one step downwards.</string>
      </property>
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="1" column="1" colspan="3">
-    <widget class="KPushButton" name="bAdd">
+    <widget class="QPushButton" name="bAdd">
      <property name="toolTip">
       <string>Add a new scheme</string>
      </property>
      <property name="whatsThis">
       <string>Press this button to add a new file name scheme to the end of the list.</string>
      </property>
      <property name="text">
       <string>&amp;Add</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1" colspan="3">
-    <widget class="KPushButton" name="bModify">
+    <widget class="QPushButton" name="bModify">
      <property name="toolTip">
       <string>Modify scheme</string>
      </property>
      <property name="whatsThis">
       <string>Press this button to modify the currently selected scheme.</string>
      </property>
      <property name="text">
       <string>&amp;Modify</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1" colspan="3">
-    <widget class="KPushButton" name="bRemove">
+    <widget class="QPushButton" name="bRemove">
      <property name="toolTip">
       <string>Remove scheme</string>
      </property>
      <property name="whatsThis">
       <string>Press this button to remove the currently selected scheme from the list.</string>
      </property>
      <property name="text">
       <string>&amp;Remove</string>
      </property>
     </widget>
    </item>
    <item row="4" column="2">
     <spacer name="spacer1">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>130</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="5" column="2">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>You can use the following placeholders:
 %t: Title
 %A: Album
 %a: Artist
 %T: Track
 %c: Comment</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
- </customwidgets>
- <includes>
-  <include location="local">kpushbutton.h</include>
- </includes>
  <resources/>
  <connections/>
 </ui>