diff --git a/containment/contents/config/main.xml b/containment/contents/config/main.xml
index 777946ebc..e30a955e7 100644
--- a/containment/contents/config/main.xml
+++ b/containment/contents/config/main.xml
@@ -24,12 +24,11 @@
     </entry>
     <entry name="panelVisibility" type="Enum">
       <choices>
-            <choice name="BelowActive"/>
-            <choice name="BelowMaximized"/>
-            <choice name="LetWindowsCover"/>
-            <choice name="WindowsGoBelow"/>
-            <choice name="AutoHide"/>
             <choice name="AlwaysVisible"/>
+            <choice name="AutoHide"/>
+            <choice name="DodgeActive"/>
+            <choice name="DodgeMaximized"/>
+            <choice name="DodgeAllWindows"/>
       </choices>
       <default>0</default>
     </entry>
diff --git a/liblattedock/dock.h b/liblattedock/dock.h
index 2f4b92ba0..f331ee044 100644
--- a/liblattedock/dock.h
+++ b/liblattedock/dock.h
@@ -19,7 +19,7 @@ public:
         AutoHide,
         DodgeActive,
         DodgeMaximized,
-        DodgeAllWindows,
+        DodgeAllWindows
     };
     Q_ENUM(Visibility)
     
diff --git a/shell/contents/configuration/LatteDockConfiguration.qml.cmake b/shell/contents/configuration/LatteDockConfiguration.qml.cmake
index 5ea088092..6c46b9dde 100644
--- a/shell/contents/configuration/LatteDockConfiguration.qml.cmake
+++ b/shell/contents/configuration/LatteDockConfiguration.qml.cmake
@@ -165,13 +165,11 @@ PlasmaCore.FrameSvgItem {
             }
         }
 
-
-        //  BelowActive = 0, /** always visible except if ovelaps with the active window, no area reserved */
-        //  BelowMaximized, /** always visible except if ovelaps with an active maximize window, no area reserved */
-        //  LetWindowsCover, /** always visible, windows will go over the panel, no area reserved */
-        //  WindowsGoBelow, /** default, always visible, windows will go under the panel, no area reserved */
-        //  AutoHide, /** the panel will be shownn only if the mouse cursor is on screen edges */
-        //  AlwaysVisible,  /** always visible panel, "Normal" plasma panel, accompanies plasma's "Always Visible"  */
+        //AlwaysVisible = 0,
+        //AutoHide,
+        //DodgeActive,
+        //DodgeMaximized,
+        //DodgeAllWindows
         /**********  Panel Visibility ****************/
 
         Column{
@@ -183,7 +181,7 @@ PlasmaCore.FrameSvgItem {
             }
 
             //user set Panel Visibility
-            // 0-BelowActive, 1-BelowMaximized, 2-LetWindowsCover, 3-WindowsGoBelow, 4-AutoHide, 5-AlwaysVisible
+            // 0-AlwaysVisible, 1-AutoHide, 2-DodgeActive, 3-DodgeMaximized, 4-DodgeAllWindows
             Flow{
                 width: parent.width
                 spacing: 2
@@ -218,10 +216,10 @@ PlasmaCore.FrameSvgItem {
                     else
                         fifthState.checked = false;
 
-                    if (panelVisibility === 5)
+                 /*   if (panelVisibility === 5)
                         sixthState.checked = true;
                     else
-                        sixthState.checked = false;
+                        sixthState.checked = false;*/
                 }
 
                 onPanelVisibilityChanged: updatePanelVisibilityVisual();
@@ -234,7 +232,7 @@ PlasmaCore.FrameSvgItem {
                 PlasmaComponents.Button{
                     id: firstState
                     checkable: true
-                    text: i18n("Dodge Active")
+                    text: i18n("Always Visible")
                     width: (parent.width / 2) - 1
 
                     onCheckedChanged: {
@@ -247,7 +245,7 @@ PlasmaCore.FrameSvgItem {
                 PlasmaComponents.Button{
                     id: secondState
                     checkable: true
-                    text: i18n("Dodge Maximized")
+                    text: i18n("Auto Hide")
                     width: (parent.width / 2) - 1
 
                     onCheckedChanged: {
@@ -260,7 +258,7 @@ PlasmaCore.FrameSvgItem {
                 PlasmaComponents.Button{
                     id: thirdState
                     checkable: true
-                    text: i18n("Let Windows Cover")
+                    text: i18n("Dodge Active")
                     width: (parent.width / 2) - 1
 
                     onCheckedChanged: {
@@ -274,7 +272,7 @@ PlasmaCore.FrameSvgItem {
                 PlasmaComponents.Button{
                     id: fourthState
                     checkable: true
-                    text: i18n("Windows Go Below")
+                    text: i18n("Dodge Maximized")
                     width: (parent.width/2) - 1
 
                     onCheckedChanged: {
@@ -288,7 +286,7 @@ PlasmaCore.FrameSvgItem {
                 PlasmaComponents.Button{
                     id: fifthState
                     checkable: true
-                    text: i18n("Auto Hide")
+                    text: i18n("Dodge All Windows")
                     width: (parent.width/2) - 1
 
                     onCheckedChanged: {
@@ -298,7 +296,7 @@ PlasmaCore.FrameSvgItem {
                     }
                     onClicked: checked=true;
                 }
-                PlasmaComponents.Button{
+               /* PlasmaComponents.Button{
                     id: sixthState
                     checkable: true
                     text: i18n("Always Visible")
@@ -310,7 +308,7 @@ PlasmaCore.FrameSvgItem {
                         }
                     }
                     onClicked: checked=true;
-                }
+                }*/
             }
         }