diff --git a/debian/changelog b/debian/changelog
index 798e922..b563c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gfxboot-theme-ubuntu (0.5.1) UNRELEASED; urgency=low
 
   * Update dates in debian/copyright.
+  * Update for layout changes up to console-setup 1.21ubuntu2. Shorten some
+    descriptions to cope with the increased number of layouts.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Tue, 04 Dec 2007 11:36:02 +0000
 
diff --git a/keytables.inc b/keytables.inc
index a8afe4d..c622680 100644
--- a/keytables.inc
+++ b/keytables.inc
@@ -290,6 +290,10 @@
   [ 0x79 keyDel keyDel keyDel ]
 ] def
 
+/keymap.braille [
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.bt [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -337,23 +341,26 @@
   [ 0x08 0x29 0x37 0x5d ]
   [ 0x09 0x00 0x38 0xbb ]
   [ 0x0a 0x00 0x39 0x00 ]
-  [ 0x0b 0x00 0x30 0x00 ]
+  [ 0x0b 0x00 0x30 0x40 ]
   [ 0x0c 0x2d 0x5f 0x25 ]
   [ 0x0d 0x3d 0x2b 0xd7 ]
   [ 0x10 0x61 0x41 0x61 ]
+  [ 0x11 0x7a 0x5a 0x7a ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0x00 ]
   [ 0x18 0x6f 0x4f 0xf8 ]
+  [ 0x1a 0x00 0x00 0x5e ]
   [ 0x1b 0x2a 0x5e 0x24 ]
   [ 0x1e 0x71 0x51 0x71 ]
   [ 0x27 0x6d 0x4d 0x6d ]
   [ 0x29 0x60 0x7e 0x00 ]
   [ 0x2b 0x22 0x5c 0x7c ]
+  [ 0x2c 0x77 0x57 0x77 ]
   [ 0x2e 0x63 0x43 0xe7 ]
-  [ 0x32 0x2c 0x2e 0x2c ]
-  [ 0x33 0x3b 0x3a 0x3b ]
-  [ 0x34 0x21 0x3f 0x21 ]
-  [ 0x35 0x27 0x2f 0x00 ]
+  [ 0x32 0x2c 0x3f 0x00 ]
+  [ 0x33 0x3b 0x2e 0x3b ]
+  [ 0x34 0x3a 0x2f 0x3a ]
+  [ 0x35 0x21 0x27 0x00 ]
   [ 0x39 0x20 0x20 0xa0 ]
   [ 0x56 0x5c 0x7c 0x7c ]
 ] def
@@ -454,23 +461,7 @@
   [ 0x56 0x3c 0x3e 0x5c ]
 ] def
 
-/keymap.cs [
-  [ 0x02 0x00 0x21 0x00 ]
-  [ 0x03 0x00 0x22 0x00 ]
-  [ 0x04 0x00 0x23 0x00 ]
-  [ 0x05 0x00 0x24 0x00 ]
-  [ 0x06 0x00 0x25 0x00 ]
-  [ 0x07 0x00 0x26 0x00 ]
-  [ 0x08 0x00 0x2f 0x00 ]
-  [ 0x09 0x00 0x28 0x00 ]
-  [ 0x0a 0x00 0x29 0x00 ]
-  [ 0x0b 0x00 0x3d 0x00 ]
-  [ 0x0c 0x00 0x3f 0x00 ]
-  [ 0x0d 0x00 0x2a 0x00 ]
-  [ 0x29 0x00 0x7e 0x00 ]
-  [ 0x33 0x00 0x3b 0x00 ]
-  [ 0x34 0x00 0x3a 0x00 ]
-  [ 0x35 0x00 0x5f 0x00 ]
+/keymap.cn [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
@@ -672,53 +663,21 @@
 ] def
 
 /keymap.epo [
-  [ 0x02 0x00 0x21 0x00 ]
-  [ 0x03 0x00 0x22 0x00 ]
-  [ 0x04 0x00 0x23 0x00 ]
-  [ 0x05 0x00 0x24 0x00 ]
-  [ 0x06 0x00 0x25 0x00 ]
-  [ 0x07 0x00 0x27 0x00 ]
-  [ 0x08 0x00 0x26 0x00 ]
-  [ 0x09 0x00 0x2a 0x00 ]
-  [ 0x0a 0x00 0x28 0x00 ]
-  [ 0x0b 0x00 0x29 0x00 ]
-  [ 0x0c 0x00 0x5f 0x00 ]
-  [ 0x0d 0x00 0x2b 0x00 ]
-  [ 0x10 0x00 0xde 0x40 ]
-  [ 0x11 0x00 0xac 0x5e ]
-  [ 0x12 0x00 0x45 0xa4 ]
-  [ 0x13 0x00 0x52 0x00 ]
-  [ 0x14 0x00 0x54 0x00 ]
-  [ 0x15 0x00 0xd8 0x00 ]
-  [ 0x16 0x00 0x55 0x00 ]
-  [ 0x17 0x00 0x49 0x00 ]
-  [ 0x18 0x00 0x4f 0x00 ]
-  [ 0x19 0x00 0x50 0x00 ]
-  [ 0x1a 0x00 0x7b 0x00 ]
-  [ 0x1b 0x00 0x7d 0x00 ]
-  [ 0x1e 0x00 0x41 0x3c ]
-  [ 0x1f 0x00 0x53 0x3e ]
+  [ 0x06 0x35 0x25 0xa4 ]
+  [ 0x10 0xfe 0xde 0x71 ]
+  [ 0x11 0xf8 0xd8 0x77 ]
+  [ 0x15 0xfd 0xdd 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 ]
-  [ 0x22 0x00 0x47 0x00 ]
-  [ 0x23 0x00 0x48 0x00 ]
-  [ 0x24 0x00 0x4a 0x00 ]
-  [ 0x25 0x00 0x4b 0x00 ]
-  [ 0x26 0x00 0x4c 0x00 ]
-  [ 0x27 0x00 0xdd 0x00 ]
-  [ 0x28 0x00 0xa6 0x00 ]
-  [ 0x29 0x00 0x7e 0x00 ]
-  [ 0x2b 0x00 0x7c 0x00 ]
-  [ 0x2c 0x00 0x5a 0x00 ]
-  [ 0x2d 0x00 0xc6 0x00 ]
-  [ 0x2e 0x00 0x43 0x00 ]
-  [ 0x2f 0x00 0x56 0x00 ]
-  [ 0x30 0x00 0x42 0x00 ]
-  [ 0x31 0x00 0x4e 0x00 ]
-  [ 0x32 0x00 0x4d 0x00 ]
-  [ 0x33 0x00 0x3b 0x00 ]
-  [ 0x34 0x00 0x3a 0x00 ]
-  [ 0x35 0x00 0x3f 0x00 ]
+  [ 0x2d 0xe6 0xc6 0x78 ]
+  [ 0x31 0x6e 0x4e 0x00 ]
+  [ 0x32 0x6d 0x4d 0x00 ]
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
@@ -726,7 +685,7 @@
   [ 0x02 0x31 0x21 0x7c ]
   [ 0x03 0x32 0x22 0x40 ]
   [ 0x04 0x33 0xb7 0x23 ]
-  [ 0x05 0x34 0x24 0x7e ]
+  [ 0x05 0x34 0x24 0x00 ]
   [ 0x06 0x35 0x25 0xbd ]
   [ 0x07 0x36 0x26 0xac ]
   [ 0x08 0x37 0x2f 0x7b ]
@@ -771,51 +730,47 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.et [
+  [ 0x2b 0x5c 0x00 0x5c ]
+  [ 0x35 0x00 0x3f 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.fi [
-  [ 0x02 0x31 0x21 0xa1 ]
+  [ 0x02 0x00 0x21 0x00 ]
   [ 0x03 0x32 0x22 0x40 ]
   [ 0x04 0x33 0x23 0xa3 ]
   [ 0x05 0x34 0xa4 0x24 ]
-  [ 0x06 0x35 0x25 0xa4 ]
-  [ 0x07 0x36 0x26 0xa5 ]
-  [ 0x08 0x37 0x2f 0x7b ]
-  [ 0x09 0x38 0x28 0x5b ]
-  [ 0x0a 0x39 0x29 0x5d ]
+  [ 0x06 0x35 0x25 0x00 ]
+  [ 0x07 0x36 0x26 0x00 ]
+  [ 0x08 0x00 0x2f 0x7b ]
+  [ 0x09 0x00 0x28 0x5b ]
+  [ 0x0a 0x00 0x29 0x5d ]
   [ 0x0b 0x30 0x3d 0x7d ]
   [ 0x0c 0x2b 0x3f 0x5c ]
-  [ 0x10 0x71 0x51 0x40 ]
-  [ 0x11 0x77 0x57 0xb3 ]
-  [ 0x12 0x65 0x45 0xa4 ]
-  [ 0x13 0x72 0x52 0xae ]
+  [ 0x12 0x00 0x45 0xa4 ]
   [ 0x14 0x74 0x54 0xfe ]
-  [ 0x15 0x79 0x59 0x00 ]
-  [ 0x16 0x75 0x55 0x00 ]
-  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x17 0x00 0x49 0xb9 ]
   [ 0x18 0x6f 0x4f 0xbd ]
-  [ 0x19 0x70 0x50 0xb6 ]
-  [ 0x1a 0xe5 0xc5 0xbd ]
-  [ 0x1e 0x61 0x41 0xaa ]
-  [ 0x1f 0x73 0x53 0xa8 ]
+  [ 0x19 0x70 0x50 0x00 ]
+  [ 0x1a 0xe5 0xc5 0x00 ]
+  [ 0x1e 0x61 0x41 0x00 ]
+  [ 0x1f 0x00 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 ]
+  [ 0x25 0x00 0x4b 0xa2 ]
+  [ 0x26 0x00 0x4c 0x00 ]
   [ 0x27 0xf6 0xd6 0xf8 ]
   [ 0x28 0xe4 0xc4 0xe6 ]
-  [ 0x29 0xa7 0xbd 0xbc ]
+  [ 0x29 0x00 0xbd 0x00 ]
   [ 0x2b 0x27 0x2a 0x00 ]
-  [ 0x2c 0x7a 0x5a 0xb8 ]
+  [ 0x2c 0x7a 0x5a 0x00 ]
   [ 0x2d 0x78 0x58 0xd7 ]
-  [ 0x2e 0x63 0x43 0xa9 ]
-  [ 0x2f 0x76 0x56 0x00 ]
-  [ 0x30 0x62 0x42 0xdf ]
-  [ 0x31 0x6e 0x4e 0xf1 ]
+  [ 0x31 0x6e 0x4e 0xbf ]
   [ 0x32 0x6d 0x4d 0xb5 ]
   [ 0x33 0x2c 0x3b 0x00 ]
-  [ 0x34 0x2e 0x3a 0xb7 ]
-  [ 0x35 0x2d 0x5f 0xad ]
+  [ 0x34 0x2e 0x3a 0x00 ]
+  [ 0x35 0x2d 0x5f 0x00 ]
+  [ 0x39 0x20 0x20 0xa0 ]
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
@@ -943,7 +898,7 @@
   [ 0x17 0x69 0x49 0xee ]
   [ 0x18 0x6f 0x4f 0xbd ]
   [ 0x19 0x70 0x50 0xf4 ]
-  [ 0x1b 0x24 0xa3 0xb3 ]
+  [ 0x1b 0x24 0xa3 0xf8 ]
   [ 0x1e 0x71 0x51 0xe4 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xeb ]
@@ -954,9 +909,9 @@
   [ 0x25 0x6b 0x4b 0xef ]
   [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x27 0x6d 0x4d 0xf6 ]
-  [ 0x28 0xf9 0x25 0xb9 ]
-  [ 0x29 0xf8 0xd8 0x00 ]
-  [ 0x2b 0x2a 0xb5 0xb2 ]
+  [ 0x28 0xf9 0x25 0x00 ]
+  [ 0x29 0xb2 0xb3 0xb9 ]
+  [ 0x2b 0x2a 0xb5 0x00 ]
   [ 0x2c 0x77 0x57 0xab ]
   [ 0x2d 0x78 0x58 0xbb ]
   [ 0x2e 0x63 0x43 0xa9 ]
@@ -1026,6 +981,25 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.gn [
+  [ 0x04 0x00 0x00 0x23 ]
+  [ 0x06 0x28 0x00 0x00 ]
+  [ 0x07 0x2d 0x00 0x7c ]
+  [ 0x08 0x00 0x00 0x60 ]
+  [ 0x09 0x00 0x00 0x5c ]
+  [ 0x0a 0x00 0x00 0x5e ]
+  [ 0x0b 0x00 0x00 0x40 ]
+  [ 0x0c 0x29 0x29 0x29 ]
+  [ 0x0d 0x3d 0x2b 0x7d ]
+  [ 0x11 0x00 0x3c 0x00 ]
+  [ 0x1b 0x24 0xa3 0xa4 ]
+  [ 0x28 0x00 0x00 0x25 ]
+  [ 0x29 0x00 0x7e 0xac ]
+  [ 0x2b 0x00 0x2a 0x00 ]
+  [ 0x34 0x00 0x2f 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.gr [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -1220,7 +1194,7 @@
   [ 0x0b 0x00 0x29 0x00 ]
   [ 0x0c 0x2d 0x00 0x2d ]
   [ 0x33 0x2c 0x00 0x2c ]
-  [ 0x34 0x2e 0x2e 0x2e ]
+  [ 0x34 0x2e 0x00 0x2e ]
   [ 0x35 0x00 0x3f 0x00 ]
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -1252,20 +1226,21 @@
 ] def
 
 /keymap.iq [
+  [ 0x0a 0x39 0x29 0x39 ]
+  [ 0x0b 0x30 0x28 0x30 ]
   [ 0x16 0x00 0x60 0x00 ]
   [ 0x17 0x00 0xf7 0x00 ]
   [ 0x18 0x00 0xd7 0x00 ]
-  [ 0x1a 0x00 0x7b 0x00 ]
-  [ 0x1b 0x00 0x7d 0x00 ]
-  [ 0x1e 0x00 0x5c 0x00 ]
-  [ 0x1f 0x00 0x53 0x00 ]
-  [ 0x20 0x00 0x5b 0x00 ]
-  [ 0x21 0x00 0x5d 0x00 ]
+  [ 0x1a 0x00 0x3c 0x00 ]
+  [ 0x1b 0x00 0x3e 0x00 ]
+  [ 0x20 0x00 0x5d 0x00 ]
+  [ 0x21 0x00 0x5b 0x00 ]
   [ 0x26 0x00 0x2f 0x00 ]
   [ 0x27 0x00 0x3a 0x00 ]
   [ 0x28 0x00 0x22 0x00 ]
-  [ 0x2b 0x3c 0x3e 0x3c ]
   [ 0x2c 0x00 0x7e 0x00 ]
+  [ 0x2e 0x00 0x7d 0x00 ]
+  [ 0x2f 0x00 0x7b 0x00 ]
   [ 0x32 0x00 0x27 0x00 ]
   [ 0x33 0x00 0x2c 0x00 ]
   [ 0x34 0x00 0x2e 0x00 ]
@@ -1435,7 +1410,7 @@
   [ 0x17 0x69 0x49 0x00 ]
   [ 0x18 0x6f 0x4f 0xf8 ]
   [ 0x19 0x70 0x50 0xfe ]
-  [ 0x1b 0x2b 0x2a 0x7e ]
+  [ 0x1b 0x2b 0x2a 0x00 ]
   [ 0x1e 0x61 0x41 0xe6 ]
   [ 0x1f 0x73 0x53 0xdf ]
   [ 0x20 0x64 0x44 0xf0 ]
@@ -1504,6 +1479,37 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.ma [
+  [ 0x02 0x26 0x31 0x26 ]
+  [ 0x03 0xe9 0x32 0xe9 ]
+  [ 0x04 0x22 0x33 0x22 ]
+  [ 0x05 0x27 0x34 0x27 ]
+  [ 0x06 0x28 0x35 0x28 ]
+  [ 0x07 0x2d 0x36 0x2d ]
+  [ 0x08 0xe8 0x37 0xe8 ]
+  [ 0x09 0x5f 0x38 0x5f ]
+  [ 0x0a 0xe7 0x39 0xe7 ]
+  [ 0x0b 0xe0 0x30 0xe0 ]
+  [ 0x0c 0x29 0xb0 0x29 ]
+  [ 0x16 0x00 0x60 0x00 ]
+  [ 0x17 0x00 0xf7 0x00 ]
+  [ 0x18 0x00 0xd7 0x00 ]
+  [ 0x1a 0x00 0x3c 0x00 ]
+  [ 0x1b 0x00 0x3e 0x00 ]
+  [ 0x20 0x00 0x5d 0x00 ]
+  [ 0x21 0x00 0x5b 0x00 ]
+  [ 0x26 0x00 0x2f 0x00 ]
+  [ 0x27 0x00 0x3a 0x00 ]
+  [ 0x28 0x00 0x22 0x00 ]
+  [ 0x2c 0x00 0x7e 0x00 ]
+  [ 0x2e 0x00 0x7d 0x00 ]
+  [ 0x2f 0x00 0x7b 0x00 ]
+  [ 0x32 0x00 0x27 0x00 ]
+  [ 0x33 0x00 0x2c 0x00 ]
+  [ 0x34 0x00 0x2e 0x00 ]
+  [ 0x56 0x7c 0xa6 0x7c ]
+] def
+
 /keymap.mao [
   [ 0x02 0x31 0x21 0xb9 ]
   [ 0x03 0x32 0x40 0xb2 ]
@@ -1553,6 +1559,48 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.me [
+  [ 0x02 0x00 0x21 0x00 ]
+  [ 0x03 0x00 0x22 0x00 ]
+  [ 0x04 0x00 0x23 0x00 ]
+  [ 0x05 0x00 0x24 0x00 ]
+  [ 0x06 0x00 0x25 0x00 ]
+  [ 0x07 0x00 0x26 0x00 ]
+  [ 0x08 0x00 0x2f 0x00 ]
+  [ 0x09 0x00 0x28 0x00 ]
+  [ 0x0a 0x00 0x29 0x00 ]
+  [ 0x0b 0x00 0x3d 0x00 ]
+  [ 0x0c 0x00 0x3f 0x00 ]
+  [ 0x0d 0x00 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 ]
+  [ 0x1b 0x00 0x00 0xd7 ]
+  [ 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 0x00 0x7e 0x00 ]
+  [ 0x2b 0x00 0x00 0xa4 ]
+  [ 0x2e 0x00 0x00 0xa2 ]
+  [ 0x2f 0x00 0x00 0x40 ]
+  [ 0x30 0x00 0x00 0x7b ]
+  [ 0x31 0x00 0x00 0x7d ]
+  [ 0x32 0x00 0x00 0x5e ]
+  [ 0x33 0x00 0x3b 0x00 ]
+  [ 0x34 0x00 0x3a 0x00 ]
+  [ 0x35 0x00 0x5f 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.mk [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -1633,7 +1681,7 @@
   [ 0x08 0x37 0x5f 0xa3 ]
   [ 0x09 0x38 0x28 0x7b ]
   [ 0x0a 0x39 0x29 0x7d ]
-  [ 0x0b 0x30 0x27 0x7d ]
+  [ 0x0b 0x30 0x27 0xb0 ]
   [ 0x0c 0x2f 0x3f 0x5c ]
   [ 0x0d 0xb0 0x00 0x00 ]
   [ 0x10 0x71 0x51 0x40 ]
@@ -1657,7 +1705,7 @@
   [ 0x25 0x6b 0x4b 0xa2 ]
   [ 0x26 0x6c 0x4c 0xb3 ]
   [ 0x27 0x2b 0xb1 0x00 ]
-  [ 0x28 0x27 0x60 0x00 ]
+  [ 0x28 0x00 0x00 0x27 ]
   [ 0x29 0x40 0xa7 0xac ]
   [ 0x2b 0x3c 0x3e 0x00 ]
   [ 0x2c 0x7a 0x5a 0xab ]
@@ -1912,6 +1960,26 @@
   [ 0x56 0x5c 0x7c 0x7c ]
 ] def
 
+/keymap.rs [
+  [ 0x02 0x00 0x21 0x00 ]
+  [ 0x03 0x00 0x22 0x00 ]
+  [ 0x04 0x00 0x23 0x00 ]
+  [ 0x05 0x00 0x24 0x00 ]
+  [ 0x06 0x00 0x25 0x00 ]
+  [ 0x07 0x00 0x26 0x00 ]
+  [ 0x08 0x00 0x2f 0x00 ]
+  [ 0x09 0x00 0x28 0x00 ]
+  [ 0x0a 0x00 0x29 0x00 ]
+  [ 0x0b 0x00 0x3d 0x00 ]
+  [ 0x0c 0x00 0x3f 0x00 ]
+  [ 0x0d 0x00 0x2a 0x00 ]
+  [ 0x29 0x00 0x7e 0x00 ]
+  [ 0x33 0x00 0x3b 0x00 ]
+  [ 0x34 0x00 0x3a 0x00 ]
+  [ 0x35 0x00 0x5f 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.ru [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -2271,6 +2339,49 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.us_intl [
+  [ 0x02 0x31 0x21 0xa1 ]
+  [ 0x03 0x32 0x40 0xb2 ]
+  [ 0x04 0x33 0x23 0xb3 ]
+  [ 0x05 0x34 0x24 0xa4 ]
+  [ 0x06 0x35 0x25 0xa4 ]
+  [ 0x07 0x36 0x00 0xbc ]
+  [ 0x08 0x37 0x26 0xbd ]
+  [ 0x09 0x38 0x2a 0xbe ]
+  [ 0x0a 0x39 0x28 0x00 ]
+  [ 0x0b 0x30 0x29 0x00 ]
+  [ 0x0c 0x2d 0x5f 0xa5 ]
+  [ 0x0d 0x3d 0x2b 0xd7 ]
+  [ 0x10 0x71 0x51 0xe4 ]
+  [ 0x11 0x77 0x57 0xe5 ]
+  [ 0x12 0x65 0x45 0xe9 ]
+  [ 0x13 0x72 0x52 0xae ]
+  [ 0x14 0x74 0x54 0xfe ]
+  [ 0x15 0x79 0x59 0xfc ]
+  [ 0x16 0x75 0x55 0xfa ]
+  [ 0x17 0x69 0x49 0xed ]
+  [ 0x18 0x6f 0x4f 0xf3 ]
+  [ 0x19 0x70 0x50 0xf6 ]
+  [ 0x1a 0x5b 0x7b 0xab ]
+  [ 0x1b 0x5d 0x7d 0xbb ]
+  [ 0x1e 0x61 0x41 0xe1 ]
+  [ 0x1f 0x73 0x53 0xdf ]
+  [ 0x20 0x64 0x44 0xf0 ]
+  [ 0x25 0x6b 0x4b 0xbd ]
+  [ 0x26 0x6c 0x4c 0xf8 ]
+  [ 0x27 0x3b 0x3a 0xb6 ]
+  [ 0x28 0x00 0x00 0x27 ]
+  [ 0x29 0x00 0x00 0x60 ]
+  [ 0x2b 0x5c 0x7c 0xac ]
+  [ 0x2c 0x7a 0x5a 0xe6 ]
+  [ 0x2e 0x63 0x43 0xa9 ]
+  [ 0x31 0x6e 0x4e 0xf1 ]
+  [ 0x32 0x6d 0x4d 0xb5 ]
+  [ 0x33 0x2c 0x3c 0xe7 ]
+  [ 0x35 0x2f 0x3f 0xbf ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.uz [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -2351,10 +2462,12 @@
   [ "be" keymap.be "Belgium" [ "_BE" ] .undef ]
   [ "bt" keymap.bt "Bhutan" [ ] .undef ]
   [ "ba" keymap.ba "Bosnia" [ "bs_" ] .undef ]
+  [ "braille" keymap.braille "Braille" [ ] .undef ]
   [ "br" keymap.br "Brazil" [ "_BR" ] "abnt2" ]
   [ "bg" keymap.bg "Bulgaria" [ "_BG" ] .undef ]
   [ "kh" keymap.kh "Cambodia" [ ] .undef ]
   [ "ca" keymap.ca "Canada" [ "_CA" ] .undef ]
+  [ "cn" keymap.cn "China" [ "zh_CN" ] .undef ]
   [ "cd" keymap.cd "Congo" [ ] .undef ]
   [ "hr" keymap.hr "Croatia" [ "hr_" ] .undef ]
   [ "cz" keymap.cz "Czechia" [ "_CZ" ] .undef ]
@@ -2362,14 +2475,15 @@
   [ "us_dvorak" keymap.us_dvorak "Dvorak" [ ] .undef ]
   [ "epo" keymap.epo "Esperanto" [ "eo" ] .undef ]
   [ "ee" keymap.ee "Estonia" [ "_EE" ] .undef ]
-  [ "fo" keymap.fo "Faroe Islands" [ ] .undef ]
+  [ "et" keymap.et "Ethiopia" [ ] .undef ]
+  [ "fo" keymap.fo "Faroes" [ ] .undef ]
   [ "fi" keymap.fi "Finland" [ "_FI" ] .undef ]
-  [ "fi_smi" keymap.fi_smi "Finland (Saami)" [ "se_FI" ] .undef ]
   [ "fr_oss" keymap.fr_oss "France" [ "fr_" ] .undef ]
   [ "ge" keymap.ge "Georgia" [ "ka_" ] .undef ]
   [ "de" keymap.de "Germany" [ "de_" ] .undef ]
   [ "gh" keymap.gh "Ghana" [ ] .undef ]
   [ "gr" keymap.gr "Greece" [ "el_" ] .undef ]
+  [ "gn" keymap.gn "Guinea" [ ] .undef ]
   [ "in_guj" keymap.in_guj "Gujarati" [ "gu_" ] .undef ]
   [ "in_guru" keymap.in_guru "Gurmukhi" [ "pa_" ] .undef ]
   [ "hu" keymap.hu "Hungary" [ "_HU" ] .undef ]
@@ -2386,7 +2500,7 @@
   [ "kr" keymap.kr "Korea" [ ] .undef ]
   [ "kg" keymap.kg "Kyrgyzstan" [ ] .undef ]
   [ "la" keymap.la "Laos" [ "lo_" ] .undef ]
-  [ "latam" keymap.latam "Latin American" [ "_AR" "_BO" "_CL" "_CO" "_CR" "_DO" "_EC" "_GT" "_HN" "_MX" "_NI" "_PA" "_PE" "es_PR" "_PY" "_SV" "es_US" "_UY" "_VE" ] .undef ]
+  [ "latam" keymap.latam "Latin Amer." [ "_AR" "_BO" "_CL" "_CO" "_CR" "_DO" "_EC" "_GT" "_HN" "_MX" "_NI" "_PA" "_PE" "es_PR" "_PY" "_SV" "es_US" "_UY" "_VE" ] .undef ]
   [ "lv" keymap.lv "Latvia" [ "_LV" ] .undef ]
   [ "lt" keymap.lt "Lithuania" [ "_LT" ] .undef ]
   [ "mk" keymap.mk "Macedonia" [ "_MK" ] .undef ]
@@ -2395,25 +2509,28 @@
   [ "mt" keymap.mt "Malta" [ "_MT" ] .undef ]
   [ "mao" keymap.mao "Maori" [ ] .undef ]
   [ "mn" keymap.mn "Mongolia" [ "_MN" ] .undef ]
+  [ "me" keymap.me "Montenegro" [ "sr_ME" ] .undef ]
+  [ "ma" keymap.ma "Morocco" [ "_MA" ] .undef ]
   [ "mm" keymap.mm "Myanmar" [ ] .undef ]
   [ "np" keymap.np "Nepal" [ ] .undef ]
-  [ "nl" keymap.nl "Netherlands" [ "_NL" ] .undef ]
+  [ "nl" keymap.nl "Netherlands" [ ] .undef ]
   [ "ng" keymap.ng "Nigeria" [ ] .undef ]
   [ "no" keymap.no "Norway" [ "_NO" ] .undef ]
-  [ "no_smi" keymap.no_smi "Norway (Saami)" [ "se_NO" ] .undef ]
   [ "pk" keymap.pk "Pakistan" [ ] .undef ]
   [ "pl" keymap.pl "Poland" [ "_PL" ] .undef ]
   [ "pt" keymap.pt "Portugal" [ "_PT" ] .undef ]
   [ "ro" keymap.ro "Romania" [ "_RO" ] .undef ]
   [ "ru" keymap.ru "Russia" [ "_RU" ] .undef ]
-  [ "cs" keymap.cs "Serbia" [ "sr_" ] .undef ]
+  [ "fi_smi" keymap.fi_smi "Saami (Fin.)" [ "se_FI" ] .undef ]
+  [ "no_smi" keymap.no_smi "Saami (Nor.)" [ "se_NO" ] .undef ]
+  [ "se_smi" keymap.se_smi "Saami (Swe.)" [ "se_SE" ] .undef ]
+  [ "rs" keymap.rs "Serbia" [ "sr_" ] .undef ]
   [ "sk" keymap.sk "Slovakia" [ "_SK" ] .undef ]
   [ "si" keymap.si "Slovenia" [ "_SI" ] .undef ]
   [ "za" keymap.za "South Africa" [ ] .undef ]
   [ "es" keymap.es "Spain" [ "_ES" ] .undef ]
   [ "lk" keymap.lk "Sri Lanka" [ ] .undef ]
   [ "se" keymap.se "Sweden" [ "sv_" ] .undef ]
-  [ "se_smi" keymap.se_smi "Sweden (Saami)" [ "se_SE" ] .undef ]
   [ "ch_fr" keymap.ch_fr "Swiss French" [ "fr_CH" ] .undef ]
   [ "ch" keymap.ch "Swiss German" [ "_CH" ] .undef ]
   [ "sy" keymap.sy "Syria" [ ] .undef ]
@@ -2423,12 +2540,13 @@
   [ "th" keymap.th "Thailand" [ "_TH" ] .undef ]
   [ "tr" keymap.tr "Turkey" [ "_TR" ] .undef ]
   [ "tr_f" keymap.tr_f "Turkey ((F))" [ ] .undef ]
-  [ "us" keymap.us "U.S. English" [ "en_US" ] .undef ]
+  [ "gb" keymap.gb "UK" [ "_GB" ] .undef ]
+  [ "us" keymap.us "USA" [ "en_US" ] .undef ]
+  [ "us_intl" keymap.us_intl "USA Intl." [ "_NL" ] .undef ]
   [ "ua" keymap.ua "Ukraine" [ "_UA" ] .undef ]
-  [ "gb" keymap.gb "United Kingdom" [ "_GB" ] .undef ]
   [ "uz" keymap.uz "Uzbekistan" [ ] .undef ]
   [ "vn" keymap.vn "Vietnam" [ "_VN" ] .undef ]
 ] def
 
 % set to "us" for safety
-/config.keymap keymaps 83 get def
+/config.keymap keymaps 90 get def
diff --git a/scrape-console-setup b/scrape-console-setup
index 9536054..4bb9633 100755
--- a/scrape-console-setup
+++ b/scrape-console-setup
@@ -36,8 +36,8 @@ my %keymap_locales = (
     'jp' => '_JP',
     'lt' => '_LT',
     'lv' => '_LV',
+    'ma' => '_MA',
     'mk' => '_MK',
-    'nl' => '_NL',
     'mn' => '_MN',
     'mt' => '_MT',
     'no_smi' => 'se_NO',
@@ -54,6 +54,7 @@ my %keymap_locales = (
     'tr' => '_TR',
     'ua' => '_UA',
     'us' => 'en_US',
+    'us_intl' => '_NL',
     'vn' => '_VN',
     'latam' => ['_AR', '_BO', '_CL', '_CO', '_CR', '_DO', '_EC', '_GT', '_HN', '_MX', '_NI', '_PA', '_PE', 'es_PR', '_PY', '_SV', 'es_US', '_UY', '_VE'],
     'ara' => 'ar_',
@@ -71,10 +72,12 @@ my %keymap_locales = (
     'la' => 'lo_',
     'in_mal' => 'ml_',
     'in_guru' => 'pa_',
-    'cs' => 'sr_',
+    'me' => 'sr_ME',
+    'rs' => 'sr_',
     'se' => 'sv_',
     'in_tam' => 'ta_',
     'in_tel' => 'te_',
+    'cn' => 'zh_CN',
 );
 
 # Non-top-level layouts to put on the menu.
@@ -100,8 +103,10 @@ my %description_overrides = (
     'ch_fr' => 'Swiss French',
     'ch' => 'Swiss German',
     'cs' => 'Serbia',
-    'fi_smi' => 'Finland (Saami)',
+    'fi_smi' => 'Saami (Fin.)',
+    'fo' => 'Faroes',
     'fr_oss' => 'France',
+    'gb' => 'UK',
     'in_guj' => 'Gujarati',
     'in_guru' => 'Gurmukhi',
     'in_kan' => 'Kannada',
@@ -109,9 +114,11 @@ my %description_overrides = (
     'in_tam' => 'Tamil',
     'in_tel' => 'Telugu',
     'kr' => 'Korea',
-    'no_smi' => 'Norway (Saami)',
-    'se_smi' => 'Sweden (Saami)',
+    'latam' => 'Latin Amer.',
+    'no_smi' => 'Saami (Nor.)',
+    'se_smi' => 'Saami (Swe.)',
     'us_dvorak' => 'Dvorak',
+    'us_intl' => 'USA Intl.',
 );
 
 # These keymaps are non-Latin, which isn't very useful in gfxboot, so map