diff --git a/src/Avalonia.X11/X11KeyTransform.cs b/src/Avalonia.X11/X11KeyTransform.cs
index c68cb04733..87a4174c06 100644
--- a/src/Avalonia.X11/X11KeyTransform.cs
+++ b/src/Avalonia.X11/X11KeyTransform.cs
@@ -52,16 +52,6 @@ namespace Avalonia.X11
             {X11Key.Delete, Key.Delete},
             {X11Key.KP_Delete, Key.Delete},
             {X11Key.Help, Key.Help},
-            {X11Key.XK_0, Key.D0},
-            {X11Key.XK_1, Key.D1},
-            {X11Key.XK_2, Key.D2},
-            {X11Key.XK_3, Key.D3},
-            {X11Key.XK_4, Key.D4},
-            {X11Key.XK_5, Key.D5},
-            {X11Key.XK_6, Key.D6},
-            {X11Key.XK_7, Key.D7},
-            {X11Key.XK_8, Key.D8},
-            {X11Key.XK_9, Key.D9},
             {X11Key.A, Key.A},
             {X11Key.B, Key.B},
             {X11Key.C, Key.C},
@@ -114,8 +104,8 @@ namespace Avalonia.X11
             {X11Key.x, Key.X},
             {X11Key.y, Key.Y},
             {X11Key.z, Key.Z},
-            //{ X11Key.?, Key.LWin }
-            //{ X11Key.?, Key.RWin }
+            {X11Key.Meta_L, Key.LWin },
+            {X11Key.Meta_R, Key.RWin },
             {X11Key.Menu, Key.Apps},
             //{ X11Key.?, Key.Sleep }
             {X11Key.KP_0, Key.NumPad0},
@@ -185,20 +175,51 @@ namespace Avalonia.X11
             //{ X11Key.?, Key.SelectMedia }
             //{ X11Key.?, Key.LaunchApplication1 }
             //{ X11Key.?, Key.LaunchApplication2 }
-            {X11Key.semicolon, Key.OemSemicolon},
+            {X11Key.minus, Key.OemMinus},
+            {X11Key.underscore, Key.OemMinus},
             {X11Key.plus, Key.OemPlus},
             {X11Key.equal, Key.OemPlus},
+            {X11Key.bracketleft, Key.OemOpenBrackets},
+            {X11Key.braceleft, Key.OemOpenBrackets},
+            {X11Key.bracketright, Key.OemCloseBrackets},
+            {X11Key.braceright, Key.OemCloseBrackets},
+            {X11Key.backslash, Key.OemPipe},
+            {X11Key.bar, Key.OemPipe},
+            {X11Key.semicolon, Key.OemSemicolon},
+            {X11Key.colon, Key.OemSemicolon},
+            {X11Key.apostrophe, Key.OemQuotes},
+            {X11Key.quotedbl, Key.OemQuotes},
             {X11Key.comma, Key.OemComma},
-            {X11Key.minus, Key.OemMinus},
+            {X11Key.less, Key.OemComma},
             {X11Key.period, Key.OemPeriod},
+            {X11Key.greater, Key.OemPeriod},
             {X11Key.slash, Key.Oem2},
+            {X11Key.question, Key.Oem2},
             {X11Key.grave, Key.OemTilde},
+            {X11Key.asciitilde, Key.OemTilde},
+            {X11Key.XK_1, Key.D1},
+            {X11Key.exclam, Key.D1},
+            {X11Key.XK_2, Key.D2},
+            {X11Key.at, Key.D2},
+            {X11Key.XK_3, Key.D3},
+            {X11Key.numbersign, Key.D3},
+            {X11Key.XK_4, Key.D4},
+            {X11Key.dollar, Key.D4},
+            {X11Key.XK_5, Key.D5},
+            {X11Key.percent, Key.D5},
+            {X11Key.XK_6, Key.D6},
+            {X11Key.asciicircum, Key.D6},
+            {X11Key.XK_7, Key.D7},
+            {X11Key.ampersand, Key.D7},
+            {X11Key.XK_8, Key.D8},
+            {X11Key.asterisk, Key.D8},
+            {X11Key.XK_9, Key.D9},
+            {X11Key.parenleft, Key.D9},
+            {X11Key.XK_0, Key.D0},
+            {X11Key.parenright, Key.D0},
+
             //{ X11Key.?, Key.AbntC1 }
             //{ X11Key.?, Key.AbntC2 }
-            {X11Key.bracketleft, Key.OemOpenBrackets},
-            {X11Key.backslash, Key.OemPipe},
-            {X11Key.bracketright, Key.OemCloseBrackets},
-            {X11Key.apostrophe, Key.OemQuotes},
             //{ X11Key.?, Key.Oem8 }
             //{ X11Key.?, Key.Oem102 }
             //{ X11Key.?, Key.ImeProcessed }