diff --git a/CMakeLists.txt b/CMakeLists.txt
index 916a28d57..bd57e2e2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,11 +15,11 @@ find_package(ECM 1.8.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
-     Quick QuickWidgets X11Extras)
+     Quick X11Extras)
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Plasma PlasmaQuick WindowSystem Declarative
-    I18n CoreAddons XmlGui DBusAddons Notifications)
+    I18n CoreAddons XmlGui DBusAddons IconThemes)
 
 
 FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e12d770d7..d5000e2fb 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -14,15 +14,17 @@ include(KDEPackageAppTemplates)
 
 set(lattedock-app_SRCS
     ../liblattedock/dock.cpp
+    ../liblattedock/windowsystem.cpp
     windowinfowrap.cpp
     abstractwindowinterface.cpp
     xwindowinterface.cpp
     windowinfowrap.cpp
     visibilitymanager.cpp
-    nowdockconfigview.cpp
-    nowdockview.cpp
-    packageplugins/shell/nowdockpackage.cpp
-    nowdockcorona.cpp
+    dockcorona.cpp
+    dockview.cpp
+    dockconfigview.cpp
+    packageplugins/shell/dockpackage.cpp
+    iconitem.cpp
     main.cpp
 )
 
@@ -34,19 +36,17 @@ include(FakeTarget.cmake)
 
 target_link_libraries(
     latte-dock
-    Qt5::Widgets
     Qt5::Quick
     Qt5::Qml
     Qt5::X11Extras
     KF5::I18n
     KF5::CoreAddons
     KF5::XmlGui
-    KF5::PlasmaQuick
     KF5::Plasma
+    KF5::PlasmaQuick
     KF5::QuickAddons
-    KF5::DBusAddons    
-    KF5::Notifications
     KF5::WindowSystem
+    KF5::IconThemes
 )
 
 install(TARGETS latte-dock ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/app/packageplugins/CMakeLists.txt b/app/packageplugins/CMakeLists.txt
deleted file mode 100644
index c37265486..000000000
--- a/app/packageplugins/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(shell) 
diff --git a/app/packageplugins/shell/CMakeLists.txt b/app/packageplugins/shell/CMakeLists.txt
deleted file mode 100644
index a775e8c7f..000000000
--- a/app/packageplugins/shell/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-set(nowdock-app_SRCS nowdockpackage.cpp)
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 32ba9e51f..5aa6bd57e 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -8,7 +8,7 @@ ecm_install_icons(ICONS
     48-apps-latte-dock.svg
     sc-apps-latte-dock.svg
 THEME hicolor
-DESTINATION ${ICON_INSTALL_DIR} )
+DESTINATION ${ICON_INSTALL_DIR})
 
 install(FILES org.kde.latte.plasmoid.svg DESTINATION ${ICON_INSTALL_DIR}/breeze/applets/256)