Merge remote-tracking branch 'origin' into coptic

3 files changed, 198 insertions, 163 deletions

diff --git a/rules/base.extras.xml b/rules/base.extras.xml
index fc2c937b..feb542be 100644
--- a/rules/base.extras.xml
+++ b/rules/base.extras.xml
@@ -4,7 +4,7 @@
   <modelList/>
   <layoutList>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>apl</name>
         <shortDescription>apl</shortDescription>
         <description>APL</description>
@@ -14,42 +14,42 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>dyalog</name>
             <shortDescription>dlg</shortDescription>
             <description>APL symbols (Dyalog APL)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sax</name>
             <shortDescription>sax</shortDescription>
             <description>APL symbols (SAX, Sharp APL for Unix)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>unified</name>
             <shortDescription>ufd</shortDescription>
             <description>APL symbols (unified)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>apl2</name>
             <shortDescription>apl2</shortDescription>
             <description>APL symbols (IBM APL2)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>aplplusII</name>
             <shortDescription>aplII</shortDescription>
             <description>APL symbols (Manugistics APL*PLUS II)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>aplx</name>
             <shortDescription>aplx</shortDescription>
             <description>APL symbols (APLX unified)</description>
@@ -58,7 +58,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>ca</name>
         <shortDescription>fr</shortDescription>
         <description>French (Canada)</description>
@@ -68,21 +68,21 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>kut</name>
             <shortDescription>kut</shortDescription>
             <description>Kutenai</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>shs</name>
             <shortDescription>shs</shortDescription>
             <description>Secwepemctsin</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Multilingual (Canada, Sun Type 6/7)</description>
           </configItem>
@@ -90,7 +90,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>de</name>
         <shortDescription>de</shortDescription>
         <description>German</description>
@@ -100,7 +100,7 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>us</name>
             <description>German (US)</description>
             <languageList>
@@ -109,7 +109,7 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>hu</name>
             <description>German (with Hungarian letters, no dead keys)</description>
             <languageList>
@@ -119,7 +119,7 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>pl</name>
             <description>Polish (Germany, no dead keys)</description>
             <languageList>
@@ -129,49 +129,49 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>German (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>adnw</name>
             <description>German (Aus der Neo-Welt)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>koy</name>
             <description>German (KOY)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>bone</name>
             <description>German (Bone)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>bone_eszett_home</name>
             <description>German (Bone, eszett in the home row)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>neo_qwertz</name>
             <description>German (Neo, QWERTZ)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>neo_qwerty</name>
             <description>German (Neo, QWERTY)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ru-recom</name>
             <!-- Keyboard indicator for Russian layouts -->
             <shortDescription>ru</shortDescription>
@@ -182,7 +182,7 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ru-translit</name>
             <!-- Keyboard indicator for Russian layouts -->
             <shortDescription>ru</shortDescription>
@@ -193,7 +193,7 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>lld</name>
             <shortDescription>de_lld</shortDescription>
             <description>German (Ladin)</description>
@@ -206,7 +206,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>eg</name>
         <shortDescription>ⲕⲏⲙⲉ</shortDescription>
         <description>Coptic</description>
@@ -222,14 +222,14 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>oldhun</name>
             <shortDescription>oldhun</shortDescription>
             <description>Old Hungarian</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ohu_lig</name>
             <shortDescription>ohu_lig</shortDescription>
             <description>Old Hungarian (for ligatures)</description>
@@ -239,7 +239,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>ir</name>
         <shortDescription>fa</shortDescription>
         <description>Persian</description>
@@ -249,7 +249,7 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ave</name>
             <description>Avestan</description>
             <languageList>
@@ -260,7 +260,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>lt</name>
         <shortDescription>lt</shortDescription>
         <description>Lithuanian</description>
@@ -270,13 +270,13 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>us_dvorak</name>
             <description>Lithuanian (Dvorak)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Lithuanian (Sun Type 6/7)</description>
           </configItem>
@@ -284,7 +284,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>lv</name>
         <shortDescription>lv</shortDescription>
         <description>Latvian</description>
@@ -294,55 +294,55 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>dvorak</name>
             <description>Latvian (Dvorak)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ykeydvorak</name>
             <description>Latvian (Dvorak, with Y)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>minuskeydvorak</name>
             <description>Latvian (Dvorak, with minus)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>dvorakprogr</name>
             <description>Latvian (programmer Dvorak)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ykeydvorakprogr</name>
             <description>Latvian (programmer Dvorak, with Y)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>minuskeydvorakprogr</name>
             <description>Latvian (programmer Dvorak, with minus)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>colemak</name>
             <description>Latvian (Colemak)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>apostrophecolemak</name>
             <description>Latvian (Colemak, with apostrophe)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Latvian (Sun Type 6/7)</description>
           </configItem>
@@ -350,7 +350,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>us</name>
         <shortDescription>en</shortDescription>
         <description>English (US)</description>
@@ -360,26 +360,26 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>intl-unicode</name>
             <description>English (US, intl., AltGr Unicode combining)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>alt-intl-unicode</name>
             <description>English (US, intl., AltGr Unicode combining, alt.)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ats</name>
             <description>Atsina</description>
             <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>crd</name>
             <description>Coeur d'Alene Salish</description>
             <languageList>
@@ -388,7 +388,7 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>cz_sk_de</name>
             <description>Czech Slovak and German (US)</description>
             <languageList>
@@ -400,13 +400,13 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>drix</name>
             <description>English (Drix)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>de_se_fi</name>
             <description>German, Swedish and Finnish (US)</description>
             <languageList>
@@ -418,73 +418,73 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ibm238l</name>
             <description>English (US, IBM Arabic 238_L)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>English (US, Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>carpalx</name>
             <description>English (Carpalx)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>carpalx-intl</name>
             <description>English (Carpalx, intl., with dead keys)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>carpalx-altgr-intl</name>
             <description>English (Carpalx, intl., with AltGr dead keys)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>carpalx-full</name>
             <description>English (Carpalx, full optimization)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>carpalx-full-intl</name>
             <description>English (Carpalx, full optimization, intl., with dead keys)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>carpalx-full-altgr-intl</name>
             <description>English (Carpalx, full optimization, intl., with AltGr dead keys)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>3l</name>
             <description>English (3l)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>3l-cros</name>
             <description>English (3l, Chromebook)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>3l-emacs</name>
             <description>English (3l, emacs)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>scn</name>
             <description>Sicilian (US keyboard)</description>
             <languageList>
@@ -497,7 +497,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>pl</name>
         <shortDescription>pl</shortDescription>
         <description>Polish</description>
@@ -507,25 +507,25 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>intl</name>
             <description>Polish (intl., with dead keys)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>colemak</name>
             <description>Polish (Colemak)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Polish (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>glagolica</name>
             <description>Polish (Glagolica)</description>
           </configItem>
@@ -533,7 +533,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>ro</name>
         <shortDescription>ro</shortDescription>
         <description>Romanian</description>
@@ -543,7 +543,7 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>crh_dobruja</name>
             <shortDescription>crh</shortDescription>
             <description>Crimean Tatar (Dobruja Q)</description>
@@ -553,13 +553,13 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ergonomic</name>
             <description>Romanian (ergonomic Touchtype)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Romanian (Sun Type 6/7)</description>
           </configItem>
@@ -567,7 +567,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>rs</name>
         <shortDescription>sr</shortDescription>
         <description>Serbian</description>
@@ -577,7 +577,7 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>combiningkeys</name>
             <description>Serbian (combining accents instead of dead keys)</description>
           </configItem>
@@ -585,14 +585,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>ru</name>
         <shortDescription>ru</shortDescription>
         <description>Russian</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>chu</name>
             <description>Church Slavonic</description>
             <languageList>
@@ -601,7 +601,7 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ruu</name>
             <shortDescription>ru</shortDescription>
             <description>Russian (with Ukrainian-Belorussian layout)</description>
@@ -613,31 +613,31 @@
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>rulemak</name>
             <description>Russian (Rulemak, phonetic Colemak)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>phonetic_mac</name>
             <description>Russian (phonetic Macintosh)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Russian (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>unipunct</name>
             <description>Russian (with US punctuation)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>prxn</name>
             <shortDescription>ru</shortDescription>
             <description>Russian (Polyglot and Reactionary)</description>
@@ -714,7 +714,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>am</name>
         <shortDescription>hy</shortDescription>
         <description>Armenian</description>
@@ -724,7 +724,7 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>olpc-phonetic</name>
             <description>Armenian (OLPC, phonetic)</description>
           </configItem>
@@ -732,7 +732,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>il</name>
         <shortDescription>he</shortDescription>
         <description>Hebrew</description>
@@ -742,7 +742,7 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>biblicalSIL</name>
             <description>Hebrew (Biblical, SIL phonetic)</description>
             <languageList>
@@ -753,32 +753,32 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>ara</name>
         <shortDescription>ar</shortDescription>
         <description>Arabic</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Arabic (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>basic_ext</name>
             <description>Arabic (Arabic numerals, extensions in the 4th level)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>basic_ext_digits</name>
             <description>Arabic (Eastern Arabic numerals, extensions in the 4th level)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>uga</name>
             <description>Ugaritic instead of Arabic</description>
           </configItem>
@@ -786,14 +786,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>be</name>
         <shortDescription>be</shortDescription>
         <description>Belgian</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Belgian (Sun Type 6/7)</description>
           </configItem>
@@ -801,14 +801,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>br</name>
         <shortDescription>pt</shortDescription>
         <description>Portuguese (Brazil)</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Portuguese (Brazil, Sun Type 6/7)</description>
           </configItem>
@@ -816,38 +816,38 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>cz</name>
         <shortDescription>cs</shortDescription>
         <description>Czech</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Czech (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>prog</name>
             <description>Czech (programming)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>typo</name>
             <description>Czech (typographic)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>coder</name>
             <description>Czech (coder)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>prog_typo</name>
             <description>Czech (programming, typographic)</description>
           </configItem>
@@ -855,14 +855,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>dk</name>
         <shortDescription>da</shortDescription>
         <description>Danish</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Danish (Sun Type 6/7)</description>
           </configItem>
@@ -870,14 +870,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>nl</name>
         <shortDescription>nl</shortDescription>
         <description>Dutch</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Dutch (Sun Type 6/7)</description>
           </configItem>
@@ -885,14 +885,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>ee</name>
         <shortDescription>et</shortDescription>
         <description>Estonian</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Estonian (Sun Type 6/7)</description>
           </configItem>
@@ -900,26 +900,26 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>fi</name>
         <shortDescription>fi</shortDescription>
         <description>Finnish</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Finnish (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>das</name>
             <description>Finnish (DAS)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>fidvorak</name>
             <description>Finnish (Dvorak)</description>
           </configItem>
@@ -927,26 +927,26 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>fr</name>
         <shortDescription>fr</shortDescription>
         <description>French</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>French (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>us-alt</name>
             <description>French (US with dead keys, alt.)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>us-azerty</name>
             <description>French (US, AZERTY)</description>
           </configItem>
@@ -954,20 +954,20 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>gr</name>
         <shortDescription>gr</shortDescription>
         <description>Greek</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Greek (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>colemak</name>
             <description>Greek (Colemak)</description>
           </configItem>
@@ -975,20 +975,20 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>it</name>
         <shortDescription>it</shortDescription>
         <description>Italian</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Italian (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>lld</name>
             <shortDescription>it_lld</shortDescription>
             <description>Italian (Ladin)</description>
@@ -1001,26 +1001,26 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>jp</name>
         <shortDescription>ja</shortDescription>
         <description>Japanese</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Japanese (Sun Type 6)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type7</name>
             <description>Japanese (Sun Type 7, PC-compatible)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type7_suncompat</name>
             <description>Japanese (Sun Type 7, Sun-compatible)</description>
           </configItem>
@@ -1028,14 +1028,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>no</name>
         <shortDescription>no</shortDescription>
         <description>Norwegian</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Norwegian (Sun Type 6/7)</description>
           </configItem>
@@ -1043,14 +1043,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>pt</name>
         <shortDescription>pt</shortDescription>
         <description>Portuguese</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Portuguese (Sun Type 6/7)</description>
           </configItem>
@@ -1058,14 +1058,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>pt</name>
         <shortDescription>pt</shortDescription>
         <description>Portuguese</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>colemak</name>
             <description>Portuguese (Colemak)</description>
           </configItem>
@@ -1073,20 +1073,20 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>sk</name>
         <shortDescription>sk</shortDescription>
         <description>Slovak</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>acc</name>
             <description>Slovak (ACC layout, only accented letters)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Slovak (Sun Type 6/7)</description>
           </configItem>
@@ -1094,14 +1094,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>es</name>
         <shortDescription>es</shortDescription>
         <description>Spanish</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Spanish (Sun Type 6/7)</description>
           </configItem>
@@ -1109,26 +1109,26 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>se</name>
         <shortDescription>sv</shortDescription>
         <description>Swedish</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>dvorak_a5</name>
             <description>Swedish (Dvorak A5)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Swedish (Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>ovd</name>
             <description>Elfdalian (Swedish, with combining ogonek)</description>
             <languageList>
@@ -1139,20 +1139,20 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>ch</name>
         <shortDescription>de</shortDescription>
         <description>German (Switzerland)</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6_de</name>
             <description>German (Switzerland, Sun Type 6/7)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6_fr</name>
             <description>French (Switzerland, Sun Type 6/7)</description>
           </configItem>
@@ -1160,14 +1160,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>tr</name>
         <shortDescription>tr</shortDescription>
         <description>Turkish</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Turkish (Sun Type 6/7)</description>
           </configItem>
@@ -1175,14 +1175,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>ua</name>
         <shortDescription>uk</shortDescription>
         <description>Ukrainian</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Ukrainian (Sun Type 6/7)</description>
           </configItem>
@@ -1190,14 +1190,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>gb</name>
         <shortDescription>en</shortDescription>
         <description>English (UK)</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>English (UK, Sun Type 6/7)</description>
           </configItem>
@@ -1205,14 +1205,14 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>kr</name>
         <shortDescription>ko</shortDescription>
         <description>Korean</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>sun_type6</name>
             <description>Korean (Sun Type 6/7)</description>
           </configItem>
@@ -1220,7 +1220,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>vn</name>
         <!-- Keyboard indicator for Vietnamese layouts -->
         <shortDescription>vi</shortDescription>
@@ -1231,13 +1231,13 @@
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>aderty</name>
             <description>Vietnamese (AÐERTY)</description>
           </configItem>
         </variant>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>qderty</name>
             <description>Vietnamese (QĐERTY)</description>
           </configItem>
@@ -1245,7 +1245,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>eu</name>
         <!-- Keyboard indicator for European layouts -->
         <shortDescription>eu</shortDescription>
@@ -1272,14 +1272,14 @@
       </configItem>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>cm</name>
         <shortDescription>cm</shortDescription>
         <description>English (Cameroon)</description>
       </configItem>
       <variantList>
         <variant>
-          <configItem>
+          <configItem popularity="exotic">
             <name>mmuock</name>
             <description>Mmuock</description>
           </configItem>
@@ -1287,7 +1287,7 @@
       </variantList>
     </layout>
     <layout>
-      <configItem>
+      <configItem popularity="exotic">
         <name>trans</name>
         <!-- Keyboard layouts for transcription and transliteration systems -->
         <description>International Phonetic Alphabet</description>
@@ -1299,18 +1299,18 @@
     <group allowMultipleSelection="true">
       <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
            level of symbols -->
-      <configItem>
+      <configItem popularity="exotic">
         <name>lv3</name>
         <description>Key to choose the 3rd level</description>
       </configItem>
       <option>
-        <configItem>
+        <configItem popularity="exotic">
           <name>lv3:4_switch_isolated</name>
           <description>Number key 4 when pressed in isolation</description>
         </configItem>
       </option>
       <option>
-        <configItem>
+        <configItem popularity="exotic">
           <name>lv3:9_switch_isolated</name>
           <description>Number key 9 when pressed in isolation</description>
         </configItem>
@@ -1318,12 +1318,12 @@
     </group>
     <group allowMultipleSelection="true">
       <!-- Tweaking the position of the "(" and ")" keys -->
-      <configItem>
+      <configItem popularity="exotic">
         <name>parens</name>
         <description>Parentheses position</description>
       </configItem>
       <option>
-        <configItem>
+        <configItem popularity="exotic">
           <name>parens:swap_brackets</name>
           <description>Swap with square brackets</description>
         </configItem>
diff --git a/rules/base.xml b/rules/base.xml
index d389c4b1..4c86ee22 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -1370,6 +1370,16 @@
         </variant>
         <variant>
           <configItem>
+            <name>haw</name>
+            <shortDescription>haw</shortDescription>
+            <description>Hawaiian</description>
+            <languageList>
+              <iso639Id>haw</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>euro</name>
             <description>English (US, euro on 5)</description>
           </configItem>
diff --git a/symbols/us b/symbols/us
index 84b60208..d061d153 100644
--- a/symbols/us
+++ b/symbols/us
@@ -1178,6 +1178,31 @@ xkb_symbols "chr" {
     key <AB10> { [      U13C2,      U13C9 ] };
 };
 
+// Add Hawaiian `okina and kahako to US layout
+// Author: Greg Meyer <gregory.meyer@gmail.com>, 2020
+// this mapping follows the one for Windows here: http://www.olelo.hawaii.edu/enehana/winkbd.php
+// `okina replaces apostrophe (apostrophe moves to level 3)
+// vowels with kahako (macron) are level 3 symbols
+partial alphanumeric_keys
+xkb_symbols "haw"  {
+
+    include "us(basic)"
+    name[Group1] = "Hawaiian";
+
+    // `okina replaces single apostrophe
+    // alt gives the literal apostrophe
+    key <AC11> {[ U02BB, quotedbl, apostrophe ] };
+
+    // kahako
+    key <AC01> {[ a, A, amacron, Amacron ]};
+    key <AD03> {[ e, E, emacron, Emacron ]};
+    key <AD07> {[ u, U, umacron, Umacron ]};
+    key <AD08> {[ i, I, imacron, Imacron ]};
+    key <AD09> {[ o, O, omacron, Omacron ]};
+
+    include "level3(ralt_switch)"
+};
+
 // Serbian charecters added as third level symbols to US keyboard layout.
 
 partial alphanumeric_keys