diff --git a/common/rc.xml b/common/rc.xml
index 0fca27c..ea5bb0c 100644
--- a/common/rc.xml
+++ b/common/rc.xml
@@ -600,55 +600,55 @@
     <keybind key="C-S-KP_7">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap topleft</command>
+        <command>snapwin topleft</command>
       </action>
     </keybind>
     <keybind key="C-S-KP_8">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap top</command>
+        <command>snapwin top</command>
       </action>
     </keybind>
     <keybind key="C-S-KP_9">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap topright</command>
+        <command>snapwin topright</command>
       </action>
     </keybind>
     <keybind key="C-S-KP_4">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap left</command>
+        <command>snapwin left</command>
       </action>
     </keybind>
     <keybind key="C-S-KP_5">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap center</command>
+        <command>snapwin center</command>
       </action>
     </keybind>
     <keybind key="C-S-KP_6">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap right</command>
+        <command>snapwin right</command>
       </action>
     </keybind>
     <keybind key="C-S-KP_1">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap bottomleft</command>
+        <command>snapwin bottomleft</command>
       </action>
     </keybind>
     <keybind key="C-S-KP_2">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap bottom</command>
+        <command>snapwin bottom</command>
       </action>
     </keybind>
     <keybind key="C-S-KP_3">
       <action name="Unmaximize"/>
       <action name="Execute">
-        <command>winsnap bottomright</command>
+        <command>snapwin bottomright</command>
       </action>
     </keybind>
     <keybind key="W-KP_1">
@@ -956,13 +956,12 @@
        switching due to hitting the edge of the screen -->
     <context name="Frame">
       <mousebind action="Press" button="C-S-Left">
-        <action name="UnmaximizeFull"/>
         <action name="Execute">
-          <command>winsnap</command>
+          <command>snapwin</command>
         </action>
       </mousebind>
       <mousebind action="Press" button="W-Left">
-        <action name="UnmaximizeFull"/>
+        <action name="Unmaximize"/>
         <action name="Execute">
           <command>deskgrid</command>
         </action>
@@ -1048,13 +1047,7 @@
           </then>
         </action>
       </mousebind>
-      <mousebind button="Middle" action="Click">
-        <action name="Focus"/>
-        <action name="Execute">
-          <command>autosnap</command>
-        </action>
-        <action name="Raise"/>
-      </mousebind>
+      
     </context>
     <context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner">
       <mousebind action="Press" button="Left">