diff --git a/libapper/Requirements.cpp b/libapper/Requirements.cpp
index dd2b593..19877d9 100644
--- a/libapper/Requirements.cpp
+++ b/libapper/Requirements.cpp
@@ -1,268 +1,273 @@
 /***************************************************************************
  *   Copyright (C) 2008-2011 by Daniel Nicoletti                           *
  *   dantti12@gmail.com                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; see the file COPYING. If not, write to       *
  *   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,  *
  *   Boston, MA 02110-1301, USA.                                           *
  ***************************************************************************/
 
 #include "Requirements.h"
 #include "ui_Requirements.h"
 
 #include "PkIcons.h"
 #include "PackageModel.h"
 #include "ApplicationSortFilterModel.h"
 
 #include <QToolButton>
 #include <KPushButton>
 #include <KDebug>
 #include <KGlobal>
 
 Requirements::Requirements(PackageModel *model, QWidget *parent) :
-    KDialog(parent),
+    QDialog(parent),
     m_embed(false),
     m_shouldShow(true),
     m_untrustedButton(0),
     ui(new Ui::Requirements)
 {
     setAttribute(Qt::WA_DeleteOnClose);
 
-    ui->setupUi(mainWidget());
+    ui->setupUi(this);
     connect(ui->confirmCB, SIGNAL(toggled(bool)), this, SLOT(on_confirmCB_Toggled(bool)));
 
     ApplicationSortFilterModel *proxy = new ApplicationSortFilterModel(this);
     proxy->setSourceModel(model);
     ui->packageView->setModel(proxy);
     ui->packageView->header()->setResizeMode(PackageModel::NameCol, QHeaderView::ResizeToContents);
     ui->packageView->header()->hideSection(PackageModel::ActionCol);
     ui->packageView->header()->hideSection(PackageModel::ArchCol);
     ui->packageView->header()->hideSection(PackageModel::CurrentVersionCol);
     ui->packageView->header()->hideSection(PackageModel::OriginCol);
     ui->packageView->header()->hideSection(PackageModel::SizeCol);
 
     m_hideAutoConfirm = false;
 
-    setCaption(i18n("Additional changes"));
+    setWindowTitle(i18n("Additional changes"));
     setWindowIcon(QIcon::fromTheme("dialog-warning"));
-    setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Help);
-    setButtonText(KDialog::Ok, i18n("Continue"));
+//    setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Help);
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("Continue"));
+//    setButtonText(KDialog::Ok, i18n("Continue"));
     // restore size
     setMinimumSize(QSize(600,480));
-    setInitialSize(QSize(600,600));
+//    setInitialSize(QSize(600,600));
     KConfig config("apper");
     KConfigGroup requirementsDialog(&config, "requirementsDialog");
-    restoreDialogSize(requirementsDialog);
+//    restoreGeometry(requirementsDialog.readEntry("geometry").toByteArray());
+//    restoreDialogSize(requirementsDialog);
 
-    button(KDialog::Help)->setFlat(true);
-    button(KDialog::Help)->setEnabled(false);
-    button(KDialog::Help)->setIcon(QIcon::fromTheme("download"));
+    QPushButton *help = ui->buttonBox->button(QDialogButtonBox::Help);
+    help->setFlat(true);
+    help->setEnabled(false);
+    help->setIcon(QIcon::fromTheme("download"));
 
     m_buttonGroup = new QButtonGroup(this);
     connect(m_buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(actionClicked(int)));
 
     int count = 0;
     if (int c = model->countInfo(Transaction::InfoRemoving)) {
         QToolButton *button = new QToolButton(this);
         button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
         button->setCheckable(true);
         button->setAutoRaise(true);
         button->setIconSize(QSize(32, 32));
         button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         button->setText(i18np("1 package to remove", "%1 packages to remove", c));
         button->setIcon(PkIcons::actionIcon(Transaction::RoleRemovePackages));
         m_buttonGroup->addButton(button, Transaction::InfoRemoving);
         ui->verticalLayout->insertWidget(count++, button);
 
         m_hideAutoConfirm = true;
     }
 
     if (int c = model->countInfo(Transaction::InfoDowngrading)) {
         QToolButton *button = new QToolButton(this);
         button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
         button->setCheckable(true);
         button->setAutoRaise(true);
         button->setIconSize(QSize(32, 32));
         button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         button->setText(i18np("1 package to downgrade", "%1 packages to downgrade", c));
         button->setIcon(PkIcons::actionIcon(Transaction::RoleRepairSystem));
         m_buttonGroup->addButton(button, Transaction::InfoDowngrading);
         ui->verticalLayout->insertWidget(count++, button);
 
         m_hideAutoConfirm = true;
     }
 
     if (int c = model->countInfo(Transaction::InfoReinstalling)) {
         QToolButton *button = new QToolButton(this);
         button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
         button->setCheckable(true);
         button->setAutoRaise(true);
         button->setIconSize(QSize(32, 32));
         button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         button->setText(i18np("1 package to reinstall", "%1 packages to reinstall", c));
         button->setIcon(PkIcons::actionIcon(Transaction::RoleRemovePackages));
         m_buttonGroup->addButton(button, Transaction::InfoReinstalling);
         ui->verticalLayout->insertWidget(count++, button);
     }
 
     if (int c = model->countInfo(Transaction::InfoInstalling)) {
         QToolButton *button = new QToolButton(this);
         button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
         button->setCheckable(true);
         button->setAutoRaise(true);
         button->setIconSize(QSize(32, 32));
         button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         button->setText(i18np("1 package to install", "%1 packages to install", c));
         button->setIcon(PkIcons::actionIcon(Transaction::RoleInstallPackages));
         m_buttonGroup->addButton(button, Transaction::InfoInstalling);
         ui->verticalLayout->insertWidget(count++, button);
     }
 
     if (int c = model->countInfo(Transaction::InfoUpdating)) {
         QToolButton *button = new QToolButton(this);
         button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
         button->setCheckable(true);
         button->setAutoRaise(true);
         button->setIconSize(QSize(32, 32));
         button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         button->setText(i18np("1 package to update", "%1 packages to update", c));
         button->setIcon(PkIcons::actionIcon(Transaction::RoleUpdatePackages));
         m_buttonGroup->addButton(button, Transaction::InfoUpdating);
         ui->verticalLayout->insertWidget(count++, button);
     }
 
     if (int c = model->countInfo(Transaction::InfoUntrusted)) {
         m_untrustedButton = new QToolButton(this);
         m_untrustedButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
         m_untrustedButton->setCheckable(true);
         m_untrustedButton->setAutoRaise(true);
         m_untrustedButton->setIconSize(QSize(32, 32));
         m_untrustedButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         m_untrustedButton->setText(i18np("1 untrusted package", "%1 untrusted packages", c));
         m_untrustedButton->setIcon(QIcon::fromTheme("security-low"));
         m_untrustedButton->setVisible(false);
         ui->verticalLayout->insertWidget(count++, m_untrustedButton);
     }
 
     if (!m_buttonGroup->buttons().isEmpty()) {
         m_buttonGroup->buttons().first()->click();
 
         if (m_hideAutoConfirm) {
             ui->confirmCB->setVisible(false);
         } else {
             // if the confirmCB is visible means that we can skip this
             // dialog, but only if the user previusly set so
             ui->confirmCB->setChecked(requirementsDialog.readEntry("autoConfirm", false));
         }
     } else if (m_untrustedButton) {
         showUntrustedButton();
     } else {
         // set this as false so the dialog is not shown
         m_shouldShow = false;
     }
 }
 
 Requirements::~Requirements()
 {
     KConfig config("apper");
     KConfigGroup requirementsDialog(&config, "requirementsDialog");
-    saveDialogSize(requirementsDialog);
+    requirementsDialog.writeEntry("geometry", saveGeometry());
 
     delete ui;
 }
 
 bool Requirements::embedded() const
 {
     return m_embed;
 }
 
 void Requirements::setEmbedded(bool embedded)
 {
     m_embed = embedded;
     ui->label->setVisible(!embedded);
 }
 
 void Requirements::setDownloadSizeRemaining(qulonglong size)
 {
+    QPushButton *help = ui->buttonBox->button(QDialogButtonBox::Help);
     if (size) {
         QString text;
         text = i18nc("how many bytes are required for download",
                      "Need to get %1 of archives",
                      KLocale::global()->formatByteSize(size));
-        button(KDialog::Help)->setText(text);
-        button(KDialog::Help)->setToolTip(text);
-        button(KDialog::Help)->show();
+        help->setText(text);
+        help->setToolTip(text);
+        help->show();
     } else {
-        button(KDialog::Help)->hide();
+        help->hide();
     }
 }
 
 bool Requirements::trusted() const
 {
     // There are untrusted packages if the button was created...
     return !m_untrustedButton;
 }
 
 bool Requirements::shouldShow() const
 {
     return (m_shouldShow && !ui->confirmCB->isChecked());
 }
 
-void Requirements::slotButtonClicked(int button)
+void Requirements::slotButtonClicked(int)
 {
-    if (button == KDialog::Ok &&
-            m_untrustedButton &&
-            !m_untrustedButton->isVisible()) {
-        showUntrustedButton();
-    } else {
-        KDialog::slotButtonClicked(button);
-    }
+    // FIXME
+//    if (button == KDialog::Ok &&
+//            m_untrustedButton &&
+//            !m_untrustedButton->isVisible()) {
+//        showUntrustedButton();
+//    } else {
+//        KDialog::slotButtonClicked(button);
+//    }
 }
 
 void Requirements::on_confirmCB_Toggled(bool checked)
 {
     KConfig config("apper");
     KConfigGroup requirementsDialog(&config, "requirementsDialog");
 
     if (!m_hideAutoConfirm) {
         requirementsDialog.writeEntry("autoConfirm", checked);
     }
     config.sync();
 }
 
 void Requirements::actionClicked(int type)
 {
     ApplicationSortFilterModel *proxy;
     proxy = qobject_cast<ApplicationSortFilterModel*>(ui->packageView->model());
     proxy->setInfoFilter(static_cast<Transaction::Info>(type));
 }
 
 void Requirements::showUntrustedButton()
 {
     // Clear the other buttons
     foreach (QAbstractButton *button, m_buttonGroup->buttons()) {
         delete button;
     }
 
     // Hide the auto confirm button since we will be showing this dialog anyway
     ui->confirmCB->setVisible(false);
 
     ui->label->setText(i18n("You are about to install unsigned packages that can compromise your system, "
                             "as it is impossible to verify if the software came from a trusted source."));
     m_untrustedButton->setVisible(true);
     m_buttonGroup->addButton(m_untrustedButton, Transaction::InfoUntrusted);
     m_untrustedButton->click();
 }
 
 #include "moc_Requirements.cpp"
diff --git a/libapper/Requirements.h b/libapper/Requirements.h
index b993b41..18dc459 100644
--- a/libapper/Requirements.h
+++ b/libapper/Requirements.h
@@ -1,67 +1,67 @@
 /***************************************************************************
  *   Copyright (C) 2008-2011 by Daniel Nicoletti                           *
  *   dantti12@gmail.com                                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; see the file COPYING. If not, write to       *
  *   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,  *
  *   Boston, MA 02110-1301, USA.                                           *
  ***************************************************************************/
 
 #ifndef REQUIREMENTS_H
 #define REQUIREMENTS_H
 
 #include <KDialog>
 
 #include <QToolButton>
 
 namespace Ui {
     class Requirements;
 }
 
 class PackageModel;
-class Requirements : public KDialog
+class Requirements : public QDialog
 {
     Q_OBJECT
     Q_PROPERTY(bool embedded READ embedded WRITE setEmbedded USER true)
 public:
     explicit Requirements(PackageModel *model, QWidget *parent = 0);
     ~Requirements();
 
     bool embedded() const;
     void setEmbedded(bool embedded);
     void setDownloadSizeRemaining(qulonglong size);
     bool trusted() const;
 
 public Q_SLOTS:
     bool shouldShow() const;
 
 protected Q_SLOTS:
      virtual void slotButtonClicked(int button);
 
 private Q_SLOTS:
     void on_confirmCB_Toggled(bool checked);
     void actionClicked(int type);
 
 private:
     void showUntrustedButton();
 
     bool m_embed;
     bool m_shouldShow;
     bool m_hideAutoConfirm;
     QToolButton *m_untrustedButton;
     QButtonGroup *m_buttonGroup;
     Ui::Requirements *ui;
 };
 
 #endif
diff --git a/libapper/Requirements.ui b/libapper/Requirements.ui
index c2dd2d0..fb2e02a 100644
--- a/libapper/Requirements.ui
+++ b/libapper/Requirements.ui
@@ -1,112 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Requirements</class>
- <widget class="QWidget" name="Requirements">
+ <widget class="QDialog" name="Requirements">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>497</width>
     <height>359</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>Additional changes are required to complete the task</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="1">
     <widget class="QTreeView" name="packageView">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>200</width>
        <height>0</height>
       </size>
      </property>
      <property name="focusPolicy">
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAlwaysOff</enum>
      </property>
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
      <property name="showDropIndicator" stdset="0">
       <bool>false</bool>
      </property>
      <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
      <property name="selectionMode">
       <enum>QAbstractItemView::NoSelection</enum>
      </property>
      <property name="rootIsDecorated">
       <bool>false</bool>
      </property>
      <property name="itemsExpandable">
       <bool>false</bool>
      </property>
      <property name="expandsOnDoubleClick">
       <bool>false</bool>
      </property>
      <attribute name="headerDefaultSectionSize">
       <number>50</number>
      </attribute>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QCheckBox" name="confirmCB">
-     <property name="text">
-      <string>Do not confirm when installing or updating additional packages</string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>40</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QCheckBox" name="confirmCB">
+     <property name="text">
+      <string>Do not confirm when installing or updating additional packages</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string>Additional changes are required to complete the task</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>