--- default.xkb	2011-10-16 17:06:35.147967060 -0600
+++ mackeyboard.xkb	2011-10-16 17:26:44.559996432 -0600
@@ -125,8 +125,8 @@
     <HNGL> = 130;
     <HJCV> = 131;
     <AE13> = 132;
-    <LWIN> = 133;
-    <RWIN> = 134;
+    <LCMD> = 133;
+    <RCMD> = 134;
     <COMP> = 135;
     <STOP> = 136;
     <AGAI> = 137;
@@ -263,8 +263,8 @@
     alias <AC12> = <BKSL>;
     alias <MENU> = <COMP>;
     alias <HZTG> = <TLDE>;
-    alias <LMTA> = <LWIN>;
-    alias <RMTA> = <RWIN>;
+#    alias <LMTA> = <LCMD>;
+#    alias <RMTA> = <RCMD>;
     alias <ALGR> = <RALT>;
     alias <KPPT> = <I129>;
     alias <LatQ> = <AD01>;
@@ -1221,7 +1221,7 @@
     };
     key <LALT> {         [           Alt_L,          Meta_L ] };
     key <SPCE> {         [           space ] };
-    key <CAPS> {         [       Caps_Lock ] };
+    key <CAPS> {         [       Super_L ] };
     key <FK01> {
         type= "TWO_LEVEL",
         symbols[Group1]= [              F1,              F1 ]
@@ -1340,8 +1340,8 @@
     key <I129> {         [      KP_Decimal,      KP_Decimal ] };
     key <HNGL> {         [          Hangul ] };
     key <HJCV> {         [    Hangul_Hanja ] };
-    key <LWIN> {         [         Super_L ] };
-    key <RWIN> {         [         Super_R ] };
+    key <LCMD> {         [         Hyper_L ] };
+    key <RCMD> {         [         Hyper_R ] };
     key <COMP> {         [            Menu ] };
     key <STOP> {         [          Cancel ] };
     key <AGAI> {         [            Redo ] };
@@ -1443,17 +1443,17 @@
     modifier_map Shift { <LFSH> };
     modifier_map Shift { <RTSH> };
     modifier_map Mod1 { <LALT> };
-    modifier_map Lock { <CAPS> };
+    modifier_map Mod4 { <CAPS> };
     modifier_map Mod2 { <NMLK> };
     modifier_map Mod5 { <LVL3> };
     modifier_map Control { <RCTL> };
     modifier_map Mod1 { <RALT> };
-    modifier_map Mod4 { <LWIN> };
-    modifier_map Mod4 { <RWIN> };
+    modifier_map Mod3 { <LCMD> };
+    modifier_map Mod3 { <RCMD> };
     modifier_map Mod5 { <MDSW> };
     modifier_map Mod1 { <META> };
-    modifier_map Mod4 { <SUPR> };
-    modifier_map Mod4 { <HYPR> };
+#    modifier_map Mod4 { <SUPR> };
+#    modifier_map Mod4 { <HYPR> };
 };
 
 xkb_geometry "pc(pc105)" {
@@ -1637,11 +1637,11 @@
             left= 1;
             keys {
                 { <LCTL>, "MODK",   1, color="grey20" },
-                { <LWIN>, "SMOD",   1, color="grey20" },
+                { <LCMD>, "SMOD",   1, color="grey20" },
                 { <LALT>, "SMOD",   1, color="grey20" },
                 { <SPCE>, "SPCE",   1 },
                 { <RALT>, "SMOD",   1, color="grey20" },
-                { <RWIN>, "SMOD",   1, color="grey20" },
+                { <RCMD>, "SMOD",   1, color="grey20" },
                 { <MENU>, "SMOD",   1, color="grey20" },
                 { <RCTL>, "SMOD",   1, color="grey20" }
             };