--- oldsymbols	2009-07-12 21:08:12.654378452 +0100
+++ /usr/share/X11/xkb/symbols/gb	2009-07-12 21:05:44.590378368 +0100
@@ -61,50 +61,6 @@
     include "level3(ralt_switch)"
 };
 
-partial alphanumeric_keys 
-xkb_symbols "extd" {
-    // Clone of the Microsoft "United Kingdom - Extended" layout, which
-    // includes dead keys for: grave; diaeresis; circumflex; tilde; and
-    // accute. It also enables direct access to accute characters using
-    // the Multi_key (Alt Gr).
-    //
-    // Taken from...
-    //    "Windows Keyboard Layouts"
-    //    http://msdn.microsoft.com/en-us/goglobal/bb964651.aspx
-    //
-    // -- Jonathan Miles <jon@cybah.co.uk>
-
-    include "latin"
-
-    name[Group1]="United Kingdom - Extended - Winkeys";
-    
-    // Alphanumeric section
-    key <TLDE> { [ dead_grave,    notsign,       brokenbar,    NoSymbol ] };
-    
-    key <AE02> { [     2,        quotedbl,  dead_diaeresis,     onehalf ] };
-    key <AE03> { [     3,        sterling,   threesuperior,    onethird ] };
-    key <AE04> { [     4,          dollar,        EuroSign,  onequarter ] };
-    key <AE06> { [     6,     asciicircum, dead_circumflex,    NoSymbol ] };
-
-    key <AD02> { [   w,                 W,          wacute,      Wacute ] };
-    key <AD03> { [   e,                 E,          eacute,      Eacute ] };
-    key <AD06> { [   y,                 Y,          yacute,      Yacute ] };
-    key <AD07> { [   u,                 U,          uacute,      Uacute ] };
-    key <AD08> { [   i,                 I,          iacute,      Iacute ] };
-    key <AD09> { [   o,                 O,          oacute,      Oacute ] };
-
-    key <AC01> { [   a,                 A,          aacute,      Aacute ] };
-    key <AC11> { [  apostrophe,         at,     dead_acute,    NoSymbol ] };
-
-    key <AB03> { [   c,                 C,        ccedilla,    Ccedilla ] };
-
-    key <BKSL>  { [ numbersign, asciitilde,     dead_tilde,    NoSymbol ] };
-    key <LSGT>  { [  backslash,        bar,       NoSymbol,    NoSymbol ] };
-    // End alphanumeric section
-
-    include "level3(ralt_switch)"
-};
-
 // Describe the differences between the US Colemak layout
 // and a UK variant. By Andy Buckley (andy@insectnation.org)
 
@@ -122,14 +78,22 @@
     key <TLDE>	{ [     grave,    notsign,          bar,          bar ]	};
 
     key <BKSL>	{ [numbersign, asciitilde,   dead_grave,   dead_breve ]	};
-    key <LSGT>	{ [ backslash,        bar,          bar,    brokenbar ]	};
-
+    key <LSGT> { [            z,            Z,              ae,               AE ] };
+    key <AB01> { [            x,            X, dead_circumflex,       asciitilde ] };
+    key <AB02> { [            c,            C,        ccedilla,         Ccedilla ] };
+    key <AB03> { [            v,            V,              oe,               OE ] };
+    key <AB04> { [            b,            B,      dead_breve,       asciitilde ] };
+    key <AB05> { [            k,            K,  dead_abovering,       asciitilde ] };
+    key <AB06> { [            m,            M,     dead_macron,       asciitilde ] };
+    key <AB07> { [        comma,         less,    dead_cedilla,       asciitilde ] };
+    key <AB08> { [       period,      greater,   dead_abovedot,       asciitilde ] };
+    key <AB09> { [    backslash,          bar,      asciitilde,       asciitilde ] };
+    key <AB10> { [        slash,     question,    questiondown,       asciitilde ] };
     include "level3(ralt_switch_multikey)"
 };
 
-
 // Dvorak (UK) keymap (by odaen) allowing the usage of
-// the £ and ? key and swapping the @ and " keys.
+// the £ and ? key and swapping the @ and " keys.
 
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
@@ -178,3 +142,5 @@
     
     include "level3(ralt_switch)"
 };
+
+