diff --git a/16x16.fnt b/16x16.fnt
index fa78015..f0beb9d 100644
Binary files a/16x16.fnt and b/16x16.fnt differ
diff --git a/Makefile b/Makefile
index 00ca096..32186a0 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ font:
 	@if [ -z "$(DI_PATH)" ]; then echo "Please set DI_PATH to an unpacked debian-installer source tree" >&2; exit 1; fi
 	cat po/*.po >tmp.txt
 	cat $(DI_PATH)/build/boot/x86/po/*.po >>tmp.txt
-	mkblfont -v -l 18 -p /usr/share/fonts/X11/misc \
+	gfxboot-font -v -l 18 -p /usr/share/fonts/X11/misc \
 	-c ISO-8859-15 -c ISO-8859-2 -c koi8-r \
 	`$(KEYMAPCHARS) keytables.inc` \
 	-t tmp.txt \
diff --git a/debian/changelog b/debian/changelog
index f69ceb6..e37cce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gfxboot-theme-ubuntu (0.11.2) UNRELEASED; urgency=low
+
+  * Update keymaps from console-setup 1.57ubuntu17.
+  * Update langnames from localechooser 2.34ubuntu3.
+  * Regenerate font.
+
+ -- Evan Dandrea <ev@ubuntu.com>  Mon, 28 Mar 2011 13:45:57 +0100
+
 gfxboot-theme-ubuntu (0.11.1) natty; urgency=low
 
   * Add an "access-options-v1" option to gfxboot.cfg, which overrides the
diff --git a/keytables.inc b/keytables.inc
index 1fb3a35..b76b07c 100644
--- a/keytables.inc
+++ b/keytables.inc
@@ -118,6 +118,56 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.at [
+  [ 0x02 0x31 0x21 0xb9 ]
+  [ 0x03 0x32 0x22 0xb2 ]
+  [ 0x04 0x33 0xa7 0xb3 ]
+  [ 0x05 0x34 0x24 0xbc ]
+  [ 0x06 0x35 0x25 0xbd ]
+  [ 0x07 0x36 0x26 0xac ]
+  [ 0x08 0x37 0x2f 0x7b ]
+  [ 0x09 0x38 0x28 0x5b ]
+  [ 0x0a 0x39 0x29 0x5d ]
+  [ 0x0b 0x30 0x3d 0x7d ]
+  [ 0x0c 0xdf 0x3f 0x5c ]
+  [ 0x10 0x71 0x51 0x40 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
+  [ 0x13 0x72 0x52 0xb6 ]
+  [ 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 0xfc 0xdc 0x00 ]
+  [ 0x1b 0x2b 0x2a 0x00 ]
+  [ 0x1e 0x61 0x41 0xe6 ]
+  [ 0x1f 0x73 0x53 0x00 ]
+  [ 0x20 0x64 0x44 0xf0 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x24 0x6a 0x4a 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x27 0xf6 0xd6 0x00 ]
+  [ 0x28 0xe4 0xc4 0x00 ]
+  [ 0x29 0x00 0xb0 0x00 ]
+  [ 0x2b 0x23 0x27 0x00 ]
+  [ 0x2c 0x79 0x59 0xbb ]
+  [ 0x2d 0x78 0x58 0xab ]
+  [ 0x2e 0x63 0x43 0xa2 ]
+  [ 0x2f 0x76 0x56 0x00 ]
+  [ 0x30 0x62 0x42 0x00 ]
+  [ 0x31 0x6e 0x4e 0x00 ]
+  [ 0x32 0x6d 0x4d 0xb5 ]
+  [ 0x33 0x2c 0x3b 0xb7 ]
+  [ 0x34 0x2e 0x3a 0x00 ]
+  [ 0x35 0x2d 0x5f 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.az [
   [ 0x04 0x33 0x23 0x00 ]
   [ 0x07 0x36 0x3a 0x00 ]
@@ -292,13 +342,24 @@
   [ 0x35 0x3b 0x3a 0x00 ]
   [ 0x56 0x5c 0x7c 0xba ]
   [ 0x59 0x2f 0x3f 0xb0 ]
-  [ 0x79 keyDel keyDel keyDel ]
 ] def
 
 /keymap.bt [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.bw [
+  [ 0x07 0x36 0x5e 0x00 ]
+  [ 0x09 0x38 0x2a 0x00 ]
+  [ 0x0a 0x39 0x28 0x00 ]
+  [ 0x0b 0x30 0x29 0x00 ]
+  [ 0x0c 0x2d 0x5f 0x00 ]
+  [ 0x27 0x3b 0x3a 0x00 ]
+  [ 0x28 0x27 0x22 0x00 ]
+  [ 0x29 0x60 0x7e 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.by [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -514,7 +575,6 @@
   [ 0x33 0x2c 0x3f 0x3c ]
   [ 0x34 0x2e 0x3a 0x3e ]
   [ 0x35 0x2d 0x5f 0x2a ]
-  [ 0x39 0x20 0x20 0xa0 ]
   [ 0x56 0x5c 0x7c 0x2f ]
 ] def
 
@@ -1171,8 +1231,8 @@
   [ 0x15 0x7a 0x5a 0x00 ]
   [ 0x16 0x75 0x55 0x00 ]
   [ 0x17 0x69 0x49 0xcd ]
-  [ 0x18 0x6f 0x4f 0xf8 ]
-  [ 0x19 0x70 0x50 0xfe ]
+  [ 0x18 0x6f 0x4f 0x00 ]
+  [ 0x19 0x70 0x50 0x00 ]
   [ 0x1a 0x00 0x00 0xf7 ]
   [ 0x1b 0xfa 0xda 0xd7 ]
   [ 0x1e 0x61 0x41 0xe4 ]
@@ -1196,7 +1256,7 @@
   [ 0x31 0x6e 0x4e 0x7d ]
   [ 0x32 0x6d 0x4d 0x3c ]
   [ 0x33 0x2c 0x3f 0x3b ]
-  [ 0x34 0x2e 0x3a 0x3e ]
+  [ 0x34 0x2e 0x3a 0x00 ]
   [ 0x35 0x2d 0x5f 0x2a ]
   [ 0x56 0xed 0xcd 0x3c ]
 ] def
@@ -1381,7 +1441,8 @@
   [ 0x26 0x00 0x2f 0x00 ]
   [ 0x27 0x00 0x3a 0x00 ]
   [ 0x28 0x00 0x22 0x00 ]
-  [ 0x2c 0x00 0x7e 0x00 ]
+  [ 0x2c 0x00 0x7e 0xbb ]
+  [ 0x2d 0x00 0x00 0xab ]
   [ 0x2e 0x00 0x7d 0x00 ]
   [ 0x2f 0x00 0x7b 0x00 ]
   [ 0x32 0x00 0x27 0x00 ]
@@ -1511,6 +1572,18 @@
   [ 0x7c 0x5c 0x7c 0x5c ]
 ] def
 
+/keymap.ke [
+  [ 0x07 0x36 0x5e 0x00 ]
+  [ 0x09 0x38 0x2a 0x00 ]
+  [ 0x0a 0x39 0x28 0x00 ]
+  [ 0x0b 0x30 0x29 0x00 ]
+  [ 0x0c 0x2d 0x5f 0x00 ]
+  [ 0x27 0x3b 0x3a 0x00 ]
+  [ 0x28 0x27 0x22 0x00 ]
+  [ 0x29 0x60 0x7e 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.kg [
   [ 0x03 0x32 0x22 0x32 ]
   [ 0x04 0x33 0x00 0x33 ]
@@ -1651,7 +1724,8 @@
   [ 0x26 0x00 0x2f 0x00 ]
   [ 0x27 0x00 0x3a 0x00 ]
   [ 0x28 0x00 0x22 0x00 ]
-  [ 0x2c 0x00 0x7e 0x00 ]
+  [ 0x2c 0x00 0x7e 0xbb ]
+  [ 0x2d 0x00 0x00 0xab ]
   [ 0x2e 0x00 0x7d 0x00 ]
   [ 0x2f 0x00 0x7b 0x00 ]
   [ 0x32 0x00 0x27 0x00 ]
@@ -1762,6 +1836,25 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.ml [
+  [ 0x02 0x00 0x21 0x00 ]
+  [ 0x03 0x00 0x40 0x00 ]
+  [ 0x04 0x00 0x23 0x00 ]
+  [ 0x05 0x00 0x24 0x00 ]
+  [ 0x06 0x00 0x25 0x00 ]
+  [ 0x07 0x00 0x5e 0x00 ]
+  [ 0x08 0x00 0x26 0x00 ]
+  [ 0x09 0x00 0x2a 0x00 ]
+  [ 0x0a 0x00 0x28 0x00 ]
+  [ 0x0b 0x00 0x29 0x00 ]
+  [ 0x0c 0x2d 0x00 0x2d ]
+  [ 0x2b 0x00 0x5c 0x00 ]
+  [ 0x33 0x2c 0x00 0x2c ]
+  [ 0x34 0x2e 0x00 0x2e ]
+  [ 0x35 0x00 0x3f 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.mm [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -1985,6 +2078,44 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.ph [
+  [ 0x02 0x31 0x21 0xb9 ]
+  [ 0x03 0x32 0x40 0xb2 ]
+  [ 0x04 0x33 0x23 0xb3 ]
+  [ 0x05 0x34 0x24 0xbc ]
+  [ 0x06 0x35 0x25 0xbd ]
+  [ 0x07 0x36 0x5e 0xbe ]
+  [ 0x08 0x37 0x26 0x00 ]
+  [ 0x09 0x38 0x2a 0x00 ]
+  [ 0x0a 0x39 0x28 0x00 ]
+  [ 0x0b 0x30 0x29 0x00 ]
+  [ 0x0c 0x2d 0x5f 0xac ]
+  [ 0x0d 0x3d 0x2b 0xb1 ]
+  [ 0x12 0x65 0x45 0x00 ]
+  [ 0x13 0x72 0x52 0xae ]
+  [ 0x14 0x74 0x54 0x00 ]
+  [ 0x15 0x79 0x59 0xa5 ]
+  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x18 0x6f 0x4f 0xf8 ]
+  [ 0x19 0x70 0x50 0x00 ]
+  [ 0x1e 0x61 0x41 0xe6 ]
+  [ 0x1f 0x73 0x53 0xa7 ]
+  [ 0x28 0x27 0x22 0x00 ]
+  [ 0x29 0x60 0x7e 0x00 ]
+  [ 0x2b 0x5c 0x7c 0x00 ]
+  [ 0x2c 0x7a 0x5a 0xab ]
+  [ 0x2d 0x78 0x58 0xd7 ]
+  [ 0x2e 0x63 0x43 0xa9 ]
+  [ 0x2f 0x76 0x56 0x00 ]
+  [ 0x30 0x62 0x42 0x00 ]
+  [ 0x31 0x6e 0x4e 0xf1 ]
+  [ 0x32 0x6d 0x4d 0xb5 ]
+  [ 0x33 0x2c 0x3c 0x00 ]
+  [ 0x34 0x2e 0x3e 0x00 ]
+  [ 0x35 0x2f 0x3f 0xf7 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.pk [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -2287,7 +2418,7 @@
   [ 0x25 0x6b 0x4b 0x00 ]
   [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x28 0x00 0x00 0xdf ]
-  [ 0x29 0xb8 0xa8 0xac ]
+  [ 0x29 0xb8 0xa8 0xa8 ]
   [ 0x2b 0x00 0x00 0xa4 ]
   [ 0x2c 0x79 0x59 0x00 ]
   [ 0x2d 0x78 0x58 0x00 ]
@@ -2559,6 +2690,47 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.tw [
+  [ 0x02 0x31 0x21 0x00 ]
+  [ 0x03 0x32 0x40 0x00 ]
+  [ 0x04 0x33 0x23 0xa7 ]
+  [ 0x05 0x34 0x24 0xa5 ]
+  [ 0x06 0x35 0x25 0x00 ]
+  [ 0x07 0x36 0x5e 0x00 ]
+  [ 0x08 0x37 0x26 0x00 ]
+  [ 0x09 0x38 0x2a 0x00 ]
+  [ 0x0a 0x39 0x28 0x00 ]
+  [ 0x0b 0x30 0x29 0x2e ]
+  [ 0x0c 0x2d 0x5f 0x5f ]
+  [ 0x0d 0x3d 0x2b 0xd7 ]
+  [ 0x10 0x71 0x51 0xb6 ]
+  [ 0x12 0x65 0x45 0xe9 ]
+  [ 0x13 0x72 0x52 0x00 ]
+  [ 0x14 0x74 0x54 0x00 ]
+  [ 0x15 0x79 0x59 0x00 ]
+  [ 0x16 0x75 0x55 0x00 ]
+  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x18 0x6f 0x4f 0xf8 ]
+  [ 0x1f 0x73 0x53 0xdf ]
+  [ 0x20 0x64 0x44 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x27 0x3b 0x3a 0x00 ]
+  [ 0x28 0x27 0x22 0x00 ]
+  [ 0x29 0x60 0x7e 0x00 ]
+  [ 0x2b 0x5c 0x7c 0xac ]
+  [ 0x2e 0x63 0x43 0xe7 ]
+  [ 0x31 0x6e 0x4e 0xf1 ]
+  [ 0x32 0x6d 0x4d 0xb5 ]
+  [ 0x34 0x2e 0x3e 0x00 ]
+  [ 0x35 0x2f 0x3f 0xbf ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
+/keymap.tz [
+  [ 0x0c 0x2d 0x00 0x2d ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.ua [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -2723,12 +2895,14 @@
   [ "ara" keymap.ara "Arabic" [ "ar_" ] .undef ]
   [ "am" keymap.am "Armenia" [ "hy_" ] .undef ]
   [ "es_ast" keymap.es_ast "Asturian" [ "ast_ES" ] .undef ]
+  [ "at" keymap.at "Austria" [ ] .undef ]
   [ "az" keymap.az "Azerbaijan" [ "_AZ" ] .undef ]
   [ "bd" keymap.bd "Bangladesh" [ "_BD" ] .undef ]
   [ "by" keymap.by "Belarus" [ "_BY" ] .undef ]
   [ "be" keymap.be "Belgium" [ "_BE" ] .undef ]
   [ "bt" keymap.bt "Bhutan" [ ] .undef ]
   [ "ba" keymap.ba "Bosnia" [ "bs_" ] .undef ]
+  [ "bw" keymap.bw "Botswana" [ ] .undef ]
   [ "br" keymap.br "Brazil" [ "_BR" ] "abnt2" ]
   [ "bg" keymap.bg "Bulgaria" [ "_BG" ] .undef ]
   [ "kh" keymap.kh "Cambodia" [ ] .undef ]
@@ -2764,6 +2938,7 @@
   [ "jp" keymap.jp "Japan" [ "_JP" ] "jp106" ]
   [ "in_kan" keymap.in_kan "Kannada" [ "kn_" ] .undef ]
   [ "kz" keymap.kz "Kazakhstan" [ ] .undef ]
+  [ "ke" keymap.ke "Kenya" [ ] .undef ]
   [ "kr" keymap.kr "Korea" [ ] .undef ]
   [ "tr_ku" keymap.tr_ku "Kurdish" [ "ku_TR" ] .undef ]
   [ "kg" keymap.kg "Kyrgyzstan" [ ] .undef ]
@@ -2774,6 +2949,7 @@
   [ "mk" keymap.mk "Macedonia" [ "_MK" ] .undef ]
   [ "in_mal" keymap.in_mal "Malayalam" [ "ml_" ] .undef ]
   [ "mv" keymap.mv "Maldives" [ ] .undef ]
+  [ "ml" keymap.ml "Mali" [ ] .undef ]
   [ "mt" keymap.mt "Malta" [ "_MT" ] .undef ]
   [ "mao" keymap.mao "Maori" [ ] .undef ]
   [ "mn" keymap.mn "Mongolia" [ "_MN" ] .undef ]
@@ -2785,6 +2961,7 @@
   [ "ng" keymap.ng "Nigeria" [ ] .undef ]
   [ "no" keymap.no "Norway" [ "_NO" ] .undef ]
   [ "pk" keymap.pk "Pakistan" [ ] .undef ]
+  [ "ph" keymap.ph "Philippines" [ ] .undef ]
   [ "pl" keymap.pl "Poland" [ "_PL" ] .undef ]
   [ "pt" keymap.pt "Portugal" [ "_PT" ] .undef ]
   [ "ro" keymap.ro "Romania" [ "_RO" ] .undef ]
@@ -2803,8 +2980,10 @@
   [ "ch_fr" keymap.ch_fr "Swiss French" [ "fr_CH" ] .undef ]
   [ "ch" keymap.ch "Swiss German" [ "_CH" ] .undef ]
   [ "sy" keymap.sy "Syria" [ ] .undef ]
+  [ "tw" keymap.tw "Taiwan" [ ] .undef ]
   [ "tj" keymap.tj "Tajikistan" [ "_TJ" ] .undef ]
   [ "in_tam" keymap.in_tam "Tamil" [ "ta_" ] .undef ]
+  [ "tz" keymap.tz "Tanzania" [ ] .undef ]
   [ "in_tel" keymap.in_tel "Telugu" [ "te_" ] .undef ]
   [ "th" keymap.th "Thailand" [ "_TH" ] .undef ]
   [ "tr" keymap.tr "Turkey" [ "_TR" ] .undef ]
@@ -2819,4 +2998,4 @@
 ] def
 
 % set to "us" for safety
-/config.keymap keymaps 94 get def
+/config.keymap keymaps 101 get def
diff --git a/langlist b/langlist
index ab4a148..be8ef9b 100644
--- a/langlist
+++ b/langlist
@@ -7,7 +7,6 @@ bn
 bs
 ca
 cs
-cy
 da
 de
 dz
@@ -17,6 +16,7 @@ eo
 es
 et
 eu
+fa
 fi
 fr
 ga
@@ -27,13 +27,16 @@ hi
 hr
 hu
 id
+is
 it
 ja
 ka
 kk
 km
+kn
 ko
 ku
+lo
 lt
 lv
 mk
@@ -50,17 +53,18 @@ pt_PT
 ro
 ru
 se
+si
 sk
 sl
 sq
 sr
 sv
 ta
+te
 th
 tl
 tr
 uk
 vi
-wo
 zh_CN
 zh_TW
diff --git a/langnames.inc b/langnames.inc
index 4c96f90..1e2dba8 100644
--- a/langnames.inc
+++ b/langnames.inc
@@ -8,7 +8,6 @@
   [ "bs" "bs_BA" "Bosanski" ]
   [ "ca" "ca_ES" "Català" ]
   [ "cs" "cs_CZ" "Čeština" ]
-  [ "cy" "cy_GB" "Cymraeg" ]
   [ "da" "da_DK" "Dansk" ]
   [ "de" "de_DE" "Deutsch" ]
   [ "dz" "dz_BT" "Dzongkha" ]
@@ -18,6 +17,7 @@
   [ "es" "es_ES" "Español" ]
   [ "et" "et_EE" "Eesti" ]
   [ "eu" "eu_ES" "Euskara" ]
+  [ "fa" "fa_IR" "فارسی" ]
   [ "fi" "fi_FI" "Suomi" ]
   [ "fr" "fr_FR" "Français" ]
   [ "ga" "ga_IE" "Gaeilge" ]
@@ -28,13 +28,16 @@
   [ "hr" "hr_HR" "Hrvatski" ]
   [ "hu" "hu_HU" "Magyar" ]
   [ "id" "id_ID" "Bahasa Indonesia" ]
+  [ "is" "is_IS" "Íslenska" ]
   [ "it" "it_IT" "Italiano" ]
   [ "ja" "ja_JP" "日本語" ]
   [ "ka" "ka_GE" "ქართული" ]
   [ "kk" "kk_KZ" "Қазақ" ]
   [ "km" "km_KH" "Khmer" ]
+  [ "kn" "kn_IN" "ಕನ್ನಡ" ]
   [ "ko" "ko_KR" "한국어" ]
   [ "ku" "ku_TR" "Kurdî" ]
+  [ "lo" "lo_LA" "Lao" ]
   [ "lt" "lt_LT" "Lietuviškai" ]
   [ "lv" "lv_LV" "Latviski" ]
   [ "mk" "mk_MK" "Македонски" ]
@@ -51,18 +54,19 @@
   [ "ro" "ro_RO" "Română" ]
   [ "ru" "ru_RU" "Русский" ]
   [ "se" "se_NO" "Sámegillii" ]
+  [ "si" "si_LK" "සිංහල" ]
   [ "sk" "sk_SK" "Slovenčina" ]
   [ "sl" "sl_SI" "Slovenščina" ]
   [ "sq" "sq_AL" "Shqip" ]
   [ "sr" "sr_RS" "Српски" ]
   [ "sv" "sv_SE" "Svenska" ]
   [ "ta" "ta_IN" "Tamil" ]
+  [ "te" "te_IN" "తెలుగు" ]
   [ "th" "th_TH" "Thai" ]
   [ "tl" "tl_PH" "Tagalog" ]
   [ "tr" "tr_TR" "Türkçe" ]
   [ "uk" "uk_UA" "Українська" ]
   [ "vi" "vi_VN" "Tiếng Việt" ]
-  [ "wo" "wo_SN" "Wolof" ]
   [ "zh_CN" "zh_CN" "中文(简体)" ]
   [ "zh_TW" "zh_TW" "中文(繁體)" ]
 ] def
diff --git a/scrape-localechooser b/scrape-localechooser
index 2f561b3..4c02d76 100755
--- a/scrape-localechooser
+++ b/scrape-localechooser
@@ -28,6 +28,7 @@ my @langname_notranslate = (
     'gu',
     'hi',
     'km',
+    'lo',
     'ml',
     'mr',
     'ne',