diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56b54189..32335926 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,134 +1,134 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(kdeconnect)
 
 set(KDECONNECT_VERSION_MAJOR 1)
 set(KDECONNECT_VERSION_MINOR 3)
 set(KDECONNECT_VERSION_PATCH 3)
 
 set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}")
 
 find_package(PkgConfig)
 
 if (SAILFISHOS)
     set(KF5_MIN_VERSION "5.31.0")
     set(QT_MIN_VERSION "5.6.0")
     set(KF5_REQUIRED_COMPONENTS I18n DBusAddons CoreAddons IconThemes Config)
     set(KF5_OPTIONAL_COMPONENTS)
     set(QCA_MIN_VERSION 2.0.0)
     pkg_search_module(SFOS REQUIRED sailfishapp)
     pkg_check_modules(QCA2 qca2-qt5>=${QCA_MIN_VERSION} REQUIRED)
     add_definitions(-DSAILFISHOS)
     include_directories(${QCA2_INCLUDEDIR})
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 else()
     set(KF5_MIN_VERSION "5.42.0")
     set(QT_MIN_VERSION "5.7.0")
     set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service)
     set(KF5_OPTIONAL_COMPONENTS DocTools)
     if(UNIX)
         set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner)
     endif()
     set(QCA_MIN_VERSION "2.1.0")
     find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED)
-    find_package(KF5PulseAudioQt)
+    find_package(KF5PulseAudioQt REQUIRED)
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS)
 endif()
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Quick Network)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ${KF5_REQUIRED_COMPONENTS})
 if (KF5_OPTIONAL_COMPONENTS)
 find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS ${KF5_OPTIONAL_COMPONENTS})
 endif()
 
 if (NOT ZSH_AUTOCOMPLETE_DIR)
 set(ZSH_AUTOCOMPLETE_DIR "${CMAKE_INSTALL_PREFIX}/share/zsh/site-functions")
 endif()
 
 find_package(Qt5Multimedia)
 
 set_package_properties(KF5Kirigami2 PROPERTIES
   DESCRIPTION "QtQuick plugins to build user interfaces based on KDE UX guidelines"
   PURPOSE "Required for KDE Connect's QML-based GUI applications"
   URL "https://www.kde.org/products/kirigami/"
   TYPE RUNTIME
 )
 
 configure_file(kdeconnect-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/kdeconnect-version.h)
 
 include(KDEInstallDirs)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 include(ECMAddTests)
 include(ECMSetupVersion)
 include(ECMInstallIcons)
 include(FeatureSummary)
 
 include(KDEConnectMacros.cmake)
 
 include(GenerateExportHeader)
 
 add_subdirectory(core)
 if(NOT SAILFISHOS)
     add_subdirectory(kcm)
     add_subdirectory(kcmplugin)
     add_subdirectory(daemon)
 endif()
 
 if(NOT WIN32 AND NOT SAILFISHOS)
     add_subdirectory(kio)
     add_subdirectory(plasmoid)
 endif()
 
 add_subdirectory(icon)
 add_subdirectory(interfaces)
 add_subdirectory(data)
 
 option(EXPERIMENTALAPP_ENABLED OFF)
 if(EXPERIMENTALAPP_ENABLED)
   find_package(KF5Kirigami2)
   add_subdirectory(app)
 endif()
 add_subdirectory(plugins)
 add_subdirectory(cli)
 add_subdirectory(declarativeplugin)
 
 if(KF5Runner_FOUND)
     add_subdirectory(runners)
 endif()
 
 if (NOT SAILFISHOS)
     add_subdirectory(indicator)
     add_subdirectory(urlhandler)
     add_subdirectory(nautilus-extension)
     add_subdirectory(fileitemactionplugin)
 else()
     add_subdirectory(sfos)
 endif()
 
 option(SMSAPP_ENABLED OFF)
 if(SMSAPP_ENABLED)
     find_package(KF5Kirigami2)
     find_package(KF5People REQUIRED)
     find_package(KF5PeopleVCard)
     set_package_properties(KF5PeopleVCard PROPERTIES
         PURPOSE "Read vcards from the file system"
         URL "https://phabricator.kde.org/source/kpeoplevcard/"
         TYPE RUNTIME
     )
 
     add_subdirectory(smsapp)
 endif()
 
 if(KF5DocTools_FOUND)
     add_subdirectory(doc)
 endif()
 
 if(BUILD_TESTING AND NOT SAILFISHOS)
     add_subdirectory(tests)
 endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6426c42f..ed5652b7 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,48 +1,44 @@
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/core)
 add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-plugins\")
 install(FILES kdeconnect_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 add_subdirectory(ping)
 add_subdirectory(battery)
 add_subdirectory(sendnotifications)
 add_subdirectory(mpriscontrol)
 add_subdirectory(photo)
+add_subdirectory(systemvolume)
 
 if(NOT SAILFISHOS)
     add_subdirectory(clipboard)
     add_subdirectory(contacts)
     add_subdirectory(share)
     add_subdirectory(remotekeyboard)
     add_subdirectory(notifications)
     add_subdirectory(findmyphone)
     add_subdirectory(telephony)
     add_subdirectory(mousepad)
     add_subdirectory(sms)
     add_subdirectory(runcommand)
     if(NOT WIN32)
         add_subdirectory(screensaver-inhibit)
         add_subdirectory(sftp)
+        add_subdirectory(pausemusic)
     endif()
 
     if(Qt5Multimedia_FOUND)
         add_subdirectory(findthisdevice)
     endif()
 endif()
 
 if(SAILFISHOS OR EXPERIMENTALAPP_ENABLED)
     add_subdirectory(remotecommands)
     add_subdirectory(mprisremote)
     add_subdirectory(remotecontrol)
     add_subdirectory(lockdevice)
     add_subdirectory(remotesystemvolume)
 endif()
 
-if(KF5PulseAudioQt_FOUND AND NOT WIN32)
-    add_subdirectory(pausemusic)
-endif()
-
-if(KF5PulseAudioQt_FOUND OR WIN32)
-    add_subdirectory(systemvolume)
-endif()
-
+# If we split notifications per plugin, in several notifyrc files, they won't 
+# appear in the same group in the Notifications KCM
 install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})