diff --git a/CMakeLists.txt b/CMakeLists.txt
index a64e9aa..31a892b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,13 @@
 cmake_minimum_required(VERSION 3.10.0)
 
-project(asteroid-settings
-	VERSION 2.0.0
-	DESCRIPTION "Default settings app for AsteroidOS")
+project(
+	asteroid-settings
+	VERSION 2.0
+	DESCRIPTION "Default settings app for AsteroidOS"
+)
 
 find_package(ECM REQUIRED NO_MODULE)
-find_package(AsteroidApp REQUIRED)
+find_package(AsteroidApp6 REQUIRED)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ASTEROID_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
@@ -13,25 +15,31 @@ include(FindPkgConfig)
 include(FeatureSummary)
 include(GNUInstallDirs)
 include(ECMFindQmlModule)
-include(AsteroidCMakeSettings)
-include(AsteroidTranslations)
+include(Asteroid6CMakeSettings)
+include(Asteroid6Translations)
 
-find_package(Qt5 COMPONENTS Core Qml Quick DBus Multimedia REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Core Qml Quick DBus Multimedia)
 find_package(Mce REQUIRED)
 
-ecm_find_qmlmodule(Nemo.DBus 2.0)
-ecm_find_qmlmodule(Nemo.Configuration 1.0)
-ecm_find_qmlmodule(Qt.labs.folderlistmodel 2.1)
-ecm_find_qmlmodule(org.nemomobile.systemsettings 1.0)
+ecm_find_qmlmodule(Nemo.Configuration 1.0 REQUIRED)
+ecm_find_qmlmodule(Nemo.DBus 2.0 REQUIRED)
+ecm_find_qmlmodule(Nemo.FileManager 1.0 REQUIRED)
+ecm_find_qmlmodule(Nemo.Mce 1.0 REQUIRED)
+ecm_find_qmlmodule(Qt.labs.folderlistmodel 2.1 REQUIRED)
+ecm_find_qmlmodule(org.nemomobile.systemsettings 1.0 REQUIRED)
 
 add_subdirectory(src)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/asteroid-settings.in
+configure_file(
+	${CMAKE_CURRENT_SOURCE_DIR}/asteroid-settings.in
 	${CMAKE_BINARY_DIR}/asteroid-settings
-	@ONLY)
+	@ONLY
+)
 
-install(PROGRAMS ${CMAKE_BINARY_DIR}/asteroid-settings
-	DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(
+	PROGRAMS ${CMAKE_BINARY_DIR}/asteroid-settings
+	DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
 
 build_translations(i18n)
 generate_desktop(${CMAKE_SOURCE_DIR} asteroid-settings)
diff --git a/asteroid-settings.in b/asteroid-settings.in
index 1feaf07..33e1f3e 100644
--- a/asteroid-settings.in
+++ b/asteroid-settings.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec invoker --single-instance --type=qt5 @CMAKE_INSTALL_FULL_LIBDIR@/asteroid-settings.so
+exec invoker --single-instance --type=qt6 @CMAKE_INSTALL_FULL_LIBDIR@/asteroid-settings.so
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4ccaf5e..0c08fd2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,40 +1,51 @@
-# Generate mceiface.h
-find_program(QDBUSXML2CPP NAMES qdbusxml2cpp-qt5 qdbusxml2cpp)
-if(NOT QDBUSXML2CPP)
-	message(FATAL_ERROR "qdbusxml2cpp not found")
-endif()
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mceiface.h ${CMAKE_CURRENT_BINARY_DIR}/mceiface.cpp
-	COMMAND ${QDBUSXML2CPP} -p mceiface.h:mceiface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mce.xml)
+# Generate DBus interfaces
+qt_add_dbus_interfaces(
+	dbus_srcs
+	${CMAKE_CURRENT_SOURCE_DIR}/mce.xml
+)
 
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/VolumeControl2.h ${CMAKE_CURRENT_BINARY_DIR}/VolumeControl2.cpp
-	COMMAND ${QDBUSXML2CPP} -p VolumeControl2.h:VolumeControl2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/VolumeControl2.xml)
+qt_add_dbus_interfaces(
+	dbus_srcs
+	${CMAKE_CURRENT_SOURCE_DIR}/VolumeControl2.xml
+)
 
-set(SRC
+set(
+	SRC
 	main.cpp
 	sysinfo.cpp
 	taptowake.cpp
 	tilttowake.cpp
-	volumecontrol.cpp)
-set(HEADERS
+	volumecontrol.cpp
+	${dbus_srcs}
+)
+set(
+	HEADERS
 	sysinfo.h
 	taptowake.h
 	tilttowake.h
-	volumecontrol.h)
+	volumecontrol.h
+)
 
-add_library(asteroid-settings ${SRC} ${HEADERS} resources.qrc 
-    ${CMAKE_CURRENT_BINARY_DIR}/mceiface.h 
-    ${CMAKE_CURRENT_BINARY_DIR}/mceiface.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/VolumeControl2.h 
-    ${CMAKE_CURRENT_BINARY_DIR}/VolumeControl2.cpp
+add_library(asteroid-settings ${SRC} ${HEADERS} resources.qrc)
+message(${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(
+	asteroid-settings
+	PRIVATE
+	${GENERATED_DBUS_HEADERS_DIR}
 )
 set_target_properties(asteroid-settings PROPERTIES PREFIX "")
 
-target_link_libraries(asteroid-settings PRIVATE
-	Qt5::Qml
-	Qt5::Quick
-	Qt5::DBus
-	Qt5::Multimedia
-	AsteroidApp)
+target_link_libraries(
+	asteroid-settings
+	PRIVATE
+		Qt::Qml
+		Qt::Quick
+		Qt::DBus
+		Qt::Multimedia
+		Asteroid::AsteroidApp6
+)
 
-install(TARGETS asteroid-settings
-	DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(
+	TARGETS asteroid-settings
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
diff --git a/src/qml/AboutPage.qml b/src/qml/AboutPage.qml
index 911a1de..fdadf99 100644
--- a/src/qml/AboutPage.qml
+++ b/src/qml/AboutPage.qml
@@ -16,11 +16,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import org.asteroid.utils 1.0
-import org.asteroid.controls 1.0
-import org.asteroid.settings 1.0
-import org.nemomobile.systemsettings 1.0
+import QtQuick
+import org.asteroid.utils
+import org.asteroid.controls
+import org.asteroid.settings
+import org.nemomobile.systemsettings
+import Nemo.FileManager
 
 Flickable {
     AboutSettings {
diff --git a/src/qml/BluetoothPage.qml b/src/qml/BluetoothPage.qml
index b07fe22..2a1ebd0 100644
--- a/src/qml/BluetoothPage.qml
+++ b/src/qml/BluetoothPage.qml
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
+import QtQuick
+import org.asteroid.controls
+import org.asteroid.utils
 
 Item {
     BluetoothStatus { id: btStatus }
diff --git a/src/qml/DatePage.qml b/src/qml/DatePage.qml
index 88d82bc..fefda23 100644
--- a/src/qml/DatePage.qml
+++ b/src/qml/DatePage.qml
@@ -16,10 +16,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import org.nemomobile.systemsettings 1.0
+import QtQuick
+import org.asteroid.controls
+import org.asteroid.utils
+import org.nemomobile.systemsettings
 
 Item {
     id: root
diff --git a/src/qml/DisplayPage.qml b/src/qml/DisplayPage.qml
index 586eaf6..ad54328 100644
--- a/src/qml/DisplayPage.qml
+++ b/src/qml/DisplayPage.qml
@@ -17,14 +17,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import org.asteroid.settings 1.0
-import org.nemomobile.systemsettings 1.0
-import Nemo.Configuration 1.0
-import Nemo.Mce 1.0
+import QtQuick
+import QtQuick.Layouts
+import org.asteroid.controls
+import org.asteroid.utils
+import org.asteroid.settings
+import org.nemomobile.systemsettings
+import Nemo.Configuration
+import Nemo.Mce
 
 Item {
     TapToWake { id: tapToWake }
diff --git a/src/qml/LanguagePage.qml b/src/qml/LanguagePage.qml
index ade4515..edc2104 100644
--- a/src/qml/LanguagePage.qml
+++ b/src/qml/LanguagePage.qml
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import org.asteroid.controls 1.0
-import org.nemomobile.systemsettings 1.0
+import QtQuick
+import org.asteroid.controls
+import org.nemomobile.systemsettings
 
 Item {
     id: root
diff --git a/src/qml/LauncherPage.qml b/src/qml/LauncherPage.qml
index 4561d21..ee1f32f 100644
--- a/src/qml/LauncherPage.qml
+++ b/src/qml/LauncherPage.qml
@@ -16,12 +16,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import Qt.labs.folderlistmodel 2.1
-import Nemo.Time 1.0
-import Nemo.Configuration 1.0
-import org.asteroid.controls 1.0
-import QtQml.Models 2.15
+import QtQuick
+import Qt.labs.folderlistmodel
+import Nemo.Time
+import Nemo.Configuration
+import org.asteroid.controls
+import QtQml.Models
 
 Item {
     property alias displayAmbient: compositor.displayAmbient
diff --git a/src/qml/NightstandPage.qml b/src/qml/NightstandPage.qml
index f572bdc..17725f0 100644
--- a/src/qml/NightstandPage.qml
+++ b/src/qml/NightstandPage.qml
@@ -18,14 +18,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.3
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import org.asteroid.settings 1.0
-import org.nemomobile.systemsettings 1.0 as NemoSystemSettings
-import Nemo.Configuration 1.0
-import Nemo.Mce 1.0
+import QtQuick
+import QtQuick.Layouts
+import org.asteroid.controls
+import org.asteroid.utils
+import org.asteroid.settings
+import org.nemomobile.systemsettings as NemoSystemSettings
+import Nemo.Configuration
+import Nemo.Mce
 
 Item {
     ConfigurationValue {
diff --git a/src/qml/NightstandWatchfacePage.qml b/src/qml/NightstandWatchfacePage.qml
index b724be5..7a7d181 100644
--- a/src/qml/NightstandWatchfacePage.qml
+++ b/src/qml/NightstandWatchfacePage.qml
@@ -17,13 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtGraphicalEffects 1.12
-import Qt.labs.folderlistmodel 2.1
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import Nemo.Configuration 1.0
-import Nemo.Time 1.0
+import QtQuick
+import Qt.labs.folderlistmodel
+import org.asteroid.controls
+import org.asteroid.utils
+import Nemo.Configuration
+import Nemo.Time
 
 Item {
 
diff --git a/src/qml/PowerPage.qml b/src/qml/PowerPage.qml
index b5eb993..0cbeed0 100644
--- a/src/qml/PowerPage.qml
+++ b/src/qml/PowerPage.qml
@@ -17,9 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import org.asteroid.controls 1.0
-import Nemo.DBus 2.0
+import QtQuick
+import org.asteroid.controls
+import Nemo.DBus
 
 Item {
 
diff --git a/src/qml/QuickPanelPage.qml b/src/qml/QuickPanelPage.qml
index 5532ccf..3eb0846 100644
--- a/src/qml/QuickPanelPage.qml
+++ b/src/qml/QuickPanelPage.qml
@@ -15,12 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtGraphicalEffects 1.15
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import Nemo.Configuration 1.0
-import Nemo.Mce 1.0
+import QtQuick
+import org.asteroid.controls
+import org.asteroid.utils
+import Nemo.Configuration
+import Nemo.Mce
 
 Item {
     id: quickPanelPage
diff --git a/src/qml/SoundPage.qml b/src/qml/SoundPage.qml
index 8cd697f..bacb98a 100644
--- a/src/qml/SoundPage.qml
+++ b/src/qml/SoundPage.qml
@@ -16,11 +16,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtMultimedia 5.8
-import org.asteroid.controls 1.0
-import org.asteroid.settings 1.0
-import Nemo.Configuration 1.0
+import QtQuick
+import QtMultimedia
+import org.asteroid.controls
+import org.asteroid.settings
+import Nemo.Configuration
 
 
 Item {
diff --git a/src/qml/TimePage.qml b/src/qml/TimePage.qml
index b25126b..d2ddec0 100644
--- a/src/qml/TimePage.qml
+++ b/src/qml/TimePage.qml
@@ -16,12 +16,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import Nemo.Time 1.0
-import Nemo.Configuration 1.0
-import org.nemomobile.systemsettings 1.0
+import QtQuick
+import org.asteroid.controls
+import org.asteroid.utils
+import Nemo.Time
+import Nemo.Configuration
+import org.nemomobile.systemsettings
 
 Item {
     id: root
diff --git a/src/qml/TimezonePage.qml b/src/qml/TimezonePage.qml
index d23c001..1b1aea7 100644
--- a/src/qml/TimezonePage.qml
+++ b/src/qml/TimezonePage.qml
@@ -18,9 +18,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import org.asteroid.controls 1.0
-import Nemo.DBus 2.0
+import QtQuick
+import org.asteroid.controls
+import Nemo.DBus
 
 Item {
     id: root
diff --git a/src/qml/USBPage.qml b/src/qml/USBPage.qml
index 0eea2be..9f1b7b1 100644
--- a/src/qml/USBPage.qml
+++ b/src/qml/USBPage.qml
@@ -16,9 +16,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import Nemo.DBus 2.0
-import org.asteroid.controls 1.0
+import QtQuick
+import Nemo.DBus
+import org.asteroid.controls
 
 Item {
     id: root
diff --git a/src/qml/UnitsPage.qml b/src/qml/UnitsPage.qml
index 955429c..49fbea8 100644
--- a/src/qml/UnitsPage.qml
+++ b/src/qml/UnitsPage.qml
@@ -15,10 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtQuick.Layouts 1.3
-import Nemo.Configuration 1.0
-import org.asteroid.controls 1.0
+import QtQuick
+import QtQuick.Layouts
+import Nemo.Configuration
+import org.asteroid.controls
 
 Item {
 
diff --git a/src/qml/WallpaperPage.qml b/src/qml/WallpaperPage.qml
index f4c1462..321c89a 100644
--- a/src/qml/WallpaperPage.qml
+++ b/src/qml/WallpaperPage.qml
@@ -17,12 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtGraphicalEffects 1.12
-import Qt.labs.folderlistmodel 2.1
-import Nemo.Configuration 1.0
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
+import QtQuick
+import Qt5Compat.GraphicalEffects
+import Qt.labs.folderlistmodel
+import Nemo.Configuration
+import org.asteroid.controls
+import org.asteroid.utils
 
 
 Item {
diff --git a/src/qml/WatchfacePage.qml b/src/qml/WatchfacePage.qml
index d39fe55..0427763 100644
--- a/src/qml/WatchfacePage.qml
+++ b/src/qml/WatchfacePage.qml
@@ -17,13 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtGraphicalEffects 1.12
-import Qt.labs.folderlistmodel 2.1
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import Nemo.Configuration 1.0
-import Nemo.Time 1.0
+import QtQuick
+import Qt.labs.folderlistmodel
+import org.asteroid.controls
+import org.asteroid.utils
+import Nemo.Configuration
+import Nemo.Time
 
 Item {
     property alias displayAmbient: compositor.displayAmbient
diff --git a/src/qml/WatchfaceSelector.qml b/src/qml/WatchfaceSelector.qml
index 1b56d5b..04af636 100644
--- a/src/qml/WatchfaceSelector.qml
+++ b/src/qml/WatchfaceSelector.qml
@@ -17,13 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import QtGraphicalEffects 1.12
-import Qt.labs.folderlistmodel 2.1
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import Nemo.Configuration 1.0
-import Nemo.Time 1.0
+import QtQuick
+import Qt5Compat.GraphicalEffects
+import Qt.labs.folderlistmodel
+import org.asteroid.controls
+import org.asteroid.utils
+import Nemo.Configuration
+import Nemo.Time
 
 Item {
     id: watchfaceSelector
diff --git a/src/qml/main.qml b/src/qml/main.qml
index a06c98a..c433619 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -17,11 +17,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.9
-import org.asteroid.controls 1.0
-import org.asteroid.utils 1.0
-import org.asteroid.settings 1.0
-import Nemo.Configuration 1.0
+import QtQuick
+import org.asteroid.controls
+import org.asteroid.utils
+import org.asteroid.settings
+import Nemo.Configuration
 
 Application {
     id: app
diff --git a/src/taptowake.cpp b/src/taptowake.cpp
index 802553f..cf294d2 100644
--- a/src/taptowake.cpp
+++ b/src/taptowake.cpp
@@ -55,7 +55,7 @@
 
 #include <mce/dbus-names.h>
 #include <mce/mode-names.h>
-#include "mceiface.h"
+#include "mceinterface.h"
 
 static const char *MceTapToWakeEnabled = "/system/osso/dsm/powerkey/actions_gesture4";
 
diff --git a/src/tilttowake.cpp b/src/tilttowake.cpp
index 2da985b..a50758b 100644
--- a/src/tilttowake.cpp
+++ b/src/tilttowake.cpp
@@ -55,7 +55,7 @@
 
 #include <mce/dbus-names.h>
 #include <mce/mode-names.h>
-#include "mceiface.h"
+#include "mceinterface.h"
 
 static const char *MceWristSensorEnabled = "/system/osso/dsm/display/wrist_sensor_enabled";
 static const char *MceWristSensorAvailable = "/system/osso/dsm/display/wrist_sensor_available";
diff --git a/src/volumecontrol.cpp b/src/volumecontrol.cpp
index 8f467fd..526f0f8 100644
--- a/src/volumecontrol.cpp
+++ b/src/volumecontrol.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "volumecontrol.h"
-#include "VolumeControl2.h"
+#include "volumecontrol2interface.h"
 #include <QDBusMessage>
 #include <QDBusConnection>
 #include <QDBusArgument>
@@ -94,7 +94,7 @@ void VolumeControl::setVolume(int volume)
             if(effect != NULL)
                 effect->stop();
             effect = new QMediaPlayer(this);
-            effect->setMedia(QUrl::fromLocalFile("/usr/share/sounds/notification.wav"));
+            effect->setSource(QUrl::fromLocalFile("/usr/share/sounds/notification.wav"));
             effect->play();
         }
     }