diff --git a/CMakeLists.txt b/CMakeLists.txt
index adc7c35ae..041e1efc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,6 +155,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libmaia
 
 SET( QT_USE_QTNETWORK TRUE )
 SET( QT_USE_QTXML TRUE )
+SET( QT_USE_QTDBUS TRUE )
 
 # this command finds Qt4 libraries and sets all required variables
 FIND_PACKAGE( Qt4 REQUIRED QtCore QtGui QtXml QtNetwork )
diff --git a/ChangeLog b/ChangeLog
index f971e264f..be52974da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,19 @@
 0.2.0
 -----
-1. Add option to show (and sort by) year of albums in library view.
-2. Show 'Various Artists' at the top of the library view.
-3. Add option to group single track artist/albums under
-   'Various Artists'/'Single Tracks'/'Artist - Track'
-4. Improve time slider accuracy, by checking the time elapsed at each interval.
-5. Fix inconsistency between adding items via drag'n'drop and using the 'add to'
-   and 'replace' actions.
-6. Add basic MPRISv2 interface - mainly so that Cantata can be controlled via
-   IconTasks' media buttons.
-7. Add option to set icon in dockmanager docks (IconTasks, Docky, DockBarX, etc)
-   to that of the current track.
-8. Provide a simple script to convert amarok radio streams into cantata streams.
+ 1. Add option to show (and sort by) year of albums in library view.
+ 2. Show 'Various Artists' at the top of the library view.
+ 3. Add option to group single track artist/albums under
+    'Various Artists'/'Single Tracks'/'Artist - Track'
+ 4. Improve time slider accuracy, by checking the time elapsed at each interval.
+ 5. Fix inconsistency between adding items via drag'n'drop and using the 'add to'
+    and 'replace' actions.
+ 6. Add basic MPRISv2 interface - mainly so that Cantata can be controlled via
+    IconTasks' media buttons.
+ 7. Add option to set icon in dockmanager docks (IconTasks, Docky, DockBarX, etc)
+    to that of the current track.
+ 8. Provide a simple script to convert amarok radio streams into cantata streams.
+ 9. Use .cantata extension for import/export of cantata streams.
+10. Only export selected strema categories.
 
 0.1.2
 -----
diff --git a/dbus/dockmanager.cpp b/dbus/dockmanager.cpp
index 513385972..ae7575b57 100644
--- a/dbus/dockmanager.cpp
+++ b/dbus/dockmanager.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "dockmanager.h"
-#include <QtCore/QDebug>
 
 DockManager::DockManager(QObject *p)
     : QObject(p)
diff --git a/gui/albumspage.cpp b/gui/albumspage.cpp
index 5ffd98bc6..580b0eb31 100644
--- a/gui/albumspage.cpp
+++ b/gui/albumspage.cpp
@@ -28,11 +28,11 @@
 #include <QtGui/QIcon>
 #include <QtGui/QToolButton>
 #ifdef ENABLE_KDE_SUPPORT
-#include <KAction>
-#include <KLocale>
-#include <KActionCollection>
+#include <KDE/KAction>
+#include <KDE/KLocale>
+#include <KDE/KActionCollection>
 #else
-#include <QAction>
+#include <QtGui/QAction>
 #endif
 
 AlbumsPage::AlbumsPage(MainWindow *p)
@@ -49,11 +49,11 @@ AlbumsPage::AlbumsPage(MainWindow *p)
     addToPlaylist->setEnabled(false);
     replacePlaylist->setEnabled(false);
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     view->setTopText(i18n("Albums"));
-#else
+    #else
     view->setTopText(tr("Albums"));
-#endif
+    #endif
     view->addAction(p->addToPlaylistAction);
     view->addAction(p->replacePlaylistAction);
     view->addAction(p->addToStoredPlaylistAction);
@@ -143,11 +143,11 @@ void AlbumsPage::searchItems()
 void AlbumsPage::updateGenres(const QStringList &genres)
 {
     QStringList entries;
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     entries << i18n("All Genres");
-#else
+    #else
     entries << tr("All Genres");
-#endif
+    #endif
     entries+=genres;
 
     bool diff=genreCombo->count() != entries.count();
diff --git a/gui/covers.cpp b/gui/covers.cpp
index 7cd435913..35a80be2c 100644
--- a/gui/covers.cpp
+++ b/gui/covers.cpp
@@ -100,11 +100,9 @@ static QString xdgConfig()
 static QString kdeHome()
 {
     static QString kdeHomePath;
-    if (kdeHomePath.isEmpty())
-    {
+    if (kdeHomePath.isEmpty()) {
         kdeHomePath = QString::fromLocal8Bit(qgetenv("KDEHOME"));
-        if (kdeHomePath.isEmpty())
-        {
+        if (kdeHomePath.isEmpty())  {
             QDir homeDir(QDir::homePath());
             QString kdeConfDir(QLatin1String("/.kde"));
             if (homeDir.exists(QLatin1String(".kde4")))
@@ -124,11 +122,11 @@ struct AppCover
 
 static AppCover otherAppCover(const Covers::Job &job)
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     QString kdeDir=KGlobal::dirs()->localkdedir();
-#else
+    #else
     QString kdeDir=kdeHome();
-#endif
+    #endif
     AppCover app;
     app.filename=kdeDir+"/share/apps/amarok/albumcovers/large/"+
                  QCryptographicHash::hash(job.artist.toLower().toLocal8Bit()+job.album.toLower().toLocal8Bit(),
@@ -162,15 +160,15 @@ static AppCover otherAppCover(const Covers::Job &job)
 
 Covers * Covers::self()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     return instance;
-#else
+    #else
     static Covers *instance=0;;
     if(!instance) {
         instance=new Covers;
     }
     return instance;
-#endif
+    #endif
 }
 
 Covers::Covers()
diff --git a/gui/folderpage.cpp b/gui/folderpage.cpp
index 012272c28..98bc89e33 100644
--- a/gui/folderpage.cpp
+++ b/gui/folderpage.cpp
@@ -26,11 +26,11 @@
 #include <QtGui/QIcon>
 #include <QtGui/QToolButton>
 #ifdef ENABLE_KDE_SUPPORT
-#include <KAction>
-#include <KLocale>
-#include <KActionCollection>
+#include <KDE/KAction>
+#include <KDE/KLocale>
+#include <KDE/KActionCollection>
 #else
-#include <QAction>
+#include <QtGui/QAction>
 #endif
 
 FolderPage::FolderPage(MainWindow *p)
@@ -47,11 +47,11 @@ FolderPage::FolderPage(MainWindow *p)
     addToPlaylist->setEnabled(false);
     replacePlaylist->setEnabled(false);
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     view->setTopText(i18n("Folders"));
-#else
+    #else
     view->setTopText(tr("Folders"));
-#endif
+    #endif
     view->addAction(p->addToPlaylistAction);
     view->addAction(p->replacePlaylistAction);
     view->addAction(p->addToStoredPlaylistAction);
diff --git a/gui/infopage.cpp b/gui/infopage.cpp
index 09e7c809f..7b1a52d8c 100644
--- a/gui/infopage.cpp
+++ b/gui/infopage.cpp
@@ -41,7 +41,6 @@
 #endif
 #include "infopage.h"
 #include "network.h"
-#include <QDebug>
 
 #ifdef ENABLE_KDE_SUPPORT
 #define WEBVIEW_BASE KWebView
@@ -186,11 +185,11 @@ void InfoPage::downloadRequested(const QNetworkRequest &request)
 {
 
     QString defaultFileName=QFileInfo(request.url().toString()).fileName();
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     QString fileName=KFileDialog::getSaveFileName(KUrl(), QString(), this);
-#else
+    #else
     QString fileName=QFileDialog::getSaveFileName(this, tr("Save File"), defaultFileName);
-#endif
+    #endif
     if (fileName.isEmpty()) {
         return;
     }
diff --git a/gui/infopage.h b/gui/infopage.h
index 09dec7201..f4a37e1aa 100644
--- a/gui/infopage.h
+++ b/gui/infopage.h
@@ -24,7 +24,7 @@
 #ifndef INFOPAGE_H
 #define INFOPAGE_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 #include "song.h"
 
 class QComboBox;
diff --git a/gui/librarypage.cpp b/gui/librarypage.cpp
index 601a50941..4c7a559ef 100644
--- a/gui/librarypage.cpp
+++ b/gui/librarypage.cpp
@@ -70,11 +70,11 @@ LibraryPage::LibraryPage(MainWindow *p)
     connect(view, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(itemDoubleClicked(const QModelIndex &)));
     connect(view, SIGNAL(searchItems()), this, SLOT(searchItems()));
     proxy.setSourceModel(&model);
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     view->setTopText(i18n("Library"));
-#else
+    #else
     view->setTopText(tr("Library"));
-#endif
+    #endif
     view->setModel(&proxy);
     view->init(p->replacePlaylistAction, p->addToPlaylistAction);
 }
@@ -148,11 +148,11 @@ void LibraryPage::searchItems()
 void LibraryPage::updateGenres(const QStringList &genres)
 {
     QStringList entries;
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     entries << i18n("All Genres");
-#else
+    #else
     entries << tr("All Genres");
-#endif
+    #endif
     entries+=genres;
 
     bool diff=genreCombo->count() != entries.count();
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 7ff6cc50b..4886e6124 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -242,7 +242,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     setCentralWidget(widget);
     QMenu *mainMenu=new QMenu(this);
 
-#ifndef ENABLE_KDE_SUPPORT
+    #ifndef ENABLE_KDE_SUPPORT
     setWindowIcon(QIcon(":/icons/cantata.svg"));
     setWindowTitle("Cantata");
 
@@ -260,9 +260,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
 //     menuBar()->addMenu(menu);
 
     QNetworkProxyFactory::setApplicationProxyFactory(NetworkProxyFactory::Instance());
-#endif
+    #endif
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     KStandardAction::preferences(this, SLOT(showPreferencesDialog()), actionCollection());
     quitAction=KStandardAction::quit(kapp, SLOT(quit()), actionCollection());
 
@@ -359,11 +359,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     #ifdef ENABLE_WEBKIT
     infoTabAction = actionCollection()->addAction("showinfotab");
     infoTabAction->setText(i18n("Info"));
-    #endif
+    #endif // ENABLE_WEBKIT
 
     serverInfoTabAction = actionCollection()->addAction("showserverinfotab");
     serverInfoTabAction->setText(i18n("Server Info"));
-#else
+    #else
     quitAction = new QAction(tr("&Quit"), this);
     connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
     quitAction->setIcon(QIcon::fromTheme("application-exit"));
@@ -399,9 +399,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     streamsTabAction = new QAction(tr("Streams"), this);
     #ifdef ENABLE_WEBKIT
     infoTabAction = new QAction(tr("Info"), this);
-    #endif
+    #endif // ENABLE_WEBKIT
     serverInfoTabAction = new QAction(tr("Server Info"), this);
-#endif
+    #endif // ENABLE_KDE_SUPPORT
     libraryTabAction->setShortcut(Qt::Key_F5);
     albumsTabAction->setShortcut(Qt::Key_F6);
     foldersTabAction->setShortcut(Qt::Key_F7);
@@ -411,9 +411,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     #ifdef ENABLE_WEBKIT
     infoTabAction->setShortcut(Qt::Key_F11);
     serverInfoTabAction->setShortcut(Qt::Key_F12);
-    #else
+    #else // ENABLE_WEBKIT
     serverInfoTabAction->setShortcut(Qt::Key_F11);
-    #endif
+    #endif // ENABLE_WEBKIT
 
     // Setup event handler for volume adjustment
     volumeSliderEventHandler = new VolumeSliderEventHandler(this);
@@ -479,9 +479,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     playlistsPage = new PlaylistsPage(this);
     streamsPage = new StreamsPage(this);
     lyricsPage = new LyricsPage(this);
-#ifdef ENABLE_WEBKIT
+    #ifdef ENABLE_WEBKIT
     infoPage = new InfoPage(this);
-#endif
+    #endif
     serverInfoPage = new ServerInfoPage(this);
 
     connect(&libraryPage->getModel(), SIGNAL(updated(const MusicLibraryItemRoot *)), albumsPage, SLOT(update(const MusicLibraryItemRoot *)));
@@ -503,9 +503,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     tabWidget->AddTab(playlistsPage, playlistsTabAction->icon(), playlistsTabAction->text(), !hiddenPages.contains(playlistsPage->metaObject()->className()));
     tabWidget->AddTab(streamsPage, streamsTabAction->icon(), streamsTabAction->text(), !hiddenPages.contains(streamsPage->metaObject()->className()));
     tabWidget->AddTab(lyricsPage, lyricsTabAction->icon(), lyricsTabAction->text(), !hiddenPages.contains(lyricsPage->metaObject()->className()));
-#ifdef ENABLE_WEBKIT
+    #ifdef ENABLE_WEBKIT
     tabWidget->AddTab(infoPage, infoTabAction->icon(), infoTabAction->text(), !hiddenPages.contains(infoPage->metaObject()->className()));
-#endif
+    #endif
     tabWidget->AddTab(serverInfoPage, serverInfoTabAction->icon(), serverInfoTabAction->text(), !hiddenPages.contains(serverInfoPage->metaObject()->className()));
 
     tabWidget->SetMode(FancyTabWidget::Mode_LargeSidebar);
@@ -516,11 +516,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     repeatPlaylistAction->setCheckable(true);
     consumePlaylistAction->setCheckable(true);
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     searchPlaylistLineEdit->setPlaceholderText(i18n("Search Play Queue..."));
-#else
+    #else
     searchPlaylistLineEdit->setPlaceholderText(tr("Search Play Queue..."));
-#endif
+    #endif
     QList<QToolButton *> playbackBtns;
     QList<QToolButton *> controlBtns;
     QList<QToolButton *> btns;
@@ -576,24 +576,24 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
 
     setupTrayIcon();
     togglePlaylist();
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     setupGUI(KXmlGuiWindow::Keys | KXmlGuiWindow::Save | KXmlGuiWindow::Create);
     menuBar()->setVisible(false);
-#else
+    #else
     QSize sz=Settings::self()->mainWindowSize();
     if (!sz.isEmpty()) {
         resize(sz);
     }
-#endif
+    #endif
 
     mainMenu->addAction(expandInterfaceAction);
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     QAction *menuAct= mainMenu->addAction(i18n("Configure Cantata..."), this, SLOT(showPreferencesDialog()));
     menuAct->setIcon(QIcon::fromTheme("configure"));
     mainMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::KeyBindings)));
     mainMenu->addSeparator();
-   mainMenu->addMenu(helpMenu());
-#else
+    mainMenu->addMenu(helpMenu());
+    #else
     QAction *menuAct=mainMenu->addAction(tr("Configure Cantata..."), this, SLOT(showPreferencesDialog()));
     menuAct->setIcon(QIcon::fromTheme("configure"));
     mainMenu->addSeparator();
@@ -602,7 +602,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     menuAct=mainMenu->addAction(tr("About Cantata..."), this, SLOT(showAboutDialog()));
     menuAct->setIcon(windowIcon());
 //     mainMenu->addMenu(menu);
-#endif
+    #endif
     mainMenu->addSeparator();
     mainMenu->addAction(quitAction);
 
@@ -748,9 +748,9 @@ MainWindow::~MainWindow()
     if (dock) {
         dock->setIcon(QString());
     }
-#ifndef ENABLE_KDE_SUPPORT
+    #ifndef ENABLE_KDE_SUPPORT
     Settings::self()->saveMainWindowSize(size());
-#endif
+    #endif
     Settings::self()->saveShowPlaylist(expandInterfaceAction->isChecked());
     Settings::self()->saveSplitterState(splitter->saveState());
     Settings::self()->savePlayQueueHeaderState(playQueueHeader->saveState());
@@ -847,8 +847,7 @@ void MainWindow::mpdConnectionStateChanged(bool connected)
 
 void MainWindow::closeEvent(QCloseEvent *event)
 {
-    if (trayItem)
-    {
+    if (trayItem) {
         lastPos=pos();
         hide();
     }
@@ -892,12 +891,12 @@ void MainWindow::mpdConnectionDied()
     stopTrackAction->setEnabled(false);
 
     // Show warning message
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     KMessageBox::error(this, i18n("The MPD connection died unexpectedly.<br/>TThis error is unrecoverable, please restart %1.").arg(PACKAGE_NAME),
                        i18n("Lost MPD Connection"));
-#else
+    #else
     QMessageBox::critical(this, tr("MPD connection gone"), tr("The MPD connection died unexpectedly.<br/>This error is unrecoverable, please restart %1.").arg(PACKAGE_NAME));
-#endif
+    #endif
 }
 
 void MainWindow::updateDb()
@@ -1126,17 +1125,17 @@ void MainWindow::updateCurrentSong(const Song &song)
         lyricsNeedUpdating=true;
     }
 
-#ifdef ENABLE_WEBKIT
+    #ifdef ENABLE_WEBKIT
     if (PAGE_INFO==tabWidget->current_index()) {
         infoPage->update(song);
     } else {
         infoNeedsUpdating=true;
     }
-#endif
+    #endif
 
     if (Settings::self()->showPopups()) { //(trayIcon && trayIcon->isVisible() && isHidden()) {
         if (!song.title.isEmpty() && !song.artist.isEmpty() && !song.album.isEmpty()) {
-#ifdef ENABLE_KDE_SUPPORT
+            #ifdef ENABLE_KDE_SUPPORT
             const QString text(i18n("<table>"
                                     "<tr><td align=\"right\"><b>Artist:</b></td><td>%1</td></tr>"
                                     "<tr><td align=\"right\"><b>Album:</b></td><td>%2</td></tr>"
@@ -1149,7 +1148,7 @@ void MainWindow::updateCurrentSong(const Song &song)
             KNotification *notification = new KNotification("CurrentTrackChanged", this);
             notification->setText(text);
             notification->sendEvent();
-#else
+            #else
             const QString text("album:  " + song.album + "\n"
                             + "track:  " + QString::number(song.track) + "\n"
                             + "length: " + Song::formattedTime(song.time));
@@ -1157,7 +1156,7 @@ void MainWindow::updateCurrentSong(const Song &song)
             if (trayItem) {
                 trayItem->showMessage(song.artist + " - " + song.title, text, QSystemTrayIcon::Information, 5000);
             }
-#endif
+            #endif
         }
     }
 }
@@ -1190,13 +1189,13 @@ void MainWindow::updateStatus()
     }
 
     int vol=status->volume();
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     volumeButton->setToolTip(i18n("Volume %1%").arg(vol));
     volumeControl->setToolTip(i18n("Volume %1%").arg(vol));
-#else
+    #else
     volumeButton->setToolTip(tr("Volume %1%").arg(vol));
     volumeControl->setToolTip(tr("Volume %1%").arg(vol));
-#endif
+    #endif
     volumeButton->setIcon(QIcon::fromTheme("player-volume"));
     volumeControl->setValue(vol);
 
@@ -1408,15 +1407,15 @@ void MainWindow::updatePlayListStatus()
         return;
     }
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     status+=i18np("1 Artist, ", "%1 Artists, ", stats->playlistArtists());
     status+=i18np("1 Album, ", "%1 Albums, ", stats->playlistAlbums());
     status+=i18np("1 Track", "%1 Tracks", stats->playlistSongs());
-#else
+    #else
     status += QString::number(stats->playlistArtists())+QString(1==stats->playlistArtists() ? " Artist, " : "Artists, ");
     status += QString::number(stats->playlistAlbums())+QString(1==stats->playlistAlbums() ? " Album, " : "Albums, ");
     status += QString::number(stats->playlistSongs())+QString(1==stats->playlistSongs() ? " Track" : "Tracks");
-#endif
+    #endif
     status += " (";
     status += MPDParseUtils::formatDuration(stats->playlistTime());
     status += ")";
@@ -1602,7 +1601,7 @@ void MainWindow::setupTrayIcon()
     if (trayItem) {
         return;
     }
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     trayItem = new KStatusNotifierItem(this);
     trayItem->setCategory(KStatusNotifierItem::ApplicationStatus);
     trayItem->setTitle(i18n("Cantata"));
@@ -1616,7 +1615,7 @@ void MainWindow::setupTrayIcon()
     trayItem->setContextMenu(trayItemMenu);
     connect(trayItem, SIGNAL(scrollRequested(int, Qt::Orientation)), this, SLOT(trayItemScrollRequested(int, Qt::Orientation)));
     connect(trayItem, SIGNAL(secondaryActivateRequested(const QPoint &)), this, SLOT(playPauseTrack()));
-#else
+    #else
     if (!QSystemTrayIcon::isSystemTrayAvailable()) {
         trayItem = NULL;
         return;
@@ -1636,7 +1635,7 @@ void MainWindow::setupTrayIcon()
     trayItem->setToolTip(tr("Cantata"));
     trayItem->show();
     connect(trayItem, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayItemClicked(QSystemTrayIcon::ActivationReason)));
-#endif
+    #endif
 }
 
 #ifdef ENABLE_KDE_SUPPORT
@@ -1706,14 +1705,14 @@ void MainWindow::currentTabChanged(int index)
             lyricsNeedUpdating=false;
         }
         break;
-#ifdef ENABLE_WEBKIT
+    #ifdef ENABLE_WEBKIT
     case PAGE_INFO:
         if (infoNeedsUpdating) {
             infoPage->update(current);
             infoNeedsUpdating=false;
         }
         break;
-#endif
+    #endif
     case PAGE_SERVER_INFO:
     default:
         break;
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 99d5bf852..ac0954705 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -257,6 +257,7 @@ private:
     void showTab(int page);
 
 private:
+    bool connectedToMpd;
     int loaded;
     MPDStatus::State lastState;
     quint32 songTime;
diff --git a/gui/playbacksettings.cpp b/gui/playbacksettings.cpp
index 41a5de45f..e67b37826 100644
--- a/gui/playbacksettings.cpp
+++ b/gui/playbacksettings.cpp
@@ -32,15 +32,15 @@ PlaybackSettings::PlaybackSettings(QWidget *p)
     : QWidget(p)
 {
     setupUi(this);
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     replayGain->addItem(i18n("None"), QVariant("off"));
     replayGain->addItem(i18n("Track"), QVariant("track"));
     replayGain->addItem(i18n("Album"), QVariant("album"));
-#else
+    #else
     replayGain->addItem(tr("None"), QVariant("off"));
     replayGain->addItem(tr("Track"), QVariant("track"));
     replayGain->addItem(tr("Album"), QVariant("album"));
-#endif
+    #endif
     connect(MPDConnection::self(), SIGNAL(replayGain(const QString &)), this, SLOT(replayGainSetting(const QString &)));
     connect(this, SIGNAL(setReplayGain(const QString &)), MPDConnection::self(), SLOT(setReplayGain(const QString &)));
     connect(this, SIGNAL(setCrossFade(int)), MPDConnection::self(), SLOT(setCrossFade(int)));
diff --git a/gui/playlistspage.cpp b/gui/playlistspage.cpp
index 42e1c0ff8..10efcc1ac 100644
--- a/gui/playlistspage.cpp
+++ b/gui/playlistspage.cpp
@@ -28,10 +28,10 @@
 #include <QtGui/QToolButton>
 #include <QtGui/QInputDialog>
 #ifdef ENABLE_KDE_SUPPORT
-#include <KAction>
-#include <KLocale>
-#include <KActionCollection>
-#include <KMessageBox>
+#include <KDE/KAction>
+#include <KDE/KLocale>
+#include <KDE/KActionCollection>
+#include <KDE/KMessageBox>
 #else
 #include <QtGui/QAction>
 #include <QtGui/QMessageBox>
@@ -73,11 +73,11 @@ PlaylistsPage::PlaylistsPage(MainWindow *p)
     rem->setEnabled(false);
     renPlaylist->setEnabled(false);
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     view->setTopText(i18n("Playlists"));
-#else
+    #else
     view->setTopText(tr("Playlists"));
-#endif
+    #endif
     view->addAction(p->addToPlaylistAction);
     view->addAction(p->replacePlaylistAction);
     view->addAction(removeAction);
diff --git a/gui/preferencesdialog.cpp b/gui/preferencesdialog.cpp
index 3041859cf..0c86aad78 100644
--- a/gui/preferencesdialog.cpp
+++ b/gui/preferencesdialog.cpp
@@ -74,13 +74,13 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, LyricsPage *lp)
     : QDialog(parent)
 #endif
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     KPageWidget *widget = new KPageWidget(this);
-#else
+    #else
     FancyTabWidget *widget = new FancyTabWidget(this);
     widget->setAllowContextMenu(false);
     widget->setDrawBorder(true);
-#endif
+    #endif
 
     server = new ServerSettings(widget);
     playback = new PlaybackSettings(widget);
@@ -95,7 +95,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, LyricsPage *lp)
     ext->load();
     const QList<UltimateLyricsProvider *> &lprov=lp->getProviders();
     lyrics->Load(lprov);
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     KPageWidgetItem *page=widget->addPage(server, i18n("Server"));
     page->setHeader(i18n("MPD Backend Settings"));
     page->setIcon(KIcon("server-database"));
@@ -118,7 +118,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, LyricsPage *lp)
 
     setButtons(KDialog::Ok | KDialog::Apply | KDialog::Cancel);
     setCaption(i18n("Configure"));
-#else
+    #else
     widget->AddTab(new ConfigPage(this, tr("MPD Backend Settings"), QIcon::fromTheme("server-database"), server),
                    QIcon::fromTheme("server-database"), tr("Server"));
     widget->AddTab(new ConfigPage(this, tr("Playback Settings"), QIcon::fromTheme("media-playback-start"), playback),
@@ -146,7 +146,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, LyricsPage *lp)
     connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonPressed(QAbstractButton *)));
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-#endif
+    #endif
     resize(600, 400);
 }
 
@@ -158,9 +158,9 @@ void PreferencesDialog::writeSettings()
     output->save();
     interface->save();
     ext->save();
-#ifndef ENABLE_KDE_SUPPORT
+    #ifndef ENABLE_KDE_SUPPORT
     proxy->save();
-#endif
+    #endif
     Settings::self()->saveLyricProviders(lyrics->EnabledProviders());
     Settings::self()->save();
     emit settingsSaved();
diff --git a/gui/preferencesdialog.h b/gui/preferencesdialog.h
index 3c1afafb7..7e44fa9b5 100644
--- a/gui/preferencesdialog.h
+++ b/gui/preferencesdialog.h
@@ -25,9 +25,9 @@
 #define PREFERENCES_DIALOG_H
 
 #ifdef ENABLE_KDE_SUPPORT
-#include <KDialog>
+#include <KDE/KDialog>
 #else
-#include <QDialog>
+#include <QtGui/QDialog>
 class ProxySettings;
 class QDialogButtonBox;
 class QAbstractButton;
diff --git a/gui/serverinfopage.h b/gui/serverinfopage.h
index d129efa5c..7a456e802 100644
--- a/gui/serverinfopage.h
+++ b/gui/serverinfopage.h
@@ -24,7 +24,7 @@
 #ifndef SERVERINFOPAGE_H
 #define SERVERINFOPAGE_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 #include "ui_serverinfopage.h"
 #include "mainwindow.h"
 
diff --git a/gui/settings.cpp b/gui/settings.cpp
index 9f8872f79..d71f5d8bb 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -40,31 +40,31 @@ K_GLOBAL_STATIC(Settings, instance)
 
 Settings * Settings::self()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     return instance;
-#else
+    #else
     static Settings *instance=0;;
     if(!instance) {
         instance=new Settings;
     }
     return instance;
-#endif
+    #endif
 }
 
 Settings::Settings()
     : timer(0)
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     , cfg(KGlobal::config(), "General")
     , wallet(0)
-#endif
+    #endif
 {
 }
 
 Settings::~Settings()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     delete wallet;
-#endif
+    #endif
 }
 
 #ifdef ENABLE_KDE_SUPPORT
@@ -112,14 +112,14 @@ bool Settings::openWallet()
 
 QString Settings::connectionPasswd()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     if(passwd.isEmpty() && GET_BOOL("connectionPasswd", false) && openWallet()) {
         wallet->readPassword("mpd", passwd);
     }
     return passwd;
-#else
+    #else
     return GET_STRING("connectionPasswd", "");
-#endif
+    #endif
 }
 
 int Settings::connectionPort()
@@ -286,7 +286,7 @@ void Settings::saveConnectionHost(const QString &v)
 
 void Settings::saveConnectionPasswd(const QString &v)
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     if(v!=passwd) {
         passwd=v;
         SET_VALUE("connectionPasswd", !passwd.isEmpty());
@@ -300,9 +300,9 @@ void Settings::saveConnectionPasswd(const QString &v)
             wallet->writePassword("mpd", passwd);
         }
     }
-#else
+    #else
     SET_VALUE("connectionPasswd", v);
-#endif
+    #endif
 }
 
 void Settings::saveConnectionPort(int v)
@@ -444,11 +444,11 @@ void Settings::saveDockManager(bool v)
 void Settings::save(bool force)
 {
     if (force) {
-#ifdef ENABLE_KDE_SUPPORT
+        #ifdef ENABLE_KDE_SUPPORT
         KGlobal::config()->sync();
-#else
+        #else
         cfg.sync();
-#endif
+        #endif
         if (timer) {
             timer->stop();
         }
diff --git a/gui/streamdialog.cpp b/gui/streamdialog.cpp
index 49e1d4a53..9635652ef 100644
--- a/gui/streamdialog.cpp
+++ b/gui/streamdialog.cpp
@@ -54,31 +54,31 @@ StreamDialog::StreamDialog(const QStringList &categories, QWidget *parent)
     sizePolicy.setHeightForWidth(catCombo->sizePolicy().hasHeightForWidth());
     catCombo->setSizePolicy(sizePolicy);
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     layout->setWidget(0, QFormLayout::LabelRole, new QLabel(i18n("Name:"), wid));
-#else
+    #else
     layout->setWidget(0, QFormLayout::LabelRole, new QLabel(tr("Name:"), wid));
-#endif
+    #endif
     layout->setWidget(0, QFormLayout::FieldRole, nameEntry);
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     layout->setWidget(1, QFormLayout::LabelRole, new QLabel(i18n("Stream:"), wid));
-#else
+    #else
     layout->setWidget(1, QFormLayout::LabelRole, new QLabel(tr("Stream:"), wid));
-#endif
+    #endif
     layout->setWidget(1, QFormLayout::FieldRole, urlEntry);
     urlEntry->setMinimumWidth(300);
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     layout->setWidget(2, QFormLayout::LabelRole, new QLabel(i18n("Category:"), wid));
-#else
+    #else
     layout->setWidget(2, QFormLayout::LabelRole, new QLabel(tr("Category:"), wid));
-#endif
+    #endif
     layout->setWidget(2, QFormLayout::FieldRole, catCombo);
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     setMainWidget(wid);
     setButtons(KDialog::Ok|KDialog::Cancel);
     setCaption(i18n("Add Stream"));
     enableButton(KDialog::Ok, false);
-#else
+    #else
     setWindowTitle(tr("Add Stream"));
     QBoxLayout *mainLayout=new QBoxLayout(QBoxLayout::TopToBottom, this);
     mainLayout->addWidget(wid);
@@ -87,7 +87,7 @@ StreamDialog::StreamDialog(const QStringList &categories, QWidget *parent)
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
     buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-#endif
+    #endif
     foreach (const QString &c, categories) {
         catCombo->insertItem(catCombo->count(), c);
     }
@@ -99,13 +99,13 @@ StreamDialog::StreamDialog(const QStringList &categories, QWidget *parent)
 
 void StreamDialog::setEdit(const QString &cat, const QString &editName, const QString &editUrl)
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     setCaption(i18n("Edit Stream"));
     enableButton(KDialog::Ok, false);
-#else
+    #else
     setWindowTitle(tr("Edit Stream"));
     buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-#endif
+    #endif
     prevName=editName;
     prevUrl=editUrl;
     prevCat=cat;
@@ -120,9 +120,9 @@ void StreamDialog::changed()
     QString u=url();
     QString c=category();
     bool enableOk=!n.isEmpty() && !u.isEmpty() && !c.isEmpty() && (n!=prevName || u!=prevUrl || c!=prevCat);
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     enableButton(KDialog::Ok, enableOk);
-#else
+    #else
     buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enableOk);
-#endif
+    #endif
 }
diff --git a/gui/streamdialog.h b/gui/streamdialog.h
index 51f369179..80319b9a3 100644
--- a/gui/streamdialog.h
+++ b/gui/streamdialog.h
@@ -25,9 +25,9 @@
 #define STREAMDIALOG_H
 
 #ifdef ENABLE_KDE_SUPPORT
-#include <KDialog>
+#include <KDE/KDialog>
 #else
-#include <QDialog>
+#include <QtGui/QDialog>
 class QDialogButtonBox;
 #endif
 #include "lineedit.h"
diff --git a/gui/streamspage.cpp b/gui/streamspage.cpp
index 1251e26c9..da0b519f3 100644
--- a/gui/streamspage.cpp
+++ b/gui/streamspage.cpp
@@ -95,11 +95,11 @@ StreamsPage::StreamsPage(MainWindow *p)
 //     addToPlaylist->setEnabled(false);
     replacePlaylist->setEnabled(false);
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     view->setTopText(i18n("Streams"));
-#else
+    #else
     view->setTopText(tr("Streams"));
-#endif
+    #endif
 //     view->addAction(p->addToPlaylistAction);
     view->addAction(p->replacePlaylistAction);
     view->addAction(removeAction);
@@ -160,11 +160,11 @@ void StreamsPage::itemDoubleClicked(const QModelIndex &index)
 
 void StreamsPage::importXml()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     QString fileName=KFileDialog::getOpenFileName(KUrl(), i18n("*.cantata|Cantata Streams"), this, i18n("Import Streams"));
-#else
+    #else
     QString fileName=QFileDialog::getOpenFileName(this, tr("Import Streams"), QDir::homePath(), tr("Cantata Streams (*.cantata)"));
-#endif
+    #endif
 
     if (fileName.isEmpty()) {
         return;
@@ -197,11 +197,11 @@ void StreamsPage::exportXml()
     if (1==mapped.count()) {
         name=static_cast<StreamsModel::StreamItem*>(mapped.first().internalPointer())->name+QLatin1String(".cantata");
     }
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     QString fileName=KFileDialog::getSaveFileName(name, i18n("*.cantata|Cantata Streams"), this, i18n("Export Streams"));
-#else
+    #else
     QString fileName=QFileDialog::getSaveFileName(this, tr("Export Streams"), name, tr("Cantata Streams (*.cantata)"));
-#endif
+    #endif
 
     if (fileName.isEmpty()) {
         return;
diff --git a/gui/updatedialog.cpp b/gui/updatedialog.cpp
index 02c7e0a52..fe3ecf760 100644
--- a/gui/updatedialog.cpp
+++ b/gui/updatedialog.cpp
@@ -33,18 +33,18 @@
 #endif
 
 UpdateDialog::UpdateDialog(QWidget *parent)
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     : KDialog(parent)
-#else
+    #else
     : QDialog(parent)
-#endif
+    #endif
     , done(false)
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     QWidget *wid = new QWidget(this);
-#else
+    #else
     QWidget *wid = this;
-#endif
+    #endif
     QBoxLayout *layout=new QBoxLayout(QBoxLayout::LeftToRight, wid);
 
     QLabel *icon = new QLabel(wid);
@@ -53,24 +53,24 @@ UpdateDialog::UpdateDialog(QWidget *parent)
     layout->addWidget(icon);
     layout->addWidget(label);
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     setMainWidget(wid);
     setButtons(KDialog::Close);
     setCaption(i18n("Updating"));
-#else
+    #else
     setWindowTitle(tr("Updating"));
-#endif
+    #endif
     timer=new QTimer(this);
     connect(timer, SIGNAL(timeout()), SLOT(display()));
 }
 
 void UpdateDialog::show()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     label->setText(i18n("<b>Updating backend database</b><br><i>Please wait...</i>"));
-#else
+    #else
     label->setText(tr("<b>Updating backend database</b><br><i>Please wait...</i>"));
-#endif
+    #endif
     timer->start(1000);
 }
 
@@ -90,10 +90,10 @@ void UpdateDialog::display()
 void UpdateDialog::complete()
 {
     done=true;
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     label->setText(i18n("<b>Finished</b><br><i>Database updated.</i>"));
-#else
+    #else
     label->setText(tr("<b>Finished</b><br><i>Database updated.</i>"));
-#endif
+    #endif
 }
 
diff --git a/lyrics/lyricsettings.cpp b/lyrics/lyricsettings.cpp
index db86b3912..c61fd382b 100644
--- a/lyrics/lyricsettings.cpp
+++ b/lyrics/lyricsettings.cpp
@@ -28,7 +28,7 @@
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KLocale>
 #endif
-#include <QIcon>
+#include <QtGui/QIcon>
 
 LyricSettings::LyricSettings(QWidget *parent)
   : QWidget(parent),
diff --git a/lyrics/lyricsettings.h b/lyrics/lyricsettings.h
index 127901dc4..b301e9b7a 100644
--- a/lyrics/lyricsettings.h
+++ b/lyrics/lyricsettings.h
@@ -24,9 +24,9 @@
 #ifndef LYRICSETTINGS_H
 #define LYRICSETTINGS_H
 
-#include <QWidget>
-#include <QStringList>
-#include <QList>
+#include <QtGui/QWidget>
+#include <QtCore/QStringList>
+#include <QtCore/QList>
 
 class Ui_LyricSettings;
 class QListWidgetItem;
diff --git a/lyrics/lyricspage.cpp b/lyrics/lyricspage.cpp
index a74a1c29d..328ffa8ba 100644
--- a/lyrics/lyricspage.cpp
+++ b/lyrics/lyricspage.cpp
@@ -26,15 +26,15 @@
 #include "ultimatelyricsprovider.h"
 #include "ultimatelyricsreader.h"
 #include "network.h"
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QSettings>
-#include <QtConcurrentRun>
+#include <QtCore/QFuture>
+#include <QtCore/QFutureWatcher>
+#include <QtCore/QSettings>
+#include <QtCore/QtConcurrentRun>
 #include <QTextBrowser>
-#include <QFile>
-#include <QDir>
-#include <QIcon>
-#include <QToolButton>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtGui/QIcon>
+#include <QtGui/QToolButton>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KAction>
 #include <KDE/KLocale>
diff --git a/lyrics/lyricspage.h b/lyrics/lyricspage.h
index 320d4ceff..cf4900d07 100644
--- a/lyrics/lyricspage.h
+++ b/lyrics/lyricspage.h
@@ -25,7 +25,7 @@
 #define LYRICSPAGE_H
 
 #include <QWidget>
-// #include <QScopedPointer>
+// #include <QtCore/QScopedPointer>
 #include "song.h"
 #include "ui_lyricspage.h"
 
diff --git a/lyrics/songinfoprovider.h b/lyrics/songinfoprovider.h
index 61c7c783f..627ccad24 100644
--- a/lyrics/songinfoprovider.h
+++ b/lyrics/songinfoprovider.h
@@ -24,8 +24,8 @@
 #ifndef SONGINFOPROVIDER_H
 #define SONGINFOPROVIDER_H
 
-#include <QObject>
-#include <QUrl>
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
 
 //#include "collapsibleinfopane.h"
 //#include "core/song.h"
diff --git a/lyrics/ultimatelyricsprovider.cpp b/lyrics/ultimatelyricsprovider.cpp
index 1fe0a0fd7..09741f717 100644
--- a/lyrics/ultimatelyricsprovider.cpp
+++ b/lyrics/ultimatelyricsprovider.cpp
@@ -25,13 +25,9 @@
 #include "ultimatelyricsprovider.h"
 #include "networkaccessmanager.h"
 //#include "core/network.h"
-
 #include "song.h"
-
-#include <QNetworkReply>
-#include <QTextCodec>
-#include <QDebug>
-
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QTextCodec>
 //#include <boost/scoped_ptr.hpp>
 
 const int UltimateLyricsProvider::kRedirectLimit = 5;
@@ -48,7 +44,7 @@ void UltimateLyricsProvider::FetchInfo(int id, const Song& metadata) {
   // Get the text codec
   const QTextCodec* codec = QTextCodec::codecForName(charset_.toAscii().constData());
   if (!codec) {
-    qWarning() << "Invalid codec" << charset_;
+    //qWarning() << "Invalid codec" << charset_;
     //emit Finished(id);
     emit InfoReady(id, QString());
     return;
diff --git a/lyrics/ultimatelyricsprovider.h b/lyrics/ultimatelyricsprovider.h
index b7e3b771c..0f39b6f3e 100644
--- a/lyrics/ultimatelyricsprovider.h
+++ b/lyrics/ultimatelyricsprovider.h
@@ -24,10 +24,10 @@
 #ifndef ULTIMATELYRICSPROVIDER_H
 #define ULTIMATELYRICSPROVIDER_H
 
-#include <QObject>
-#include <QPair>
-#include <QStringList>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QStringList>
+#include <QtCore/QHash>
 #include "songinfoprovider.h"
 
 class Song;
diff --git a/lyrics/ultimatelyricsreader.cpp b/lyrics/ultimatelyricsreader.cpp
index 61ebed506..89a46d5f6 100644
--- a/lyrics/ultimatelyricsreader.cpp
+++ b/lyrics/ultimatelyricsreader.cpp
@@ -24,10 +24,9 @@
 #include "ultimatelyricsprovider.h"
 #include "ultimatelyricsreader.h"
 
-#include <QCoreApplication>
-#include <QFile>
-#include <QXmlStreamReader>
-#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtXml/QXmlStreamReader>
 
 UltimateLyricsReader::UltimateLyricsReader(/*QObject* parent*/)
 //   : QObject(parent)
@@ -37,7 +36,7 @@ UltimateLyricsReader::UltimateLyricsReader(/*QObject* parent*/)
 QList<UltimateLyricsProvider*> UltimateLyricsReader::Parse(const QString& filename) const {
   QFile file(filename);
   if (!file.open(QIODevice::ReadOnly)) {
-    qWarning() << "Error opening" << filename;
+//     qWarning() << "Error opening" << filename;
     return QList<UltimateLyricsProvider*>();
   }
 
diff --git a/lyrics/ultimatelyricsreader.h b/lyrics/ultimatelyricsreader.h
index 283eb0bc9..23abbeb13 100644
--- a/lyrics/ultimatelyricsreader.h
+++ b/lyrics/ultimatelyricsreader.h
@@ -26,8 +26,8 @@
 
 #include "ultimatelyricsprovider.h"
 
-// #include <QObject>
-#include <QXmlStreamReader>
+// #include <QtCore/QObject>
+#include <QtXml/QXmlStreamReader>
 
 class QIODevice;
 
diff --git a/models/dirviewitem.h b/models/dirviewitem.h
index 56b045135..1121be378 100644
--- a/models/dirviewitem.h
+++ b/models/dirviewitem.h
@@ -26,9 +26,9 @@
 #ifndef DIRVIEWITEM_H
 #define DIRVIEWITEM_H
 
-#include <QString>
-#include <QList>
-#include <QVariant>
+#include <QtCore/QString>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
 
 class DirViewItem
 {
diff --git a/models/dirviewmodel.cpp b/models/dirviewmodel.cpp
index fae515f9b..5144d076f 100644
--- a/models/dirviewmodel.cpp
+++ b/models/dirviewmodel.cpp
@@ -24,11 +24,10 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QCommonStyle>
-#include <QModelIndex>
-#include <QString>
-#include <QVariant>
-#include <QMimeData>
+#include <QtCore/QModelIndex>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+#include <QtCore/QMimeData>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KLocale>
 #endif
@@ -50,33 +49,38 @@ DirViewModel::~DirViewModel()
 
 QModelIndex DirViewModel::index(int row, int column, const QModelIndex &parent) const
 {
-    if (!hasIndex(row, column, parent))
+    if (!hasIndex(row, column, parent)) {
         return QModelIndex();
+    }
 
     const DirViewItem * parentItem;
 
-    if (!parent.isValid())
+    if (!parent.isValid()) {
         parentItem = rootItem;
-    else
+    } else {
         parentItem = static_cast<DirViewItem *>(parent.internalPointer());
+    }
 
     DirViewItem * const childItem = parentItem->child(row);
-    if (childItem)
+    if (childItem) {
         return createIndex(row, column, childItem);
+    }
 
     return QModelIndex();
 }
 
 QModelIndex DirViewModel::parent(const QModelIndex &index) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return QModelIndex();
+    }
 
     const DirViewItem * const childItem = static_cast<DirViewItem *>(index.internalPointer());
     DirViewItem * const parentItem = childItem->parent();
 
-    if (parentItem == rootItem)
+    if (parentItem == rootItem) {
         return QModelIndex();
+    }
 
     return createIndex(parentItem->row(), 0, parentItem);
 }
@@ -88,37 +92,40 @@ QVariant DirViewModel::headerData(int /*section*/, Qt::Orientation /*orientation
 
 int DirViewModel::rowCount(const QModelIndex &parent) const
 {
-    if (parent.column() > 0)
+    if (parent.column() > 0) {
         return 0;
+    }
 
     const DirViewItem *parentItem;
 
-    if (!parent.isValid())
+    if (!parent.isValid()) {
         parentItem = rootItem;
-    else
+    } else {
         parentItem = static_cast<DirViewItem *>(parent.internalPointer());
+    }
 
     return parentItem->childCount();
 }
 
 int DirViewModel::columnCount(const QModelIndex &parent) const
 {
-    if (parent.isValid())
+    if (parent.isValid()) {
         return static_cast<DirViewItem *>(parent.internalPointer())->columnCount();
-    else
+    } else {
         return rootItem->columnCount();
+    }
 }
 
 QVariant DirViewModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return QVariant();
+    }
 
     DirViewItem *item = static_cast<DirViewItem *>(index.internalPointer());
 
     switch (role) {
     case Qt::DecorationRole: {
-        QCommonStyle style;
         if (item->type() == DirViewItem::Type_Dir) {
             return QIcon::fromTheme("inode-directory");
         } else if (item->type() == DirViewItem::Type_File) {
@@ -174,10 +181,11 @@ void DirViewModel::updateDirView(DirViewItemRoot *newroot)
 
 Qt::ItemFlags DirViewModel::flags(const QModelIndex &index) const
 {
-    if (index.isValid())
+    if (index.isValid()) {
         return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
-    else
+    } else {
         return Qt::ItemIsDropEnabled;
+    }
 }
 
 QStringList DirViewModel::filenames(const QModelIndexList &indexes) const
diff --git a/models/dirviewmodel.h b/models/dirviewmodel.h
index 5541656b8..62f842860 100644
--- a/models/dirviewmodel.h
+++ b/models/dirviewmodel.h
@@ -26,9 +26,9 @@
 #ifndef DIRVIEWMODEL_H
 #define DIRVIEWMODEL_H
 
-#include <QAbstractItemModel>
-#include <QList>
-#include <QModelIndex>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QList>
+#include <QtCore/QModelIndex>
 #include "dirviewitemroot.h"
 
 class DirViewModel : public QAbstractItemModel
diff --git a/models/musiclibraryitemroot.h b/models/musiclibraryitemroot.h
index 3e2baddb6..de86b7986 100644
--- a/models/musiclibraryitemroot.h
+++ b/models/musiclibraryitemroot.h
@@ -27,9 +27,9 @@
 #ifndef MUSIC_LIBRARY_ITEM_ROOT_H
 #define MUSIC_LIBRARY_ITEM_ROOT_H
 
-#include <QList>
-#include <QVariant>
-#include <QHash>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
+#include <QtCore/QHash>
 #include "musiclibraryitem.h"
 
 class Song;
diff --git a/models/musiclibrarymodel.cpp b/models/musiclibrarymodel.cpp
index 1600a28d0..0c8f26999 100644
--- a/models/musiclibrarymodel.cpp
+++ b/models/musiclibrarymodel.cpp
@@ -35,16 +35,15 @@
 #include "itemview.h"
 #include "mpdparseutils.h"
 #include "network.h"
-#include <QCommonStyle>
-#include <QFile>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QDebug>
-#include <QStringRef>
-#include <QDateTime>
-#include <QDir>
-#include <QMimeData>
-#include <QStringList>
+#include <QtGui/QCommonStyle>
+#include <QtCore/QFile>
+#include <QtXml/QXmlStreamReader>
+#include <QtXml/QXmlStreamWriter>
+#include <QtCore/QStringRef>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QMimeData>
+#include <QtCore/QStringList>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KIcon>
 #include <KDE/KLocale>
@@ -66,33 +65,38 @@ MusicLibraryModel::~MusicLibraryModel()
 
 QModelIndex MusicLibraryModel::index(int row, int column, const QModelIndex &parent) const
 {
-    if (!hasIndex(row, column, parent))
+    if (!hasIndex(row, column, parent)) {
         return QModelIndex();
+    }
 
     const MusicLibraryItem * parentItem;
 
-    if (!parent.isValid())
+    if (!parent.isValid()) {
         parentItem = rootItem;
-    else
+    } else {
         parentItem = static_cast<MusicLibraryItem *>(parent.internalPointer());
+    }
 
     MusicLibraryItem * const childItem = parentItem->child(row);
-    if (childItem)
+    if (childItem) {
         return createIndex(row, column, childItem);
+    }
 
     return QModelIndex();
 }
 
 QModelIndex MusicLibraryModel::parent(const QModelIndex &index) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return QModelIndex();
+    }
 
     const MusicLibraryItem * const childItem = static_cast<MusicLibraryItem *>(index.internalPointer());
     MusicLibraryItem * const parentItem = childItem->parent();
 
-    if (parentItem == rootItem)
+    if (parentItem == rootItem) {
         return QModelIndex();
+    }
 
     return createIndex(parentItem->row(), 0, parentItem);
 }
@@ -100,39 +104,40 @@ QModelIndex MusicLibraryModel::parent(const QModelIndex &index) const
 QVariant MusicLibraryModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     Q_UNUSED(section)
-    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
-        return rootItem->data();
-
-    return QVariant();
+    return Qt::Horizontal==orientation && Qt::DisplayRole==role ? rootItem->data() : QVariant();
 }
 
 int MusicLibraryModel::rowCount(const QModelIndex &parent) const
 {
-    if (parent.column() > 0)
+    if (parent.column() > 0) {
         return 0;
+    }
 
     const MusicLibraryItem *parentItem;
 
-    if (!parent.isValid())
+    if (!parent.isValid()) {
         parentItem = rootItem;
-    else
+    } else {
         parentItem = static_cast<MusicLibraryItem *>(parent.internalPointer());
+    }
 
     return parentItem->childCount();
 }
 
 int MusicLibraryModel::columnCount(const QModelIndex &parent) const
 {
-    if (parent.isValid())
+    if (parent.isValid()) {
         return static_cast<MusicLibraryItem *>(parent.internalPointer())->columnCount();
-    else
+    } else {
         return rootItem->columnCount();
+    }
 }
 
 QVariant MusicLibraryModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return QVariant();
+    }
 
     MusicLibraryItem *item = static_cast<MusicLibraryItem *>(index.internalPointer());
 
@@ -404,8 +409,9 @@ bool MusicLibraryModel::fromXML(const QDateTime db_update)
     QString filename(QFile::encodeName(hostname + constLibraryExt));
 
     //Check if file exists
-    if (dir.isEmpty())
+    if (dir.isEmpty()) {
         return false;
+    }
 
     QFile file(dir + filename);
 
@@ -426,69 +432,66 @@ bool MusicLibraryModel::fromXML(const QDateTime db_update)
         /**
          * TODO: CHECK FOR ERRORS
          */
-        if (reader.error()) {
-            qDebug() << reader.errorString();
-        } else {
-            if (reader.isStartElement()) {
-                QString element = reader.name().toString();
+        if (!reader.error() && reader.isStartElement()) {
+            QString element = reader.name().toString();
 
-                if (element == "MPD_database") {
-                    quint32 version = reader.attributes().value("version").toString().toUInt();
-                    quint32 time_t = reader.attributes().value("date").toString().toUInt();
+            if (element == "MPD_database") {
+                quint32 version = reader.attributes().value("version").toString().toUInt();
+                quint32 time_t = reader.attributes().value("date").toString().toUInt();
 
-                    //Incompatible version
-                    if (version < 4) {
-                        break;
-                    }
-
-                    //Outdated
-                    if (time_t != db_update.toTime_t())
-                        break;
-
-                    valid = true;
+                //Incompatible version
+                if (version < 4) {
+                    break;
                 }
 
-                //Only check for other elements when we are valid!
-                if (valid) {
-                    //New artist element. Create it an add it
-                    if (element == "Artist") {
-                        song.artist=reader.attributes().value("name").toString();
-                        artistItem = rootItem->artist(song);
+                //Outdated
+                if (time_t != db_update.toTime_t()) {
+                    break;
+                }
+
+                valid = true;
+            }
+
+            //Only check for other elements when we are valid!
+            if (valid) {
+                //New artist element. Create it an add it
+                if (element == "Artist") {
+                    song.artist=reader.attributes().value("name").toString();
+                    artistItem = rootItem->artist(song);
+                }
+
+                // New album element. Create it and add it to the artist
+                if (element == "Album") {
+                    song.album=reader.attributes().value("title").toString();
+                    song.file=reader.attributes().value("dir").toString();
+                    song.year=reader.attributes().value("year").toString().toUInt();
+                    if (!song.file.isEmpty()) {
+                        song.file.append("dummy.mp3");
                     }
+                    albumItem = artistItem->album(song);
+                }
 
-                    // New album element. Create it and add it to the artist
-                    if (element == "Album") {
-                        song.album=reader.attributes().value("title").toString();
-                        song.file=reader.attributes().value("dir").toString();
-                        song.year=reader.attributes().value("year").toString().toUInt();
-                        if (!song.file.isEmpty()) {
-                            song.file.append("dummy.mp3");
-                        }
-                        albumItem = artistItem->album(song);
-                    }
+                // New track element. Create it and add it to the album
+                if (element == "Track") {
+                    song.title=reader.attributes().value("title").toString();
+                    song.file=reader.attributes().value("filename").toString();
 
-                    // New track element. Create it and add it to the album
-                    if (element == "Track") {
-                        song.title=reader.attributes().value("title").toString();
-                        song.file=reader.attributes().value("filename").toString();
+                    QString str=reader.attributes().value("track").toString();
+                    song.track=str.isEmpty() ? 0 : str.toUInt();
+                    str=reader.attributes().value("disc").toString();
+                    song.disc=str.isEmpty() ? 0 : str.toUInt();
+                    str=reader.attributes().value("time").toString();
+                    song.time=str.isEmpty() ? 0 : str.toUInt();
 
-                        QString str=reader.attributes().value("track").toString();
-                        song.track=str.isEmpty() ? 0 : str.toUInt();
-                        str=reader.attributes().value("disc").toString();
-                        song.disc=str.isEmpty() ? 0 : str.toUInt();
-                        str=reader.attributes().value("time").toString();
-                        song.time=str.isEmpty() ? 0 : str.toUInt();
+                    songItem = new MusicLibraryItemSong(song, albumItem);
 
-                        songItem = new MusicLibraryItemSong(song, albumItem);
+                    albumItem->append(songItem);
 
-                        albumItem->append(songItem);
-
-                        QString genre = reader.attributes().value("genre").toString();
-                        albumItem->addGenre(genre);
-                        artistItem->addGenre(genre);
-                        songItem->addGenre(genre);
-                        rootItem->addGenre(genre);
-                    }
+                    QString genre = reader.attributes().value("genre").toString();
+                    albumItem->addGenre(genre);
+                    artistItem->addGenre(genre);
+                    songItem->addGenre(genre);
+                    rootItem->addGenre(genre);
                 }
             }
         }
@@ -507,10 +510,11 @@ bool MusicLibraryModel::fromXML(const QDateTime db_update)
 
 Qt::ItemFlags MusicLibraryModel::flags(const QModelIndex &index) const
 {
-    if (index.isValid())
+    if (index.isValid()) {
         return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
-    else
+    } else {
         return Qt::ItemIsDropEnabled;
+    }
 }
 
 QStringList MusicLibraryModel::filenames(const QModelIndexList &indexes) const
diff --git a/models/musiclibrarymodel.h b/models/musiclibrarymodel.h
index b2a0703ff..e85bf52e8 100644
--- a/models/musiclibrarymodel.h
+++ b/models/musiclibrarymodel.h
@@ -27,13 +27,12 @@
 #ifndef MUSIC_LIBRARY_MODEL_H
 #define MUSIC_LIBRARY_MODEL_H
 
-#include <QAbstractItemModel>
-#include <QDateTime>
-#include <QMimeData>
-#include <QMutex>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QDateTime>
 #include "musiclibraryitemroot.h"
 #include "song.h"
 
+class QMimeData;
 class MusicLibraryItemAlbum;
 class MusicLibraryItemArtist;
 
@@ -72,7 +71,6 @@ private:
     const MusicLibraryItemRoot * rootItem;
 
     void toXML(const QDateTime db_update);
-//     QMutex libraryMutex;
     QDateTime databaseTime;
 };
 
diff --git a/models/musiclibraryproxymodel.cpp b/models/musiclibraryproxymodel.cpp
index ff7d2c208..ec02c172f 100644
--- a/models/musiclibraryproxymodel.cpp
+++ b/models/musiclibraryproxymodel.cpp
@@ -32,7 +32,7 @@
 
 MusicLibraryProxyModel::MusicLibraryProxyModel(QObject *parent)
     : ProxyModel(parent),
-      _filterField(3)
+      filterField(3)
 {
     setDynamicSortFilter(true);
     setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -42,7 +42,7 @@ MusicLibraryProxyModel::MusicLibraryProxyModel(QObject *parent)
 
 bool MusicLibraryProxyModel::filterAcceptsArtist(const MusicLibraryItem * const item) const
 {
-    switch (_filterField) {
+    switch (filterField) {
     case 0: // Artist
         return item->data().contains(filterRegExp());
     case 1: // Album
@@ -88,7 +88,7 @@ bool MusicLibraryProxyModel::filterAcceptsArtist(const MusicLibraryItem * const
 
 bool MusicLibraryProxyModel::filterAcceptsAlbum(const MusicLibraryItem * const item) const
 {
-    switch (_filterField) {
+    switch (filterField) {
     case 0: // Artist
         return item->parent()->data().contains(filterRegExp());
     case 1: // Album
@@ -116,7 +116,7 @@ bool MusicLibraryProxyModel::filterAcceptsAlbum(const MusicLibraryItem * const i
 
 bool MusicLibraryProxyModel::filterAcceptsSong(const MusicLibraryItem * const item) const
 {
-    switch (_filterField) {
+    switch (filterField) {
     case 0: // Artist
         return item->parent()->parent()->data().contains(filterRegExp());
     case 1: // Album
@@ -136,7 +136,7 @@ bool MusicLibraryProxyModel::filterAcceptsSong(const MusicLibraryItem * const it
 
 bool MusicLibraryProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
-    if (_filterGenre.isEmpty() && filterRegExp().isEmpty()) {
+    if (filterGenre.isEmpty() && filterRegExp().isEmpty()) {
         return true;
     }
     if (!isChildOfRoot(sourceParent)) {
@@ -146,7 +146,7 @@ bool MusicLibraryProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &
     const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
     const MusicLibraryItem * const item = static_cast<MusicLibraryItem *>(index.internalPointer());
 
-    if (!_filterGenre.isEmpty() && !item->hasGenre(_filterGenre)) {
+    if (!filterGenre.isEmpty() && !item->hasGenre(filterGenre)) {
         return false;
     }
 
@@ -201,18 +201,13 @@ bool MusicLibraryProxyModel::lessThan(const QModelIndex &left, const QModelIndex
 
 void MusicLibraryProxyModel::setFilterField(int field)
 {
-    _filterField = field;
-}
-
-int MusicLibraryProxyModel::filterField() const
-{
-    return _filterField;
+    filterField = field;
 }
 
 void MusicLibraryProxyModel::setFilterGenre(const QString &genre)
 {
-    if (_filterGenre!=genre) {
+    if (filterGenre!=genre) {
         invalidate();
     }
-    _filterGenre=genre;
+    filterGenre=genre;
 }
diff --git a/models/musiclibraryproxymodel.h b/models/musiclibraryproxymodel.h
index 28375f19c..20e4a6b03 100644
--- a/models/musiclibraryproxymodel.h
+++ b/models/musiclibraryproxymodel.h
@@ -40,7 +40,6 @@ public:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
     void setFilterField(int field);
-    int filterField() const;
     void setFilterGenre(const QString &genre);
 
 private:
@@ -49,8 +48,8 @@ private:
     bool filterAcceptsSong(const MusicLibraryItem * const item) const;
 
 private:
-    QString _filterGenre;
-    int _filterField;
+    QString filterGenre;
+    int filterField;
 };
 
 #endif
diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp
index 1b4602315..c87dd6684 100644
--- a/models/playlistsmodel.cpp
+++ b/models/playlistsmodel.cpp
@@ -40,15 +40,15 @@ K_GLOBAL_STATIC(PlaylistsModel, instance)
 
 PlaylistsModel * PlaylistsModel::self()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     return instance;
-#else
+    #else
     static PlaylistsModel *instance=0;;
     if(!instance) {
         instance=new PlaylistsModel;
     }
     return instance;
-#endif
+    #endif
 }
 
 PlaylistsModel::PlaylistsModel(QObject *parent)
@@ -109,10 +109,9 @@ QModelIndex PlaylistsModel::parent(const QModelIndex &index) const
 
     Item *item=static_cast<Item *>(index.internalPointer());
 
-    if(item->isPlaylist())
+    if(item->isPlaylist()) {
         return QModelIndex();
-    else
-    {
+    } else {
         SongItem *song=static_cast<SongItem *>(item);
 
         if (song->parent) {
diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp
index 873d1fda9..7a7513587 100644
--- a/models/playqueuemodel.cpp
+++ b/models/playqueuemodel.cpp
@@ -94,7 +94,7 @@ QVariant PlayQueueModel::headerData(int section, Qt::Orientation orientation, in
     if (orientation == Qt::Horizontal) {
         if (role == Qt::DisplayRole) {
             switch (section) {
-#ifdef ENABLE_KDE_SUPPORT
+            #ifdef ENABLE_KDE_SUPPORT
             case COL_TITLE:
                 return i18n("Title");
             case COL_ARTIST:
@@ -111,7 +111,7 @@ QVariant PlayQueueModel::headerData(int section, Qt::Orientation orientation, in
                 return i18n("Year");
             case COL_GENRE:
                 return i18n("Genre");
-#else
+            #else
             case COL_TITLE:
                 return tr("Title");
             case COL_ARTIST:
@@ -128,7 +128,7 @@ QVariant PlayQueueModel::headerData(int section, Qt::Orientation orientation, in
                 return tr("Year");
             case COL_GENRE:
                 return tr("Genre");
-#endif
+            #endif
             default:
                 break;
             }
@@ -153,11 +153,9 @@ int PlayQueueModel::columnCount(const QModelIndex &) const
 QVariant PlayQueueModel::data(const QModelIndex &index, int role) const
 {
 
-    if (!index.isValid())
-        return QVariant();
-
-    if (index.row() >= songs.size())
+    if (!index.isValid() || index.row() >= songs.size()) {
         return QVariant();
+    }
 
     // Mark background of song currently being played
 
@@ -217,10 +215,11 @@ Qt::DropActions PlayQueueModel::supportedDropActions() const
 
 Qt::ItemFlags PlayQueueModel::flags(const QModelIndex &index) const
 {
-    if (index.isValid())
+    if (index.isValid()) {
         return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
-    else
+    } else {
         return Qt::ItemIsDropEnabled;
+    }
 }
 
 /**
@@ -252,8 +251,9 @@ QMimeData *PlayQueueModel::mimeData(const QModelIndexList &indexes) const
     QList<int> rows;
     foreach(QModelIndex index, indexes) {
         if (index.isValid()) {
-            if (rows.contains(index.row()))
+            if (rows.contains(index.row())) {
                 continue;
+            }
 
             positions.append(QString::number(getPosByRow(index.row())));
             rows.append(index.row());
@@ -350,20 +350,12 @@ void PlayQueueModel::addFiles(const QStringList &filenames, int row)
 
 qint32 PlayQueueModel::getIdByRow(qint32 row) const
 {
-    if (songs.size() <= row) {
-        return -1;
-    }
-
-    return songs.at(row).id;
+    return row>=songs.size() ? -1 : songs.at(row).id;
 }
 
 qint32 PlayQueueModel::getPosByRow(qint32 row) const
 {
-    if (songs.size() <= row) {
-        return -1;
-    }
-
-    return songs.at(row).pos;
+    return row>=songs.size() ? -1 : songs.at(row).pos;
 }
 
 qint32 PlayQueueModel::getRowById(qint32 id) const
@@ -379,11 +371,7 @@ qint32 PlayQueueModel::getRowById(qint32 id) const
 
 Song PlayQueueModel::getSongByRow(const qint32 row) const
 {
-    if (songs.size() <= row) {
-        return Song();
-    }
-
-    return songs.at(row);
+    return row>=songs.size() ? Song() : songs.at(row);
 }
 
 void PlayQueueModel::updateCurrentSong(quint32 id)
@@ -393,8 +381,9 @@ void PlayQueueModel::updateCurrentSong(quint32 id)
     oldIndex = song_id;
     song_id = id;
 
-    if (oldIndex != -1)
+    if (-1!=oldIndex) {
         emit dataChanged(index(getRowById(oldIndex), 0), index(getRowById(oldIndex), 2));
+    }
 
     emit dataChanged(index(getRowById(song_id), 0), index(getRowById(song_id), 2));
 }
diff --git a/models/playqueuemodel.h b/models/playqueuemodel.h
index 3d9b5546c..f025e2f12 100644
--- a/models/playqueuemodel.h
+++ b/models/playqueuemodel.h
@@ -27,10 +27,10 @@
 #ifndef PLAYQUEUEMODEL_H
 #define PLAYQUEUEMODEL_H
 
-#include <QAbstractTableModel>
-#include <QList>
-#include <QStringList>
-#include <QSet>
+#include <QtCore/QAbstractTableModel>
+#include <QtCore/QList>
+#include <QtCore/QStringList>
+#include <QtCore/QSet>
 #include "song.h"
 
 class StreamFetcher;
diff --git a/models/playqueueproxymodel.cpp b/models/playqueueproxymodel.cpp
index 2612b490e..4e7bead02 100644
--- a/models/playqueueproxymodel.cpp
+++ b/models/playqueueproxymodel.cpp
@@ -24,7 +24,7 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 #include "playqueueproxymodel.h"
 #include "playqueuemodel.h"
 
diff --git a/models/proxymodel.h b/models/proxymodel.h
index 351f0f34a..5f842c5d5 100644
--- a/models/proxymodel.h
+++ b/models/proxymodel.h
@@ -25,7 +25,6 @@
 #define PROXYMODEL_H
 
 #include <QtGui/QSortFilterProxyModel>
-#include <QtCore/QDebug>
 
 class ProxyModel : public QSortFilterProxyModel
 {
diff --git a/models/streamfetcher.cpp b/models/streamfetcher.cpp
index c723cbf65..051062d30 100644
--- a/models/streamfetcher.cpp
+++ b/models/streamfetcher.cpp
@@ -23,7 +23,6 @@
 
 #include "streamfetcher.h"
 #include "networkaccessmanager.h"
-#include <QtCore/QDebug>
 #include <QtCore/QRegExp>
 #include <QtCore/QUrl>
 #ifdef XSPF
diff --git a/mpd/mpdconnection.cpp b/mpd/mpdconnection.cpp
index 4bb5d8b71..c923f1cfa 100644
--- a/mpd/mpdconnection.cpp
+++ b/mpd/mpdconnection.cpp
@@ -41,15 +41,15 @@ K_GLOBAL_STATIC(MPDConnection, conn)
 
 MPDConnection * MPDConnection::self()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     return conn;
-#else
+    #else
     static MPDConnection *conn=0;;
     if(!conn) {
         conn=new MPDConnection;
     }
     return conn;
-#endif
+    #endif
 }
 
 static QByteArray readFromSocket(MpdSocket &socket)
@@ -236,6 +236,9 @@ MPDConnection::Response MPDConnection::sendCommand(const QByteArray &command)
     sock.waitForBytesWritten(5000);
     Response response=readReply(sock);
 
+    if (!response.ok) {
+        qDebug() << command << "failed";
+    }
     return response;
 }
 
@@ -257,8 +260,6 @@ void MPDConnection::add(const QStringList &files)
 
     if (sendCommand(send).ok){
         emit added(files);
-    } else {
-        qDebug("Couldn't add song(s) to playlist");
     }
 }
 
@@ -294,16 +295,12 @@ void MPDConnection::addid(const QStringList &files, quint32 pos, quint32 size)
 
     if (sendCommand(send).ok) {
         emit added(files);
-    } else {
-        qDebug("Couldn't add song(s) to playlist");
     }
 }
 
 void MPDConnection::clear()
 {
-    if(sendCommand("clear").ok) {
-        qDebug("Couldn't clear playlist");
-    }
+    sendCommand("clear");
 }
 
 void MPDConnection::removeSongs(const QList<qint32> &items)
@@ -318,9 +315,7 @@ void MPDConnection::removeSongs(const QList<qint32> &items)
 
     send += "command_list_end";
 
-    if (!sendCommand(send).ok) {
-        qDebug("Couldn't remove songs from playlist");
-    }
+    sendCommand(send);
 }
 
 void MPDConnection::move(quint32 from, quint32 to)
@@ -328,9 +323,7 @@ void MPDConnection::move(quint32 from, quint32 to)
     QByteArray send = "move " + QByteArray::number(from) + " " + QByteArray::number(to);
 
     qDebug() << send;
-    if (!sendCommand(send).ok) {
-        qDebug("Couldn't move files around in playlist");
-    }
+    sendCommand(send);
 }
 
 void MPDConnection::move(const QList<quint32> &items, quint32 pos, quint32 size)
@@ -366,16 +359,12 @@ void MPDConnection::move(const QList<quint32> &items, quint32 pos, quint32 size)
 
     send += "command_list_end";
 
-    if (!sendCommand(send).ok) {
-        qDebug("Couldn't move songs around in playlist");
-    }
+    sendCommand(send);
 }
 
 void MPDConnection::shuffle()
 {
-    if (!sendCommand("shuffle").ok) {
-        qDebug("Couldn't shuffle playlist");
-    }
+    sendCommand("shuffle");
 }
 
 void MPDConnection::shuffle(quint32 from, quint32 to)
@@ -385,9 +374,7 @@ void MPDConnection::shuffle(quint32 from, quint32 to)
     command += ":";
     command += QByteArray::number(to + 1);
 
-    if (!sendCommand(command).ok) {
-        qDebug("Couldn't shuffle playlist");
-    }
+    sendCommand(command);
 }
 
 void MPDConnection::currentSong()
@@ -413,18 +400,14 @@ void MPDConnection::setCrossFade(int secs)
 {
     QByteArray data = "crossfade ";
     data += QByteArray::number(secs);
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't set xfade");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::setReplayGain(const QString &v)
 {
     QByteArray data = "replay_gain_mode ";
     data += v.toLatin1();
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't set replay_gain_mode");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::getReplayGain()
@@ -440,9 +423,7 @@ void MPDConnection::getReplayGain()
 
 void MPDConnection::goToNext()
 {
-    if (!sendCommand("next").ok) {
-        qDebug("Couldn't go to next track");
-    }
+    sendCommand("next");
 }
 
 void MPDConnection::setPause(bool toggle)
@@ -453,34 +434,26 @@ void MPDConnection::setPause(bool toggle)
     else
         data += "0";
 
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't set pause");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::startPlayingSong(quint32 song)
 {
     QByteArray data = "play ";
     data += QByteArray::number(song);
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't start playing song");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::startPlayingSongId(quint32 song_id)
 {
     QByteArray data = "playid ";
     data += QByteArray::number(song_id);
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't start playing song id");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::goToPrevious()
 {
-    if (!sendCommand("previous").ok) {
-        qDebug("Couldn't go to previous track");
-    }
+    sendCommand("previous");
 }
 
 void MPDConnection::setConsume(bool toggle)
@@ -491,9 +464,7 @@ void MPDConnection::setConsume(bool toggle)
     else
         data += "0";
 
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't toggle consume");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::setRandom(bool toggle)
@@ -504,9 +475,7 @@ void MPDConnection::setRandom(bool toggle)
     else
         data += "0";
 
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't toggle random");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::setRepeat(bool toggle)
@@ -517,9 +486,7 @@ void MPDConnection::setRepeat(bool toggle)
     else
         data += "0";
 
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't toggle repeat");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::setSeek(quint32 song, quint32 time)
@@ -529,9 +496,7 @@ void MPDConnection::setSeek(quint32 song, quint32 time)
     data += " ";
     data += QByteArray::number(time);
 
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't set seek position");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::setSeekId(quint32 song_id, quint32 time)
@@ -540,25 +505,19 @@ void MPDConnection::setSeekId(quint32 song_id, quint32 time)
     data += QByteArray::number(song_id);
     data += " ";
     data += QByteArray::number(time);
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't set seek position");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::setVolume(int vol)
 {
     QByteArray data = "setvol ";
     data += QByteArray::number(vol);
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't set volume");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::stopPlaying()
 {
-    if (!sendCommand("stop").ok) {
-        qDebug("Couldn't stop playing");
-    }
+    sendCommand("stop");
 }
 
 void MPDConnection::getStats()
@@ -667,18 +626,14 @@ void MPDConnection::enableOutput(int id)
 {
     QByteArray data = "enableoutput ";
     data += QByteArray::number(id);
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't enable output");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::disableOutput(int id)
 {
     QByteArray data = "disableoutput ";
     data += QByteArray::number(id);
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't disable output");
-    }
+    sendCommand(data);
 }
 
 /*
@@ -757,8 +712,6 @@ void MPDConnection::loadPlaylist(QString name)
 
     if (sendCommand(data).ok) {
         emit playlistLoaded(name);
-    } else {
-        qDebug("Couldn't load playlist");
     }
 }
 
@@ -784,9 +737,7 @@ void MPDConnection::removePlaylist(QString name)
     QByteArray data("rm ");
     data += "\"" + name.toUtf8().replace("\\", "\\\\").replace("\"", "\\\"") + "\"";
 
-    if (!sendCommand(data).ok) {
-        qDebug("Couldn't remove playlist");
-    }
+    sendCommand(data);
 }
 
 void MPDConnection::savePlaylist(QString name)
diff --git a/mpd/mpdparseutils.cpp b/mpd/mpdparseutils.cpp
index a7ff6592f..fc516b5a7 100644
--- a/mpd/mpdparseutils.cpp
+++ b/mpd/mpdparseutils.cpp
@@ -51,8 +51,9 @@ QString MPDParseUtils::getDir(const QString &f)
 
     int slashPos(d.lastIndexOf('/'));
 
-    if(slashPos!=-1)
+    if(slashPos!=-1) {
         d.remove(slashPos+1, d.length());
+    }
 
     if (!d.isEmpty() && !d.endsWith("/")) {
         d=d+"/";
@@ -243,11 +244,11 @@ Song MPDParseUtils::parseSong(const QByteArray &data)
     }
 
     if (song.genre.isEmpty()) {
-#ifdef ENABLE_KDE_SUPPORT
+        #ifdef ENABLE_KDE_SUPPORT
         song.genre = i18n("Unknown");
-#else
+        #else
         song.genre = QObject::tr("Unknown");
-#endif
+        #endif
     }
 
     if (!albumartist.isEmpty() && albumartist != song.artist) {
@@ -347,10 +348,11 @@ DirViewItemRoot * MPDParseUtils::parseDirViewItems(const QByteArray &data)
             line.remove(0, 6);
             QStringList parts = line.split("/");
 
-            if (currentDir->type() == DirViewItem::Type_Root)
+            if (currentDir->type() == DirViewItem::Type_Root) {
                 static_cast<DirViewItemRoot *>(currentDir)->insertFile(parts.at(parts.size() - 1));
-            else
+            } else {
                 static_cast<DirViewItemDir *>(currentDir)->insertFile(parts.at(parts.size() - 1));
+            }
         } else if (line.startsWith("directory: ")) {
             line.remove(0, 11);
             QStringList parts = line.split("/");
@@ -358,8 +360,9 @@ DirViewItemRoot * MPDParseUtils::parseDirViewItems(const QByteArray &data)
             /* Check how much matches */
             int depth = 0;
             for (int j = 0; j < currentDirList.size() && j < parts.size(); j++) {
-                if (currentDirList.at(j) != parts.at(j))
+                if (currentDirList.at(j) != parts.at(j)) {
                     break;
+                }
                 depth++;
             }
 
@@ -367,10 +370,11 @@ DirViewItemRoot * MPDParseUtils::parseDirViewItems(const QByteArray &data)
                 currentDir = currentDir->parent();
             }
 
-            if (currentDir->type() == DirViewItem::Type_Root)
+            if (currentDir->type() == DirViewItem::Type_Root) {
                 currentDir = static_cast<DirViewItemRoot *>(currentDir)->createDirectory(parts.at(parts.size() - 1));
-            else
+            } else {
                 currentDir = static_cast<DirViewItemDir *>(currentDir)->createDirectory(parts.at(parts.size() - 1));
+            }
 
             currentDirList = parts;
         }
@@ -414,15 +418,15 @@ QString MPDParseUtils::formatDuration(const quint32 totalseconds)
     //Convert hour,minutes and seconds to a QTime for easier parsing
     QTime time(hours, minutes, seconds);
 
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     return 0==days
             ? time.toString("hh:mm:ss")
             : i18np("1 day %2", "%1 days %2", days, time.toString("hh:mm:ss"));
-#else
+    #else
     return 0==days
             ? time.toString("hh:mm:ss")
             : 1==days
                 ? QObject::tr("1 day %1").arg(time.toString("hh:mm:ss"))
                 : QObject::tr("%1 days %2").arg(days).arg(time.toString("hh:mm:ss"));
-#endif
+    #endif
 }
diff --git a/mpd/mpdparseutils.h b/mpd/mpdparseutils.h
index 0354a2be4..ef2f1feb2 100644
--- a/mpd/mpdparseutils.h
+++ b/mpd/mpdparseutils.h
@@ -27,7 +27,7 @@
 #ifndef MPD_PARSE_UTILS_H
 #define MPD_PARSE_UTILS_H
 
-#include <QString>
+#include <QtCore/QString>
 
 class Song;
 class Playlist;
diff --git a/mpd/mpdstatus.cpp b/mpd/mpdstatus.cpp
index 42a9c0e0a..19efe2f74 100644
--- a/mpd/mpdstatus.cpp
+++ b/mpd/mpdstatus.cpp
@@ -312,4 +312,3 @@ void MPDStatus::setError(QString error)
 {
     m_error = error;
 }
-
diff --git a/mpd/mpdstatus.h b/mpd/mpdstatus.h
index 61383175f..285b06ab7 100644
--- a/mpd/mpdstatus.h
+++ b/mpd/mpdstatus.h
@@ -27,8 +27,8 @@
 #ifndef MPD_STATUS_H
 #define MPD_STATUS_H
 
-#include <QtCore>
-#include <QtGlobal>
+#include <QtCore/QtCore>
+#include <QtCore/QtGlobal>
 
 class MPDStatus
 {
diff --git a/mpd/output.h b/mpd/output.h
index 7798a138a..0e61e75ff 100644
--- a/mpd/output.h
+++ b/mpd/output.h
@@ -27,7 +27,7 @@
 #ifndef OUTPUT_H
 #define OUTPUT_H
 
-#include <QString>
+#include <QtCore/QString>
 
 struct Output
 {
diff --git a/mpd/playlist.h b/mpd/playlist.h
index 51ada7a43..3f9103309 100644
--- a/mpd/playlist.h
+++ b/mpd/playlist.h
@@ -27,8 +27,8 @@
 #ifndef PLAYLIST_H
 #define PLAYLIST_H
 
-#include <QDateTime>
-#include <QString>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
 
 struct Playlist
 {
diff --git a/mpd/song.cpp b/mpd/song.cpp
index 62f756a8d..f9d86c2c7 100644
--- a/mpd/song.cpp
+++ b/mpd/song.cpp
@@ -27,7 +27,7 @@
 #include <cmath>
 #include "song.h"
 #ifdef ENABLE_KDE_SUPPORT
-#include <KLocale>
+#include <KDE/KLocale>
 #else
 #include <QtCore/QObject>
 #endif
@@ -73,7 +73,7 @@ bool Song::isEmpty() const
 
 void Song::fillEmptyFields()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     if (artist.isEmpty()) {
         artist = i18n("Unknown");
     }
@@ -85,7 +85,7 @@ void Song::fillEmptyFields()
     if (title.isEmpty()) {
         title = i18n("Unknown");
     }
-#else
+    #else
     if (artist.isEmpty()) {
         artist = QObject::tr("Unknown");
     }
@@ -97,7 +97,7 @@ void Song::fillEmptyFields()
     if (title.isEmpty()) {
         title = QObject::tr("Unknown");
     }
-#endif
+    #endif
 }
 
 void Song::clear()
@@ -122,8 +122,9 @@ QString Song::formattedTime(const quint32 &seconds)
 
     result += QString::number(floor(seconds / 60.0));
     result += ":";
-    if (seconds % 60 < 10)
+    if (seconds % 60 < 10) {
         result += "0";
+    }
     result += QString::number(seconds % 60);
 
     return result;
diff --git a/mpd/song.h b/mpd/song.h
index 4e0f7551b..1100b1c36 100644
--- a/mpd/song.h
+++ b/mpd/song.h
@@ -28,7 +28,7 @@
 #ifndef SONG_H
 #define SONG_H
 
-#include <QString>
+#include <QtCore/QString>
 
 struct Song
 {
diff --git a/network/network.cpp b/network/network.cpp
index c69a7c0b0..10000dbe0 100644
--- a/network/network.cpp
+++ b/network/network.cpp
@@ -49,15 +49,15 @@ QString Network::cacheDir(const QString &sub, bool create)
 
 Network * Network::self()
 {
-#ifdef ENABLE_KDE_SUPPORT
+    #ifdef ENABLE_KDE_SUPPORT
     return instance;
-#else
+    #else
     static Network *instance=0;;
     if(!instance) {
         instance=new Network;
     }
     return instance;
-#endif
+    #endif
 }
 
 Network::Network()
diff --git a/network/network.h b/network/network.h
index 18a3aac38..86aa1fa29 100644
--- a/network/network.h
+++ b/network/network.h
@@ -25,9 +25,9 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include <QMap>
-#include <QObject>
-#include <QUrl>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
 
 class NetworkAccessManager;
 class QNetworkReply;
diff --git a/network/networkproxyfactory.cpp b/network/networkproxyfactory.cpp
index 9d952d386..308de7b18 100644
--- a/network/networkproxyfactory.cpp
+++ b/network/networkproxyfactory.cpp
@@ -22,107 +22,108 @@
  */
 
 #include "networkproxyfactory.h"
-#include <QMutexLocker>
-#include <QSettings>
-#include <QStringList>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QSettings>
+#include <QtCore/QStringList>
 #include <stdlib.h>
 
 NetworkProxyFactory* NetworkProxyFactory::sInstance = NULL;
 const char* NetworkProxyFactory::kSettingsGroup = "Proxy";
 
 NetworkProxyFactory::NetworkProxyFactory()
-  : mode_(Mode_System),
-    type_(QNetworkProxy::HttpProxy),
-    port_(8080),
-    use_authentication_(false)
+    : mode_(Mode_System)
+    , type_(QNetworkProxy::HttpProxy)
+    , port_(8080)
+    , use_authentication_(false)
 {
-#ifdef Q_OS_LINUX
-  // Linux uses environment variables to pass proxy configuration information,
-  // which systemProxyForQuery doesn't support for some reason.
+    #ifdef Q_OS_LINUX
+    // Linux uses environment variables to pass proxy configuration information,
+    // which systemProxyForQuery doesn't support for some reason.
 
-  QStringList urls;
-  urls << QString::fromLocal8Bit(getenv("HTTP_PROXY"));
-  urls << QString::fromLocal8Bit(getenv("http_proxy"));
-  urls << QString::fromLocal8Bit(getenv("ALL_PROXY"));
-  urls << QString::fromLocal8Bit(getenv("all_proxy"));
+    QStringList urls;
+    urls << QString::fromLocal8Bit(getenv("HTTP_PROXY"));
+    urls << QString::fromLocal8Bit(getenv("http_proxy"));
+    urls << QString::fromLocal8Bit(getenv("ALL_PROXY"));
+    urls << QString::fromLocal8Bit(getenv("all_proxy"));
 
-  foreach (const QString& url_str, urls) {
-    if (url_str.isEmpty())
-      continue;
+    foreach (const QString& url_str, urls) {
+        if (url_str.isEmpty()) {
+            continue;
+        }
 
-    env_url_ = QUrl(url_str);
-    break;
-  }
-#endif
-
-  ReloadSettings();
-}
-
-NetworkProxyFactory* NetworkProxyFactory::Instance() {
-  if (!sInstance) {
-    sInstance = new NetworkProxyFactory;
-  }
-
-  return sInstance;
-}
-
-void NetworkProxyFactory::ReloadSettings() {
-  QMutexLocker l(&mutex_);
-
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
-
-  mode_ = Mode(s.value("mode", Mode_System).toInt());
-  type_ = QNetworkProxy::ProxyType(s.value("type", QNetworkProxy::HttpProxy).toInt());
-  hostname_ = s.value("hostname").toString();
-  port_ = s.value("port", 8080).toInt();
-  use_authentication_ = s.value("use_authentication", false).toBool();
-  username_ = s.value("username").toString();
-  password_ = s.value("password").toString();
-}
-
-QList<QNetworkProxy> NetworkProxyFactory::queryProxy(
-    const QNetworkProxyQuery& query) {
-  QMutexLocker l(&mutex_);
-
-  QNetworkProxy ret;
-
-  switch (mode_) {
-  case Mode_System:
-#ifdef Q_OS_LINUX
-    Q_UNUSED(query);
-
-    if (env_url_.isEmpty()) {
-      ret.setType(QNetworkProxy::NoProxy);
-    } else {
-      ret.setHostName(env_url_.host());
-      ret.setPort(env_url_.port());
-      ret.setUser(env_url_.userName());
-      ret.setPassword(env_url_.password());
-      if (env_url_.scheme().startsWith("http"))
-        ret.setType(QNetworkProxy::HttpProxy);
-      else
-        ret.setType(QNetworkProxy::Socks5Proxy);
+        env_url_ = QUrl(url_str);
+        break;
     }
-    break;
-#else
-    return systemProxyForQuery(query);
-#endif
+    #endif
 
-  case Mode_Direct:
-    ret.setType(QNetworkProxy::NoProxy);
-    break;
-
-  case Mode_Manual:
-    ret.setType(type_);
-    ret.setHostName(hostname_);
-    ret.setPort(port_);
-    if (use_authentication_) {
-      ret.setUser(username_);
-      ret.setPassword(password_);
-    }
-    break;
-  }
-
-  return QList<QNetworkProxy>() << ret;
+    ReloadSettings();
+}
+
+NetworkProxyFactory* NetworkProxyFactory::Instance()
+{
+    if (!sInstance) {
+        sInstance = new NetworkProxyFactory;
+    }
+
+    return sInstance;
+}
+
+void NetworkProxyFactory::ReloadSettings()
+{
+    QMutexLocker l(&mutex_);
+
+    QSettings s;
+    s.beginGroup(kSettingsGroup);
+
+    mode_ = Mode(s.value("mode", Mode_System).toInt());
+    type_ = QNetworkProxy::ProxyType(s.value("type", QNetworkProxy::HttpProxy).toInt());
+    hostname_ = s.value("hostname").toString();
+    port_ = s.value("port", 8080).toInt();
+    use_authentication_ = s.value("use_authentication", false).toBool();
+    username_ = s.value("username").toString();
+    password_ = s.value("password").toString();
+}
+
+QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery& query)
+{
+    QMutexLocker l(&mutex_);
+    QNetworkProxy ret;
+
+    switch (mode_) {
+    case Mode_System:
+        #ifdef Q_OS_LINUX
+        Q_UNUSED(query);
+
+        if (env_url_.isEmpty()) {
+            ret.setType(QNetworkProxy::NoProxy);
+        } else {
+            ret.setHostName(env_url_.host());
+            ret.setPort(env_url_.port());
+            ret.setUser(env_url_.userName());
+            ret.setPassword(env_url_.password());
+            if (env_url_.scheme().startsWith("http")) {
+                ret.setType(QNetworkProxy::HttpProxy);
+            } else {
+                ret.setType(QNetworkProxy::Socks5Proxy);
+            }
+        }
+        break;
+        #else
+        return systemProxyForQuery(query);
+        #endif
+    case Mode_Direct:
+        ret.setType(QNetworkProxy::NoProxy);
+        break;
+    case Mode_Manual:
+        ret.setType(type_);
+        ret.setHostName(hostname_);
+        ret.setPort(port_);
+        if (use_authentication_) {
+            ret.setUser(username_);
+            ret.setPassword(password_);
+        }
+        break;
+    }
+
+    return QList<QNetworkProxy>() << ret;
 }
diff --git a/network/networkproxyfactory.h b/network/networkproxyfactory.h
index 0f40a436c..7cabd9c6c 100644
--- a/network/networkproxyfactory.h
+++ b/network/networkproxyfactory.h
@@ -24,9 +24,9 @@
 #ifndef NETWORKPROXYFACTORY_H
 #define NETWORKPROXYFACTORY_H
 
-#include <QMutex>
-#include <QNetworkProxyFactory>
-#include <QUrl>
+#include <QtCore/QMutex>
+#include <QtNetwork/QNetworkProxyFactory>
+#include <QtCore/QUrl>
 
 class NetworkProxyFactory : public QNetworkProxyFactory {
 public:
diff --git a/network/proxysettings.h b/network/proxysettings.h
index d14f521eb..99d11d107 100644
--- a/network/proxysettings.h
+++ b/network/proxysettings.h
@@ -24,7 +24,7 @@
 #ifndef PROXYSETTINGS_H
 #define PROXYSETTINGS_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 #include "ui_proxysettings.h"
 
 class ProxySettings : public QWidget, public Ui::ProxySettings
diff --git a/widgets/fancytabwidget.cpp b/widgets/fancytabwidget.cpp
index e04ffeb7d..217aa76d6 100644
--- a/widgets/fancytabwidget.cpp
+++ b/widgets/fancytabwidget.cpp
@@ -36,24 +36,22 @@
 #include "fancytabwidget.h"
 // #include "stylehelper.h"
 
-#include <QDebug>
-
-#include <QAnimationGroup>
-#include <QColorDialog>
-#include <QHBoxLayout>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPropertyAnimation>
-#include <QSignalMapper>
-#include <QSplitter>
-#include <QStackedLayout>
-#include <QStyleOptionTabV3>
-#include <QToolButton>
-#include <QToolTip>
-#include <QVBoxLayout>
-#include <QWindowsStyle>
-#include <QApplication>
+// #include <QtGui/QColorDialog>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QMenu>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QSplitter>
+#include <QtGui/QStackedLayout>
+#include <QtGui/QStyleOptionTabV3>
+#include <QtGui/QToolButton>
+#include <QtGui/QToolTip>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWindowsStyle>
+#include <QtGui/QApplication>
+#include <QtCore/QAnimationGroup>
+#include <QtCore/QPropertyAnimation>
+#include <QtCore/QSignalMapper>
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KLocale>
 #endif
@@ -646,7 +644,7 @@ void FancyTabWidget::SetMode(Mode mode) {
   switch (mode) {
     case Mode_None:
     default:
-      qDebug() << "Unknown fancy tab mode" << mode;
+//       qDebug() << "Unknown fancy tab mode" << mode;
       // fallthrough
 
     case Mode_LargeSidebar: {
diff --git a/widgets/fancytabwidget.h b/widgets/fancytabwidget.h
index af3104f05..30ec4aa60 100644
--- a/widgets/fancytabwidget.h
+++ b/widgets/fancytabwidget.h
@@ -36,13 +36,13 @@
 #ifndef FANCYTABWIDGET_H
 #define FANCYTABWIDGET_H
 
-#include <QIcon>
-#include <QPropertyAnimation>
-#include <QProxyStyle>
-#include <QTabBar>
-#include <QTimer>
-#include <QWidget>
-#include <QScopedPointer>
+#include <QtGui/QIcon>
+#include <QtGui/QProxyStyle>
+#include <QtGui/QTabBar>
+#include <QtGui/QWidget>
+#include <QtCore/QPropertyAnimation>
+#include <QtCore/QTimer>
+#include <QtCore/QScopedPointer>
 
 //#include <boost/scoped_ptr.hpp>
 
diff --git a/widgets/lineedit.cpp b/widgets/lineedit.cpp
index 34df1f3f2..c1121b447 100644
--- a/widgets/lineedit.cpp
+++ b/widgets/lineedit.cpp
@@ -31,10 +31,9 @@
 ****************************************************************************/
 
 #include "lineedit.h"
-#include <QToolButton>
-#include <QStyle>
-#include <QIcon>
-#include <QDebug>
+#include <QtGui/QToolButton>
+#include <QtGui/QStyle>
+#include <QtGui/QIcon>
 
 LineEdit::LineEdit(QWidget *parent)
     : QLineEdit(parent)
diff --git a/widgets/lineedit.h b/widgets/lineedit.h
index cc72c6992..03e747bea 100644
--- a/widgets/lineedit.h
+++ b/widgets/lineedit.h
@@ -43,7 +43,7 @@ public:
 };
 
 #else
-#include <QLineEdit>
+#include <QtGui/QLineEdit>
 
 class QToolButton;
 
diff --git a/widgets/timeslider.cpp b/widgets/timeslider.cpp
index bee674561..c1754e7a1 100644
--- a/widgets/timeslider.cpp
+++ b/widgets/timeslider.cpp
@@ -23,7 +23,6 @@
 
 #include "timeslider.h"
 #include <QtCore/QTimer>
-#include <QtCore/QDebug>
 
 TimeSlider::TimeSlider(QWidget *p)
     : QSlider(p)