X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=rules%2Fbase.xml.in;h=e0c1b4e58f69d83ea38efc5a0a556b18bb6242b4;hb=refs%2Ftags%2Fsubmit%2Fmaster%2F20120920.151151;hp=24bfc2d6c1c5a6ec16539560c5856833f84e0948;hpb=7d3dbc837ed39c5340ff19d96b8edc0755ee71c4;p=framework%2Fuifw%2Fxorg%2Futil%2Fxkeyboard-config.git

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 24bfc2d..e0c1b4e 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<xkbConfigRegistry>
+<xkbConfigRegistry version="1.1">
   <modelList>
     <model>
       <configItem>
@@ -123,13 +123,6 @@
     </model>
     <model>
       <configItem>
-        <name>acpi</name>
-        <_description>ACPI Standard</_description>
-        <vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>azonaRF2300</name>
         <_description>Azona RF2300 wireless Internet Keyboard</_description>
         <vendor>Azona</vendor>
@@ -201,14 +194,14 @@
     <model>
       <configItem>
         <name>btc9019u</name>
-	<_description>BTC 9019U</_description>
+        <_description>BTC 9019U</_description>
         <vendor>BTC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>btc9116u</name>
-	<_description>BTC 9116U Mini Wireless Internet and Gaming</_description>
+        <_description>BTC 9116U Mini Wireless Internet and Gaming</_description>
       </configItem>
     </model>
     <model>
@@ -456,6 +449,20 @@
     </model>
     <model>
       <configItem>
+        <name>htcdream</name>
+        <_description>HTC Dream</_description>
+        <vendor>HTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>kinesis</name>
+        <_description>Kinesis</_description>
+        <vendor>Kinesis</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>logitech_base</name>
         <_description>Logitech Generic Keyboard</_description>
         <vendor>Logitech</vendor>
@@ -563,42 +570,42 @@
       <configItem>
         <name>rapidaccess</name>
         <_description>IBM Rapid Access</_description>
-        <vendor>IBM</vendor>
+        <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>rapidaccess2</name>
         <_description>IBM Rapid Access II</_description>
-        <vendor>IBM</vendor>
+        <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>thinkpad</name>
         <_description>IBM ThinkPad 560Z/600/600E/A22E</_description>
-        <vendor>IBM</vendor>
+        <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>thinkpad60</name>
         <_description>IBM ThinkPad R60/T60/R61/T61</_description>
-        <vendor>IBM</vendor>
+        <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>thinkpadz60</name>
         <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description>
-        <vendor>IBM</vendor>
+        <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>ibm_spacesaver</name>
         <_description>IBM Space Saver</_description>
-        <vendor>IBM</vendor>
+        <vendor>Lenovo (previously IBM)</vendor>
       </configItem>
     </model>
     <model>
@@ -620,6 +627,7 @@
         <name>logii350</name>
         <_description>Logitech Internet 350 Keyboard</_description>
         <vendor>Logitech</vendor>
+        <hwList> <hwId>046d:c313</hwId></hwList>
       </configItem>
     </model>
     <model>
@@ -785,6 +793,13 @@
     </model>
     <model>
       <configItem>
+        <name>microsoft4000</name>
+        <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>microsoft7000</name>
         <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description>
         <vendor>Microsoft Inc.</vendor>
@@ -897,120 +912,127 @@
     </model>
     <model>
       <configItem>
+        <name>sanwaskbkg3</name>
+        <_description>Sanwa Supply SKB-KG3</_description>
+        <vendor>Sanwa Supply Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>sk1300</name>
         <_description>SK-1300</_description>
-	<vendor>NEC</vendor>
+        <vendor>NEC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sk2500</name>
         <_description>SK-2500</_description>
-	<vendor>NEC</vendor>
+        <vendor>NEC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sk6200</name>
         <_description>SK-6200</_description>
-	<vendor>NEC</vendor>
+        <vendor>NEC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sk7100</name>
         <_description>SK-7100</_description>
-	<vendor>NEC</vendor>
+        <vendor>NEC</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sp_inet</name>
         <_description>Super Power Multimedia Keyboard</_description>
-	<vendor>Generic</vendor>
+        <vendor>Generic</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sven</name>
         <_description>SVEN Ergonomic 2500</_description>
-	<vendor>SVEN</vendor>
+        <vendor>SVEN</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>sven303</name>
         <_description>SVEN Slim 303</_description>
-	<vendor>SVEN</vendor>
+        <vendor>SVEN</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>symplon</name>
         <_description>Symplon PaceBook (tablet PC)</_description>
-	<vendor>Symplon</vendor>
+        <vendor>Symplon</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>toshiba_s3000</name>
         <_description>Toshiba Satellite S3000</_description>
-	<vendor>Toshiba</vendor>
+        <vendor>Toshiba</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>trust</name>
         <_description>Trust Wireless Keyboard Classic</_description>
-	<vendor>Trust</vendor>
+        <vendor>Trust</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>trustda</name>
         <_description>Trust Direct Access Keyboard</_description>
-	<vendor>Trust</vendor>
+        <vendor>Trust</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>trust_slimline</name>
         <_description>Trust Slimline</_description>
-	<vendor>Trust</vendor>
+        <vendor>Trust</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2020</name>
-        <description>TypeMatrix EZ-Reach 2020</description>
+        <_description>TypeMatrix EZ-Reach 2020</_description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2030PS2</name>
-        <description>TypeMatrix EZ-Reach 2030 PS2</description>
+        <_description>TypeMatrix EZ-Reach 2030 PS2</_description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2030USB</name>
-        <description>TypeMatrix EZ-Reach 2030 USB</description>
+        <_description>TypeMatrix EZ-Reach 2030 USB</_description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2030USB-102</name>
-        <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description>
+        <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</_description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>tm2030USB-106</name>
-        <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description>
+        <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</_description>
         <vendor>TypeMatrix</vendor>
       </configItem>
     </model>
@@ -1018,147 +1040,161 @@
       <configItem>
         <name>yahoo</name>
         <_description>Yahoo! Internet Keyboard</_description>
-	<vendor>Yahoo!</vendor>
+        <vendor>Yahoo!</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macbook78</name>
         <_description>MacBook/MacBook Pro</_description>
-	<vendor>Apple</vendor>
+        <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macbook79</name>
         <_description>MacBook/MacBook Pro (Intl)</_description>
-	<vendor>Apple</vendor>
+        <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macintosh</name>
         <_description>Macintosh</_description>
-	<vendor>Apple</vendor>
+        <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macintosh_old</name>
         <_description>Macintosh Old</_description>
-	<vendor>Apple</vendor>
+        <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>macintosh_hhk</name>
         <_description>Happy Hacking Keyboard for Mac</_description>
-	<vendor>Fujitsu</vendor>
+        <vendor>Fujitsu</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>acer_c300</name>
         <_description>Acer C300</_description>
-	<vendor>Acer</vendor>
+        <vendor>Acer</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>acer_ferrari4k</name>
         <_description>Acer Ferrari 4000</_description>
-	<vendor>Acer</vendor>
+        <vendor>Acer</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>acer_laptop</name>
         <_description>Acer Laptop</_description>
-	<vendor>Acer</vendor>
+        <vendor>Acer</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>asus_laptop</name>
         <_description>Asus Laptop</_description>
-	<vendor>Asus</vendor>
+        <vendor>Asus</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>apple</name>
         <_description>Apple</_description>
-	<vendor>Apple</vendor>
+        <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
         <name>apple_laptop</name>
         <_description>Apple Laptop</_description>
-	<vendor>Apple</vendor>
+        <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-        <name>silvercrest</name>
-        <_description>SILVERCREST Multimedia Wireless Keyboard</_description>
-	<vendor>Silvercrest</vendor>
+        <name>applealu_ansi</name>
+        <_description>Apple Aluminium Keyboard (ANSI)</_description>
+        <vendor>Apple</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-        <name>emachines</name>
-        <_description>Laptop/notebook eMachines m68xx</_description>
-	<vendor>eMachines</vendor>
+        <name>applealu_iso</name>
+        <_description>Apple Aluminium Keyboard (ISO)</_description>
+        <vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>applealu_jis</name>
+        <_description>Apple Aluminium Keyboard (JIS)</_description>
+        <vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>silvercrest</name>
+        <_description>SILVERCREST Multimedia Wireless Keyboard</_description>
+        <vendor>Silvercrest</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-	<name>evdev</name>
-	<_description>Evdev-managed keyboard</_description>
-	<vendor>Generic</vendor>
+        <name>emachines</name>
+        <_description>Laptop/notebook eMachines m68xx</_description>
+        <vendor>eMachines</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-	<name>benqx</name>
-	<_description>BenQ X-Touch</_description>
-	<vendor>BenQ</vendor>
+        <name>benqx</name>
+        <_description>BenQ X-Touch</_description>
+        <vendor>BenQ</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-	<name>benqx730</name>
-	<_description>BenQ X-Touch 730</_description>
-	<vendor>BenQ</vendor>
+        <name>benqx730</name>
+        <_description>BenQ X-Touch 730</_description>
+        <vendor>BenQ</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-	<name>benqx800</name>
-	<_description>BenQ X-Touch 800</_description>
-	<vendor>BenQ</vendor>
+        <name>benqx800</name>
+        <_description>BenQ X-Touch 800</_description>
+        <vendor>BenQ</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-	<name>hhk</name>
-	<_description>Happy Hacking Keyboard</_description>
-	<vendor>Fujitsu</vendor>
+        <name>hhk</name>
+        <_description>Happy Hacking Keyboard</_description>
+        <vendor>Fujitsu</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-	<name>classmate</name>
-	<_description>Classmate PC</_description>
-	<vendor>Intel</vendor>
+        <name>classmate</name>
+        <_description>Classmate PC</_description>
+        <vendor>Intel</vendor>
       </configItem>
     </model>
     <model>
       <configItem>
-	<name>olpc</name>
-	<_description>OLPC</_description>
-	<vendor>OLPC</vendor>
+        <name>olpc</name>
+        <_description>OLPC</_description>
+        <vendor>OLPC</vendor>
       </configItem>
     </model>
     <model>
@@ -1196,100 +1232,124 @@
         <vendor>Creative</vendor>
       </configItem>
     </model>
+    <model>
+      <configItem>
+       <name>htcdream</name>
+       <_description>Htc Dream phone</_description>
+       <vendor>htc</vendor>
+     </configItem>
+    </model>
   </modelList>
   <layoutList>
     <layout>
       <configItem>
         <name>us</name>
-        <_shortDescription>USA</_shortDescription>
-        <_description>USA</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <!-- Keyboard indicator for English layouts -->
+        <_shortDescription>en</_shortDescription>
+        <_description>English (US)</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>chr</name>
+            <!-- Keyboard indicator for Cherokee layouts -->
+            <_shortDescription>chr</_shortDescription>
             <_description>Cherokee</_description>
-            <languageList><iso639Id>chr</iso639Id></languageList>
+            <languageList>
+              <iso639Id>chr</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>euro</name>
-            <_description>With EuroSign on 5</_description>
+            <_description>English (US, with euro on 5)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>International (with dead keys)</_description>
+            <_description>English (US, international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt-intl</name>
-            <_description>Alternative international (former us_intl)</_description>
+            <_description>English (US, alternative international)</_description>
           </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>colemak</name>
-            <_description>Colemak</_description>
+            <_description>English (Colemak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>English (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-intl</name>
-            <_description>Dvorak international</_description>
+            <_description>English (Dvorak international with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-alt-intl</name>
+            <_description>English (Dvorak alternative international no dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-l</name>
-            <_description>Left handed Dvorak</_description>
+            <_description>English (left handed Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-r</name>
-            <_description>Right handed Dvorak</_description>
+            <_description>English (right handed Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-classic</name>
-            <_description>Classic Dvorak</_description>
+            <_description>English (classic Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>Programmer Dvorak</_description>
+            <_description>English (programmer Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <_description>Russian phonetic</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <!-- Keyboard indicator for Russian layouts -->
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (US, phonetic)</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>English (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>altgr-intl</name>
-            <_description>International (AltGr dead keys)</_description>
+            <_description>English (international AltGr dead keys)</_description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>fra</iso639Id>
                           <iso639Id>ger</iso639Id></languageList>
@@ -1298,7 +1358,18 @@
         <variant>
           <configItem>
             <name>olpc2</name>
-            <_description>Group toggle on multiply/divide key</_description>
+            <_description>English (layout toggle on multiply/divide key)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hbs</name>
+            <_description>Serbo-Croatian (US)</_description>
+            <languageList><iso639Id>eng</iso639Id>
+                          <iso639Id>bos</iso639Id>
+                          <iso639Id>hbs</iso639Id>
+                          <iso639Id>hrv</iso639Id>
+                          <iso639Id>srp</iso639Id> </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1306,52 +1377,73 @@
     <layout>
       <configItem>
         <name>ad</name>
-        <_shortDescription>And</_shortDescription>
-        <_description>Andorra</_description>
-        <languageList><iso639Id>cat</iso639Id></languageList>
+        <!-- Keyboard indicator for Catalan layouts -->
+        <_shortDescription>ca</_shortDescription>
+        <_description>Catalan</_description>
+        <languageList>
+          <iso639Id>cat</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>af</name>
-        <_shortDescription>Afg</_shortDescription>
-        <_description>Afghanistan</_description>
+        <!-- Keyboard indicator for Afghani layouts -->
+        <_shortDescription>fa</_shortDescription>
+        <_description>Afghani</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ps</name>
+            <!-- Keyboard indicator for Pashto layouts -->
+            <_shortDescription>ps</_shortDescription>
             <_description>Pashto</_description>
-            <languageList><iso639Id>pus</iso639Id></languageList>
+            <languageList>
+              <iso639Id>pus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>uz</name>
-            <_description>Southern Uzbek</_description>
-            <languageList><iso639Id>uzb</iso639Id></languageList>
+            <!-- Keyboard indicator for Uzbek layouts -->
+            <_shortDescription>uz</_shortDescription>
+            <_description>Uzbek (Afghanistan)</_description>
+            <languageList>
+              <iso639Id>uzb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>olpc-ps</name>
-            <_description>OLPC Pashto</_description>
-            <languageList><iso639Id>pus</iso639Id></languageList>
+            <!-- Keyboard indicator for Pashto layouts -->
+            <_shortDescription>ps</_shortDescription>
+            <_description>Pashto (Afghanistan, OLPC)</_description>
+            <languageList>
+              <iso639Id>pus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>olpc-fa</name>
-            <_description>OLPC Dari</_description>
-            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+            <name>fa-olpc</name>
+            <!-- Keyboard indicator for Persian layouts -->
+            <_shortDescription>fa</_shortDescription>
+            <_description>Persian (Afghanistan, Dari OLPC)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>olpc-uz</name>
-            <_description>OLPC Southern Uzbek</_description>
-            <languageList><iso639Id>uzb</iso639Id></languageList>
+            <name>uz-olpc</name>
+            <!-- Keyboard indicator for Uzbek layouts -->
+            <_shortDescription>uz</_shortDescription>
+            <_description>Uzbek (Afghanistan, OLPC)</_description>
+            <languageList>
+              <iso639Id>uzb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1359,7 +1451,8 @@
     <layout>
       <configItem>
         <name>ara</name>
-        <_shortDescription>Ara</_shortDescription>
+        <!-- Keyboard indicator for Arabic layouts -->
+        <_shortDescription>ar</_shortDescription>
         <_description>Arabic</_description>
         <countryList>
           <iso3166Id>AE</iso3166Id>
@@ -1382,43 +1475,45 @@
           <iso3166Id>TN</iso3166Id>
           <iso3166Id>YE</iso3166Id>
         </countryList>
-        <languageList><iso639Id>ara</iso639Id></languageList>
+        <languageList>
+          <iso639Id>ara</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>azerty</name>
-            <_description>azerty</_description>
+            <_description>Arabic (azerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>azerty_digits</name>
-            <_description>azerty/digits</_description>
+            <_description>Arabic (azerty/digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>digits</name>
-            <_description>digits</_description>
+            <_description>Arabic (digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Arabic (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_digits</name>
-            <_description>qwerty/digits</_description>
+            <_description>Arabic (qwerty/digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>buckwalter</name>
-            <_description>Buckwalter</_description>
+            <_description>Arabic (Buckwalter)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1426,48 +1521,85 @@
     <layout>
       <configItem>
         <name>al</name>
-        <_shortDescription>Alb</_shortDescription>
-        <_description>Albania</_description>
-        <languageList><iso639Id>alb</iso639Id></languageList>
+        <!-- Keyboard indicator for Albanian layouts -->
+        <_shortDescription>sq</_shortDescription>
+        <_description>Albanian</_description>
+        <languageList>
+          <iso639Id>alb</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>am</name>
-        <_shortDescription>Arm</_shortDescription>
-        <_description>Armenia</_description>
-        <languageList><iso639Id>hye</iso639Id></languageList>
+        <!-- Keyboard indicator for Armenian layouts -->
+        <_shortDescription>hy</_shortDescription>
+        <_description>Armenian</_description>
+        <languageList>
+          <iso639Id>hye</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Armenian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic-alt</name>
-            <_description>Alternative Phonetic</_description>
+            <_description>Armenian (alternative phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern</name>
-            <_description>Eastern</_description>
+            <_description>Armenian (eastern)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>western</name>
-            <_description>Western</_description>
+            <_description>Armenian (western)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern-alt</name>
-            <_description>Alternative Eastern</_description>
+            <_description>Armenian (alternative eastern)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>at</name>
+        <!-- Keyboard indicator for German layouts -->
+        <_shortDescription>de</_shortDescription>
+        <_description>German (Austria)</_description>
+        <languageList>
+          <iso639Id>ger</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>German (Austria, eliminate dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>German (Austria, Sun dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>German (Austria, Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1475,15 +1607,18 @@
     <layout>
       <configItem>
         <name>az</name>
-        <_shortDescription>Aze</_shortDescription>
-        <_description>Azerbaijan</_description>
-        <languageList><iso639Id>aze</iso639Id></languageList>
+        <!-- Keyboard indicator for Azerbaijani layouts -->
+        <_shortDescription>az</_shortDescription>
+        <_description>Azerbaijani</_description>
+        <languageList>
+          <iso639Id>aze</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Cyrillic</_description>
+            <_description>Azerbaijani (Cyrillic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1491,21 +1626,24 @@
     <layout>
       <configItem>
         <name>by</name>
-        <_shortDescription>Blr</_shortDescription>
-        <_description>Belarus</_description>
-        <languageList><iso639Id>bel</iso639Id></languageList>
+        <!-- Keyboard indicator for Belarusian layouts -->
+        <_shortDescription>by</_shortDescription>
+        <_description>Belarusian</_description>
+        <languageList>
+          <iso639Id>bel</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>Belarusian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Latin</_description>
+            <_description>Belarusian (Latin)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1513,52 +1651,54 @@
     <layout>
       <configItem>
         <name>be</name>
-        <_shortDescription>Bel</_shortDescription>
-        <_description>Belgium</_description>
+        <!-- Keyboard indicator for Belgian layouts -->
+        <_shortDescription>be</_shortDescription>
+        <_description>Belgian</_description>
         <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>nld</iso639Id>
                       <iso639Id>fra</iso639Id></languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>oss</name>
-            <_description>Alternative</_description>
+            <_description>Belgian (alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>Alternative, latin-9 only</_description>
+            <_description>Belgian (alternative, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_sundeadkeys</name>
-            <_description>Alternative, Sun dead keys</_description>
+            <_description>Belgian (alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>iso-alternate</name>
-            <_description>ISO Alternate</_description>
+            <_description>Belgian (ISO alternate)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Belgian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Belgian (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>wang</name>
-            <_description>Wang model 724 azerty</_description>
+            <_description>Belgian (Wang model 724 azerty)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1566,15 +1706,18 @@
     <layout>
       <configItem>
         <name>bd</name>
-        <_shortDescription>Ban</_shortDescription>
-        <_description>Bangladesh</_description>
-        <languageList><iso639Id>ben</iso639Id></languageList>
+        <!-- Keyboard indicator for Bengali layouts -->
+        <_shortDescription>bn</_shortDescription>
+        <_description>Bengali</_description>
+        <languageList>
+          <iso639Id>ben</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>probhat</name>
-            <_description>Probhat</_description>
+            <_description>Bengali (Probhat)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1582,148 +1725,277 @@
     <layout>
       <configItem>
         <name>in</name>
-        <_shortDescription>Ind</_shortDescription>
-        <_description>India</_description>
+        <!-- Keyboard indicator for Indian layouts -->
+        <_shortDescription>in</_shortDescription>
+        <_description>Indian</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ben</name>
-            <_description>Bengali</_description>
-            <languageList><iso639Id>ben</iso639Id></languageList>
+            <!-- Keyboard indicator for Bengali layouts -->
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bengali (India)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ben_probhat</name>
-            <_description>Bengali Probhat</_description>
+            <!-- Keyboard indicator for Bengali layouts -->
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bengali (India, Probhat)</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_baishakhi</name>
+            <_description>Bengali (India, Baishakhi)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_bornona</name>
+            <_description>Bengali (India, Bornona)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+            </configItem>
+        </variant>
+         <variant>
+          <configItem>
+            <name>ben_gitanjali</name>
+            <_description>Bengali (India, Uni Gitanjali)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_inscript</name>
+            <_description>Bengali (India, Baishakhi Inscript)</_description>
             <languageList><iso639Id>ben</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>guj</name>
+            <!-- Keyboard indicator for Gujarati layouts -->
+            <_shortDescription>gu</_shortDescription>
             <_description>Gujarati</_description>
-            <languageList><iso639Id>guj</iso639Id></languageList>
+            <languageList>
+              <iso639Id>guj</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>guru</name>
-            <_description>Gurmukhi</_description>
-            <languageList><iso639Id>pan</iso639Id></languageList>
+            <!-- Keyboard indicator for Punjabi layouts -->
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi)</_description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>jhelum</name>
-            <_description>Gurmukhi Jhelum</_description>
-            <languageList><iso639Id>pan</iso639Id></languageList>
+            <!-- Keyboard indicator for Punjabi layouts -->
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi Jhelum)</_description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kan</name>
+            <!-- Keyboard indicator for Kannada layouts -->
+            <_shortDescription>kn</_shortDescription>
             <_description>Kannada</_description>
-            <languageList><iso639Id>kan</iso639Id></languageList>
+            <languageList>
+              <iso639Id>kan</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mal</name>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
             <_description>Malayalam</_description>
-            <languageList><iso639Id>mal</iso639Id></languageList>
-         </configItem>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>mal_lalitha</name>
-            <_description>Malayalam Lalitha</_description>
-            <languageList><iso639Id>mal</iso639Id></languageList>
-         </configItem>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (Lalitha)</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
         </variant>
         <variant>
           <configItem>
+            <name>mal_enhanced</name>
+            <!-- Keyboard indicator for Malayalam layouts -->
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (enhanced Inscript with Rupee Sign)</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+          </configItem>
+         </variant>
+         <variant>
+           <configItem>
             <name>ori</name>
+            <!-- Keyboard indicator for Oriya layouts -->
+            <_shortDescription>or</_shortDescription>
             <_description>Oriya</_description>
-            <languageList><iso639Id>ori</iso639Id></languageList>
+            <languageList>
+              <iso639Id>ori</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_unicode</name>
-            <_description>Tamil Unicode</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (Unicode)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_keyboard_with_numerals</name>
-            <description>Tamil Keyboard with Numerals</description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (keyboard with numerals)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>Tamil TAB Typewriter</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TAB typewriter)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_TSCII</name>
-            <_description>Tamil TSCII Typewriter</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TSCII typewriter)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam</name>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
             <_description>Tamil</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tel</name>
+            <!-- Keyboard indicator for Telugu layouts -->
+            <_shortDescription>te</_shortDescription>
             <_description>Telugu</_description>
-            <languageList><iso639Id>tel</iso639Id></languageList>
+            <languageList>
+              <iso639Id>tel</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>urd-phonetic</name>
-            <_description>Urdu, Phonetic</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <!-- Keyboard indicator for Urdu layouts -->
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (phonetic)</_description>
+            <languageList>
+              <iso639Id>urd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>urd-phonetic3</name>
-            <_description>Urdu, Alternative phonetic</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <!-- Keyboard indicator for Urdu layouts -->
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (alternative phonetic)</_description>
+            <languageList>
+              <iso639Id>urd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>urd-winkeys</name>
-            <_description>Urdu, Winkeys</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <!-- Keyboard indicator for Urdu layouts -->
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (WinKeys)</_description>
+            <languageList>
+              <iso639Id>urd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bolnagri</name>
-            <_description>Hindi Bolnagri</_description>
-            <languageList><iso639Id>hin</iso639Id></languageList>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Bolnagri)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hin-wx</name>
-            <_description>Hindi Wx</_description>
-            <languageList><iso639Id>hin</iso639Id></languageList>
+            <!-- Keyboard indicator for Hindi layouts -->
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Wx)</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eng</name>
+            <!-- Keyboard indicator for English layouts -->
+            <_shortDescription>en</_shortDescription>
+            <_description>English (India, with RupeeSign)</_description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1731,33 +2003,36 @@
     <layout>
       <configItem>
         <name>ba</name>
-        <_shortDescription>Bih</_shortDescription>
-        <_description>Bosnia and Herzegovina</_description>
-        <languageList><iso639Id>bos</iso639Id></languageList>
+        <!-- Keyboard indicator for Bosnian layouts -->
+        <_shortDescription>bs</_shortDescription>
+        <_description>Bosnian</_description>
+        <languageList>
+          <iso639Id>bos</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description> Use guillemets for quotes</_description>
+            <_description>Bosnian (use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Use Bosnian digraphs</_description>
+            <_description>Bosnian (use Bosnian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicodeus</name>
-            <_description>US keyboard with Bosnian digraphs</_description>
+            <_description>Bosnian (US keyboard with Bosnian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Bosnian letters</_description>
+            <_description>Bosnian (US keyboard with Bosnian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1765,40 +2040,45 @@
     <layout>
       <configItem>
         <name>br</name>
-        <_shortDescription>Bra</_shortDescription>
-        <_description>Brazil</_description>
-        <languageList><iso639Id>por</iso639Id></languageList>
+        <!-- Keyboard indicator for Portuguese layouts -->
+        <_shortDescription>pt</_shortDescription>
+        <_description>Portuguese (Brazil)</_description>
+        <languageList>
+          <iso639Id>por</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Portuguese (Brazil, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Portuguese (Brazil, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Nativo</_description>
+            <_description>Portuguese (Brazil, nativo)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Nativo for USA keyboards</_description>
+            <_description>Portuguese (Brazil, nativo for USA keyboards)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Nativo for Esperanto</_description>
-            <languageList><iso639Id>epo</iso639Id></languageList>
+            <_description>Portuguese (Brazil, nativo for Esperanto)</_description>
+            <languageList>
+              <iso639Id>epo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1806,23 +2086,24 @@
     <layout>
       <configItem>
         <name>bg</name>
-        <_shortDescription>Bgr</_shortDescription>
-        <_description>Bulgaria</_description>
-        <languageList><iso639Id>bul</iso639Id></languageList>
+        <!-- Keyboard indicator for Bulgarian layouts -->
+        <_shortDescription>bg</_shortDescription>
+        <_description>Bulgarian</_description>
+        <languageList>
+          <iso639Id>bul</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Traditional phonetic</_description>
+            <_description>Bulgarian (traditional phonetic)</_description>
           </configItem>
         </variant>
-      </variantList>
-      <variantList>
         <variant>
           <configItem>
             <name>bas_phonetic</name>
-            <_description>New phonetic</_description>
+            <_description>Bulgarian (new phonetic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1830,56 +2111,184 @@
     <layout>
       <configItem>
         <name>ma</name>
-        <_description>Morocco</_description>
+        <!-- Keyboard indicator for Arabic layouts -->
+        <_shortDescription>ar</_shortDescription>
+        <_description>Arabic (Morocco)</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>french</name>
-            <_description>French</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <!-- Keyboard indicator for French layouts -->
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Morocco)</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh</name>
-            <_description>Tifinagh</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <!-- Keyboard indicator for Berber layouts -->
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh)</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-alt</name>
-            <_description>Tifinagh Alternative</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <!-- Keyboard indicator for Berber layouts -->
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh alternative)</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-alt-phonetic</name>
-            <_description>Tifinagh Alternative Phonetic</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <!-- Keyboard indicator for Berber layouts -->
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh alternative phonetic)</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-extended</name>
-            <_description>Tifinagh Extended</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <!-- Keyboard indicator for Berber layouts -->
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh extended)</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-phonetic</name>
-            <_description>Tifinagh Phonetic</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <!-- Keyboard indicator for Berber layouts -->
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh phonetic)</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-extended-phonetic</name>
-            <_description>Tifinagh Extended Phonetic</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <!-- Keyboard indicator for Berber layouts -->
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh extended phonetic)</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cm</name>
+        <!-- Keyboard indicator for Cameroon layouts -->
+        <_shortDescription>cm</_shortDescription>
+        <_description>English (Cameroon)</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>french</name>
+            <_description>French (Cameroon)</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>Cameroon Multilingual (qwerty)</_description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+              <iso639Id>bas</iso639Id>
+              <iso639Id>nmg</iso639Id>
+              <iso639Id>fub</iso639Id>
+              <iso639Id>ewo</iso639Id>
+              <iso639Id>xmd</iso639Id>
+              <iso639Id>mfh</iso639Id>
+              <iso639Id>bkm</iso639Id>
+              <iso639Id>ozm</iso639Id>
+              <iso639Id>lns</iso639Id>
+              <iso639Id>sox</iso639Id>
+              <iso639Id>pny</iso639Id>
+              <iso639Id>wes</iso639Id>
+              <iso639Id>lem</iso639Id>
+              <iso639Id>nyj</iso639Id>
+              <iso639Id>mfk</iso639Id>
+              <iso639Id>mcp</iso639Id>
+              <iso639Id>ass</iso639Id>
+              <iso639Id>xed</iso639Id>
+              <iso639Id>dua</iso639Id>
+              <iso639Id>anv</iso639Id>
+              <iso639Id>bum</iso639Id>
+              <iso639Id>btb</iso639Id>
+              <iso639Id>bfd</iso639Id>
+              <iso639Id>azo</iso639Id>
+              <iso639Id>ken</iso639Id>
+              <iso639Id>yam</iso639Id>
+              <iso639Id>yat</iso639Id>
+              <iso639Id>yas</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>azerty</name>
+            <_description>Cameroon Multilingual (azerty)</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+              <iso639Id>bas</iso639Id>
+              <iso639Id>nmg</iso639Id>
+              <iso639Id>fub</iso639Id>
+              <iso639Id>ewo</iso639Id>
+              <iso639Id>xmd</iso639Id>
+              <iso639Id>mfh</iso639Id>
+              <iso639Id>bkm</iso639Id>
+              <iso639Id>ozm</iso639Id>
+              <iso639Id>lns</iso639Id>
+              <iso639Id>sox</iso639Id>
+              <iso639Id>pny</iso639Id>
+              <iso639Id>wes</iso639Id>
+              <iso639Id>lem</iso639Id>
+              <iso639Id>nyj</iso639Id>
+              <iso639Id>mfk</iso639Id>
+              <iso639Id>mcp</iso639Id>
+              <iso639Id>ass</iso639Id>
+              <iso639Id>xed</iso639Id>
+              <iso639Id>dua</iso639Id>
+              <iso639Id>anv</iso639Id>
+              <iso639Id>bum</iso639Id>
+              <iso639Id>btb</iso639Id>
+              <iso639Id>bfd</iso639Id>
+              <iso639Id>azo</iso639Id>
+              <iso639Id>ken</iso639Id>
+              <iso639Id>yam</iso639Id>
+              <iso639Id>yat</iso639Id>
+              <iso639Id>yas</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Cameroon Multilingual (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1887,75 +2296,80 @@
     <layout>
       <configItem>
         <name>mm</name>
-        <_shortDescription>Mmr</_shortDescription>
-        <_description>Myanmar</_description>
-        <languageList><iso639Id>mya</iso639Id></languageList>
+        <!-- Keyboard indicator for Burmese layouts -->
+        <_shortDescription>my</_shortDescription>
+        <_description>Burmese</_description>
+        <languageList>
+          <iso639Id>mya</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>ca</name>
-        <_shortDescription>Can</_shortDescription>
-        <_description>Canada</_description>
-        <languageList><iso639Id>fra</iso639Id></languageList>
+        <!-- Keyboard indicator for French layouts -->
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Canada)</_description>
+        <languageList>
+          <iso639Id>fra</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>fr-dvorak</name>
-            <_description>French Dvorak</_description>
+            <!-- Keyboard indicator for French layouts -->
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Canada, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr-legacy</name>
-            <_description>French (legacy)</_description>
+            <!-- Keyboard indicator for French layouts -->
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Canada, legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multix</name>
-            <_description>Multilingual</_description>
+            <_description>Canadian Multilingual</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi</name>
-            <_description>Multilingual, first part</_description>
+            <_description>Canadian Multilingual (first part)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi-2gr</name>
-            <_description>Multilingual, second part</_description>
+            <_description>Canadian Multilingual (second part)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ike</name>
+            <!-- Keyboard indicator for Inuktikut layouts -->
+            <_shortDescription>ike</_shortDescription>
             <_description>Inuktitut</_description>
-            <languageList><iso639Id>iku</iso639Id></languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>shs</name>
-            <_description>Secwepemctsin</_description>
-            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>kut</name>
-            <_description>Ktunaxa</_description>
+            <languageList>
+              <iso639Id>iku</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eng</name>
-            <_description>English</_description>
-            <languageList><iso639Id>eng</iso639Id></languageList>
+            <!-- Keyboard indicator for English layouts -->
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Canada)</_description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1963,32 +2377,51 @@
     <layout>
       <configItem>
         <name>cd</name>
-        <_shortDescription>DRC</_shortDescription>
-        <_description>Congo, Democratic Republic of the</_description>
-        <languageList><iso639Id>fra</iso639Id></languageList>
+        <!-- Keyboard indicator for French layouts -->
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Democratic Republic of the Congo)</_description>
+        <languageList>
+          <iso639Id>fra</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>cn</name>
-        <_shortDescription>China</_shortDescription>
-        <_description>China</_description>
-        <languageList><iso639Id>chi</iso639Id></languageList>
+        <!-- Keyboard indicator for Chinese layouts -->
+        <_shortDescription>zh</_shortDescription>
+        <_description>Chinese</_description>
+        <languageList>
+          <iso639Id>chi</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>tib</name>
             <_description>Tibetan</_description>
-            <languageList><iso639Id>tib</iso639Id></languageList>
+            <languageList>
+              <iso639Id>tib</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tib_asciinum</name>
             <_description>Tibetan (with ASCII numerals)</_description>
-            <languageList><iso639Id>tib</iso639Id></languageList>
+            <languageList>
+              <iso639Id>tib</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>uig</name>
+            <_description>Uyghur</_description>
+            <languageList>
+              <iso639Id>uig</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1996,33 +2429,36 @@
     <layout>
       <configItem>
         <name>hr</name>
-        <_shortDescription>Hrv</_shortDescription>
-        <_description>Croatia</_description>
-        <languageList><iso639Id>scr</iso639Id></languageList>
+        <!-- Keyboard indicator for Croatian layouts -->
+        <_shortDescription>hr</_shortDescription>
+        <_description>Croatian</_description>
+        <languageList>
+          <iso639Id>scr</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Use guillemets for quotes</_description>
+            <_description>Croatian (use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Use Croatian digraphs</_description>
+            <_description>Croatian (use Croatian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicodeus</name>
-            <_description>US keyboard with Croatian digraphs</_description>
+            <_description>Croatian (US keyboard with Croatian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Croatian letters</_description>
+            <_description>Croatian (US keyboard with Croatian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2030,67 +2466,79 @@
     <layout>
       <configItem>
         <name>cz</name>
-        <_shortDescription>Cze</_shortDescription>
-        <_description>Czechia</_description>
-        <languageList><iso639Id>cze</iso639Id></languageList>
+        <!-- Keyboard indicator for Chech layouts -->
+        <_shortDescription>cs</_shortDescription>
+        <_description>Czech</_description>
+        <languageList>
+          <iso639Id>cze</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>With &lt;\|&gt; key</_description>
+            <_description>Czech (with &lt;\|&gt; key)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Czech (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_bksl</name>
-            <_description>qwerty, extended Backslash</_description>
+            <_description>Czech (qwerty, extended Backslash)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ucw</name>
+            <_description>Czech (UCW layout, accented letters only)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-ucw</name>
+            <_description>Czech (US Dvorak with CZ UCW support)</_description>
           </configItem>
         </variant>
-	<variant>
-	  <configItem>
-	    <name>ucw</name>
-	    <_description>UCW layout (accented letters only)</_description>
-	 </configItem>
-	</variant>
       </variantList>
     </layout>
     <layout>
       <configItem>
         <name>dk</name>
-        <_shortDescription>Dan</_shortDescription>
-        <_description>Denmark</_description>
-        <languageList><iso639Id>dan</iso639Id></languageList>
+        <!-- Keyboard indicator for Danish layouts -->
+        <_shortDescription>da</_shortDescription>
+        <_description>Danish</_description>
+        <languageList>
+          <iso639Id>dan</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Danish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Danish (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Macintosh, eliminate dead keys</_description>
+            <_description>Danish (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Danish (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2098,27 +2546,30 @@
     <layout>
       <configItem>
         <name>nl</name>
-        <_shortDescription>Nld</_shortDescription>
-        <_description>Netherlands</_description>
-        <languageList><iso639Id>nld</iso639Id></languageList>
+        <!-- Keyboard indicator for Dutch layouts -->
+        <_shortDescription>nl</_shortDescription>
+        <_description>Dutch</_description>
+        <languageList>
+          <iso639Id>nld</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Dutch (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Dutch (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Standard</_description>
+            <_description>Dutch (standard)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2126,35 +2577,41 @@
     <layout>
       <configItem>
         <name>bt</name>
-        <_shortDescription>Bhu</_shortDescription>
-        <_description>Bhutan</_description>
-        <languageList><iso639Id>dzo</iso639Id></languageList>
+        <!-- Keyboard indicator for Dzongkha layouts -->
+        <_shortDescription>dz</_shortDescription>
+        <_description>Dzongkha</_description>
+        <languageList>
+          <iso639Id>dzo</iso639Id>
+        </languageList>
       </configItem>
     </layout>
     <layout>
       <configItem>
         <name>ee</name>
-        <_shortDescription>Est</_shortDescription>
-        <_description>Estonia</_description>
-        <languageList><iso639Id>est</iso639Id></languageList>
+        <!-- Keyboard indicator for Estonian layouts -->
+        <_shortDescription>et</_shortDescription>
+        <_description>Estonian</_description>
+        <languageList>
+          <iso639Id>est</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Estonian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Estonian (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Estonian letters</_description>
+            <_description>Estonian (US keyboard with Estonian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2162,43 +2619,62 @@
     <layout>
       <configItem>
         <name>ir</name>
-        <_shortDescription>Irn</_shortDescription>
-        <_description>Iran</_description>
-        <languageList><iso639Id>per</iso639Id></languageList>
+        <!-- Keyboard indicator for Persian layouts -->
+        <_shortDescription>fa</_shortDescription>
+        <_description>Persian</_description>
+        <languageList>
+          <iso639Id>per</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>pes_keypad</name>
-            <_description>Persian, with Persian Keypad</_description>
+            <_description>Persian (with Persian Keypad)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Kurdish, Latin Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, Latin Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Kurdish, (F)</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Kurdish, Latin Alt-Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, Latin Alt-Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_ara</name>
-            <_description>Kurdish, Arabic-Latin</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, Arabic-Latin)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2206,8 +2682,9 @@
     <layout>
       <configItem>
         <name>iq</name>
-        <_shortDescription>Irq</_shortDescription>
-        <_description>Iraq</_description>
+        <!-- Keyboard indicator for Iraqi layouts -->
+        <_shortDescription>ar</_shortDescription>
+        <_description>Iraqi</_description>
         <languageList><iso639Id>ara</iso639Id>
                       <iso639Id>kur</iso639Id></languageList>
       </configItem>
@@ -2215,29 +2692,45 @@
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Kurdish, Latin Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Latin Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Kurdish, (F)</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Kurdish, Latin Alt-Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Latin Alt-Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_ara</name>
-            <_description>Kurdish, Arabic-Latin</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Arabic-Latin)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2245,15 +2738,18 @@
     <layout>
       <configItem>
         <name>fo</name>
-        <_shortDescription>Fao</_shortDescription>
-        <_description>Faroe Islands</_description>
-        <languageList><iso639Id>fao</iso639Id></languageList>
+        <!-- Keyboard indicator for Faroese layouts -->
+        <_shortDescription>fo</_shortDescription>
+        <_description>Faroese</_description>
+        <languageList>
+          <iso639Id>fao</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Faroese (eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2261,35 +2757,37 @@
     <layout>
       <configItem>
         <name>fi</name>
-        <_shortDescription>Fin</_shortDescription>
-        <_description>Finland</_description>
-        <languageList><iso639Id>fin</iso639Id></languageList>
+        <!-- Keyboard indicator for Finnish layouts -->
+        <_shortDescription>fi</_shortDescription>
+        <_description>Finnish</_description>
+        <languageList>
+          <iso639Id>fin</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
-            <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <name>classic</name>
+            <_description>Finnish (classic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>smi</name>
-            <_description>Northern Saami</_description>
-            <languageList><iso639Id>smi</iso639Id>
-                          <iso639Id>sme</iso639Id></languageList>
+            <name>nodeadkeys</name>
+            <_description>Finnish (classic, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>classic</name>
-            <_description>Classic</_description>
+            <name>smi</name>
+            <_description>Northern Saami (Finland)</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Finnish (Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2297,107 +2795,114 @@
     <layout>
       <configItem>
         <name>fr</name>
-        <_shortDescription>Fra</_shortDescription>
-        <_description>France</_description>
-        <languageList><iso639Id>fra</iso639Id></languageList>
+        <!-- Keyboard indicator for French layouts -->
+        <_shortDescription>fr</_shortDescription>
+        <_description>French</_description>
+        <languageList>
+          <iso639Id>fra</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>French (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>French (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss</name>
-            <_description>Alternative</_description>
+            <_description>French (alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>Alternative, latin-9 only</_description>
+            <_description>French (alternative, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_nodeadkeys</name>
-            <_description>Alternative, eliminate dead keys</_description>
+            <_description>French (alternative, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_sundeadkeys</name>
-            <_description>Alternative, Sun dead keys</_description>
+            <_description>French (alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9</name>
-            <_description>(Legacy) Alternative</_description>
+            <_description>French (legacy, alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9_nodeadkeys</name>
-            <_description>(Legacy) Alternative, eliminate dead keys</_description>
+            <_description>French (legacy, alternative, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9_sundeadkeys</name>
-            <_description>(Legacy) Alternative, Sun dead keys</_description>
+            <_description>French (legacy, alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bepo</name>
-            <_description>Bepo, ergonomic, Dvorak way</_description>
+            <_description>French (Bepo, ergonomic, Dvorak way)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bepo_latin9</name>
-            <_description>Bepo, ergonomic, Dvorak way, latin-9 only</_description>
+            <_description>French (Bepo, ergonomic, Dvorak way, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>French (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>French (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bre</name>
-            <_description>Breton</_description>
+            <_description>French (Breton)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oci</name>
             <_description>Occitan</_description>
-            <languageList><iso639Id>oci</iso639Id></languageList>
+            <languageList>
+              <iso639Id>oci</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>Georgian AZERTY Tskapo</_description>
-            <languageList><iso639Id>geo</iso639Id></languageList>
+            <_description>Georgian (France, AZERTY Tskapo)</_description>
+            <languageList>
+              <iso639Id>geo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2405,50 +2910,90 @@
     <layout>
       <configItem>
         <name>gh</name>
-        <_shortDescription>Gha</_shortDescription>
-        <_description>Ghana</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <!-- Keyboard indicator for English layouts -->
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Ghana)</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>generic</name>
-            <_description>Multilingual</_description>
+            <_description>English (Ghana, multilingual)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>akan</name>
+            <!-- Keyboard indicator for Akan layouts -->
+            <_shortDescription>ak</_shortDescription>
             <_description>Akan</_description>
-            <languageList><iso639Id>aka</iso639Id></languageList>
+            <languageList>
+              <iso639Id>aka</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ewe</name>
+            <!-- Keyboard indicator for Ewe layouts -->
+            <_shortDescription>ee</_shortDescription>
             <_description>Ewe</_description>
-            <languageList><iso639Id>ewe</iso639Id></languageList>
+            <languageList>
+              <iso639Id>ewe</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fula</name>
+            <!-- Keyboard indicator for Fula layouts -->
+            <_shortDescription>ff</_shortDescription>
             <_description>Fula</_description>
-            <languageList><iso639Id>ful</iso639Id></languageList>
+            <languageList>
+              <iso639Id>ful</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ga</name>
+            <!-- Keyboard indicator for Ga layouts -->
+            <_shortDescription>gaa</_shortDescription>
             <_description>Ga</_description>
-            <languageList><iso639Id>gaa</iso639Id></languageList>
+            <languageList>
+              <iso639Id>gaa</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hausa</name>
+            <!-- Keyboard indicator for Hausa layouts -->
+            <_shortDescription>ha</_shortDescription>
             <_description>Hausa</_description>
-            <languageList><iso639Id>hau</iso639Id></languageList>
+            <languageList>
+              <iso639Id>hau</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>avn</name>
+            <!-- Keyboard indicator for Avatime layouts -->
+            <_shortDescription>avn</_shortDescription>
+            <_description>Avatime</_description>
+            <languageList>
+              <iso639Id>avn</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>gillbt</name>
+            <_description>English (Ghana, GILLBT)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2456,44 +3001,56 @@
     <layout>
       <configItem>
         <name>gn</name>
-        <_shortDescription>Gui</_shortDescription>
-        <_description>Guinea</_description>
-        <languageList><iso639Id>fra</iso639Id></languageList>
+        <!-- Keyboard indicator for French layouts -->
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Guinea)</_description>
+        <languageList>
+          <iso639Id>fra</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>ge</name>
-        <_shortDescription>Geo</_shortDescription>
-        <_description>Georgia</_description>
-        <languageList><iso639Id>geo</iso639Id></languageList>
+        <!-- Keyboard indicator for Georgian layouts -->
+        <_shortDescription>ka</_shortDescription>
+        <_description>Georgian</_description>
+        <languageList>
+          <iso639Id>geo</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ergonomic</name>
-            <_description>Ergonomic</_description>
+            <_description>Georgian (ergonomic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mess</name>
-            <_description>MESS</_description>
+            <_description>Georgian (MESS)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru</name>
-            <_description>Russian</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <!-- Keyboard indicator for Russian layouts -->
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Georgia)</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>os</name>
-            <_description>Ossetian</_description>
-            <languageList><iso639Id>oss</iso639Id></languageList>
+            <_description>Ossetian (Georgia)</_description>
+            <languageList>
+              <iso639Id>oss</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2501,89 +3058,107 @@
     <layout>
       <configItem>
         <name>de</name>
-        <_shortDescription>Deu</_shortDescription>
-        <_description>Germany</_description>
-        <languageList><iso639Id>ger</iso639Id></languageList>
+        <!-- Keyboard indicator for German layouts -->
+        <_shortDescription>de</_shortDescription>
+        <_description>German</_description>
+        <languageList>
+          <iso639Id>ger</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>deadacute</name>
-            <_description>Dead acute</_description>
+            <_description>German (dead acute)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadgraveacute</name>
-            <_description>Dead grave acute</_description>
+            <_description>German (dead grave acute)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>German (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro</name>
-            <_description>Romanian keyboard with German letters</_description>
+            <_description>Romanian (Germany)</_description>
+            <languageList><iso639Id>rum</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro_nodeadkeys</name>
-            <_description>Romanian keyboard with German letters, eliminate dead keys</_description>
+            <_description>Romanian (Germany, eliminate dead keys)</_description>
+            <languageList><iso639Id>rum</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>German (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>German (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>neo</name>
-            <_description>Neo 2</_description>
+            <_description>German (Neo 2)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>German (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Macintosh, eliminate dead keys</_description>
+            <_description>German (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dsb</name>
             <_description>Lower Sorbian</_description>
-            <languageList><iso639Id>dsb</iso639Id></languageList>
+            <languageList>
+              <iso639Id>dsb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dsb_qwertz</name>
             <_description>Lower Sorbian (qwertz)</_description>
-            <languageList><iso639Id>dsb</iso639Id></languageList>
+            <languageList>
+              <iso639Id>dsb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>German (qwerty)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru</name>
+            <_description>Russian (Germany, phonetic)</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2591,33 +3166,36 @@
     <layout>
       <configItem>
         <name>gr</name>
-        <_shortDescription>Gre</_shortDescription>
-        <_description>Greece</_description>
-        <languageList><iso639Id>gre</iso639Id></languageList>
+        <!-- Keyboard indicator for Greek layouts -->
+        <_shortDescription>gr</_shortDescription>
+        <_description>Greek</_description>
+        <languageList>
+          <iso639Id>gre</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>simple</name>
-            <_description>Simple</_description>
+            <_description>Greek (simple)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>extended</name>
-            <_description>Extended</_description>
+            <_description>Greek (extended)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Greek (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>polytonic</name>
-            <_description>Polytonic</_description>
+            <_description>Greek (polytonic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2625,128 +3203,126 @@
     <layout>
       <configItem>
         <name>hu</name>
-        <_shortDescription>Hun</_shortDescription>
-        <_description>Hungary</_description>
-        <languageList><iso639Id>hun</iso639Id></languageList>
+        <!-- Keyboard indicator for Hungarian layouts -->
+        <_shortDescription>hu</_shortDescription>
+        <_description>Hungarian</_description>
+        <languageList>
+          <iso639Id>hun</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>standard</name>
-            <_description>Standard</_description>
+            <_description>Hungarian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Hungarian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Hungarian (qwerty)</_description>
           </configItem>
         </variant>
-
-        <!-- 101 keys -->
         <variant>
           <configItem>
             <name>101_qwertz_comma_dead</name>
-            <_description>101/qwertz/comma/Dead keys</_description>
+            <_description>Hungarian (101/qwertz/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_comma_nodead</name>
-            <_description>101/qwertz/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwertz/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_dot_dead</name>
-            <_description>101/qwertz/dot/Dead keys</_description>
+            <_description>Hungarian (101/qwertz/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_dot_nodead</name>
-            <_description>101/qwertz/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwertz/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_comma_dead</name>
-            <_description>101/qwerty/comma/Dead keys</_description>
+            <_description>Hungarian (101/qwerty/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_comma_nodead</name>
-            <_description>101/qwerty/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwerty/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_dot_dead</name>
-            <_description>101/qwerty/dot/Dead keys</_description>
+            <_description>Hungarian (101/qwerty/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_dot_nodead</name>
-            <_description>101/qwerty/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwerty/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
-
-
-        <!-- 102 keys -->
         <variant>
           <configItem>
             <name>102_qwertz_comma_dead</name>
-            <_description>102/qwertz/comma/Dead keys</_description>
+            <_description>Hungarian (102/qwertz/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_comma_nodead</name>
-            <_description>102/qwertz/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwertz/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_dot_dead</name>
-            <_description>102/qwertz/dot/Dead keys</_description>
+            <_description>Hungarian (102/qwertz/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_dot_nodead</name>
-            <_description>102/qwertz/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwertz/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_comma_dead</name>
-            <_description>102/qwerty/comma/Dead keys</_description>
+            <_description>Hungarian (102/qwerty/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_comma_nodead</name>
-            <_description>102/qwerty/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwerty/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_dot_dead</name>
-            <_description>102/qwerty/dot/Dead keys</_description>
+            <_description>Hungarian (102/qwerty/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_dot_nodead</name>
-            <_description>102/qwerty/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwerty/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2754,33 +3330,36 @@
     <layout>
       <configItem>
         <name>is</name>
-        <_shortDescription>Isl</_shortDescription>
-        <_description>Iceland</_description>
-        <languageList><iso639Id>ice</iso639Id></languageList>
+        <!-- Keyboard indicator for Icelandic layouts -->
+        <_shortDescription>is</_shortDescription>
+        <_description>Icelandic</_description>
+        <languageList>
+          <iso639Id>ice</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>Sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Icelandic (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Icelandic (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Icelandic (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Icelandic (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2788,27 +3367,30 @@
     <layout>
       <configItem>
         <name>il</name>
-        <_shortDescription>Isr</_shortDescription>
-        <_description>Israel</_description>
-        <languageList><iso639Id>heb</iso639Id></languageList>
+        <!-- Keyboard indicator for Hebrew layouts -->
+        <_shortDescription>he</_shortDescription>
+        <_description>Hebrew</_description>
+        <languageList>
+          <iso639Id>heb</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>lyx</name>
-            <_description>lyx</_description>
+            <_description>Hebrew (lyx)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Hebrew (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>biblical</name>
-            <_description>Biblical Hebrew (Tiro)</_description>
+            <_description>Hebrew (Biblical, Tiro)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2816,34 +3398,39 @@
     <layout>
       <configItem>
         <name>it</name>
-        <_shortDescription>Ita</_shortDescription>
-        <_description>Italy</_description>
-        <languageList><iso639Id>ita</iso639Id></languageList>
+        <!-- Keyboard indicator for Italian layouts -->
+        <_shortDescription>it</_shortDescription>
+        <_description>Italian</_description>
+        <languageList>
+          <iso639Id>ita</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Italian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Italian (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Italian letters</_description>
+            <_description>Italian (US keyboard with Italian letters)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>Georgian</_description>
-            <languageList><iso639Id>geo</iso639Id></languageList>
+            <_description>Georgian (Italy)</_description>
+            <languageList>
+              <iso639Id>geo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2851,37 +3438,61 @@
     <layout>
       <configItem>
         <name>jp</name>
-        <_shortDescription>Jpn</_shortDescription>
-        <_description>Japan</_description>
-        <languageList><iso639Id>jpn</iso639Id></languageList>
+        <!-- Keyboard indicator for Japanese layouts -->
+        <_shortDescription>ja</_shortDescription>
+        <_description>Japanese</_description>
+        <languageList>
+          <iso639Id>jpn</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>kana</name>
-            <_description>Kana</_description>
+            <_description>Japanese (Kana)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kana86</name>
+            <_description>Japanese (Kana 86)</_description>
           </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>OADG109A</name>
-            <_description>OADG 109A</_description>
+            <_description>Japanese (OADG 109A)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Japanese (Macintosh)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Japanese (Dvorak)</_description>
           </configItem>
-	</variant>
+        </variant>
       </variantList>
     </layout>
     <layout>
       <configItem>
         <name>kg</name>
-        <_shortDescription>Kgz</_shortDescription>
-        <_description>Kyrgyzstan</_description>
-        <languageList><iso639Id>kir</iso639Id></languageList>
+        <!-- Keyboard indicator for Kyrgyz layouts -->
+        <_shortDescription>ki</_shortDescription>
+        <_description>Kyrgyz</_description>
+        <languageList>
+          <iso639Id>kir</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
-       <variant>
+        <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Kyrgyz (phonetic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2889,52 +3500,73 @@
     <layout>
       <configItem>
         <name>kh</name>
-        <_shortDescription>Khm</_shortDescription>
-        <_description>Cambodia</_description>
-        <languageList><iso639Id>khm</iso639Id></languageList>
+        <!-- Keyboard indicator for Khmer layouts -->
+        <_shortDescription>km</_shortDescription>
+        <_description>Khmer (Cambodia)</_description>
+        <languageList>
+          <iso639Id>khm</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
-	<name>kz</name>
-	<_shortDescription>Kaz</_shortDescription>
-	<_description>Kazakhstan</_description>
-        <languageList><iso639Id>kaz</iso639Id></languageList>
+        <name>kz</name>
+        <!-- Keyboard indicator for Kazakh layouts -->
+        <_shortDescription>kk</_shortDescription>
+        <_description>Kazakh</_description>
+        <languageList>
+          <iso639Id>kaz</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
-	<variant>
-	  <configItem>
-	    <name>ruskaz</name>
-	    <_description>Russian with Kazakh</_description>
+        <variant>
+          <configItem>
+            <name>ruskaz</name>
+            <!-- Keyboard indicator for Russian layouts -->
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Kazakhstan, with Kazakh)</_description>
             <languageList><iso639Id>kaz</iso639Id>
                           <iso639Id>rus</iso639Id></languageList>
-	  </configItem>
-	</variant>
-	<variant>
-	  <configItem>
-	    <name>kazrus</name>
-	    <_description>Kazakh with Russian</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kazrus</name>
+            <_description>Kazakh (with Russian)</_description>
             <languageList><iso639Id>kaz</iso639Id>
                           <iso639Id>rus</iso639Id></languageList>
-	  </configItem>
-	</variant>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
       <configItem>
         <name>la</name>
-        <_shortDescription>Lao</_shortDescription>
-        <_description>Laos</_description>
-        <languageList><iso639Id>lao</iso639Id></languageList>
+        <!-- Keyboard indicator for Lao layouts -->
+        <_shortDescription>lo</_shortDescription>
+        <_description>Lao</_description>
+        <languageList>
+          <iso639Id>lao</iso639Id>
+        </languageList>
       </configItem>
-      <variantList/>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>stea</name>
+            <_description>Lao (STEA proposed standard layout)</_description>
+            <languageList><iso639Id>lao</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
     </layout>
     <layout>
       <configItem>
         <name>latam</name>
-        <_shortDescription>LAm</_shortDescription>
-        <_description>Latin American</_description>
+        <!-- Keyboard indicator for Spanish layouts -->
+        <_shortDescription>es</_shortDescription>
+        <_description>Spanish (Latin American)</_description>
         <countryList>
           <iso3166Id>AR</iso3166Id>
           <iso3166Id>BO</iso3166Id>
@@ -2958,25 +3590,27 @@
           <iso3166Id>UY</iso3166Id>
           <iso3166Id>VE</iso3166Id>
         </countryList>
-        <languageList><iso639Id>spa</iso639Id></languageList>
+        <languageList>
+          <iso639Id>spa</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Spanish (Latin American, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadtilde</name>
-            <_description>Include dead tilde</_description>
+            <_description>Spanish (Latin American, include dead tilde)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Spanish (Latin American, Sun dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2984,39 +3618,42 @@
     <layout>
       <configItem>
         <name>lt</name>
-        <_shortDescription>Ltu</_shortDescription>
-        <_description>Lithuania</_description>
-        <languageList><iso639Id>lit</iso639Id></languageList>
+        <!-- Keyboard indicator for Lithuanian layouts -->
+        <_shortDescription>lt</_shortDescription>
+        <_description>Lithuanian</_description>
+        <languageList>
+          <iso639Id>lit</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Standard</_description>
+            <_description>Lithuanian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Lithuanian letters</_description>
+            <_description>Lithuanian (US keyboard with Lithuanian letters)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ibm</name>
-            <_description>IBM (LST 1205-92)</_description>
+            <_description>Lithuanian (IBM LST 1205-92)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>lekp</name>
-            <_description>LEKP</_description>
+            <_description>Lithuanian (LEKP)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>lekpa</name>
-            <_description>LEKPa</_description>
+            <_description>Lithuanian (LEKPa)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3024,27 +3661,48 @@
     <layout>
       <configItem>
         <name>lv</name>
-        <_shortDescription>Lav</_shortDescription>
-        <_description>Latvia</_description>
-        <languageList><iso639Id>lav</iso639Id></languageList>
+        <!-- Keyboard indicator for Latvian layouts -->
+        <_shortDescription>lv</_shortDescription>
+        <_description>Latvian</_description>
+        <languageList>
+          <iso639Id>lav</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>apostrophe</name>
-            <_description>Apostrophe (') variant</_description>
+            <_description>Latvian (apostrophe variant)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tilde</name>
-            <_description>Tilde (~) variant</_description>
+            <_description>Latvian (tilde variant)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fkey</name>
-            <_description>F-letter (F) variant</_description>
+            <_description>Latvian (F variant)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>modern</name>
+            <_description>Latvian (modern)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <_description>Latvian (ergonomic, ŪGJRMV)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>adapted</name>
+            <_description>Latvian (adapted)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3052,60 +3710,66 @@
     <layout>
       <configItem>
         <name>mao</name>
-        <_shortDescription>Mao</_shortDescription>
+        <!-- Keyboard indicator for Maori layouts -->
+        <_shortDescription>mi</_shortDescription>
         <_description>Maori</_description>
-        <languageList><iso639Id>mao</iso639Id></languageList>
+        <languageList>
+          <iso639Id>mao</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>me</name>
-        <_shortDescription>MNE</_shortDescription>
-        <_description>Montenegro</_description>
-        <languageList><iso639Id>srp</iso639Id></languageList>
+        <!-- Keyboard indicator for Montenegrin layouts -->
+        <_shortDescription>sr</_shortDescription>
+        <_description>Montenegrin</_description>
+        <languageList>
+          <iso639Id>srp</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Cyrillic</_description>
+            <_description>Montenegrin (Cyrillic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cyrillicyz</name>
-            <_description>Cyrillic, Z and ZHE swapped</_description>
+            <_description>Montenegrin (Cyrillic, Z and ZHE swapped)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Latin unicode</_description>
+            <_description>Montenegrin (Latin Unicode)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinyz</name>
-            <_description>Latin qwerty</_description>
+            <_description>Montenegrin (Latin qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Latin unicode qwerty</_description>
+            <_description>Montenegrin (Latin Unicode qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cyrillicalternatequotes</name>
-            <_description>Cyrillic with guillemets</_description>
+            <_description>Montenegrin (Cyrillic with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinalternatequotes</name>
-            <_description>Latin with guillemets</_description>
+            <_description>Montenegrin (Latin with guillemets)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3113,15 +3777,18 @@
     <layout>
       <configItem>
         <name>mk</name>
-        <_shortDescription>Mkd</_shortDescription>
-        <_description>Macedonia</_description>
-        <languageList><iso639Id>mkd</iso639Id></languageList>
+        <!-- Keyboard indicator for Macedonian layouts -->
+        <_shortDescription>mk</_shortDescription>
+        <_description>Macedonian</_description>
+        <languageList>
+          <iso639Id>mkd</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Macedonian (eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3129,15 +3796,18 @@
     <layout>
       <configItem>
         <name>mt</name>
-        <_shortDescription>Mlt</_shortDescription>
-        <_description>Malta</_description>
-        <languageList><iso639Id>mlt</iso639Id></languageList>
+        <!-- Keyboard indicator for Maltese layouts -->
+        <_shortDescription>mt</_shortDescription>
+        <_description>Maltese</_description>
+        <languageList>
+          <iso639Id>mlt</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Maltese keyboard with US layout</_description>
+            <_description>Maltese (with US layout)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3145,56 +3815,66 @@
     <layout>
       <configItem>
         <name>mn</name>
-        <_shortDescription>Mng</_shortDescription>
-        <_description>Mongolia</_description>
-        <languageList><iso639Id>mng</iso639Id></languageList>
+        <!-- Keyboard indicator for Mongolian layouts -->
+        <_shortDescription>mn</_shortDescription>
+        <_description>Mongolian</_description>
+        <languageList>
+          <iso639Id>mng</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>no</name>
-        <_shortDescription>Nor</_shortDescription>
-        <_description>Norway</_description>
-        <languageList><iso639Id>nor</iso639Id></languageList>
+        <!-- Keyboard indicator for Norwegian layouts -->
+        <_shortDescription>no</_shortDescription>
+        <_description>Norwegian</_description>
+        <languageList>
+          <iso639Id>nor</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Norwegian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Norwegian (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Northern Saami</_description>
-            <languageList><iso639Id>sme</iso639Id></languageList>
+            <_description>Northern Saami (Norway)</_description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi_nodeadkeys</name>
-            <_description>Northern Saami, eliminate dead keys</_description>
-            <languageList><iso639Id>sme</iso639Id></languageList>
+            <_description>Northern Saami (Norway, eliminate dead keys)</_description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Norwegian (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Macintosh, eliminate dead keys</_description>
+            <_description>Norwegian (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3202,53 +3882,62 @@
     <layout>
       <configItem>
         <name>pl</name>
-        <_shortDescription>Pol</_shortDescription>
-        <_description>Poland</_description>
-        <languageList><iso639Id>pol</iso639Id></languageList>
+        <!-- Keyboard indicator for Polish layouts -->
+        <_shortDescription>pl</_shortDescription>
+        <_description>Polish</_description>
+        <languageList>
+          <iso639Id>pol</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>qwertz</name>
-            <_description>qwertz</_description>
+            <_description>Polish (qwertz)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Polish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak_quotes</name>
-            <_description>Dvorak, Polish quotes on quotemark key</_description>
+            <_description>Polish (Dvorak, Polish quotes on quotemark key)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak_altquotes</name>
-            <_description>Dvorak, Polish quotes on key 1</_description>
+            <_description>Polish (Dvorak, Polish quotes on key 1)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>csb</name>
             <_description>Kashubian</_description>
-            <languageList><iso639Id>csb</iso639Id></languageList>
+            <languageList>
+              <iso639Id>csb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru_phonetic_dvorak</name>
-            <_description>Russian phonetic Dvorak</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <!-- Keyboard indicator for Russian layouts -->
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Poland, phonetic Dvorak)</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>Programmer Dvorak</_description>
+            <_description>Polish (programmer Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3256,58 +3945,63 @@
     <layout>
       <configItem>
         <name>pt</name>
-        <_shortDescription>Prt</_shortDescription>
-        <_description>Portugal</_description>
-        <languageList><iso639Id>por</iso639Id></languageList>
+        <!-- Keyboard indicator for Portuguese layouts -->
+        <_shortDescription>pt</_shortDescription>
+        <_description>Portuguese</_description>
+        <languageList>
+          <iso639Id>por</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Portuguese (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Portuguese (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Portuguese (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Macintosh, eliminate dead keys</_description>
+            <_description>Portuguese (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_sundeadkeys</name>
-            <_description>Macintosh, Sun dead keys</_description>
+            <_description>Portuguese (Macintosh, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Nativo</_description>
+            <_description>Portuguese (Nativo)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Nativo for USA keyboards</_description>
+            <_description>Portuguese (Nativo for USA keyboards)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Nativo for Esperanto</_description>
-            <languageList><iso639Id>epo</iso639Id></languageList>
+            <_description>Esperanto (Portugal, Nativo)</_description>
+            <languageList>
+              <iso639Id>epo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3315,61 +4009,36 @@
     <layout>
       <configItem>
         <name>ro</name>
-        <_shortDescription>Rou</_shortDescription>
-        <_description>Romania</_description>
-        <languageList><iso639Id>rum</iso639Id></languageList>
+        <!-- Keyboard indicator for Romanian layouts -->
+        <_shortDescription>ro</_shortDescription>
+        <_description>Romanian</_description>
+        <languageList>
+          <iso639Id>rum</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>cedilla</name>
-            <_description>Cedilla</_description>
+            <_description>Romanian (cedilla)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Standard</_description>
+            <_description>Romanian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std_cedilla</name>
-            <_description>Standard (Cedilla)</_description>
+            <_description>Romanian (standard cedilla)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>winkeys</name>
-            <_description>Winkeys</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_f</name>
-            <_description>Crimean Tatar (Turkish F)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_alt</name>
-            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_dobruca1</name>
-            <_description>Crimean Tatar (Dobruca-1 Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_dobruca2</name>
-            <_description>Crimean Tatar (Dobruca-2 Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Romanian (WinKeys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3377,167 +4046,219 @@
     <layout>
       <configItem>
         <name>ru</name>
-        <_shortDescription>Rus</_shortDescription>
-        <_description>Russia</_description>
-        <languageList><iso639Id>rus</iso639Id></languageList>
+        <!-- Keyboard indicator for Russian layouts -->
+        <_shortDescription>ru</_shortDescription>
+        <_description>Russian</_description>
+        <languageList>
+          <iso639Id>rus</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Russian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic_winkeys</name>
-            <_description>Phonetic Winkeys</_description>
+            <_description>Russian (phonetic WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter</name>
-            <_description>Typewriter</_description>
+            <_description>Russian (typewriter)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>Russian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter-legacy</name>
-            <_description>Typewriter, legacy</_description>
+            <_description>Russian (typewriter, legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tt</name>
             <_description>Tatar</_description>
-            <languageList><iso639Id>tat</iso639Id></languageList>
+            <languageList>
+              <iso639Id>tat</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>os_legacy</name>
-            <_description>Ossetian, legacy</_description>
-            <languageList><iso639Id>oss</iso639Id></languageList>
+            <_description>Ossetian (legacy)</_description>
+            <languageList>
+              <iso639Id>oss</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>os_winkeys</name>
-            <_description>Ossetian, Winkeys</_description>
-            <languageList><iso639Id>oss</iso639Id></languageList>
+            <_description>Ossetian (WinKeys)</_description>
+            <languageList>
+              <iso639Id>oss</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cv</name>
             <_description>Chuvash</_description>
-            <languageList><iso639Id>chv</iso639Id></languageList>
+            <languageList>
+              <iso639Id>chv</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cv_latin</name>
-            <_description>Chuvash Latin</_description>
-            <languageList><iso639Id>chv</iso639Id></languageList>
+            <_description>Chuvash (Latin)</_description>
+            <languageList>
+              <iso639Id>chv</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>udm</name>
             <_description>Udmurt</_description>
-            <languageList><iso639Id>udm</iso639Id></languageList>
+            <languageList>
+              <iso639Id>udm</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kom</name>
             <_description>Komi</_description>
-            <languageList><iso639Id>kom</iso639Id></languageList>
+            <languageList>
+              <iso639Id>kom</iso639Id>
+            </languageList>
           </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>sah</name>
             <_description>Yakut</_description>
-            <languageList><iso639Id>sah</iso639Id></languageList>
+            <languageList>
+              <iso639Id>sah</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>xal</name>
             <_description>Kalmyk</_description>
-            <languageList><iso639Id>xal</iso639Id></languageList>
+            <languageList>
+              <iso639Id>xal</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dos</name>
-            <_description>DOS</_description>
+            <_description>Russian (DOS)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>srp</name>
+            <_description>Serbian (Russia)</_description>
+            <languageList><iso639Id>rus</iso639Id>
+                          <iso639Id>srp</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bak</name>
             <_description>Bashkirian</_description>
-            <languageList><iso639Id>bak</iso639Id></languageList>
+            <languageList>
+              <iso639Id>bak</iso639Id>
+            </languageList>
           </configItem>
         </variant>
-      </variantList>
-    </layout>
-    <layout>
+        <variant>
+          <configItem>
+            <name>chm</name>
+            <_description>Mari</_description>
+            <languageList>
+              <iso639Id>chm</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
       <configItem>
         <name>rs</name>
-        <_shortDescription>SRB</_shortDescription>
-        <_description>Serbia</_description>
-        <languageList><iso639Id>srp</iso639Id></languageList>
+        <!-- Keyboard indicator for Serbian layouts -->
+        <_shortDescription>sr</_shortDescription>
+        <_description>Serbian (Cyrillic)</_description>
+        <languageList>
+          <iso639Id>srp</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>yz</name>
-            <_description>Z and ZHE swapped</_description>
+            <_description>Serbian (Cyrillic, Z and ZHE swapped)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Latin</_description>
+            <_description>Serbian (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Latin Unicode</_description>
+            <_description>Serbian (Latin Unicode)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinyz</name>
-            <_description>Latin qwerty</_description>
+            <_description>Serbian (Latin qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Latin Unicode qwerty</_description>
+            <_description>Serbian (Latin Unicode qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>With guillemets</_description>
+            <_description>Serbian (Cyrillic with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinalternatequotes</name>
-            <_description>Latin with guillemets</_description>
+            <_description>Serbian (Latin with guillemets)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rue</name>
+            <_description>Pannonian Rusyn (homophonic)</_description>
+            <languageList>
+              <iso639Id>rue</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3545,21 +4266,24 @@
     <layout>
       <configItem>
         <name>si</name>
-        <_shortDescription>Svn</_shortDescription>
-        <_description>Slovenia</_description>
-        <languageList><iso639Id>slv</iso639Id></languageList>
+        <!-- Keyboard indicator for Slovenian layouts -->
+        <_shortDescription>sl</_shortDescription>
+        <_description>Slovenian</_description>
+        <languageList>
+          <iso639Id>slv</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Use guillemets for quotes</_description>
+            <_description>Slovenian (use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Slovenian letters</_description>
+            <_description>Slovenian (US keyboard with Slovenian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3567,27 +4291,30 @@
     <layout>
       <configItem>
         <name>sk</name>
-        <_shortDescription>Svk</_shortDescription>
-        <_description>Slovakia</_description>
-        <languageList><iso639Id>slo</iso639Id></languageList>
+        <!-- Keyboard indicator for Slovak layouts -->
+        <_shortDescription>sk</_shortDescription>
+        <_description>Slovak</_description>
+        <languageList>
+          <iso639Id>slo</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>Extended Backslash</_description>
+            <_description>Slovak (extended Backslash)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Slovak (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_bksl</name>
-            <_description>qwerty, extended Backslash</_description>
+            <_description>Slovak (qwerty, extended Backslash)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3595,53 +4322,60 @@
     <layout>
       <configItem>
         <name>es</name>
-        <_shortDescription>Esp</_shortDescription>
-        <_description>Spain</_description>
-        <languageList><iso639Id>spa</iso639Id></languageList>
+        <!-- Keyboard indicator for Spanish layouts -->
+        <_shortDescription>es</_shortDescription>
+        <_description>Spanish</_description>
+        <languageList>
+          <iso639Id>spa</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Spanish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadtilde</name>
-            <_description>Include dead tilde</_description>
+            <_description>Spanish (include dead tilde)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Spanish (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Spanish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ast</name>
-            <_description>Asturian variant with bottom-dot H and bottom-dot L</_description>
-            <languageList><iso639Id>ast</iso639Id></languageList>
+            <_description>Asturian (Spain, with bottom-dot H and bottom-dot L)</_description>
+            <languageList>
+              <iso639Id>ast</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cat</name>
-            <_description>Catalan variant with middle-dot L</_description>
-            <languageList><iso639Id>cat</iso639Id></languageList>
+            <_description>Catalan (Spain, with middle-dot L)</_description>
+            <languageList>
+              <iso639Id>cat</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Spanish (Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3649,54 +4383,74 @@
     <layout>
       <configItem>
         <name>se</name>
-        <_shortDescription>Swe</_shortDescription>
-        <_description>Sweden</_description>
-        <languageList><iso639Id>swe</iso639Id></languageList>
+        <!-- Keyboard indicator for Swedish layouts -->
+        <_shortDescription>sv</_shortDescription>
+        <_description>Swedish</_description>
+        <languageList>
+          <iso639Id>swe</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Swedish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Swedish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <_description>Russian phonetic</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <!-- Keyboard indicator for Russian layouts -->
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Sweden, phonetic)</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus_nodeadkeys</name>
-            <_description>Russian phonetic, eliminate dead keys</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <!-- Keyboard indicator for Russian layouts -->
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Sweden, phonetic, eliminate dead keys)</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Northern Saami</_description>
-            <languageList><iso639Id>sme</iso639Id></languageList>
+            <_description>Northern Saami (Sweden)</_description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Swedish (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>svdvorak</name>
-            <_description>Svdvorak</_description>
+            <_description>Swedish (Svdvorak)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>swl</name>
+            <_description>Swedish Sign Language</_description>
+            <languageList><iso639Id>swl</iso639Id></languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3704,8 +4458,9 @@
     <layout>
       <configItem>
         <name>ch</name>
-        <_shortDescription>Che</_shortDescription>
-        <_description>Switzerland</_description>
+        <!-- Keyboard indicator for German layouts -->
+        <_shortDescription>de</_shortDescription>
+        <_description>German (Switzerland)</_description>
         <languageList><iso639Id>ger</iso639Id>
                       <iso639Id>gsw</iso639Id></languageList>
       </configItem>
@@ -3713,53 +4468,75 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>German (Switzerland, legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_nodeadkeys</name>
-            <_description>German, eliminate dead keys</_description>
+            <!-- Keyboard indicator for German layouts -->
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_sundeadkeys</name>
-            <_description>German, Sun dead keys</_description>
+            <!-- Keyboard indicator for German layouts -->
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr</name>
-            <_description>French</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <!-- Keyboard indicator for French layouts -->
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland)</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr_nodeadkeys</name>
-            <_description>French, eliminate dead keys</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <!-- Keyboard indicator for French layouts -->
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, eliminate dead keys)</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr_sundeadkeys</name>
-            <_description>French, Sun dead keys</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <!-- Keyboard indicator for French layouts -->
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, Sun dead keys)</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr_mac</name>
-            <_description>French (Macintosh)</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <!-- Keyboard indicator for French layouts -->
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, Macintosh)</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_mac</name>
-            <_description>German (Macintosh)</_description>
+            <!-- Keyboard indicator for German layouts -->
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3767,42 +4544,61 @@
     <layout>
       <configItem>
         <name>sy</name>
-        <_shortDescription>Syr</_shortDescription>
-        <_description>Syria</_description>
-        <languageList><iso639Id>syr</iso639Id></languageList>
+        <!-- Keyboard indicator for Arabic layouts -->
+        <_shortDescription>ar</_shortDescription>
+        <_description>Arabic (Syria)</_description>
+        <languageList>
+          <iso639Id>syr</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>syc</name>
+            <!-- Keyboard indicator for Syriac layouts -->
+            <_shortDescription>syc</_shortDescription>
             <_description>Syriac</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>syc_phonetic</name>
-            <_description>Syriac phonetic</_description>
+            <!-- Keyboard indicator for Syriac layouts -->
+            <_shortDescription>syc</_shortDescription>
+            <_description>Syriac (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Kurdish, Latin Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, Latin Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Kurdish, (F)</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Kurdish, Latin Alt-Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, Latin Alt-Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3810,15 +4606,18 @@
     <layout>
       <configItem>
         <name>tj</name>
-        <_shortDescription>Tjk</_shortDescription>
-        <_description>Tajikistan</_description>
-        <languageList><iso639Id>tgk</iso639Id></languageList>
+        <!-- Keyboard indicator for Tajik layouts -->
+        <_shortDescription>tg</_shortDescription>
+        <_description>Tajik</_description>
+        <languageList>
+          <iso639Id>tgk</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>Tajik (legacy)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3826,23 +4625,32 @@
     <layout>
       <configItem>
         <name>lk</name>
-        <_shortDescription>SrL</_shortDescription>
-        <_description>Sri Lanka</_description>
-        <languageList><iso639Id>sin</iso639Id></languageList>
+        <!-- Keyboard indicator for Sinhala layouts -->
+        <_shortDescription>si</_shortDescription>
+        <_description>Sinhala (phonetic)</_description>
+        <languageList>
+          <iso639Id>sin</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>tam_unicode</name>
-            <_description>Tamil Unicode</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <!-- Keyboard indicator for Tamil layouts -->
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (Sri Lanka, Unicode)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>Tamil TAB Typewriter</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <_description>Tamil (Sri Lanka, TAB Typewriter)</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3850,21 +4658,24 @@
     <layout>
       <configItem>
         <name>th</name>
-        <_shortDescription>Tha</_shortDescription>
-        <_description>Thailand</_description>
-        <languageList><iso639Id>tha</iso639Id></languageList>
+        <!-- Keyboard indicator for Thai layouts -->
+        <_shortDescription>th</_shortDescription>
+        <_description>Thai</_description>
+        <languageList>
+          <iso639Id>tha</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>tis</name>
-            <_description>TIS-820.2538</_description>
+            <_description>Thai (TIS-820.2538)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>pat</name>
-            <_description>Pattachote</_description>
+            <_description>Thai (Pattachote)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3872,150 +4683,200 @@
     <layout>
       <configItem>
         <name>tr</name>
-        <_shortDescription>Tur</_shortDescription>
-        <_description>Turkey</_description>
-        <languageList><iso639Id>tur</iso639Id></languageList>
+        <!-- Keyboard indicator for Turkish layouts -->
+        <_shortDescription>tr</_shortDescription>
+        <_description>Turkish</_description>
+        <languageList>
+          <iso639Id>tur</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>f</name>
-            <_description>(F)</_description>
+            <_description>Turkish (F)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt</name>
-            <_description>Alt-Q</_description>
+            <_description>Turkish (Alt-Q)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Turkish (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Kurdish, Latin Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, Latin Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Kurdish, (F)</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Kurdish, Latin Alt-Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <!-- Keyboard indicator for Kurdish layouts -->
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, Latin Alt-Q)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>International (with dead keys)</_description>
+            <_description>Turkish (international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
+            <!-- Keyboard indicator for Crimean Tatar layouts -->
+            <_shortDescription>crh</_shortDescription>
             <_description>Crimean Tatar (Turkish Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_f</name>
+            <!-- Keyboard indicator for Crimean Tatar layouts -->
+            <_shortDescription>crh</_shortDescription>
             <_description>Crimean Tatar (Turkish F)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_alt</name>
+            <!-- Keyboard indicator for Crimean Tatar layouts -->
+            <_shortDescription>crh</_shortDescription>
             <_description>Crimean Tatar (Turkish Alt-Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
     </layout>
     <layout>
       <configItem>
-        <name>ua</name>
-        <_shortDescription>Ukr</_shortDescription>
-        <_description>Ukraine</_description>
-        <languageList><iso639Id>ukr</iso639Id></languageList>
+        <name>tw</name>
+        <!-- Keyboard indicator for Taiwanese layouts -->
+        <_shortDescription>zh</_shortDescription>
+        <_description>Taiwanese</_description>
+        <languageList>
+          <iso639Id>trv</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
-            <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <name>indigenous</name>
+            <_description>Taiwanese (indigenous)</_description>
+            <languageList>
+              <iso639Id>ami</iso639Id>
+              <iso639Id>tay</iso639Id>
+              <iso639Id>bnn</iso639Id>
+              <iso639Id>ckv</iso639Id>
+              <iso639Id>pwn</iso639Id>
+              <iso639Id>pyu</iso639Id>
+              <iso639Id>dru</iso639Id>
+              <iso639Id>ais</iso639Id>
+              <iso639Id>ssf</iso639Id>
+              <iso639Id>tao</iso639Id>
+              <iso639Id>tsu</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>typewriter</name>
-            <_description>Typewriter</_description>
+            <name>saisiyat</name>
+            <!-- Keyboard indicator for Saisiyat layouts -->
+            <_shortDescription>xsy</_shortDescription>
+            <_description>Saisiyat (Taiwan)</_description>
+            <languageList>
+              <iso639Id>xsy</iso639Id>
+            </languageList>
           </configItem>
         </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ua</name>
+        <!-- Keyboard indicator for Ukranian layouts -->
+        <_shortDescription>uk</_shortDescription>
+        <_description>Ukrainian</_description>
+        <languageList>
+          <iso639Id>ukr</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
         <variant>
           <configItem>
-            <name>winkeys</name>
-            <_description>Winkeys</_description>
+            <name>phonetic</name>
+            <_description>Ukrainian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>legacy</name>
-            <_description>Legacy</_description>
+            <name>typewriter</name>
+            <_description>Ukrainian (typewriter)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>rstu</name>
-<!-- RSTU 2019-91 -->
-            <_description>Standard RSTU</_description>
+            <name>winkeys</name>
+            <_description>Ukrainian (WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>rstu_ru</name>
-<!-- RSTU 2019-91 -->
-            <_description>Standard RSTU on Russian layout</_description>
-          </configItem>
-        </variant>
-	<variant>
-          <configItem>
-            <name>homophonic</name>
-            <_description>Homophonic</_description>
+            <name>legacy</name>
+            <_description>Ukrainian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>crh</name>
-            <_description>Crimean Tatar (Turkish Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <name>rstu</name>
+            <_description>Ukrainian (standard RSTU)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>crh_f</name>
-            <_description>Crimean Tatar (Turkish F)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <name>rstu_ru</name>
+            <_description>Russian (Ukraine, standard RSTU)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>crh_alt</name>
-            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <name>homophonic</name>
+            <_description>Ukrainian (homophonic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4023,45 +4884,54 @@
     <layout>
       <configItem>
         <name>gb</name>
-        <_shortDescription>GBr</_shortDescription>
-        <_description>United Kingdom</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <!-- Keyboard indicator for English layouts -->
+        <_shortDescription>en</_shortDescription>
+        <_description>English (UK)</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>extd</name>
-            <_description>Extended - Winkeys</_description>
+            <_description>English (UK, extended WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>International (with dead keys)</_description>
+            <_description>English (UK, international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>English (UK, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorakukp</name>
-            <_description>Dvorak (UK Punctuation)</_description>
+            <_description>English (UK, Dvorak with UK punctuation)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>English (UK, Macintosh)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_intl</name>
+            <_description>English (UK, Macintosh international)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>Colemak</_description>
+            <_description>English (UK, Colemak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4069,36 +4939,18 @@
     <layout>
       <configItem>
         <name>uz</name>
-        <_shortDescription>Uzb</_shortDescription>
-        <_description>Uzbekistan</_description>
-        <languageList><iso639Id>uzb</iso639Id></languageList>
+        <!-- Keyboard indicator for Uzbek layouts -->
+        <_shortDescription>uz</_shortDescription>
+        <_description>Uzbek</_description>
+        <languageList>
+          <iso639Id>uzb</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Latin</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh</name>
-            <_description>Crimean Tatar (Turkish Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_f</name>
-            <_description>Crimean Tatar (Turkish F)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>crh_alt</name>
-            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Uzbek (Latin)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4106,71 +4958,91 @@
     <layout>
       <configItem>
         <name>vn</name>
-        <_shortDescription>Vnm</_shortDescription>
-        <_description>Vietnam</_description>
-        <languageList><iso639Id>vie</iso639Id></languageList>
+        <!-- Keyboard indicator for Vietnamese layouts -->
+        <_shortDescription>vi</_shortDescription>
+        <_description>Vietnamese</_description>
+        <languageList>
+          <iso639Id>vie</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
-       <configItem>
+      <configItem>
         <name>kr</name>
-        <_shortDescription>Kor</_shortDescription>
-        <_description>Korea, Republic of</_description>
-        <languageList><iso639Id>kor</iso639Id></languageList>
+        <!-- Keyboard indicator for Korean layouts -->
+        <_shortDescription>ko</_shortDescription>
+        <_description>Korean</_description>
+        <languageList>
+          <iso639Id>kor</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
-	<variant>
-	  <configItem>
-	    <name>kr104</name>
-	    <_description>101/104 key Compatible</_description>
-	  </configItem>
-	</variant>
+        <variant>
+          <configItem>
+            <name>kr104</name>
+            <_description>Korean (101/104 key compatible)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
       <configItem>
         <name>nec_vndr/jp</name>
-        <_shortDescription>Jpn</_shortDescription>
-        <_description>Japan (PC-98xx Series)</_description>
-        <countryList><iso3166Id>JP</iso3166Id></countryList>
-        <languageList><iso639Id>jpn</iso639Id></languageList>
+        <!-- Keyboard indicator for Japanese layouts -->
+        <_shortDescription>ja</_shortDescription>
+        <_description>Japanese (PC-98xx Series)</_description>
+        <countryList>
+          <iso3166Id>JP</iso3166Id>
+        </countryList>
+        <languageList>
+          <iso639Id>jpn</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>ie</name>
-        <_shortDescription>Irl</_shortDescription>
-        <_description>Ireland</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <!-- Keyboard indicator for Irish layouts -->
+        <_shortDescription>ie</_shortDescription>
+        <_description>Irish</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>CloGaelach</name>
             <_description>CloGaelach</_description>
-            <languageList><iso639Id>gla</iso639Id></languageList>
+            <languageList>
+              <iso639Id>gla</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>UnicodeExpert</name>
-            <_description>UnicodeExpert</_description>
+            <_description>Irish (UnicodeExpert)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ogam</name>
             <_description>Ogham</_description>
-            <!-- No ISO code in ISO639 -->
-         </configItem>
+            <languageList>
+              <iso639Id>sga</iso639Id>
+            </languageList>
+          </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ogam_is434</name>
-            <_description>Ogham IS434</_description>
-            <!-- No ISO code in ISO639 -->
+            <_description>Ogham (IS434)</_description>
+            <languageList>
+              <iso639Id>sga</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4178,30 +5050,45 @@
     <layout>
       <configItem>
         <name>pk</name>
-        <_shortDescription>Pak</_shortDescription>
-        <_description>Pakistan</_description>
-        <languageList><iso639Id>urd</iso639Id></languageList>
+        <!-- Keyboard indicator for Urdu layouts -->
+        <_shortDescription>ur</_shortDescription>
+        <_description>Urdu (Pakistan)</_description>
+        <languageList>
+          <iso639Id>urd</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>urd-crulp</name>
-            <_description>CRULP</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <_description>Urdu (Pakistan, CRULP)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>urd-nla</name>
-            <_description>NLA</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <_description>Urdu (Pakistan, NLA)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ara</name>
-            <_description>Arabic</_description>
-            <languageList><iso639Id>ara</iso639Id></languageList>
+            <_shortDescription>ar</_shortDescription>
+            <_description>Arabic (Pakistan)</_description>
+            <languageList>
+              <iso639Id>ara</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>snd</name>
+            <!-- Keyboard indicator for Sindhi layouts -->
+            <_shortDescription>sd</_shortDescription>
+            <_description>Sindhi</_description>
+            <languageList>
+              <iso639Id>sd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4209,32 +5096,41 @@
     <layout>
       <configItem>
         <name>mv</name>
-        <_shortDescription>Mal</_shortDescription>
-        <_description>Maldives</_description>
-        <languageList><iso639Id>div</iso639Id></languageList>
+        <!-- Keyboard indicator for Dhivehi layouts -->
+        <_shortDescription>dv</_shortDescription>
+        <_description>Dhivehi</_description>
+        <languageList>
+          <iso639Id>div</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
-       <configItem>
+      <configItem>
         <name>za</name>
-        <_shortDescription>Zar</_shortDescription>
-        <_description>South Africa</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <!-- Keyboard indicator for English layouts -->
+        <_shortDescription>en</_shortDescription>
+        <_description>English (South Africa)</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
     </layout>
     <layout>
       <configItem>
         <name>epo</name>
-        <_shortDescription>Epo</_shortDescription>
-	<_description>Esperanto</_description>
-        <languageList><iso639Id>epo</iso639Id></languageList>
+        <!-- Keyboard indicator for Esperanto layouts -->
+        <_shortDescription>eo</_shortDescription>
+        <_description>Esperanto</_description>
+        <languageList>
+          <iso639Id>epo</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>displaced semicolon and quote (obsolete)</_description>
+            <_description>Esperanto (displaced semicolon and quote, obsolete)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4242,38 +5138,56 @@
     <layout>
       <configItem>
         <name>np</name>
-        <_shortDescription>Nep</_shortDescription>
-	<_description>Nepal</_description>
-        <languageList><iso639Id>nep</iso639Id></languageList>
+        <!-- Keyboard indicator for Nepali layouts -->
+        <_shortDescription>ne</_shortDescription>
+        <_description>Nepali</_description>
+        <languageList>
+          <iso639Id>nep</iso639Id>
+        </languageList>
       </configItem>
     </layout>
     <layout>
       <configItem>
         <name>ng</name>
-        <_shortDescription>Nig</_shortDescription>
-	<_description>Nigeria</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <!-- Keyboard indicator for English layouts -->
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Nigeria)</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>igbo</name>
+            <!-- Keyboard indicator for Igbo layouts -->
+            <_shortDescription>ig</_shortDescription>
             <_description>Igbo</_description>
-            <languageList><iso639Id>ibo</iso639Id></languageList>
+            <languageList>
+              <iso639Id>ibo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>yoruba</name>
+            <!-- Keyboard indicator for Yoruba layouts -->
+            <_shortDescription>yo</_shortDescription>
             <_description>Yoruba</_description>
-            <languageList><iso639Id>yor</iso639Id></languageList>
+            <languageList>
+              <iso639Id>yor</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hausa</name>
+            <!-- Keyboard indicator for Hausa layouts -->
+            <_shortDescription>ha</_shortDescription>
             <_description>Hausa</_description>
-            <languageList><iso639Id>hau</iso639Id></languageList>
+            <languageList>
+              <iso639Id>hau</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4281,38 +5195,45 @@
     <layout>
       <configItem>
         <name>et</name>
-        <_shortDescription>Eth</_shortDescription>
-        <_description>Ethiopia</_description>
-        <languageList><iso639Id>amh</iso639Id></languageList>
+        <!-- Keyboard indicator for Amharic layouts -->
+        <_shortDescription>am</_shortDescription>
+        <_description>Amharic</_description>
+        <languageList>
+          <iso639Id>amh</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>sn</name>
-        <shortDescription>Sen</shortDescription>
-        <description>Senegal</description>
-        <languageList><iso639Id>wol</iso639Id></languageList>
+        <!-- Keyboard indicator for Wolof layouts -->
+        <_shortDescription>wo</_shortDescription>
+        <_description>Wolof</_description>
+        <languageList>
+          <iso639Id>wol</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
       <configItem>
         <name>brai</name>
-        <_shortDescription>Brl</_shortDescription>
+        <!-- Keyboard indicator for Braille layouts -->
+        <_shortDescription>brl</_shortDescription>
         <_description>Braille</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>left_hand</name>
-            <_description>Left hand</_description>
+            <_description>Braille (left hand)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>right_hand</name>
-            <_description>Right hand</_description>
+            <_description>Braille (right hand)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4320,15 +5241,229 @@
     <layout>
       <configItem>
         <name>tm</name>
-        <shortDescription>Tkm</shortDescription>
-        <_description>Turkmenistan</_description>
-        <languageList><iso639Id>tuk</iso639Id></languageList>
+        <!-- Keyboard indicator for Turkmen layouts -->
+        <_shortDescription>tk</_shortDescription>
+        <_description>Turkmen</_description>
+        <languageList>
+          <iso639Id>tuk</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>alt</name>
-            <_description>Alt-Q</_description>
+            <_description>Turkmen (Alt-Q)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ml</name>
+        <!-- Keyboard indicator for Bambara layouts -->
+        <_shortDescription>bm</_shortDescription>
+        <_description>Bambara</_description>
+        <languageList>
+          <iso639Id>bam</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>fr-oss</name>
+            <!-- Keyboard indicator for French layouts -->
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Mali, alternative)</_description>
+            <languageList>
+              <iso639Id>fr</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us-mac</name>
+            <!-- Keyboard indicator for English layouts -->
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Mali, US Macintosh)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us-intl</name>
+            <!-- Keyboard indicator for English layouts -->
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Mali, US international)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tz</name>
+        <!-- Keyboard indicator for Swahili layouts -->
+        <_shortDescription>sw</_shortDescription>
+        <_description>Swahili (Tanzania)</_description>
+        <languageList>
+          <iso639Id>swa</iso639Id>
+        </languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ke</name>
+        <!-- Keyboard indicator for Swahili layouts -->
+        <_shortDescription>sw</_shortDescription>
+        <_description>Swahili (Kenya)</_description>
+        <languageList>
+          <iso639Id>swa</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>kik</name>
+            <!-- Keyboard indicator for Kikuyu layouts -->
+            <_shortDescription>ki</_shortDescription>
+            <_description>Kikuyu</_description>
+            <languageList>
+              <iso639Id>kik</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bw</name>
+        <!-- Keyboard indicator for Tswana layouts -->
+        <_shortDescription>tn</_shortDescription>
+        <_description>Tswana</_description>
+        <languageList>
+          <iso639Id>tsn</iso639Id>
+        </languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ph</name>
+        <!-- Keyboard indicator for Filipino layouts -->
+        <_shortDescription>ph</_shortDescription>
+        <_description>Filipino</_description>
+        <languageList><iso639Id>eng</iso639Id>
+                     <iso639Id>bik</iso639Id>
+                      <iso639Id>ceb</iso639Id>
+                      <iso639Id>fil</iso639Id>
+                      <iso639Id>hil</iso639Id>
+                      <iso639Id>ilo</iso639Id>
+                      <iso639Id>pam</iso639Id>
+                      <iso639Id>pag</iso639Id>
+                      <iso639Id>phi</iso639Id>
+                      <iso639Id>tgl</iso639Id>
+                      <iso639Id>war</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>qwerty-bay</name>
+            <_description>Filipino (QWERTY Baybayin)</_description>
+            <languageList><iso639Id>bik</iso639Id>
+                          <iso639Id>ceb</iso639Id>
+                          <iso639Id>fil</iso639Id>
+                          <iso639Id>hil</iso639Id>
+                          <iso639Id>ilo</iso639Id>
+                          <iso639Id>pam</iso639Id>
+                          <iso639Id>pag</iso639Id>
+                          <iso639Id>phi</iso639Id>
+                          <iso639Id>tgl</iso639Id>
+                          <iso639Id>war</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>capewell-dvorak</name>
+            <_description>Filipino (Capewell-Dvorak Latin)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>capewell-dvorak-bay</name>
+            <_description>Filipino (Capewell-Dvorak Baybayin)</_description>
+            <languageList><iso639Id>bik</iso639Id>
+                          <iso639Id>ceb</iso639Id>
+                          <iso639Id>fil</iso639Id>
+                          <iso639Id>hil</iso639Id>
+                          <iso639Id>ilo</iso639Id>
+                          <iso639Id>pam</iso639Id>
+                          <iso639Id>pag</iso639Id>
+                          <iso639Id>phi</iso639Id>
+                          <iso639Id>tgl</iso639Id>
+                          <iso639Id>war</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>capewell-qwerf2k6</name>
+            <_description>Filipino (Capewell-QWERF 2006 Latin)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>capewell-qwerf2k6-bay</name>
+            <_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description>
+            <languageList><iso639Id>bik</iso639Id>
+                          <iso639Id>ceb</iso639Id>
+                          <iso639Id>fil</iso639Id>
+                          <iso639Id>hil</iso639Id>
+                          <iso639Id>ilo</iso639Id>
+                          <iso639Id>pam</iso639Id>
+                          <iso639Id>pag</iso639Id>
+                          <iso639Id>phi</iso639Id>
+                          <iso639Id>tgl</iso639Id>
+                          <iso639Id>war</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Filipino (Colemak Latin)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>colemak-bay</name>
+            <_description>Filipino (Colemak Baybayin)</_description>
+            <languageList><iso639Id>bik</iso639Id>
+                          <iso639Id>ceb</iso639Id>
+                          <iso639Id>fil</iso639Id>
+                          <iso639Id>hil</iso639Id>
+                          <iso639Id>ilo</iso639Id>
+                          <iso639Id>pam</iso639Id>
+                          <iso639Id>pag</iso639Id>
+                          <iso639Id>phi</iso639Id>
+                          <iso639Id>tgl</iso639Id>
+                          <iso639Id>war</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Filipino (Dvorak Latin)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-bay</name>
+            <_description>Filipino (Dvorak Baybayin)</_description>
+            <languageList><iso639Id>bik</iso639Id>
+                          <iso639Id>ceb</iso639Id>
+                          <iso639Id>fil</iso639Id>
+                          <iso639Id>hil</iso639Id>
+                          <iso639Id>ilo</iso639Id>
+                          <iso639Id>pam</iso639Id>
+                          <iso639Id>pag</iso639Id>
+                          <iso639Id>phi</iso639Id>
+                          <iso639Id>tgl</iso639Id>
+                          <iso639Id>war</iso639Id></languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4374,7 +5509,7 @@
       <option>
         <configItem>
           <name>grp:caps_switch</name>
-          <_description>CapsLock (while pressed), Alt+CapsLock does the original capslock action</_description>
+          <_description>Caps Lock (while pressed), Alt+Caps Lock does the original capslock action</_description>
         </configItem>
       </option>
       <option>
@@ -4398,19 +5533,19 @@
       <option>
         <configItem>
           <name>grp:caps_toggle</name>
-          <_description>CapsLock</_description>
+          <_description>Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:shift_caps_toggle</name>
-          <_description>Shift+CapsLock</_description>
+          <_description>Shift+Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:shift_caps_switch</name>
-          <_description>CapsLock (to first layout), Shift+CapsLock (to last layout)</_description>
+          <_description>Caps Lock (to first layout), Shift+Caps Lock (to last layout)</_description>
         </configItem>
       </option>
       <option>
@@ -4428,7 +5563,7 @@
       <option>
         <configItem>
           <name>grp:alt_caps_toggle</name>
-          <_description>Alt+CapsLock</_description>
+          <_description>Alt+Caps Lock</_description>
         </configItem>
       </option>
       <option>
@@ -4481,6 +5616,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:lalt_lshift_toggle</name>
+          <_description>Left Alt+Left Shift</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>grp:alt_space_toggle</name>
           <_description>Alt+Space</_description>
         </configItem>
@@ -4533,10 +5674,16 @@
           <_description>Scroll Lock</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_lwin_rctrl_menu</name>
+          <_description>LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
-	   level of symbols -->
+           level of symbols -->
       <configItem>
         <name>lv3</name>
         <_description>Key to choose 3rd level</_description>
@@ -4607,8 +5754,44 @@
           <_description>Enter on keypad</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>lv3:caps_switch</name>
+          <_description>Caps Lock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:bksl_switch</name>
+          <_description>Backslash</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lsgt_switch</name>
+          <_description>&lt;Less/Greater&gt;</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:caps_switch_latch</name>
+          <_description>Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:bksl_switch_latch</name>
+          <_description>Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lsgt_switch_latch</name>
+          <_description>&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser</_description>
+        </configItem>
+      </option>
     </group>
-    <group allowMultipleSelection="false">
+    <group allowMultipleSelection="true">
       <!-- Tweaking the position of the "Ctrl" key -->
       <configItem>
         <name>ctrl</name>
@@ -4617,33 +5800,51 @@
       <option>
         <configItem>
           <name>ctrl:nocaps</name>
-          <_description>Make CapsLock an additional Ctrl</_description>
+          <_description>Caps Lock as Ctrl</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:lctrl_meta</name>
+          <_description>Left Ctrl as Meta</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>ctrl:swapcaps</name>
-          <_description>Swap Ctrl and CapsLock</_description>
+          <_description>Swap Ctrl and Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_ac</name>
+          <name>ctrl:ac_ctrl</name>
           <_description>At left of 'A'</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_aa</name>
+          <name>ctrl:aa_ctrl</name>
           <_description>At bottom left</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_ra</name>
+          <name>ctrl:rctrl_ralt</name>
           <_description>Right Ctrl as Right Alt</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>ctrl:menu_rctrl</name>
+          <_description>Menu as Right Ctrl</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ralt</name>
+          <_description>Right Alt as Right Ctrl</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
@@ -4654,19 +5855,19 @@
       <option>
         <configItem>
           <name>grp_led:num</name>
-          <_description>NumLock</_description>
+          <_description>Num Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp_led:caps</name>
-          <_description>CapsLock</_description>
+          <_description>Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp_led:scroll</name>
-          <_description>ScrollLock</_description>
+          <_description>Scroll Lock</_description>
         </configItem>
       </option>
     </group>
@@ -4703,13 +5904,13 @@
       <option>
         <configItem>
           <name>keypad:oss_wang</name>
-          <_description>Wang 724 keypad with unicode additions (arrows and math operators)</_description>
+          <_description>Wang 724 keypad with Unicode additions (arrows and math operators)</_description>
        </configItem>
       </option>
       <option>
         <configItem>
           <name>keypad:future_wang</name>
-          <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level</_description>
+          <_description>Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level</_description>
        </configItem>
       </option>
       <option>
@@ -4786,89 +5987,95 @@
       </option>
     </group>
     <group allowMultipleSelection="false">
-      <!-- CapsLock tweaks. 
-	   "Internal" capitalization means capitalization using some internal tables.
-	   Otherwise "as Shift" - means using next group. -->
+      <!-- Caps Lock tweaks. 
+           "Internal" capitalization means capitalization using some internal tables.
+           Otherwise "as Shift" - means using next group. -->
       <configItem>
         <name>caps</name>
-        <_description>CapsLock key behavior</_description>
+        <_description>Caps Lock key behavior</_description>
       </configItem>
       <option>
         <configItem>
           <name>caps:internal</name>
-          <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock</_description>
+          <_description>Caps Lock uses internal capitalization. Shift "pauses" Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:internal_nocancel</name>
-          <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock</_description>
+          <_description>Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shift</name>
-          <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock</_description>
+          <_description>Caps Lock acts as Shift with locking. Shift "pauses" Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shift_nocancel</name>
-          <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock</_description>
+          <_description>Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:capslock</name>
-          <_description>CapsLock toggles normal capitalization of alphabetic characters</_description>
+          <_description>Caps Lock toggles normal capitalization of alphabetic characters</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:numlock</name>
-          <_description>Make CapsLock an additional NumLock</_description>
+          <_description>Make Caps Lock an additional Num Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:swapescape</name>
-          <_description>Swap ESC and CapsLock</_description>
+          <_description>Swap ESC and Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:escape</name>
-          <_description>Make CapsLock an additional ESC</_description>
+          <_description>Make Caps Lock an additional ESC</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:backspace</name>
-          <_description>Make CapsLock an additional Backspace</_description>
+          <_description>Make Caps Lock an additional Backspace</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:super</name>
-          <_description>Make CapsLock an additional Super</_description>
+          <_description>Make Caps Lock an additional Super</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:hyper</name>
-          <_description>Make CapsLock an additional Hyper</_description>
+          <_description>Make Caps Lock an additional Hyper</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shiftlock</name>
-          <_description>CapsLock toggles Shift so all keys are affected</_description>
+          <_description>Caps Lock toggles Shift so all keys are affected</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:none</name>
-          <_description>CapsLock is disabled</_description>
+          <_description>Caps Lock is disabled</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:ctrl_modifier</name>
+          <_description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</_description>
         </configItem>
       </option>
     </group>
@@ -4984,7 +6191,25 @@
       <option>
         <configItem>
           <name>compose:102</name>
-          <_description>Less-than/Greater-than</_description>
+          <_description>&lt;Less/Greater&gt;</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:paus</name>
+          <_description>Pause</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:prsc</name>
+          <_description>PrtSc</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:sclk</name>
+          <_description>Scroll Lock</_description>
         </configItem>
       </option>
     </group>
@@ -5002,7 +6227,7 @@
       <option>
         <configItem>
           <name>numpad:mac</name>
-          <_description>Numeric keypad keys work as with Mac</_description>
+          <_description>Numeric keypad keys always enter digits (as in Mac OS)</_description>
         </configItem>
       </option>
       <option>
@@ -5014,7 +6239,7 @@
       <option>
         <configItem>
           <name>numpad:shift3</name>
-          <_description>Shift does not cancel NumLock, chooses 3d level instead</_description>
+          <_description>Shift does not cancel Num Lock, chooses 3rd level instead</_description>
         </configItem>
       </option>
       <option>
@@ -5025,8 +6250,14 @@
       </option>
       <option>
         <configItem>
+          <name>apple:alupckeys</name>
+          <_description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>shift:breaks_caps</name>
-          <_description>Shift cancels CapsLock</_description>
+          <_description>Shift cancels Caps Lock</_description>
         </configItem>
       </option>
       <option>
@@ -5035,40 +6266,144 @@
           <_description>Enable extra typographic characters</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>shift:both_capslock</name>
+          <_description>Both Shift-Keys together toggle Caps Lock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>shift:both_capslock_cancel</name>
+          <_description>Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>shift:both_shiftlock</name>
+          <_description>Both Shift-Keys together toggle ShiftLock</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:pointerkeys</name>
+          <_description>Toggle PointerKeys with Shift + NumLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grab:break_actions</name>
+          <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->
       <configItem>
         <name>eurosign</name>
-        <_description>Adding EuroSign to certain keys</_description>
+        <_description>Adding currency signs to certain keys</_description>
       </configItem>
       <option>
         <configItem>
           <name>eurosign:e</name>
-          <_description>E</_description>
+          <_description>Euro on E</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>eurosign:2</name>
-          <_description>2</_description>
+          <_description>Euro on 2</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>eurosign:4</name>
-          <_description>4</_description>
+          <_description>Euro on 4</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>eurosign:5</name>
-          <_description>5</_description>
+          <_description>Euro on 5</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>rupeesign:4</name>
+          <_description>Rupee on 4</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>lv5</name>
+        <_description>Key to choose 5th level</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock</name>
+          <_description>&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock</name>
+          <_description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock</name>
+          <_description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:rwin_switch_lock</name>
+          <_description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+<!--
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+          <_description>&lt;Less/Greater&gt; chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock_cancel</name>
+          <_description>Right Alt chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock_cancel</name>
+          <_description>Left Win chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:rwin_switch_lock_cancel</name>
+          <_description>Right Win chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+          <_description>&lt;Less/Greater&gt; chooses 5th level, acts as onetime lock lock when pressed together with another 5th-level-chooser</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock_cancel</name>
+          <_description>Right Alt chooses 5th level, acts as onetime lock when pressed together with another 5th-level-chooser</_description>
+        </configItem>
+      </option>
+-->
     </group>
     <group allowMultipleSelection="false">
-      <!-- Let space output nobreakspace for the desired level -->
+      <!-- Let space output NBSP, NNBSP, ZWNJ, and ZWJ for the desired level -->
       <configItem>
         <name>nbsp</name>
         <_description>Using space key to input non-breakable space character</_description>
@@ -5121,6 +6456,54 @@
           <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>nbsp:zwnj2</name>
+          <_description>Zero-width non-joiner character at second level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:zwnj2zwj3</name>
+          <_description>Zero-width non-joiner character at second level, zero-width joiner character at third level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:zwnj2zwj3nb4</name>
+          <_description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:zwnj2nb3</name>
+          <_description>Zero-width non-joiner character at second level, non-breakable space character at third level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:zwnj2nb3s</name>
+          <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:zwnj2nb3zwj4</name>
+          <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:zwnj2nb3nnb4</name>
+          <_description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:zwnj3zwj4</name>
+          <_description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <configItem>
@@ -5139,6 +6522,12 @@
           <_description>NICOLA-F style Backspace</_description>
        </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>japan:hztg_escape</name>
+          <_description>Make Zenkaku Hankaku an additional ESC</_description>
+       </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="false">
       <configItem>