diff --git a/shell/package/contents/configuration/LatteDockConfiguration.qml b/shell/package/contents/configuration/LatteDockConfiguration.qml
index 3a8dad625..bf35cf10b 100644
--- a/shell/package/contents/configuration/LatteDockConfiguration.qml
+++ b/shell/package/contents/configuration/LatteDockConfiguration.qml
@@ -313,27 +313,34 @@ FocusScope {
                     PlasmaComponents.Label {
                         id: complexityLbl
                         Layout.alignment: Qt.AlignRight
-                        opacity: complexityMouseArea.containsMouse ? 1 : 0.45
-                        text: {
-                            if (dialog.basicLevel) {
-                                return i18nc("basic settings", "Basic");
-                            } else if (dialog.advancedLevel) {
-                                return i18nc("advanced settings", "Advanced");
-                            } else if (dialog.expertLevel) {
-                                return i18nc("expert settings", "Expert");
-                            }
+                        opacity: dialog.basicLevel ? 0.3 : 1
 
-                            return "";
-                        }
+                        //! TODO: the term here is not accurate because the expert settings mode
+                        //! is used currently. In the future this term will be rethought if
+                        //! it must remain or be changed
+                        text: i18nc("advanced settings", "Advanced")
 
                         MouseArea {
                             id: complexityMouseArea
                             anchors.fill: parent
                             hoverEnabled: true
                             onClicked: {
-                                if (dialog.basicLevel) {
-                                    viewConfig.complexity = Latte.Types.AdvancedSettings;
-                                } else if (dialog.advancedLevel) {
+                                if (dialog.basicLevel || dialog.advancedLevel) {
+                                    viewConfig.complexity = Latte.Types.ExpertSettings;
+                                } else if (dialog.expertLevel) {
+                                    viewConfig.complexity = Latte.Types.BasicSettings;
+                                }
+                            }
+                        }
+                    }
+
+                    Switch {
+                        id: complexitySwitch
+                        checked: dialog.expertLevel
+
+                        onPressedChanged: {
+                            if(pressed){
+                                if (dialog.basicLevel || dialog.advancedLevel) {
                                     viewConfig.complexity = Latte.Types.ExpertSettings;
                                 } else if (dialog.expertLevel) {
                                     viewConfig.complexity = Latte.Types.BasicSettings;
@@ -341,13 +348,8 @@ FocusScope {
                             }
                         }
 
-                        Rectangle {
-                            anchors.top: parent.bottom
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: complexityLbl.width + 6
-                            height: 2
-                            color: theme.highlightColor
-                            visible: complexityMouseArea.containsMouse
+                        style: Styles.SwitchStyle {
+                            property bool checked: dialog.highLevel
                         }
                     }
                 }
diff --git a/shell/package/contents/configuration/pages/AppearanceConfig.qml b/shell/package/contents/configuration/pages/AppearanceConfig.qml
index 46b2cab47..0d252a2db 100644
--- a/shell/package/contents/configuration/pages/AppearanceConfig.qml
+++ b/shell/package/contents/configuration/pages/AppearanceConfig.qml
@@ -803,7 +803,7 @@ PlasmaComponents.Page {
             visible: dialog.expertLevel
 
             LatteExtraControls.Header {
-                text: i18n("Appearance")
+                text: i18nc("adjust properties to differentiate", "Adjust")
             }
 
             PlasmaComponents.CheckBox {
diff --git a/shell/package/contents/configuration/pages/BehaviorConfig.qml b/shell/package/contents/configuration/pages/BehaviorConfig.qml
index a67f8ca38..958509034 100644
--- a/shell/package/contents/configuration/pages/BehaviorConfig.qml
+++ b/shell/package/contents/configuration/pages/BehaviorConfig.qml
@@ -514,7 +514,7 @@ PlasmaComponents.Page {
             visible: dialog.expertLevel
 
             LatteExtraControls.Header {
-                text: i18n("Behavior")
+                text: i18nc("adjust properties to differentiate", "Adjust")
             }
 
             PlasmaComponents.CheckBox {
diff --git a/shell/package/contents/configuration/pages/EffectsConfig.qml b/shell/package/contents/configuration/pages/EffectsConfig.qml
index 2d658f61c..24030d218 100644
--- a/shell/package/contents/configuration/pages/EffectsConfig.qml
+++ b/shell/package/contents/configuration/pages/EffectsConfig.qml
@@ -44,72 +44,6 @@ PlasmaComponents.Page {
         anchors.horizontalCenter: parent.horizontalCenter
         Layout.leftMargin: units.smallSpacing * 2
 
-        //! BEGIN: Animations
-        ColumnLayout {
-            Layout.fillWidth: true
-            Layout.topMargin: units.smallSpacing
-            spacing: units.smallSpacing
-
-            LatteExtraControls.Header {
-                text: i18n("Animations")
-            }
-
-            RowLayout {
-                Layout.fillWidth: true
-                Layout.leftMargin: units.smallSpacing * 2
-                Layout.rightMargin: units.smallSpacing * 2
-                spacing: 2
-
-                property int duration: plasmoid.configuration.durationTime
-
-                ExclusiveGroup {
-                    id: animationsGroup
-                    onCurrentChanged: {
-                        if (current.checked)
-                            plasmoid.configuration.durationTime = current.duration
-                    }
-                }
-
-                PlasmaComponents.Button {
-                    Layout.fillWidth: true
-                    text: i18n("None")
-                    checked: parent.duration === duration
-                    checkable: true
-                    exclusiveGroup: animationsGroup
-
-                    readonly property int duration: 0
-                }
-                PlasmaComponents.Button {
-                    Layout.fillWidth: true
-                    text: i18n("x1")
-                    checked: parent.duration === duration
-                    checkable: true
-                    exclusiveGroup: animationsGroup
-
-                    readonly property int duration: 1
-                }
-                PlasmaComponents.Button {
-                    Layout.fillWidth: true
-                    text: i18n("x2")
-                    checked: parent.duration === duration
-                    checkable: true
-                    exclusiveGroup: animationsGroup
-
-                    readonly property int duration: 2
-                }
-                PlasmaComponents.Button {
-                    Layout.fillWidth: true
-                    text: i18n("x3")
-                    checked: parent.duration === duration
-                    checkable: true
-                    exclusiveGroup: animationsGroup
-
-                    readonly property int duration: 3
-                }
-            }
-        }
-        //! END: Animations
-
         //! BEGIN: Shadows
         ColumnLayout {
             Layout.fillWidth: true
@@ -146,7 +80,7 @@ PlasmaComponents.Page {
                         Layout.maximumWidth: showAppletShadow.width
                         text:" "
                         enabled: showAppletShadow.checked
-                        visible: dialog.advancedLevel
+                        visible: dialog.highLevel
 
                         PlasmaComponents3.ComboBox {
                             id: restoreCmb
@@ -210,7 +144,7 @@ PlasmaComponents.Page {
                             height: parent.height
                             text: " "
                             enabled: showAppletShadow.checked
-                            visible: dialog.advancedLevel
+                            visible: dialog.highLevel
 
                             onClicked: {
                                 viewConfig.setSticker(true);
@@ -318,7 +252,7 @@ PlasmaComponents.Page {
                     }
 
                     RowLayout{
-                        visible: dialog.advancedLevel
+                        visible: dialog.highLevel
                         PlasmaComponents.Label {
                             text: " | "
                             horizontalAlignment: Text.AlignLeft
@@ -445,7 +379,7 @@ PlasmaComponents.Page {
                     }
 
                     RowLayout{
-                        visible: dialog.advancedLevel
+                        visible: dialog.highLevel
 
                         PlasmaComponents.Label {
                             enabled: showGlowChk.checked
@@ -514,5 +448,71 @@ PlasmaComponents.Page {
             }
         }
         //! END: Glow
+
+        //! BEGIN: Animations
+        ColumnLayout {
+            Layout.fillWidth: true
+            Layout.topMargin: units.smallSpacing
+            spacing: units.smallSpacing
+
+            LatteExtraControls.Header {
+                text: i18n("Animations")
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+                Layout.leftMargin: units.smallSpacing * 2
+                Layout.rightMargin: units.smallSpacing * 2
+                spacing: 2
+
+                property int duration: plasmoid.configuration.durationTime
+
+                ExclusiveGroup {
+                    id: animationsGroup
+                    onCurrentChanged: {
+                        if (current.checked)
+                            plasmoid.configuration.durationTime = current.duration
+                    }
+                }
+
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    text: i18n("None")
+                    checked: parent.duration === duration
+                    checkable: true
+                    exclusiveGroup: animationsGroup
+
+                    readonly property int duration: 0
+                }
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    text: i18n("x1")
+                    checked: parent.duration === duration
+                    checkable: true
+                    exclusiveGroup: animationsGroup
+
+                    readonly property int duration: 1
+                }
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    text: i18n("x2")
+                    checked: parent.duration === duration
+                    checkable: true
+                    exclusiveGroup: animationsGroup
+
+                    readonly property int duration: 2
+                }
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    text: i18n("x3")
+                    checked: parent.duration === duration
+                    checkable: true
+                    exclusiveGroup: animationsGroup
+
+                    readonly property int duration: 3
+                }
+            }
+        }
+        //! END: Animations
     }
 }