diff --git a/src/qml/RoomSettings/Categories.qml b/src/qml/RoomSettings/Categories.qml
index db82ad680..856ff3c1c 100644
--- a/src/qml/RoomSettings/Categories.qml
+++ b/src/qml/RoomSettings/Categories.qml
@@ -3,17 +3,18 @@
 
 import QtQuick 2.15
 import org.kde.kirigami 2.18 as Kirigami
+import org.kde.kirigamiaddons.settings 1.0 as KirigamiSettings
 import QtQuick.Layouts 1.15
 
 import org.kde.neochat 1.0
 
-Kirigami.CategorizedSettings {
+KirigamiSettings.CategorizedSettings {
     id: root
     property NeoChatRoom room
 
     objectName: "settingsPage"
     actions: [
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "general"
             text: i18n("General")
             icon.name: "settings-configure"
@@ -24,7 +25,7 @@ Kirigami.CategorizedSettings {
                 }
             }
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "security"
             text: i18n("Security")
             icon.name: "security-low"
@@ -35,7 +36,7 @@ Kirigami.CategorizedSettings {
                 }
             }
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "permissions"
             text: i18n("Permissions")
             icon.name: "visibility"
@@ -46,7 +47,7 @@ Kirigami.CategorizedSettings {
                 }
             }
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "notifications"
             text: i18n("Notifications")
             icon.name: "notifications"
diff --git a/src/qml/Settings/SettingsPage.qml b/src/qml/Settings/SettingsPage.qml
index 8e21c2ddd..e017ca6d6 100644
--- a/src/qml/Settings/SettingsPage.qml
+++ b/src/qml/Settings/SettingsPage.qml
@@ -3,60 +3,61 @@
 
 import QtQuick 2.15
 import org.kde.kirigami 2.18 as Kirigami
+import org.kde.kirigamiaddons.settings 1.0 as KirigamiSettings
 import QtQuick.Layouts 1.15
 
-Kirigami.CategorizedSettings {
+KirigamiSettings.CategorizedSettings {
     id: settingsPage
 
     required property var connection
 
     objectName: "settingsPage"
     actions: [
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "general"
             text: i18n("General")
             icon.name: "org.kde.neochat"
             page: Qt.resolvedUrl("GeneralSettingsPage.qml")
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "appearance"
             text: i18n("Appearance")
             icon.name: "preferences-desktop-theme-global"
             page: Qt.resolvedUrl("AppearanceSettingsPage.qml")
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "notifications"
             text: i18n("Notifications")
             icon.name: "preferences-desktop-notification"
             page: Qt.resolvedUrl("GlobalNotificationsPage.qml")
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "accounts"
             text: i18n("Accounts")
             icon.name: "preferences-system-users"
             page: Qt.resolvedUrl("AccountsPage.qml")
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "emoticons"
             text: i18n("Stickers & Emojis")
             icon.name: "preferences-desktop-emoticons"
             page: Qt.resolvedUrl("EmoticonsPage.qml")
         },
 
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "spellChecking"
             text: i18n("Spell Checking")
             icon.name: "tools-check-spelling"
             page: Qt.resolvedUrl("SonnetConfigPage.qml")
             visible: Qt.platform.os !== "android"
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "networkProxy"
             text: i18n("Network Proxy")
             icon.name: "network-connect"
             page: Qt.resolvedUrl("NetworkProxyPage.qml")
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "devices"
             text: i18n("Devices")
             icon.name: "computer"
@@ -67,13 +68,13 @@ Kirigami.CategorizedSettings {
                 }
             }
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "aboutNeochat"
             text: i18n("About NeoChat")
             icon.name: "help-about"
             page: Qt.resolvedUrl("About.qml")
         },
-        Kirigami.SettingAction {
+        KirigamiSettings.SettingAction {
             actionName: "aboutKDE"
             text: i18n("About KDE")
             icon.name: "kde"