--- workman	2010-10-03 23:17:56.000000000 -0400
+++ workman	2012-11-19 00:09:07.000000000 -0500
@@ -1,5 +1,5 @@
 // Workman Keyboard Layout symbols for xkb on X.Org Server 7.x
-// 09-06-2010 OJ Bucao. Public domain.
+// 09-06-2010 OJ Bucao. http://www.workmanlayout.com
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -22,43 +22,43 @@
     key <AE12> { [        equal,         plus,        multiply,         division ] };
 
     key <AD01> { [            q,            Q,      adiaeresis,       Adiaeresis ] };
-    key <AD02> { [            d,            D,           aring,            Aring ] };
-    key <AD03> { [            r,            R,          atilde,           Atilde ] };
-    key <AD04> { [            w,            W,          oslash,         Ooblique ] };
-    key <AD05> { [            b,            B,     dead_ogonek,       asciitilde ] };
+    key <AD02> { [            d,            D,  dead_diaeresis,       asciitilde ] };
+    key <AD03> { [            r,            R,      dead_grave,       asciitilde ] };
+    key <AD04> { [            w,            W,           aring,            Aring ] };
+    key <AD05> { [            b,            B,      dead_breve,       asciitilde ] };
     key <AD06> { [            j,            J,         dstroke,          Dstroke ] };
-    key <AD07> { [            f,            F,         lstroke,          Lstroke ] };
+    key <AD07> { [            f,            F,          atilde,           Atilde ] };
     key <AD08> { [            u,            U,          uacute,           Uacute ] };
-    key <AD09> { [            p,            P,      udiaeresis,       Udiaeresis ] };
+    key <AD09> { [            p,            P,          oslash,         Ooblique ] };
     key <AD10> { [    semicolon,        colon,      odiaeresis,       Odiaeresis ] };
     key <AD11> { [  bracketleft,    braceleft,   guillemotleft,        0x1002039 ] };
     key <AD12> { [ bracketright,   braceright,  guillemotright,        0x100203a ] };
     key <BKSL> { [    backslash,          bar,      asciitilde,       asciitilde ] };
 
     key <AC01> { [            a,            A,          aacute,           Aacute ] };
-    key <AC02> { [            s,            S,      dead_grave,       asciitilde ] }; 
-    key <AC03> { [            h,            H,          ssharp,       asciitilde ] }; 
+    key <AC02> { [            s,            S,          ssharp,       asciitilde ] };
+    key <AC03> { [            h,            H,      dead_caron,       asciitilde ] };
     key <AC04> { [            t,            T,      dead_acute, dead_doubleacute ] };
-    key <AC05> { [            g,            G,  dead_diaeresis,       asciitilde ] };
-    key <AC06> { [            y,            Y,      dead_caron,       asciitilde ] };
+    key <AC05> { [            g,            G,     dead_ogonek,       asciitilde ] };
+    key <AC06> { [            y,            Y,      udiaeresis,       Udiaeresis ] };
     key <AC07> { [            n,            N,          ntilde,           Ntilde ] };
     key <AC08> { [            e,            E,          eacute,           Eacute ] };
-    key <AC09> { [            o,            O,          iacute,           Iacute ] };
-    key <AC10> { [            i,            I,          oacute,           Oacute ] };
-    key <AC11> { [   apostrophe,     quotedbl,          otilde,           Otilde ] }; 
+    key <AC09> { [            o,            O,          oacute,           Oacute ] };
+    key <AC10> { [            i,            I,          iacute,           Iacute ] };
+    key <AC11> { [   apostrophe,     quotedbl,          otilde,           Otilde ] };
 
     key <AB01> { [            z,            Z,              ae,               AE ] };
     key <AB02> { [            x,            X, dead_circumflex,       asciitilde ] };
-    key <AB03> { [            m,            M,        ccedilla,         Ccedilla ] };
-    key <AB04> { [            c,            C,              oe,               OE ] };
-    key <AB05> { [            v,            V,      dead_breve,       asciitilde ] };
+    key <AB03> { [            m,            M,     dead_macron,       asciitilde ] };
+    key <AB04> { [            c,            C,        ccedilla,         Ccedilla ] };
+    key <AB05> { [            v,            V,              oe,               OE ] };
     key <AB06> { [            k,            K,  dead_abovering,       asciitilde ] };
-    key <AB07> { [            l,            L,     dead_macron,       asciitilde ] };
+    key <AB07> { [            l,            L,         lstroke,          Lstroke ] };
     key <AB08> { [        comma,         less,    dead_cedilla,       asciitilde ] };
     key <AB09> { [       period,      greater,   dead_abovedot,       asciitilde ] };
     key <AB10> { [        slash,     question,    questiondown,       asciitilde ] };
 
-    key <CAPS> { [    BackSpace,    Escape,       BackSpace,        BackSpace ] };
+    key <CAPS> { [    BackSpace,       Escape,       BackSpace,        BackSpace ] };
     key <LSGT> { [        minus,   underscore,          endash,           emdash ] };
     key <SPCE> { [        space,        space,           space,     nobreakspace ] };