diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c54401..d02a7f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,49 +1,49 @@
 cmake_minimum_required(VERSION 3.5)
 set(KDEPIM_VERSION_NUMBER "5.10.80")
 project(ktimetracker VERSION ${KDEPIM_VERSION_NUMBER})
 
 set(KF5_MIN_VERSION "5.54.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 include(ECMInstallIcons)
 include(KDEInstallDirs)
 include(ECMAddAppIcon)
 include(ECMQtDeclareLoggingCategory)
 include(FeatureSummary)
 include(KDECMakeSettings)
 include(ECMSetupVersion)
 
 ecm_setup_version(${KDEPIM_VERSION_NUMBER}
     VARIABLE_PREFIX KTIMETRACKER
     VERSION_HEADER src/ktimetracker-version.h
 )
 
 set(QT_REQUIRED_VERSION "5.10.0")
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus)
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-	I18n
-	Config
-	KCMUtils
-	WindowSystem
-	Notifications
-	IconThemes
-	JobWidgets
-	XmlGui
-	KIO
-	DBusAddons
-	IdleTime
-	DocTools
+    Config
+    DBusAddons
+    DocTools
+    I18n
+    IconThemes
+    IdleTime
+    JobWidgets
+    KIO
+    KCMUtils
+    Notifications
+    WindowSystem
+    XmlGui
 )
 
 # Find KdepimLibs Package
 find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
 
 add_subdirectory(pics)
 add_subdirectory(icons)
 add_subdirectory(doc)
 add_subdirectory(src)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05ae792..f24c7fd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,90 +1,94 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set(ktimetracker_SRCS
+    export/totalsastext.cpp
+
     file/filecalendar.cpp
     file/icalformatkio.cpp
+
+    model/task.cpp
     model/tasksmodel.cpp
     model/tasksmodelitem.cpp
-    model/task.cpp
+
     settings/ktimetrackerconfigdialog.cpp
+
+    widgets/searchline.cpp
+
+    csvexportdialog.cpp
     desktoptracker.cpp
     edittaskdialog.cpp
+    focusdetector.cpp
+    historydialog.cpp
     idletimedetector.cpp
-    export/totalsastext.cpp
     ktimetrackerutility.cpp
-    timetrackerstorage.cpp
     mainwindow.cpp
+    plannerparser.cpp
     taskview.cpp
+    timetrackerstorage.cpp
+    timetrackerwidget.cpp
     tray.cpp
-    focusdetector.cpp
-    csvexportdialog.cpp
-    plannerparser.cpp
-    historydialog.cpp
     treeviewheadercontextmenu.cpp
-    timetrackerwidget.cpp
-    widgets/searchline.cpp
-    main.cpp
     $<TARGET_OBJECTS:pics>
     $<TARGET_OBJECTS:ktimetracker_app_icon>
 )
 
 ecm_qt_declare_logging_category(ktimetracker_SRCS
     HEADER ktt_debug.h
     IDENTIFIER KTT_LOG
     CATEGORY_NAME log_ktt
 )
 
 qt5_add_dbus_adaptor(ktimetracker_SRCS
     org.kde.ktimetracker.ktimetracker.xml
     timetrackerwidget.h
     TimeTrackerWidget
     mainadaptor
     MainAdaptor
 )
 
 ki18n_wrap_ui(ktimetracker_SRCS
     csvexportdialog.ui
     historydialog.ui
     edittaskdialog.ui
     settings/cfgbehavior.ui
     settings/cfgdisplay.ui
     settings/cfgstorage.ui
 )
 
 kconfig_add_kcfg_files(ktimetracker_SRCS settings/ktimetracker.kcfgc)
 
 qt5_add_resources(ktimetracker_SRCS ktimetracker.qrc)
 
 add_library(libktimetracker STATIC ${ktimetracker_SRCS})
 target_link_libraries(libktimetracker
     KF5::KCMUtils
     KF5::WindowSystem
     KF5::Notifications
     KF5::IconThemes
     KF5::I18n
     KF5::XmlGui
     KF5::JobWidgets
     KF5::KIOCore
     KF5::KIOWidgets
     KF5::IdleTime
     KF5::DBusAddons
     KF5::CalendarCore
     ${X11_X11_LIB}
 )
 if(X11_Xscreensaver_LIB)
     target_link_libraries(libktimetracker ${X11_Xscreensaver_LIB})
 endif()
 
 add_executable(ktimetracker main.cpp)
 target_link_libraries(ktimetracker libktimetracker)
 
 install(TARGETS ktimetracker ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES org.kde.ktimetracker.ktimetracker.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
 install(PROGRAMS ktimetracker.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()