From 96971a4873e3dbd30b4d59ff319f172d71cf29d2 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Thu, 25 Sep 2008 11:54:59 +0100
Subject: [PATCH] Adjust scrape-console-setup for kbd and regenerate keymaps.
 One noticeable effect of this is that we now need to use the loadkeys -u
 option, which means that a number of Unicode keysyms not currently supported
 in gfxboot that were previously mapped to completely different and incorrect
 keysyms will now generate no output. I think this is an improvement, but
 please file a bug if any characters that you need to type in the boot loader
 disappear as a result.

---
 debian/changelog     |   7 +
 keytables.inc        | 788 ++++++++++++++++++++++---------------------
 scrape-console-setup |   6 +-
 3 files changed, 413 insertions(+), 388 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7848fd..8cfbcbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,13 @@ gfxboot-theme-ubuntu (0.6.6) UNRELEASED; urgency=low
 
   * Rebuild font with unifont 1:5.1.20080914-1.
   * Update translations from Launchpad.
+  * Adjust scrape-console-setup for kbd and regenerate keymaps. One
+    noticeable effect of this is that we now need to use the loadkeys -u
+    option, which means that a number of Unicode keysyms not currently
+    supported in gfxboot that were previously mapped to completely different
+    and incorrect keysyms will now generate no output. I think this is an
+    improvement, but please file a bug if any characters that you need to
+    type in the boot loader disappear as a result.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Thu, 25 Sep 2008 00:58:34 +0100
 
diff --git a/keytables.inc b/keytables.inc
index 94ed528..abcc448 100644
--- a/keytables.inc
+++ b/keytables.inc
@@ -22,7 +22,7 @@
   [ 0x17 0x69 0x49 0xed ]
   [ 0x18 0x6f 0x4f 0xf3 ]
   [ 0x19 0x70 0x50 0xf2 ]
-  [ 0x1b 0x5d 0x7d 0xa4 ]
+  [ 0x1b 0x5d 0x7d 0x00 ]
   [ 0x1e 0x61 0x41 0xe0 ]
   [ 0x25 0x6b 0x4b 0xef ]
   [ 0x26 0x6c 0x4c 0xb7 ]
@@ -44,7 +44,6 @@
   [ 0x0c 0x2d 0x00 0x5f ]
   [ 0x0d 0x2b 0x3d 0x2b ]
   [ 0x10 0x00 0x00 0xb0 ]
-  [ 0x12 0x00 0x00 0xa4 ]
   [ 0x18 0x00 0x5d 0x27 ]
   [ 0x19 0x00 0x5b 0x22 ]
   [ 0x1a 0x00 0x7d 0x00 ]
@@ -76,9 +75,9 @@
   [ 0x0d 0x3d 0x2b 0x00 ]
   [ 0x10 0x71 0x51 0x5c ]
   [ 0x11 0x77 0x57 0x7c ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -87,13 +86,13 @@
   [ 0x1a 0xe7 0xc7 0xf7 ]
   [ 0x1b 0x40 0x27 0xd7 ]
   [ 0x1e 0x61 0x41 0xe6 ]
-  [ 0x1f 0x73 0x53 0xf0 ]
-  [ 0x20 0x64 0x44 0xd0 ]
+  [ 0x1f 0x73 0x53 0x00 ]
+  [ 0x20 0x64 0x44 0x00 ]
   [ 0x21 0x66 0x46 0x5b ]
   [ 0x22 0x67 0x47 0x5d ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xb3 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xeb 0xcb 0x24 ]
   [ 0x28 0x5b 0x7b 0xdf ]
   [ 0x29 0x5c 0x7c 0xac ]
@@ -121,21 +120,20 @@
 
 /keymap.az [
   [ 0x04 0x33 0x23 0x00 ]
-  [ 0x07 0x36 0x3a 0xa4 ]
+  [ 0x07 0x36 0x3a 0x00 ]
   [ 0x08 0x37 0x3f 0x37 ]
   [ 0x09 0x38 0x2a 0x5e ]
   [ 0x0c 0x2d 0x5f 0xad ]
   [ 0x11 0xfc 0xdc 0xfc ]
   [ 0x13 0x72 0x52 0xae ]
-  [ 0x17 0x69 0xa9 0x69 ]
+  [ 0x17 0x69 0x00 0x69 ]
   [ 0x1a 0xf6 0xd6 0x5b ]
-  [ 0x1b 0xbb 0xab 0x5d ]
-  [ 0x27 0xb9 0x49 0xb9 ]
+  [ 0x1b 0x00 0x00 0x5d ]
+  [ 0x27 0x00 0x49 0x00 ]
   [ 0x29 0x60 0x7e 0x00 ]
   [ 0x2e 0x63 0x43 0xa9 ]
   [ 0x32 0x6d 0x4d 0xb7 ]
   [ 0x33 0xe7 0xc7 0xe7 ]
-  [ 0x34 0xba 0xaa 0xba ]
   [ 0x35 0x2e 0x2c 0x2e ]
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -155,29 +153,28 @@
   [ 0x0d 0x2b 0x2a 0x00 ]
   [ 0x10 0x71 0x51 0x5c ]
   [ 0x11 0x77 0x57 0x7c ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
   [ 0x18 0x6f 0x4f 0xf8 ]
   [ 0x19 0x70 0x50 0xfe ]
-  [ 0x1a 0xa8 0xa6 0xf7 ]
-  [ 0x1b 0xf0 0xd0 0xd7 ]
+  [ 0x1a 0x00 0x00 0xf7 ]
+  [ 0x1b 0x00 0x00 0xd7 ]
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0x00 ]
   [ 0x20 0x64 0x44 0x00 ]
   [ 0x21 0x66 0x46 0x5b ]
   [ 0x22 0x67 0x47 0x5d ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x24 0x00 0x4a 0x00 ]
-  [ 0x25 0x6b 0x4b 0xb3 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
-  [ 0x27 0xe8 0xc8 0x00 ]
-  [ 0x28 0xe6 0xc6 0xdf ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x24 0x6a 0x4a 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x28 0x00 0x00 0xdf ]
   [ 0x29 0x60 0x7e 0xac ]
-  [ 0x2b 0xb8 0xb4 0xa4 ]
+  [ 0x2b 0x00 0x00 0xa4 ]
   [ 0x2c 0x79 0x59 0x00 ]
   [ 0x2d 0x78 0x58 0x00 ]
   [ 0x2e 0x63 0x43 0xa2 ]
@@ -209,10 +206,10 @@
   [ 0x0c 0x29 0xb0 0x5c ]
   [ 0x0d 0x2d 0x5f 0x00 ]
   [ 0x10 0x61 0x41 0x40 ]
-  [ 0x11 0x7a 0x5a 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x7a 0x5a 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -223,11 +220,11 @@
   [ 0x1e 0x71 0x51 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0x6d 0x4d 0x00 ]
   [ 0x28 0xf9 0x25 0x00 ]
   [ 0x29 0xb2 0xb3 0xac ]
@@ -263,9 +260,9 @@
   [ 0x0d 0x3d 0x2b 0xa7 ]
   [ 0x10 0x71 0x51 0x2f ]
   [ 0x11 0x77 0x57 0x3f ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xae ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -276,11 +273,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xe7 0xc7 0x00 ]
   [ 0x28 0x00 0x00 0x7e ]
   [ 0x29 0x27 0x22 0xac ]
@@ -383,10 +380,10 @@
   [ 0x0b 0x30 0x3d 0x7d ]
   [ 0x0c 0x27 0x3f 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -397,11 +394,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf6 0xe9 0x00 ]
   [ 0x28 0xe4 0xe0 0x7b ]
   [ 0x29 0xa7 0xb0 0xac ]
@@ -431,10 +428,10 @@
   [ 0x0b 0x30 0x3d 0x7d ]
   [ 0x0c 0x27 0x3f 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -445,11 +442,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xe9 0xf6 0x00 ]
   [ 0x28 0xe0 0xe4 0x7b ]
   [ 0x29 0xa7 0xb0 0xac ]
@@ -472,11 +469,11 @@
 
 /keymap.cz [
   [ 0x02 0x2b 0x31 0x21 ]
-  [ 0x03 0xec 0x32 0x40 ]
-  [ 0x04 0xa8 0x33 0x23 ]
-  [ 0x05 0xe8 0x34 0x24 ]
-  [ 0x06 0xf8 0x35 0x25 ]
-  [ 0x07 0xb8 0x36 0x5e ]
+  [ 0x03 0x00 0x32 0x40 ]
+  [ 0x04 0x00 0x33 0x23 ]
+  [ 0x05 0x00 0x34 0x24 ]
+  [ 0x06 0x00 0x35 0x25 ]
+  [ 0x07 0x00 0x36 0x5e ]
   [ 0x08 0xfd 0x37 0x26 ]
   [ 0x09 0xe1 0x38 0x2a ]
   [ 0x0a 0xed 0x39 0x7b ]
@@ -485,9 +482,9 @@
   [ 0x0d 0x00 0x00 0x5f ]
   [ 0x10 0x71 0x51 0x5c ]
   [ 0x11 0x77 0x57 0x7c ]
-  [ 0x12 0x00 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -496,15 +493,15 @@
   [ 0x1a 0xfa 0x2f 0x5b ]
   [ 0x1b 0x29 0x28 0x5d ]
   [ 0x1e 0x61 0x41 0x7e ]
-  [ 0x1f 0x73 0x53 0xf0 ]
-  [ 0x20 0x64 0x44 0xd0 ]
+  [ 0x1f 0x73 0x53 0x00 ]
+  [ 0x20 0x64 0x44 0x00 ]
   [ 0x21 0x66 0x46 0x5b ]
   [ 0x22 0x67 0x47 0x5d ]
   [ 0x23 0x68 0x48 0x60 ]
-  [ 0x24 0x00 0x4a 0x27 ]
-  [ 0x25 0x6b 0x4b 0xb3 ]
-  [ 0x26 0x6c 0x4c 0xa3 ]
-  [ 0x27 0xf9 0x22 0x24 ]
+  [ 0x24 0x6a 0x4a 0x27 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x27 0x00 0x22 0x24 ]
   [ 0x28 0xa7 0x21 0x27 ]
   [ 0x29 0x3b 0x2a 0x60 ]
   [ 0x2b 0x00 0x27 0x5c ]
@@ -513,7 +510,7 @@
   [ 0x2e 0x63 0x43 0x26 ]
   [ 0x2f 0x76 0x56 0x40 ]
   [ 0x30 0x62 0x42 0x7b ]
-  [ 0x31 0x00 0x4e 0x7d ]
+  [ 0x31 0x6e 0x4e 0x7d ]
   [ 0x32 0x6d 0x4d 0x5e ]
   [ 0x33 0x2c 0x3f 0x3c ]
   [ 0x34 0x2e 0x3a 0x3e ]
@@ -535,10 +532,10 @@
   [ 0x0b 0x30 0x3d 0x7d ]
   [ 0x0c 0xdf 0x3f 0x5c ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -549,11 +546,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf6 0xd6 0x00 ]
   [ 0x28 0xe4 0xc4 0x00 ]
   [ 0x29 0x00 0xb0 0xac ]
@@ -584,24 +581,24 @@
   [ 0x0c 0x2b 0x3f 0xb1 ]
   [ 0x0d 0x00 0x00 0x7c ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xae ]
   [ 0x14 0x74 0x54 0xfe ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0xe5 0xc5 0x00 ]
   [ 0x1e 0x61 0x41 0xaa ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xe6 0xc6 0x00 ]
   [ 0x28 0xf8 0xd8 0x00 ]
   [ 0x29 0xbd 0xa7 0xbe ]
@@ -632,10 +629,10 @@
   [ 0x0c 0x2b 0x3f 0x5c ]
   [ 0x0d 0x00 0x00 0x60 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -644,18 +641,18 @@
   [ 0x1a 0xfc 0xdc 0x00 ]
   [ 0x1b 0xf5 0xd5 0xa7 ]
   [ 0x1e 0x61 0x41 0xe6 ]
-  [ 0x1f 0x73 0x53 0xa8 ]
+  [ 0x1f 0x73 0x53 0x00 ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf6 0xd6 0x00 ]
   [ 0x28 0xe4 0xc4 0x5e ]
   [ 0x29 0x00 0x00 0xac ]
   [ 0x2b 0x27 0x2a 0xbd ]
-  [ 0x2c 0x7a 0x5a 0xb8 ]
+  [ 0x2c 0x7a 0x5a 0x00 ]
   [ 0x2d 0x78 0x58 0xbb ]
   [ 0x2e 0x63 0x43 0xa2 ]
   [ 0x2f 0x76 0x56 0x00 ]
@@ -668,19 +665,19 @@
 ] def
 
 /keymap.epo [
-  [ 0x06 0x35 0x25 0xa4 ]
-  [ 0x10 0xfe 0xde 0x71 ]
-  [ 0x11 0xf8 0xd8 0x77 ]
-  [ 0x15 0xfd 0xdd 0x79 ]
+  [ 0x06 0x35 0x25 0x00 ]
+  [ 0x10 0x00 0x00 0x71 ]
+  [ 0x11 0x00 0x00 0x77 ]
+  [ 0x15 0x00 0x00 0x79 ]
   [ 0x18 0x6f 0x4f 0x7b ]
   [ 0x19 0x70 0x50 0x7d ]
-  [ 0x1a 0xbc 0xac 0x5b ]
-  [ 0x1b 0xb6 0xa6 0x5d ]
-  [ 0x1e 0x00 0x41 0x00 ]
-  [ 0x1f 0x00 0x53 0x00 ]
-  [ 0x20 0x00 0x44 0x00 ]
-  [ 0x21 0x00 0x46 0x00 ]
-  [ 0x2d 0xe6 0xc6 0x78 ]
+  [ 0x1a 0x00 0x00 0x5b ]
+  [ 0x1b 0x00 0x00 0x5d ]
+  [ 0x1e 0x61 0x41 0x00 ]
+  [ 0x1f 0x73 0x53 0x00 ]
+  [ 0x20 0x64 0x44 0x00 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x2d 0x00 0x00 0x78 ]
   [ 0x31 0x6e 0x4e 0x00 ]
   [ 0x32 0x6d 0x4d 0x00 ]
   [ 0x56 0x3c 0x3e 0x7c ]
@@ -700,10 +697,10 @@
   [ 0x0c 0x27 0x3f 0x5c ]
   [ 0x0d 0xa1 0xbf 0x7e ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -714,11 +711,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf1 0xd1 0x7e ]
   [ 0x28 0x00 0x00 0x7b ]
   [ 0x29 0xba 0xaa 0x5c ]
@@ -742,35 +739,35 @@
 ] def
 
 /keymap.fi [
-  [ 0x02 0x00 0x21 0x00 ]
+  [ 0x02 0x31 0x21 0x00 ]
   [ 0x03 0x32 0x22 0x40 ]
   [ 0x04 0x33 0x23 0xa3 ]
   [ 0x05 0x34 0xa4 0x24 ]
   [ 0x06 0x35 0x25 0x00 ]
   [ 0x07 0x36 0x26 0x00 ]
-  [ 0x08 0x00 0x2f 0x7b ]
-  [ 0x09 0x00 0x28 0x5b ]
-  [ 0x0a 0x00 0x29 0x5d ]
+  [ 0x08 0x37 0x2f 0x7b ]
+  [ 0x09 0x38 0x28 0x5b ]
+  [ 0x0a 0x39 0x29 0x5d ]
   [ 0x0b 0x30 0x3d 0x7d ]
   [ 0x0c 0x2b 0x3f 0x5c ]
-  [ 0x12 0x00 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x14 0x74 0x54 0xfe ]
-  [ 0x17 0x00 0x49 0xb9 ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0x00 ]
   [ 0x1a 0xe5 0xc5 0x00 ]
   [ 0x1e 0x61 0x41 0x00 ]
-  [ 0x1f 0x00 0x53 0xdf ]
+  [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x25 0x00 0x4b 0xa2 ]
-  [ 0x26 0x00 0x4c 0x2d ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x2d ]
   [ 0x27 0xf6 0xd6 0xf8 ]
   [ 0x28 0xe4 0xc4 0xe6 ]
-  [ 0x29 0x00 0xbd 0x2d ]
+  [ 0x29 0xa7 0xbd 0x2d ]
   [ 0x2b 0x27 0x2a 0x00 ]
   [ 0x2c 0x7a 0x5a 0x00 ]
   [ 0x2d 0x78 0x58 0xd7 ]
-  [ 0x31 0x6e 0x4e 0xbf ]
+  [ 0x31 0x6e 0x4e 0x00 ]
   [ 0x32 0x6d 0x4d 0xb5 ]
   [ 0x33 0x2c 0x3b 0x00 ]
   [ 0x34 0x2e 0x3a 0x00 ]
@@ -793,17 +790,17 @@
   [ 0x0c 0x2b 0x3f 0xf7 ]
   [ 0x0d 0x5c 0x60 0x27 ]
   [ 0x10 0xe1 0xc1 0x71 ]
-  [ 0x11 0xa8 0xa6 0x77 ]
+  [ 0x11 0x00 0x00 0x77 ]
   [ 0x12 0x65 0x45 0xe9 ]
   [ 0x13 0x72 0x52 0xae ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0xfd ]
   [ 0x16 0x75 0x55 0xfc ]
   [ 0x17 0x69 0x49 0xef ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0xe5 0xc5 0xe2 ]
-  [ 0x1b 0xbf 0xbd 0x22 ]
+  [ 0x1b 0x00 0x00 0x22 ]
   [ 0x1e 0x61 0x41 0xe0 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
@@ -816,9 +813,9 @@
   [ 0x27 0xf6 0xd6 0xf8 ]
   [ 0x28 0xe4 0xc4 0xe6 ]
   [ 0x29 0x7c 0xa7 0xa6 ]
-  [ 0x2b 0xf0 0xd0 0x27 ]
+  [ 0x2b 0x00 0x00 0x27 ]
   [ 0x2c 0x7a 0x5a 0x00 ]
-  [ 0x2d 0xe8 0xc8 0x78 ]
+  [ 0x2d 0x00 0x00 0x78 ]
   [ 0x2e 0x63 0x43 0xe7 ]
   [ 0x2f 0x76 0x56 0x00 ]
   [ 0x30 0x62 0x42 0x00 ]
@@ -827,7 +824,6 @@
   [ 0x33 0x2c 0x3b 0x00 ]
   [ 0x34 0x2e 0x3a 0x00 ]
   [ 0x35 0x2d 0x5f 0x00 ]
-  [ 0x56 0xb8 0xb4 0x00 ]
 ] def
 
 /keymap.fo [
@@ -844,25 +840,25 @@
   [ 0x0c 0x2b 0x3f 0xb1 ]
   [ 0x0d 0x00 0x00 0x7c ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xae ]
   [ 0x14 0x74 0x54 0xfe ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0xe5 0xc5 0x00 ]
   [ 0x1b 0xf0 0xd0 0x00 ]
   [ 0x1e 0x61 0x41 0xaa ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xe6 0xc6 0x00 ]
   [ 0x28 0xf8 0xd8 0x00 ]
   [ 0x29 0xbd 0xa7 0xbe ]
@@ -895,13 +891,13 @@
   [ 0x0d 0x3d 0x2b 0x7d ]
   [ 0x10 0x61 0x41 0xe6 ]
   [ 0x11 0x7a 0x5a 0xe2 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xea ]
   [ 0x14 0x74 0x54 0xfe ]
   [ 0x15 0x79 0x59 0xff ]
   [ 0x16 0x75 0x55 0xfb ]
   [ 0x17 0x69 0x49 0xee ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xf4 ]
   [ 0x1b 0x24 0xa3 0xf8 ]
   [ 0x1e 0x71 0x51 0xe4 ]
@@ -934,7 +930,7 @@
   [ 0x02 0x31 0x21 0xb9 ]
   [ 0x03 0x32 0x22 0xb2 ]
   [ 0x04 0x33 0xa3 0xb3 ]
-  [ 0x05 0x34 0x24 0xa4 ]
+  [ 0x05 0x34 0x24 0x00 ]
   [ 0x06 0x35 0x25 0xbd ]
   [ 0x07 0x36 0x5e 0xbe ]
   [ 0x08 0x37 0x26 0x7b ]
@@ -944,9 +940,9 @@
   [ 0x0c 0x2d 0x5f 0x5c ]
   [ 0x0d 0x3d 0x2b 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
+  [ 0x11 0x77 0x57 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -957,11 +953,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0x3b 0x3a 0x00 ]
   [ 0x28 0x27 0x40 0x00 ]
   [ 0x29 0x60 0xac 0x7c ]
@@ -1024,29 +1020,28 @@
   [ 0x0d 0x2b 0x2a 0x00 ]
   [ 0x10 0x71 0x51 0x5c ]
   [ 0x11 0x77 0x57 0x7c ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
   [ 0x18 0x6f 0x4f 0xf8 ]
   [ 0x19 0x70 0x50 0xfe ]
-  [ 0x1a 0xa8 0xa6 0xf7 ]
-  [ 0x1b 0xf0 0xd0 0xd7 ]
+  [ 0x1a 0x00 0x00 0xf7 ]
+  [ 0x1b 0x00 0x00 0xd7 ]
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0x00 ]
   [ 0x20 0x64 0x44 0x00 ]
   [ 0x21 0x66 0x46 0x5b ]
   [ 0x22 0x67 0x47 0x5d ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x24 0x00 0x4a 0x00 ]
-  [ 0x25 0x6b 0x4b 0xb3 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
-  [ 0x27 0xe8 0xc8 0x00 ]
-  [ 0x28 0xe6 0xc6 0xdf ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x24 0x6a 0x4a 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x28 0x00 0x00 0xdf ]
   [ 0x29 0x60 0x7e 0xac ]
-  [ 0x2b 0xb8 0xb4 0xa4 ]
+  [ 0x2b 0x00 0x00 0xa4 ]
   [ 0x2c 0x79 0x59 0x00 ]
   [ 0x2d 0x78 0x58 0x00 ]
   [ 0x2e 0x63 0x43 0xa2 ]
@@ -1076,27 +1071,27 @@
   [ 0x10 0x71 0x51 0x5c ]
   [ 0x11 0x77 0x57 0x7c ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
-  [ 0x16 0x75 0x55 0xa4 ]
+  [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0xcd ]
   [ 0x18 0x6f 0x4f 0xf8 ]
   [ 0x19 0x70 0x50 0xfe ]
-  [ 0x1a 0xf5 0xd5 0xf7 ]
+  [ 0x1a 0x00 0x00 0xf7 ]
   [ 0x1b 0xfa 0xda 0xd7 ]
   [ 0x1e 0x61 0x41 0xe4 ]
-  [ 0x1f 0x73 0x53 0xf0 ]
-  [ 0x20 0x64 0x44 0xd0 ]
+  [ 0x1f 0x73 0x53 0x00 ]
+  [ 0x20 0x64 0x44 0x00 ]
   [ 0x21 0x66 0x46 0x5b ]
   [ 0x22 0x67 0x47 0x5d ]
-  [ 0x23 0x68 0x48 0xb1 ]
+  [ 0x23 0x68 0x48 0x00 ]
   [ 0x24 0x6a 0x4a 0xed ]
-  [ 0x25 0x6b 0x4b 0xb3 ]
-  [ 0x26 0x6c 0x4c 0xa3 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xe9 0xc9 0x24 ]
   [ 0x28 0xe1 0xc1 0xdf ]
   [ 0x29 0x30 0xa7 0xac ]
-  [ 0x2b 0xfb 0xdb 0xa4 ]
+  [ 0x2b 0x00 0x00 0xa4 ]
   [ 0x2c 0x79 0x59 0x3e ]
   [ 0x2d 0x78 0x58 0x23 ]
   [ 0x2e 0x63 0x43 0x26 ]
@@ -1114,7 +1109,7 @@
   [ 0x02 0x31 0x21 0xa1 ]
   [ 0x03 0x32 0x22 0x00 ]
   [ 0x04 0x33 0xa3 0xa9 ]
-  [ 0x05 0x34 0x24 0xa4 ]
+  [ 0x05 0x34 0x24 0x00 ]
   [ 0x06 0x35 0x25 0xa7 ]
   [ 0x07 0x36 0x5e 0x00 ]
   [ 0x08 0x37 0x26 0xb6 ]
@@ -1123,7 +1118,7 @@
   [ 0x0b 0x30 0x29 0xba ]
   [ 0x0c 0x2d 0x5f 0x00 ]
   [ 0x0d 0x3d 0x2b 0x00 ]
-  [ 0x10 0x71 0x51 0xbd ]
+  [ 0x10 0x71 0x51 0x00 ]
   [ 0x11 0x77 0x57 0x2e ]
   [ 0x12 0x65 0x45 0xe9 ]
   [ 0x13 0x72 0x52 0xae ]
@@ -1132,29 +1127,29 @@
   [ 0x16 0x75 0x55 0xfa ]
   [ 0x17 0x69 0x49 0xed ]
   [ 0x18 0x6f 0x4f 0xf3 ]
-  [ 0x19 0x00 0x50 0x00 ]
+  [ 0x19 0x70 0x50 0x00 ]
   [ 0x1a 0x5b 0x7b 0x00 ]
   [ 0x1b 0x5d 0x7d 0x00 ]
   [ 0x1e 0x61 0x41 0xe1 ]
-  [ 0x1f 0x00 0x53 0xdf ]
+  [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x00 0x46 0x00 ]
-  [ 0x22 0x00 0x47 0xa9 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0xa9 ]
   [ 0x23 0x68 0x48 0x2e ]
-  [ 0x24 0x6a 0x4a 0xb9 ]
+  [ 0x24 0x6a 0x4a 0x00 ]
   [ 0x25 0x6b 0x4b 0x2a ]
   [ 0x26 0x6c 0x4c 0x27 ]
   [ 0x27 0x3b 0x3a 0x00 ]
   [ 0x28 0x27 0x40 0xe6 ]
-  [ 0x29 0x00 0xac 0xa6 ]
+  [ 0x29 0x60 0xac 0xa6 ]
   [ 0x2b 0x23 0x7e 0xab ]
   [ 0x2c 0x7a 0x5a 0x00 ]
   [ 0x2d 0x78 0x58 0xd7 ]
   [ 0x2e 0x63 0x43 0x00 ]
-  [ 0x2f 0x00 0x56 0x00 ]
-  [ 0x30 0x00 0x42 0xa8 ]
-  [ 0x31 0x00 0x4e 0x00 ]
-  [ 0x32 0x00 0x4d 0xaf ]
+  [ 0x2f 0x76 0x56 0x00 ]
+  [ 0x30 0x62 0x42 0xa8 ]
+  [ 0x31 0x6e 0x4e 0x00 ]
+  [ 0x32 0x6d 0x4d 0xaf ]
   [ 0x33 0x2c 0x3c 0x00 ]
   [ 0x34 0x2e 0x3e 0x00 ]
   [ 0x35 0x2f 0x3f 0xf7 ]
@@ -1183,6 +1178,7 @@
 /keymap.in_guru [
   [ 0x0a 0x00 0x28 0x00 ]
   [ 0x0b 0x00 0x29 0x00 ]
+  [ 0x2c 0x7a 0x00 0x7a ]
   [ 0x34 0x2e 0x00 0x2e ]
   [ 0x35 0x00 0x3f 0x00 ]
   [ 0x56 0x3c 0x3e 0x7c ]
@@ -1215,12 +1211,47 @@
 ] def
 
 /keymap.in_tam [
-  [ 0x0a 0x00 0x28 0x00 ]
-  [ 0x0b 0x00 0x29 0x00 ]
-  [ 0x0d 0x00 0x2b 0x00 ]
-  [ 0x33 0x2c 0x00 0x2c ]
+  [ 0x02 0xe7 0xe7 0xe7 ]
+  [ 0x03 0xe8 0xe8 0xe8 ]
+  [ 0x04 0xe9 0xe9 0xe9 ]
+  [ 0x05 0xea 0xea 0xea ]
+  [ 0x06 0xeb 0xeb 0xeb ]
+  [ 0x07 0xec 0xec 0xec ]
+  [ 0x08 0xed 0xed 0xed ]
+  [ 0x09 0xee 0xee 0xee ]
+  [ 0x0a 0xef 0x28 0xef ]
+  [ 0x0b 0xf0 0x29 0xf0 ]
+  [ 0x0c 0xf1 0x83 0xf1 ]
+  [ 0x0d 0xf2 0x2b 0xf2 ]
+  [ 0x10 0xcc 0x94 0xcc ]
+  [ 0x11 0xc8 0x90 0xc8 ]
+  [ 0x12 0xbe 0x86 0xbe ]
+  [ 0x13 0xc0 0x88 0xc0 ]
+  [ 0x14 0xc2 0x8a 0xc2 ]
+  [ 0x16 0xb9 0x99 0xb9 ]
+  [ 0x1b 0x9e 0x9e 0x9e ]
+  [ 0x1e 0xcb 0x93 0xcb ]
+  [ 0x1f 0xc7 0x8f 0xc7 ]
+  [ 0x20 0xcd 0x85 0xcd ]
+  [ 0x21 0xbf 0x87 0xbf ]
+  [ 0x22 0xc1 0x89 0xc1 ]
+  [ 0x23 0xaa 0xaa 0xaa ]
+  [ 0x24 0xb0 0xb1 0xb0 ]
+  [ 0x25 0x95 0x95 0x95 ]
+  [ 0x26 0xa4 0xa4 0xa4 ]
+  [ 0x27 0x9a 0x9a 0x9a ]
+  [ 0x28 0x9f 0x9f 0x9f ]
+  [ 0x29 0xca 0x92 0xca ]
+  [ 0x2c 0xc6 0x8e 0xc6 ]
+  [ 0x2d 0x82 0x82 0x82 ]
+  [ 0x2e 0xae 0xa3 0xae ]
+  [ 0x2f 0xa8 0xa9 0xa8 ]
+  [ 0x30 0xb5 0xb4 0xb5 ]
+  [ 0x31 0xb2 0xb3 0xb2 ]
+  [ 0x32 0xb8 0xb8 0xb8 ]
+  [ 0x33 0x2c 0xb7 0x2c ]
   [ 0x34 0x2e 0x00 0x2e ]
-  [ 0x35 0x00 0x3f 0x00 ]
+  [ 0x35 0xaf 0x3f 0xaf ]
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
@@ -1280,10 +1311,10 @@
   [ 0x0c 0xf6 0xd6 0x5c ]
   [ 0x0d 0x2d 0x5f 0xe7 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -1294,11 +1325,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xe6 0xc6 0x5e ]
   [ 0x28 0x00 0xc4 0x00 ]
   [ 0x29 0xb0 0xa8 0xac ]
@@ -1329,10 +1360,10 @@
   [ 0x0c 0x27 0x3f 0x60 ]
   [ 0x0d 0xec 0x5e 0x7e ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -1343,11 +1374,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf2 0xe7 0x40 ]
   [ 0x28 0xe0 0xb0 0x23 ]
   [ 0x29 0x5c 0x7c 0xac ]
@@ -1430,10 +1461,10 @@
   [ 0x0c 0x27 0x3f 0x5c ]
   [ 0x0d 0xbf 0xa1 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -1443,11 +1474,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf1 0xd1 0x7e ]
   [ 0x28 0x7b 0x5b 0x00 ]
   [ 0x29 0x7c 0xb0 0xac ]
@@ -1476,7 +1507,7 @@
   [ 0x02 0x31 0x21 0xb9 ]
   [ 0x03 0x32 0x40 0xb2 ]
   [ 0x04 0x33 0x23 0xb3 ]
-  [ 0x05 0x34 0x24 0xa4 ]
+  [ 0x05 0x34 0x24 0x00 ]
   [ 0x06 0x35 0x25 0xbd ]
   [ 0x07 0x36 0x5e 0xbe ]
   [ 0x08 0x37 0x26 0x7b ]
@@ -1485,24 +1516,24 @@
   [ 0x0b 0x30 0x29 0x7d ]
   [ 0x0c 0x2d 0x5f 0x5c ]
   [ 0x0d 0x3d 0x2b 0x00 ]
-  [ 0x12 0x65 0x45 0xba ]
-  [ 0x13 0x72 0x52 0xb3 ]
-  [ 0x16 0x75 0x55 0xfe ]
-  [ 0x17 0x69 0x49 0xef ]
-  [ 0x18 0x6f 0x4f 0xf2 ]
+  [ 0x12 0x65 0x45 0x00 ]
+  [ 0x13 0x72 0x52 0x00 ]
+  [ 0x16 0x75 0x55 0x00 ]
+  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x1a 0x5b 0x7b 0xab ]
   [ 0x1b 0x5d 0x7d 0xbb ]
-  [ 0x1e 0x61 0x41 0xe0 ]
-  [ 0x1f 0x73 0x53 0xa8 ]
-  [ 0x22 0x67 0x47 0xbb ]
-  [ 0x25 0x6b 0x4b 0xf3 ]
-  [ 0x26 0x6c 0x4c 0xb6 ]
+  [ 0x1e 0x61 0x41 0x00 ]
+  [ 0x1f 0x73 0x53 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x28 0x27 0x22 0x00 ]
   [ 0x29 0x60 0x7e 0x27 ]
   [ 0x2b 0x5c 0x7c 0x60 ]
-  [ 0x2c 0x7a 0x5a 0xb8 ]
-  [ 0x2e 0x63 0x43 0xe8 ]
-  [ 0x31 0x6e 0x4e 0xf1 ]
+  [ 0x2c 0x7a 0x5a 0x00 ]
+  [ 0x2e 0x63 0x43 0x00 ]
+  [ 0x31 0x6e 0x4e 0x00 ]
   [ 0x33 0x2c 0x3c 0x00 ]
   [ 0x34 0x2e 0x3e 0xb7 ]
   [ 0x56 0x3c 0x3e 0x7c ]
@@ -1553,25 +1584,25 @@
   [ 0x0c 0x2d 0x5f 0x5c ]
   [ 0x0d 0x3d 0x2b 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xba ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
-  [ 0x16 0x75 0x55 0xfe ]
-  [ 0x17 0x69 0x49 0xef ]
-  [ 0x18 0x6f 0x4f 0xf2 ]
+  [ 0x16 0x75 0x55 0x00 ]
+  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0x5b 0x7b 0x00 ]
   [ 0x1b 0x5d 0x7d 0x00 ]
-  [ 0x1e 0x61 0x41 0xe0 ]
+  [ 0x1e 0x61 0x41 0x00 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0x3b 0x3a 0x00 ]
   [ 0x28 0x27 0x22 0x00 ]
   [ 0x29 0x60 0x7e 0xac ]
@@ -1603,29 +1634,28 @@
   [ 0x0d 0x2b 0x2a 0x00 ]
   [ 0x10 0x71 0x51 0x5c ]
   [ 0x11 0x77 0x57 0x7c ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
   [ 0x18 0x6f 0x4f 0xf8 ]
   [ 0x19 0x70 0x50 0xfe ]
-  [ 0x1a 0xa8 0xa6 0xf7 ]
-  [ 0x1b 0xf0 0xd0 0xd7 ]
+  [ 0x1a 0x00 0x00 0xf7 ]
+  [ 0x1b 0x00 0x00 0xd7 ]
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0x00 ]
   [ 0x20 0x64 0x44 0x00 ]
   [ 0x21 0x66 0x46 0x5b ]
   [ 0x22 0x67 0x47 0x5d ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x24 0x00 0x4a 0x00 ]
-  [ 0x25 0x6b 0x4b 0xb3 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
-  [ 0x27 0xe8 0xc8 0x00 ]
-  [ 0x28 0xe6 0xc6 0xdf ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x24 0x6a 0x4a 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x28 0x00 0x00 0xdf ]
   [ 0x29 0x60 0x7e 0xac ]
-  [ 0x2b 0xb8 0xb4 0xa4 ]
+  [ 0x2b 0x00 0x00 0xa4 ]
   [ 0x2c 0x79 0x59 0x00 ]
   [ 0x2d 0x78 0x58 0x00 ]
   [ 0x2e 0x63 0x43 0xa2 ]
@@ -1653,9 +1683,9 @@
 
 /keymap.mt [
   [ 0x02 0x31 0x21 0xb9 ]
-  [ 0x03 0x32 0x40 0xb2 ]
-  [ 0x04 0x33 0xa4 0xa3 ]
-  [ 0x05 0x34 0x24 0xbc ]
+  [ 0x03 0x32 0x22 0xb2 ]
+  [ 0x04 0x33 0x00 0xa3 ]
+  [ 0x05 0x34 0x24 0x00 ]
   [ 0x06 0x35 0x25 0xbd ]
   [ 0x07 0x36 0x5e 0x00 ]
   [ 0x08 0x37 0x26 0x7b ]
@@ -1665,29 +1695,29 @@
   [ 0x0c 0x2d 0x5f 0x5c ]
   [ 0x0d 0x3d 0x2b 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
+  [ 0x11 0x77 0x57 0x00 ]
   [ 0x12 0x65 0x45 0xe8 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0xf9 ]
   [ 0x17 0x69 0x49 0xec ]
   [ 0x18 0x6f 0x4f 0xf2 ]
   [ 0x19 0x70 0x50 0xfe ]
-  [ 0x1a 0xf5 0xd5 0x5b ]
-  [ 0x1b 0xb1 0xa1 0x5d ]
+  [ 0x1a 0x00 0x00 0x5b ]
+  [ 0x1b 0x00 0x00 0x5d ]
   [ 0x1e 0x61 0x41 0xe0 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0x3b 0x3a 0x00 ]
-  [ 0x28 0x27 0x22 0x00 ]
-  [ 0x29 0xe5 0xc5 0x60 ]
-  [ 0x2b 0x5c 0x7c 0x00 ]
+  [ 0x28 0x27 0x40 0x00 ]
+  [ 0x29 0x00 0x00 0x60 ]
+  [ 0x2b 0x23 0x7e 0x00 ]
   [ 0x2c 0x7a 0x5a 0xab ]
   [ 0x2d 0x78 0x58 0xbb ]
   [ 0x2e 0x63 0x43 0xa2 ]
@@ -1697,7 +1727,7 @@
   [ 0x33 0x2c 0x3c 0x00 ]
   [ 0x34 0x2e 0x3e 0xb7 ]
   [ 0x35 0x2f 0x3f 0x00 ]
-  [ 0x56 0xbf 0xaf 0x5c ]
+  [ 0x56 0x00 0x00 0x5c ]
 ] def
 
 /keymap.mv [
@@ -1723,8 +1753,8 @@
   [ 0x0c 0x2f 0x3f 0x5c ]
   [ 0x0d 0xb0 0x00 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
   [ 0x14 0x74 0x54 0xfe ]
   [ 0x15 0x79 0x59 0xff ]
@@ -1738,10 +1768,10 @@
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
   [ 0x21 0x66 0x46 0xaa ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0x2b 0xb1 0x00 ]
   [ 0x28 0x00 0x00 0x27 ]
   [ 0x29 0x40 0xa7 0xac ]
@@ -1752,7 +1782,7 @@
   [ 0x2f 0x76 0x56 0x00 ]
   [ 0x30 0x62 0x42 0x00 ]
   [ 0x31 0x6e 0x4e 0xf1 ]
-  [ 0x32 0x6d 0x4d 0xb5 ]
+  [ 0x32 0x6d 0x4d 0x00 ]
   [ 0x33 0x2c 0x3b 0xb8 ]
   [ 0x34 0x2e 0x3a 0xb7 ]
   [ 0x35 0x2d 0x3d 0xad ]
@@ -1773,24 +1803,24 @@
   [ 0x0c 0x2b 0x3f 0xb1 ]
   [ 0x0d 0x5c 0x00 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xae ]
   [ 0x14 0x74 0x54 0xfe ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0xe5 0xc5 0x00 ]
   [ 0x1e 0x61 0x41 0xaa ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf8 0xd8 0x00 ]
   [ 0x28 0xe6 0xc6 0x00 ]
   [ 0x29 0x7c 0xa7 0xa6 ]
@@ -1821,17 +1851,17 @@
   [ 0x0c 0x2b 0x3f 0xf7 ]
   [ 0x0d 0x5c 0x60 0x27 ]
   [ 0x10 0xe1 0xc1 0x71 ]
-  [ 0x11 0xa8 0xa6 0x77 ]
+  [ 0x11 0x00 0x00 0x77 ]
   [ 0x12 0x65 0x45 0xe9 ]
   [ 0x13 0x72 0x52 0xae ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0xfd ]
   [ 0x16 0x75 0x55 0xfc ]
   [ 0x17 0x69 0x49 0xef ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0xe5 0xc5 0xe2 ]
-  [ 0x1b 0xbf 0xbd 0x22 ]
+  [ 0x1b 0x00 0x00 0x22 ]
   [ 0x1e 0x61 0x41 0xe0 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
@@ -1844,9 +1874,9 @@
   [ 0x27 0xf8 0xd8 0xf6 ]
   [ 0x28 0xe6 0xc6 0xe4 ]
   [ 0x29 0x7c 0xa7 0xa6 ]
-  [ 0x2b 0xf0 0xd0 0x27 ]
+  [ 0x2b 0x00 0x00 0x27 ]
   [ 0x2c 0x7a 0x5a 0x00 ]
-  [ 0x2d 0xe8 0xc8 0x78 ]
+  [ 0x2d 0x00 0x00 0x78 ]
   [ 0x2e 0x63 0x43 0xe7 ]
   [ 0x2f 0x76 0x56 0x00 ]
   [ 0x30 0x62 0x42 0x00 ]
@@ -1855,7 +1885,6 @@
   [ 0x33 0x2c 0x3b 0x00 ]
   [ 0x34 0x2e 0x3a 0x00 ]
   [ 0x35 0x2d 0x5f 0x00 ]
-  [ 0x56 0xb8 0xb4 0x00 ]
 ] def
 
 /keymap.np [
@@ -1884,10 +1913,10 @@
   [ 0x0c 0x2d 0x5f 0x5c ]
   [ 0x0d 0x3d 0x2b 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xea ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -1895,24 +1924,24 @@
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0x5b 0x7b 0x00 ]
   [ 0x1b 0x5d 0x7d 0x00 ]
-  [ 0x1e 0x61 0x41 0xb1 ]
-  [ 0x1f 0x73 0x53 0xb6 ]
+  [ 0x1e 0x61 0x41 0x00 ]
+  [ 0x1f 0x73 0x53 0x00 ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0x3b 0x3a 0x00 ]
   [ 0x28 0x27 0x22 0x00 ]
   [ 0x29 0x60 0x7e 0xac ]
   [ 0x2b 0x5c 0x7c 0x00 ]
-  [ 0x2c 0x7a 0x5a 0xbf ]
-  [ 0x2d 0x78 0x58 0xbc ]
-  [ 0x2e 0x63 0x43 0xe6 ]
+  [ 0x2c 0x7a 0x5a 0x00 ]
+  [ 0x2d 0x78 0x58 0x00 ]
+  [ 0x2e 0x63 0x43 0x00 ]
   [ 0x2f 0x76 0x56 0x00 ]
   [ 0x30 0x62 0x42 0x00 ]
-  [ 0x31 0x6e 0x4e 0xf1 ]
+  [ 0x31 0x6e 0x4e 0x00 ]
   [ 0x32 0x6d 0x4d 0xb5 ]
   [ 0x33 0x2c 0x3c 0x00 ]
   [ 0x34 0x2e 0x3e 0xb7 ]
@@ -1934,10 +1963,10 @@
   [ 0x0c 0x27 0x3f 0x5c ]
   [ 0x0d 0xab 0xbb 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -1947,11 +1976,11 @@
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xe7 0xc7 0x00 ]
   [ 0x28 0xba 0xaa 0x00 ]
   [ 0x29 0x5c 0x7c 0xac ]
@@ -1982,16 +2011,16 @@
   [ 0x0d 0x3d 0x2b 0x00 ]
   [ 0x10 0x71 0x51 0xe2 ]
   [ 0x11 0x77 0x57 0xdf ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x14 0x74 0x54 0x00 ]
   [ 0x17 0x69 0x49 0xee ]
   [ 0x19 0x70 0x50 0xa7 ]
   [ 0x1a 0x5b 0x7b 0x00 ]
   [ 0x1b 0x5d 0x7d 0x00 ]
-  [ 0x1e 0x61 0x41 0xe3 ]
+  [ 0x1e 0x61 0x41 0x00 ]
   [ 0x1f 0x73 0x53 0x00 ]
-  [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x20 0x64 0x44 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x2e 0x63 0x43 0xa9 ]
   [ 0x33 0x2c 0x3c 0xab ]
   [ 0x34 0x2e 0x3e 0xbb ]
@@ -2013,9 +2042,7 @@
   [ 0x0d 0x2b 0x2a 0x00 ]
   [ 0x10 0x00 0x00 0x5c ]
   [ 0x11 0x00 0x00 0x7c ]
-  [ 0x12 0x00 0x00 0xa4 ]
   [ 0x13 0x00 0x00 0xb6 ]
-  [ 0x14 0x00 0x00 0xbc ]
   [ 0x18 0x00 0x00 0xf8 ]
   [ 0x19 0x00 0x00 0xfe ]
   [ 0x1a 0x00 0x00 0xf7 ]
@@ -2023,9 +2050,6 @@
   [ 0x1e 0x00 0x00 0xe6 ]
   [ 0x21 0x00 0x00 0x5b ]
   [ 0x22 0x00 0x00 0x5d ]
-  [ 0x23 0x00 0x00 0xb1 ]
-  [ 0x25 0x00 0x00 0xb3 ]
-  [ 0x26 0x00 0x00 0xb3 ]
   [ 0x28 0x00 0x00 0xdf ]
   [ 0x29 0x60 0x7e 0xac ]
   [ 0x2b 0x00 0x00 0xa4 ]
@@ -2049,7 +2073,7 @@
   [ 0x03 0x32 0x22 0x40 ]
   [ 0x04 0x33 0x23 0xa3 ]
   [ 0x05 0x34 0xa4 0x24 ]
-  [ 0x06 0x35 0x25 0xa4 ]
+  [ 0x06 0x35 0x25 0x00 ]
   [ 0x07 0x36 0x26 0xa5 ]
   [ 0x08 0x37 0x2f 0x7b ]
   [ 0x09 0x38 0x28 0x5b ]
@@ -2058,24 +2082,24 @@
   [ 0x0c 0x2b 0x3f 0x5c ]
   [ 0x0d 0x00 0x00 0xb1 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xae ]
   [ 0x14 0x74 0x54 0xfe ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0xe5 0xc5 0x00 ]
   [ 0x1e 0x61 0x41 0xaa ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf6 0xd6 0xf8 ]
   [ 0x28 0xe4 0xc4 0xe6 ]
   [ 0x29 0xa7 0xbd 0xb6 ]
@@ -2106,17 +2130,17 @@
   [ 0x0c 0x2b 0x3f 0xf7 ]
   [ 0x0d 0x5c 0x60 0x27 ]
   [ 0x10 0xe1 0xc1 0x71 ]
-  [ 0x11 0xa8 0xa6 0x77 ]
+  [ 0x11 0x00 0x00 0x77 ]
   [ 0x12 0x65 0x45 0xe9 ]
   [ 0x13 0x72 0x52 0xae ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0xfd ]
   [ 0x16 0x75 0x55 0xfc ]
   [ 0x17 0x69 0x49 0xef ]
-  [ 0x18 0x6f 0x4f 0xbd ]
+  [ 0x18 0x6f 0x4f 0x00 ]
   [ 0x19 0x70 0x50 0xfe ]
   [ 0x1a 0xe5 0xc5 0xe2 ]
-  [ 0x1b 0xbf 0xbd 0x22 ]
+  [ 0x1b 0x00 0x00 0x22 ]
   [ 0x1e 0x61 0x41 0xe0 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
@@ -2129,9 +2153,9 @@
   [ 0x27 0xf6 0xd6 0xf8 ]
   [ 0x28 0xe4 0xc4 0xe6 ]
   [ 0x29 0x7c 0xa7 0xa6 ]
-  [ 0x2b 0xf0 0xd0 0x27 ]
+  [ 0x2b 0x00 0x00 0x27 ]
   [ 0x2c 0x7a 0x5a 0x00 ]
-  [ 0x2d 0xe8 0xc8 0x78 ]
+  [ 0x2d 0x00 0x00 0x78 ]
   [ 0x2e 0x63 0x43 0xe7 ]
   [ 0x2f 0x76 0x56 0x00 ]
   [ 0x30 0x62 0x42 0x00 ]
@@ -2140,7 +2164,6 @@
   [ 0x33 0x2c 0x3b 0x00 ]
   [ 0x34 0x2e 0x3a 0x00 ]
   [ 0x35 0x2d 0x5f 0x00 ]
-  [ 0x56 0xb8 0xb4 0x00 ]
 ] def
 
 /keymap.si [
@@ -2158,29 +2181,28 @@
   [ 0x0d 0x2b 0x2a 0x00 ]
   [ 0x10 0x71 0x51 0x5c ]
   [ 0x11 0x77 0x57 0x7c ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
   [ 0x18 0x6f 0x4f 0xf8 ]
   [ 0x19 0x70 0x50 0xfe ]
-  [ 0x1a 0xa8 0xa6 0xf7 ]
-  [ 0x1b 0xf0 0xd0 0xd7 ]
+  [ 0x1a 0x00 0x00 0xf7 ]
+  [ 0x1b 0x00 0x00 0xd7 ]
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0x00 ]
   [ 0x20 0x64 0x44 0x00 ]
   [ 0x21 0x66 0x46 0x5b ]
   [ 0x22 0x67 0x47 0x5d ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x24 0x00 0x4a 0x00 ]
-  [ 0x25 0x6b 0x4b 0xb3 ]
-  [ 0x26 0x6c 0x4c 0xb3 ]
-  [ 0x27 0xe8 0xc8 0x00 ]
-  [ 0x28 0xe6 0xc6 0xdf ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x24 0x6a 0x4a 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x28 0x00 0x00 0xdf ]
   [ 0x29 0x60 0x7e 0xac ]
-  [ 0x2b 0xb8 0xb4 0xa4 ]
+  [ 0x2b 0x00 0x00 0xa4 ]
   [ 0x2c 0x79 0x59 0x00 ]
   [ 0x2d 0x78 0x58 0x00 ]
   [ 0x2e 0x63 0x43 0xa2 ]
@@ -2196,11 +2218,11 @@
 
 /keymap.sk [
   [ 0x02 0x2b 0x31 0x21 ]
-  [ 0x03 0xb5 0x32 0x40 ]
-  [ 0x04 0xa8 0x33 0x23 ]
-  [ 0x05 0xe8 0x34 0x24 ]
-  [ 0x06 0xbb 0x35 0x25 ]
-  [ 0x07 0xb8 0x36 0x5e ]
+  [ 0x03 0x00 0x32 0x40 ]
+  [ 0x04 0x00 0x33 0x23 ]
+  [ 0x05 0x00 0x34 0x24 ]
+  [ 0x06 0x00 0x35 0x25 ]
+  [ 0x07 0x00 0x36 0x5e ]
   [ 0x08 0xfd 0x37 0x26 ]
   [ 0x09 0xe1 0x38 0x2a ]
   [ 0x0a 0xed 0x39 0x7b ]
@@ -2209,9 +2231,9 @@
   [ 0x0d 0x00 0x00 0x5f ]
   [ 0x10 0x71 0x51 0x5c ]
   [ 0x11 0x77 0x57 0x7c ]
-  [ 0x12 0x00 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
-  [ 0x14 0x74 0x54 0xbc ]
+  [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
@@ -2220,24 +2242,24 @@
   [ 0x1a 0xfa 0x2f 0x5b ]
   [ 0x1b 0xe4 0x28 0x5d ]
   [ 0x1e 0x61 0x41 0x7e ]
-  [ 0x1f 0x73 0x53 0xf0 ]
-  [ 0x20 0x64 0x44 0xd0 ]
+  [ 0x1f 0x73 0x53 0x00 ]
+  [ 0x20 0x64 0x44 0x00 ]
   [ 0x21 0x66 0x46 0x5b ]
   [ 0x22 0x67 0x47 0x5d ]
   [ 0x23 0x68 0x48 0x60 ]
-  [ 0x24 0x00 0x4a 0x27 ]
-  [ 0x25 0x6b 0x4b 0xb3 ]
-  [ 0x26 0x6c 0x4c 0xa3 ]
+  [ 0x24 0x6a 0x4a 0x27 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0xf4 0x22 0x24 ]
   [ 0x28 0xa7 0x21 0x27 ]
   [ 0x29 0x3b 0x2a 0x60 ]
-  [ 0x2b 0xf2 0x29 0x5c ]
+  [ 0x2b 0x00 0x29 0x5c ]
   [ 0x2c 0x79 0x59 0xb0 ]
   [ 0x2d 0x78 0x58 0x23 ]
   [ 0x2e 0x63 0x43 0x26 ]
   [ 0x2f 0x76 0x56 0x40 ]
   [ 0x30 0x62 0x42 0x7b ]
-  [ 0x31 0x00 0x4e 0x7d ]
+  [ 0x31 0x6e 0x4e 0x7d ]
   [ 0x32 0x6d 0x4d 0x5e ]
   [ 0x33 0x2c 0x3f 0x3c ]
   [ 0x34 0x2e 0x3a 0x3e ]
@@ -2272,20 +2294,19 @@
   [ 0x0c 0x2a 0x3f 0x5c ]
   [ 0x0d 0x2d 0x5f 0x7c ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
   [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0xfb ]
-  [ 0x17 0xb9 0x49 0xee ]
+  [ 0x17 0x00 0x49 0xee ]
   [ 0x18 0x6f 0x4f 0xf4 ]
-  [ 0x1a 0xbb 0xab 0x00 ]
   [ 0x1b 0xfc 0xdc 0x7e ]
   [ 0x1e 0x61 0x41 0xe2 ]
   [ 0x1f 0x73 0x53 0xa7 ]
   [ 0x21 0x66 0x46 0xaa ]
-  [ 0x27 0xba 0xaa 0x27 ]
-  [ 0x28 0x69 0xa9 0x27 ]
+  [ 0x27 0x00 0x00 0x27 ]
+  [ 0x28 0x69 0x00 0x27 ]
   [ 0x29 0x22 0xe9 0x3c ]
   [ 0x2b 0x2c 0x3b 0x60 ]
   [ 0x2c 0x7a 0x5a 0xab ]
@@ -2315,8 +2336,7 @@
   [ 0x0d 0x2d 0x5f 0x7c ]
   [ 0x10 0x66 0x46 0x40 ]
   [ 0x11 0x67 0x47 0x67 ]
-  [ 0x12 0xbb 0xab 0xbb ]
-  [ 0x13 0xb9 0x49 0xb6 ]
+  [ 0x13 0x00 0x49 0xb6 ]
   [ 0x14 0x6f 0x4f 0xf4 ]
   [ 0x15 0x64 0x44 0xa5 ]
   [ 0x16 0x72 0x52 0xae ]
@@ -2326,15 +2346,15 @@
   [ 0x1a 0x71 0x51 0x00 ]
   [ 0x1b 0x77 0x57 0x7e ]
   [ 0x1e 0x75 0x55 0xfb ]
-  [ 0x1f 0x69 0xa9 0xee ]
-  [ 0x20 0x65 0x45 0xa4 ]
+  [ 0x1f 0x69 0x00 0xee ]
+  [ 0x20 0x65 0x45 0x00 ]
   [ 0x21 0x61 0x41 0xe2 ]
   [ 0x22 0xfc 0xdc 0xfb ]
   [ 0x23 0x74 0x54 0x00 ]
   [ 0x24 0x6b 0x4b 0x6b ]
   [ 0x25 0x6d 0x4d 0xb5 ]
   [ 0x27 0x79 0x59 0x27 ]
-  [ 0x28 0xba 0xaa 0x23 ]
+  [ 0x28 0x00 0x00 0x23 ]
   [ 0x29 0x2b 0x2a 0xac ]
   [ 0x2b 0x78 0x58 0x60 ]
   [ 0x2c 0x6a 0x4a 0xab ]
@@ -2364,19 +2384,19 @@
   [ 0x0c 0x2a 0x3f 0x5c ]
   [ 0x0d 0x2d 0x5f 0x7c ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x12 0x65 0x45 0xa4 ]
+  [ 0x12 0x65 0x45 0x00 ]
   [ 0x13 0x72 0x52 0xb6 ]
   [ 0x14 0x74 0x54 0x00 ]
   [ 0x15 0x79 0x59 0x00 ]
   [ 0x16 0x75 0x55 0xfb ]
-  [ 0x17 0x69 0x49 0xb9 ]
+  [ 0x17 0x69 0x49 0x00 ]
   [ 0x18 0x6f 0x4f 0xf4 ]
-  [ 0x1a 0x78 0x58 0xbb ]
+  [ 0x1a 0x78 0x58 0x00 ]
   [ 0x1b 0xfb 0xdb 0x7e ]
   [ 0x1e 0x61 0x41 0xe2 ]
   [ 0x1f 0x73 0x53 0xa7 ]
   [ 0x21 0x66 0x46 0xaa ]
-  [ 0x27 0xba 0xaa 0x27 ]
+  [ 0x27 0x00 0x00 0x27 ]
   [ 0x28 0xee 0xce 0x27 ]
   [ 0x29 0x22 0xe9 0x3c ]
   [ 0x2b 0x2c 0x3b 0x60 ]
@@ -2445,7 +2465,7 @@
   [ 0x03 0x32 0x40 0xb2 ]
   [ 0x04 0x33 0x23 0xb3 ]
   [ 0x05 0x34 0x24 0xa4 ]
-  [ 0x06 0x35 0x25 0xa4 ]
+  [ 0x06 0x35 0x25 0x00 ]
   [ 0x07 0x36 0x00 0xbc ]
   [ 0x08 0x37 0x26 0xbd ]
   [ 0x09 0x38 0x2a 0xbe ]
@@ -2468,7 +2488,7 @@
   [ 0x1e 0x61 0x41 0xe1 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
-  [ 0x25 0x6b 0x4b 0xbd ]
+  [ 0x25 0x6b 0x4b 0x00 ]
   [ 0x26 0x6c 0x4c 0xf8 ]
   [ 0x27 0x3b 0x3a 0xb6 ]
   [ 0x28 0x00 0x00 0x27 ]
@@ -2488,7 +2508,6 @@
 ] def
 
 /keymap.vn [
-  [ 0x02 0xe3 0xc3 0xe3 ]
   [ 0x03 0xe2 0xc2 0xe2 ]
   [ 0x04 0xea 0xca 0xea ]
   [ 0x05 0xf4 0xd4 0xf4 ]
@@ -2497,7 +2516,6 @@
   [ 0x08 0x00 0x26 0x00 ]
   [ 0x09 0x00 0x2a 0x00 ]
   [ 0x0a 0x00 0x28 0x00 ]
-  [ 0x0b 0xf0 0xd0 0xf0 ]
   [ 0x0d 0x00 0x2b 0x00 ]
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -2507,7 +2525,7 @@
   [ 0x03 0x32 0x40 0xa5 ]
   [ 0x04 0x33 0x23 0xa3 ]
   [ 0x05 0x34 0x24 0x24 ]
-  [ 0x06 0x35 0x25 0xa4 ]
+  [ 0x06 0x35 0x25 0x00 ]
   [ 0x07 0x36 0x5e 0x00 ]
   [ 0x08 0x37 0x26 0x7b ]
   [ 0x09 0x38 0x2a 0x5b ]
@@ -2516,7 +2534,7 @@
   [ 0x0c 0x2d 0x5f 0x5c ]
   [ 0x0d 0x3d 0x2b 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
+  [ 0x11 0x77 0x57 0x00 ]
   [ 0x12 0x65 0x45 0xeb ]
   [ 0x13 0x72 0x52 0xea ]
   [ 0x14 0x74 0x54 0x00 ]
@@ -2528,12 +2546,12 @@
   [ 0x1a 0x5b 0x7b 0x00 ]
   [ 0x1b 0x5d 0x7d 0x00 ]
   [ 0x1e 0x61 0x41 0xe4 ]
-  [ 0x1f 0x73 0x53 0xa8 ]
+  [ 0x1f 0x73 0x53 0x00 ]
   [ 0x20 0x64 0x44 0x00 ]
-  [ 0x21 0x66 0x46 0xf0 ]
-  [ 0x22 0x67 0x47 0xbf ]
-  [ 0x23 0x68 0x48 0xb1 ]
-  [ 0x25 0x6b 0x4b 0xa2 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
   [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0x3b 0x3a 0x00 ]
   [ 0x28 0x27 0x22 0x00 ]
diff --git a/scrape-console-setup b/scrape-console-setup
index ec77122..4d8a359 100755
--- a/scrape-console-setup
+++ b/scrape-console-setup
@@ -211,7 +211,7 @@ my %spec_map = (
 sub map_keycode ($) {
     my $type = ($_[0] >> 8) & 0xff;
     my $code = $_[0] & 0xff;
-    if ($type == 0xf0 or $type == 0xfb) {
+    if ($type == 0x00 or $type == 0x0b or $type == 0xf0 or $type == 0xfb) {
 	# KT_LATIN or KT_LETTER
 	if ($code == 0x08 or $code == 0x7f) {
 	    # Backspace vs. Delete is a tricky case. gfxboot understands
@@ -269,9 +269,9 @@ for my $keymap (@keymaps) {
     }
     my $ckbcomp = "ckbcomp -model $model -layout \Q$layout\E";
     $ckbcomp .= " -variant \Q$variant\E" if defined $variant;
-    my $table = `$ckbcomp | sudo loadkeys -m 2>/dev/null`;
+    my $table = `$ckbcomp | sudo loadkeys -mu 2>/dev/null`;
     for my $map (qw(plain shift altgr)) {
-	if ($table =~ /${map}_map\[\] = {\s*(.*?)(?:\s|,)*}/s) {
+	if ($table =~ /${map}_map\[[^]]*\] = {\s*(.*?)(?:\s|,)*}/s) {
 	    $keycodes{$keymap}{$map} =
 		[map { map_keycode(hex) } split(/,\s+/, $1)];
 	} else {