diff --git a/bin/Release/AppX/vs.appxrecipe b/bin/Release/AppX/vs.appxrecipe
index 57af36c7..4d0bfab6 100644
--- a/bin/Release/AppX/vs.appxrecipe
+++ b/bin/Release/AppX/vs.appxrecipe
@@ -32,7 +32,7 @@
     <AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\AppxManifest.xml">
       <PackagePath>AppxManifest.xml</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
-      <Modified>2017-09-01T12:03:24.182</Modified>
+      <Modified>2017-09-01T17:35:55.254</Modified>
     </AppXManifest>
   </ItemGroup>
   <ItemGroup>
@@ -459,7 +459,7 @@
     </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\css\app.css">
       <PackagePath>www\css\app.css</PackagePath>
-      <Modified>2017-08-30T11:50:47.343</Modified>
+      <Modified>2017-09-01T15:08:26.565</Modified>
     </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\css\bootstrap-theme.css">
       <PackagePath>www\css\bootstrap-theme.css</PackagePath>
@@ -627,7 +627,7 @@
     </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\lib\kiwixServe.js">
       <PackagePath>www\js\lib\kiwixServe.js</PackagePath>
-      <Modified>2017-09-01T12:03:14.501</Modified>
+      <Modified>2017-09-01T17:35:46.718</Modified>
     </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\lib\q.js">
       <PackagePath>www\js\lib\q.js</PackagePath>
@@ -1532,7 +1532,7 @@
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\ReverseMap\resources.pri">
       <PackagePath>resources.pri</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
-      <Modified>2017-09-01T12:02:47.117</Modified>
+      <Modified>2017-09-01T13:52:38.931</Modified>
     </AppxPackagedFile>
   </ItemGroup>
   <ItemGroup>
diff --git a/bin/Release/AppX/www/css/app.css b/bin/Release/AppX/www/css/app.css
index 71232d28..c32d72ac 100644
--- a/bin/Release/AppX/www/css/app.css
+++ b/bin/Release/AppX/www/css/app.css
@@ -154,10 +154,13 @@ footer .glyphicon {
     color: lightblue;
 }
 
-.dropdown-menu, .dropdown-menu a {
-    background-color: rgba(255,255,255,0.7) !important;
+pre {
+    font-weight: bold;
 }
 
+.dropdown-menu, .dropdown-menu a {
+    background: rgba(255,255,255,0.7) !important;
+}
 
 .darkfooter .glyphicon, .dark .glyphicon {
     color: lightblue;
@@ -188,6 +191,17 @@ footer .glyphicon {
     color: lightblue !important;
 }
 
+.dark .dropdown {
+    color: #222 !important;
+    background-color: lightblue !important;
+    border-color: lightgray !important;
+}
+
+.dark .dropdown option:focus, .dark .dropdown option:hover {
+    color: lightblue !important;
+    background: darkslategray !important;
+}
+
 .darkfooter .dropdown-menu, .darkfooter .dropdown-menu a {
     color: lightblue !important;
     background-color: rgba(34,34,34,0.6) !important;
diff --git a/bin/Release/AppX/www/js/lib/kiwixServe.js b/bin/Release/AppX/www/js/lib/kiwixServe.js
index 7382874a..f351cf16 100644
--- a/bin/Release/AppX/www/js/lib/kiwixServe.js
+++ b/bin/Release/AppX/www/js/lib/kiwixServe.js
@@ -1,7 +1,13 @@
 /**
- * languageCodes.js: Provides an object literal for looking up the English-language names of language codes
- * as defined in ISO 639-1, augmented with some ISO 639-3 codes as used by Wikipedia
- * 
+ * kiwixServe.js: Provides an AJAX request process for contacting the Kiwix Download Server
+ * and manipulating the returned data for display in-app
+ * Also provides an object literal (langCodes) for looking up the English-language names of
+ * language codesas defined in ISO 639-1, augmented with some ISO 639-3 codes as used by the
+ * Kiwix server
+ *
+ * Copyright 2018 Jaifroid and contributors
+ * License GPL v3:
+ *
  * This file is part of Kiwix.
  * 
  * Kiwix is free software: you can redistribute it and/or modify
@@ -14,195 +20,319 @@
 define([], function () {
 
     var langCodes = {
-        ab: 'Abkhazian',
-        aa: 'Afar',
-        af: 'Afrikaans',
-        ak: 'Akan',
-        sq: 'Albanian',
-        am: 'Amharic',
-        ar: 'Arabic',
-        an: 'Aragonese',
-        hy: 'Armenian',
-        as: 'Assamese',
-        av: 'Avaric',
-        ae: 'Avestan',
-        ay: 'Aymara',
-        az: 'Azerbaijani',
-        bm: 'Bambara',
-        ba: 'Bashkir',
-        eu: 'Basque',
-        be: 'Belarusian',
-        bn: 'Bengali (Bangla)',
-        bh: 'Bihari',
-        bi: 'Bislama',
-        bs: 'Bosnian',
-        br: 'Breton',
-        bg: 'Bulgarian',
-        my: 'Burmese',
-        ca: 'Catalan',
-        ch: 'Chamorro',
-        ce: 'Chechen',
-        ny: 'Chichewa-Chewa-Nyanja',
-        zh: 'Chinese',
-        zh: 'Chinese',
-        cv: 'Chuvash',
-        kw: 'Cornish',
-        co: 'Corsican',
-        cr: 'Cree',
-        hr: 'Croatian',
-        cs: 'Czech',
-        da: 'Danish',
-        dv: 'Divehi-Dhivehi-Maldivian',
-        nl: 'Dutch',
-        dz: 'Dzongkha',
-        en: 'English',
-        eo: 'Esperanto',
-        et: 'Estonian',
-        ee: 'Ewe',
-        fo: 'Faroese',
-        fj: 'Fijian',
-        fi: 'Finnish',
-        fr: 'French',
-        ff: 'Fula-Fulah-Pulaar-Pular',
-        gl: 'Galician',
-        gd: 'Gaelic (Scottish)',
-        gv: 'Gaelic (Manx)',
-        ka: 'Georgian',
-        de: 'German',
-        el: 'Greek',
-        kl: 'Greenlandic-Kalaallisut',
-        gn: 'Guarani',
-        gu: 'Gujarati',
-        ht: 'Haitian Creole',
-        ha: 'Hausa',
-        he: 'Hebrew',
-        hz: 'Herero',
-        hi: 'Hindi',
-        ho: 'Hiri Motu',
-        hu: 'Hungarian',
-        is: 'Icelandic',
-        io: 'Ido',
-        ig: 'Igbo',
-        id: 'Indonesian',
-        in: 'Indonesian',
-        ia: 'Interlingua',
-        ie: 'Interlingue',
-        iu: 'Inuktitut',
-        ik: 'Inupiak',
-        ga: 'Irish',
-        it: 'Italian',
-        ja: 'Japanese',
-        jv: 'Javanese',
-        kn: 'Kannada',
-        kr: 'Kanuri',
-        ks: 'Kashmiri',
-        kk: 'Kazakh',
-        km: 'Khmer',
-        ki: 'Kikuyu',
-        rw: 'Kinyarwanda (Rwanda)',
-        rn: 'Kirundi',
-        ky: 'Kyrgyz',
-        kv: 'Komi',
-        kg: 'Kongo',
-        ko: 'Korean',
-        ku: 'Kurdish',
-        kj: 'Kwanyama',
-        lo: 'Lao',
-        la: 'Latin',
-        lv: 'Latvian (Lettish)',
-        li: 'Limburgish ( Limburger)',
-        ln: 'Lingala',
-        lt: 'Lithuanian',
-        lu: 'Luga-Katanga',
-        lg: 'Luganda-Ganda',
-        lb: 'Luxembourgish',
-        mk: 'Macedonian',
-        mg: 'Malagasy',
-        ms: 'Malay',
-        ml: 'Malayalam',
-        mt: 'Maltese',
-        mi: 'Maori',
-        mr: 'Marathi',
-        mh: 'Marshallese',
-        mo: 'Moldavian',
-        mn: 'Mongolian',
-        na: 'Nauru',
-        nv: 'Navajo',
-        ng: 'Ndonga',
-        nd: 'Northern Ndebele',
-        ne: 'Nepali',
-        no: 'Norwegian',
-        nb: 'Norwegian bokmål',
-        nn: 'Norwegian nynorsk',
-        ii: 'Nuosu (Sichuan Yi)',
-        oc: 'Occitan',
-        oj: 'Ojibwe',
-        cu: 'Old Church Slavonic-Old Bulgarian',
-        or: 'Oriya',
-        om: 'Oromo (Afaan Oromo)',
-        os: 'Ossetian',
-        pi: 'Pāli',
-        ps: 'Pashto-Pushto',
+        aa: 'Afar (Afar)',
+        ab: 'Аҧсуа (Abkhazian)',
+        af: 'Afrikaans (Afrikaans)',
+        ak: 'Akana (Akan)',
+        als: 'Alemannisch (Alemannic)',
+        am: 'አማርኛ (Amharic)',
+        an: 'Aragonés (Aragonese)',
+        ang: 'Englisc (Anglo-Saxon / Old English)',
+        ar: 'العربية (Arabic)',
+        arc: 'ܣܘܪܬ (Aramaic)',
+        as: 'অসমীয়া (Assamese)',
+        ast: 'Asturianu (Asturian)',
+        av: 'Авар (Avar)',
+        ay: 'Aymar (Aymara)',
+        az: 'Azərbaycanca / آذربايجان (Azerbaijani)',
+        ba: 'Башҡорт (Bashkir)',
+        bar: 'Boarisch (Bavarian)',
+        batSmg: 'Žemaitėška (Samogitian)',
+        sgs: 'Žemaitėška (Samogitian)',
+        bcl: 'Bikol Central (Bikol)',
+        be: 'Беларуская (Belarusian)',
+        beXOld: 'Беларуская (тарашкевіца) (Belarusian (Taraškievica))',
+        bg: 'Български (Bulgarian)',
+        bh: 'भोजपुरी (Bihari)',
+        bi: 'Bislama (Bislama)',
+        bm: 'Bamanankan (Bambara)',
+        bn: 'বাংলা (Bengali)',
+        bo: 'བོད་ཡིག / Bod skad (Tibetan)',
+        bpy: 'ইমার ঠার/বিষ্ণুপ্রিয়া মণিপুরী (Bishnupriya Manipuri)',
+        br: 'Brezhoneg (Breton)',
+        bs: 'Bosanski (Bosnian)',
+        bug: 'ᨅᨔ ᨕᨘᨁᨗ / Basa Ugi (Buginese)',
+        bxr: 'Буряад хэлэн (Buriat (Russia))',
+        ca: 'Català (Catalan)',
+        cdo: 'Mìng-dĕ̤ng-ngṳ̄ / 閩東語 (Min Dong Chinese)',
+        ce: 'Нохчийн (Chechen)',
+        ceb: 'Sinugboanong Binisaya (Cebuano)',
+        ch: 'Chamoru (Chamorro)',
+        cho: 'Choctaw (Choctaw)',
+        chr: 'ᏣᎳᎩ (Cherokee)',
+        chy: 'Tsetsêhestâhese (Cheyenne)',
+        co: 'Corsu (Corsican)',
+        cr: 'Nehiyaw (Cree)',
+        cs: 'Česky (Czech)',
+        csb: 'Kaszëbsczi (Kashubian)',
+        cu: 'словѣньскъ / slověnĭskŭ (Old Church Slavonic / Old Bulgarian)',
+        cv: 'Чăваш (Chuvash)',
+        cy: 'Cymraeg (Welsh)',
+        da: 'Dansk (Danish)',
+        de: 'Deutsch (German)',
+        diq: 'Zazaki (Dimli)',
+        dsb: 'Dolnoserbski (Lower Sorbian)',
+        dv: 'ދިވެހިބަސް (Divehi)',
+        dz: 'ཇོང་ཁ (Dzongkha)',
+        ee: 'Ɛʋɛ (Ewe)',
+        far: 'فارسی (Farsi)',
+        el: 'Ελληνικά (Greek)',
+        en: 'English (English)',
+        eo: 'Esperanto (Esperanto)',
+        es: 'Español (Spanish)',
+        et: 'Eesti (Estonian)',
+        eu: 'Euskara (Basque)',
+        ext: 'Estremeñu (Extremaduran)',
+        ff: 'Fulfulde (Peul)',
+        fi: 'Suomi (Finnish)',
+        fiuVro: 'Võro (Võro)',
+        vro: 'Võro (Võro)',
+        fj: 'Na Vosa Vakaviti (Fijian)',
+        fo: 'Føroyskt (Faroese)',
+        fr: 'Français (French)',
+        frp: 'Arpitan / francoprovençal (Arpitan / Franco-Provençal)',
+        fur: 'Furlan (Friulian)',
+        fy: 'Frysk (West Frisian)',
+        ga: 'Gaeilge (Irish)',
+        gan: '贛語 (Gan Chinese)',
+        gbm: 'गढ़वळी (Garhwali)',
+        gd: 'Gàidhlig (Scottish Gaelic)',
+        gil: 'Taetae ni kiribati (Gilbertese)',
+        gl: 'Galego (Galician)',
+        gn: 'Avañe’ẽ (Guarani)',
+        got: 'gutisk (Gothic)',
+        gu: 'ગુજરાતી (Gujarati)',
+        gv: 'Gaelg (Manx)',
+        ha: 'هَوُسَ (Hausa)',
+        hak: '客家語/Hak-kâ-ngî (Hakka Chinese)',
+        haw: 'Hawai`i (Hawaiian)',
+        he: 'עברית (Hebrew)',
+        hi: 'हिन्दी (Hindi)',
+        ho: 'Hiri Motu (Hiri Motu)',
+        hr: 'Hrvatski (Croatian)',
+        ht: 'Krèyol ayisyen (Haitian)',
+        hu: 'Magyar (Hungarian)',
+        hy: 'Հայերեն (Armenian)',
+        hz: 'Otsiherero (Herero)',
+        ia: 'Interlingua (Interlingua)',
+        id: 'Bahasa Indonesia (Indonesian)',
+        ie: 'Interlingue (Interlingue)',
+        ig: 'Igbo (Igbo)',
+        ii: 'ꆇꉙ / 四川彝语 (Sichuan Yi)',
+        ik: 'Iñupiak (Inupiak)',
+        ilo: 'Ilokano (Ilokano)',
+        io: 'Ido (Ido)',
+        is: 'Íslenska (Icelandic)',
+        it: 'Italiano (Italian)',
+        iu: 'ᐃᓄᒃᑎᑐᑦ (Inuktitut)',
+        ja: '日本語 (Japanese)',
+        jbo: 'Lojban (Lojban)',
+        jv: 'Basa Jawa (Javanese)',
+        ka: 'ქართული (Georgian)',
+        kg: 'KiKongo (Kongo)',
+        ki: 'Gĩkũyũ (Kikuyu)',
+        kj: 'Kuanyama (Kuanyama)',
+        kk: 'Қазақша (Kazakh)',
+        kl: 'Kalaallisut (Greenlandic)',
+        km: 'ភាសាខ្មែរ (Cambodian)',
+        kn: 'ಕನ್ನಡ (Kannada)',
+        khw: 'کھوار (Khowar)',
+        ko: '한국어 (Korean)',
+        kr: 'Kanuri (Kanuri)',
+        ks: 'कश्मीरी / كشميري (Kashmiri)',
+        ksh: 'Ripoarisch (Ripuarian)',
+        ku: 'Kurdî / كوردی (Kurdish)',
+        kv: 'Коми (Komi)',
+        kw: 'Kernewek (Cornish)',
+        ky: 'Kırgızca / Кыргызча (Kirghiz)',
+        la: 'Latina (Latin)',
+        lad: 'Dzhudezmo / Djudeo-Espanyol (Ladino / Judeo-Spanish)',
+        lan: 'Leb Lango / Luo (Lango)',
+        lb: 'Lëtzebuergesch (Luxembourgish)',
+        lg: 'Luganda (Ganda)',
+        li: 'Limburgs (Limburgian)',
+        lij: 'Líguru (Ligurian)',
+        lmo: 'Lumbaart (Lombard)',
+        ln: 'Lingála (Lingala)',
+        lo: 'ລາວ / Pha xa lao (Laotian)',
+        lt: 'Lietuvių (Lithuanian)',
+        lv: 'Latviešu (Latvian)',
+        mapBms: 'Basa Banyumasan (Banyumasan)',
+        mg: 'Malagasy (Malagasy)',
+        man: '官話/官话 (Mandarin)',
+        mh: 'Kajin Majel / Ebon (Marshallese)',
+        mi: 'Māori (Maori)',
+        min: 'Minangkabau (Minangkabau)',
+        mk: 'Македонски (Macedonian)',
+        ml: 'മലയാളം (Malayalam)',
+        mn: 'Монгол (Mongolian)',
+        mo: 'Moldovenească (Moldovan)',
+        mr: 'मराठी (Marathi)',
+        ms: 'Bahasa Melayu (Malay)',
+        mt: 'bil-Malti (Maltese)',
+        mus: 'Mvskoke (Creek / Muskogee)',
+        mwl: 'Mirandés (Mirandese)',
+        my: 'Myanmasa (Burmese)',
+        na: 'Dorerin Naoero (Nauruan)',
+        nah: 'Nahuatl (Nahuatl)',
+        nap: 'Nnapulitano (Neapolitan)',
+        nd: 'Sindebele (North Ndebele)',
+        nds: 'Plattdüütsch (Low German / Low Saxon)',
+        ndsNl: 'Nedersaksisch (Dutch Low Saxon)',
+        ne: 'नेपाली (Nepali)',
+        new: 'नेपालभाषा / Newah Bhaye (Newar)',
+        ng: 'Oshiwambo (Ndonga)',
+        nl: 'Nederlands (Dutch)',
+        nn: 'Norsk (nynorsk) (Norwegian Nynorsk)',
+        no: 'Norsk (bokmål / riksmål) (Norwegian)',
+        nr: 'isiNdebele (South Ndebele)',
+        nso: 'Sesotho sa Leboa / Sepedi (Northern Sotho)',
+        nrm: 'Nouormand / Normaund (Norman)',
+        nv: 'Diné bizaad (Navajo)',
+        ny: 'Chi-Chewa (Chichewa)',
+        oc: 'Occitan (Occitan)',
+        oj: 'ᐊᓂᔑᓈᐯᒧᐎᓐ / Anishinaabemowin (Ojibwa)',
+        om: 'Oromoo (Oromo)',
+        or: 'ଓଡ଼ିଆ (Oriya)',
+        os: 'Иронау (Ossetian / Ossetic)',
+        pa: 'ਪੰਜਾਬੀ / पंजाबी / پنجابي (Panjabi / Punjabi)',
+        pag: 'Pangasinan (Pangasinan)',
+        pam: 'Kapampangan (Kapampangan)',
+        pap: 'Papiamentu (Papiamentu)',
+        pdc: 'Deitsch (Pennsylvania German)',
+        pi: 'Pāli / पाऴि (Pali)',
+        pih: 'Norfuk (Norfolk)',
+        pl: 'Polski (Polish)',
+        pms: 'Piemontèis (Piedmontese)',
+        ps: 'پښتو (Pashto)',
+        pt: 'Português (Portuguese)',
+        qu: 'Runa Simi (Quechua)',
+        rm: 'Rumantsch (Raeto Romance)',
+        rmy: 'Romani / रोमानी (Romani)',
+        rn: 'Kirundi (Kirundi)',
+        ro: 'Română (Romanian)',
+        roaRup: 'Armâneashti (Aromanian)',
+        rup: 'Armâneashti (Aromanian)',
+        ru: 'Русский (Russian)',
+        rw: 'Kinyarwandi (Rwandi)',
+        sa: 'संस्कृतम् (Sanskrit)',
+        sc: 'Sardu (Sardinian)',
+        scn: 'Sicilianu (Sicilian)',
+        sco: 'Scots (Scots)',
+        sd: 'सिनधि (Sindhi)',
+        se: 'Davvisámegiella (Northern Sami)',
+        sg: 'Sängö (Sango)',
+        sh: 'Srpskohrvatski / Српскохрватски (Serbo-Croatian)',
+        si: 'සිංහල (Sinhalese)',
+        simple: 'Simple English (Simple English)',
+        sk: 'Slovenčina (Slovak)',
+        sl: 'Slovenščina (Slovenian)',
+        sm: 'Gagana Samoa (Samoan)',
+        sn: 'chiShona (Shona)',
+        so: 'Soomaaliga (Somalia)',
+        sq: 'Shqip (Albanian)',
+        sr: 'Српски (Serbian)',
+        ss: 'SiSwati (Swati)',
+        st: 'Sesotho (Southern Sotho)',
+        su: 'Basa Sunda (Sundanese)',
+        sv: 'Svenska (Swedish)',
+        sw: 'Kiswahili (Swahili)',
+        ta: 'தமிழ் (Tamil)',
+        te: 'తెలుగు (Telugu)',
+        tet: 'Tetun (Tetum)',
+        tg: 'Тоҷикӣ (Tajik)',
+        th: 'ไทย / Phasa Thai (Thai)',
+        ti: 'ትግርኛ (Tigrinya)',
+        tk: 'Туркмен / تركمن (Turkmen)',
+        tl: 'Tagalog (Tagalog)',
+        tlh: 'tlhIngan-Hol (Klingon)',
+        tn: 'Setswana (Tswana)',
+        to: 'Lea Faka-Tonga (Tonga)',
+        tpi: 'Tok Pisin (Tok Pisin)',
+        tr: 'Türkçe (Turkish)',
+        ts: 'Xitsonga (Tsonga)',
+        tt: 'Tatarça (Tatar)',
+        tum: 'chiTumbuka (Tumbuka)',
+        tw: 'Twi (Twi)',
+        ty: 'Reo Mā`ohi (Tahitian)',
+        udm: 'Удмурт кыл (Udmurt)',
+        ug: 'Uyƣurqə / ئۇيغۇرچە (Uyghur)',
+        uk: 'Українська (Ukrainian)',
+        ur: 'اردو (Urdu)',
+        uz: 'Ўзбек (Uzbek)',
+        ve: 'Tshivenḓa (Venda)',
+        vi: 'Việtnam (Vietnamese)',
+        vec: 'Vèneto (Venetian)',
+        vls: 'West-Vlaoms (West Flemish)',
+        vo: 'Volapük (Volapük)',
+        wa: 'Walon (Walloon)',
+        war: 'Winaray / Binisaya Lineyte-Samarnon (Waray / Samar-Leyte Visayan)',
+        wo: 'Wollof (Wolof)',
+        xal: 'Хальмг (Kalmyk)',
+        xh: 'isiXhosa (Xhosa)',
+        yi: 'ייִדיש (Yiddish)',
+        yo: 'Yorùbá (Yoruba)',
+        za: 'Cuengh / Tôô / 壮语 (Zhuang)',
+        zh: '中文 (Chinese)',
+        lzh: '文言 (Classical Chinese)',
+        zhClassical: '文言 (Classical Chinese)',
+        nan: 'Bân-lâm-gú (Minnan)',
+        yue: '粵語 / 粤语 (Cantonese)',
+        zu: 'isiZulu (Zulu)',
+        ace: 'Achinese',
+        ady: 'Adyghe-Adygei',
+        arz: 'Egyptian Arabic',
+        atj: 'Atikamekw',
+        azb: 'South Azerbaijani',
+        bho: 'Bhojpuri',
+        bjn: 'Banjar',
+        ckb: 'Central Kurdish',
+        din: 'Dinka',
+        dty: 'Dotyali',
+        eml: 'Emilian-Romagnol',
         fa: 'Persian (Farsi)',
-        pl: 'Polish',
-        pt: 'Portuguese',
-        pa: 'Punjabi (Eastern)',
-        qu: 'Quechua',
-        rm: 'Romansh',
-        ro: 'Romanian',
-        ru: 'Russian',
-        se: 'Sami',
-        sm: 'Samoan',
-        sg: 'Sango',
-        sa: 'Sanskrit',
-        sr: 'Serbian',
-        sh: 'Serbo-Croatian',
-        st: 'Sesotho',
-        tn: 'Setswana',
-        sn: 'Shona',
-        sd: 'Sindhi',
-        si: 'Sinhalese',
-        ss: 'Siswati',
-        sk: 'Slovak',
-        sl: 'Slovenian',
-        so: 'Somali',
-        nr: 'Southern Ndebele',
-        es: 'Spanish',
-        su: 'Sundanese',
-        sw: 'Swahili (Kiswahili)',
-        sv: 'Swedish',
-        tl: 'Tagalog',
-        ty: 'Tahitian',
-        tg: 'Tajik',
-        ta: 'Tamil',
-        tt: 'Tatar',
-        te: 'Telugu',
-        th: 'Thai',
-        bo: 'Tibetan',
-        ti: 'Tigrinya',
-        to: 'Tonga',
-        ts: 'Tsonga',
-        tr: 'Turkish',
-        tk: 'Turkmen',
-        tum: 'Tumbuka',
-        tw: 'Twi',
-        ug: 'Uyghur',
-        uk: 'Ukrainian',
-        ur: 'Urdu',
-        uz: 'Uzbek',
-        ve: 'Venda',
-        vi: 'Vietnamese',
-        vo: 'Volapük',
-        wa: 'Wallon',
-        cy: 'Welsh',
-        wo: 'Wolof',
-        fy: 'Western Frisian',
-        xh: 'Xhosa',
-        yi: 'Yiddish',
-        ji: 'Yiddish',
-        yo: 'Yoruba',
-        za: 'Zhuang-Chuang',
-        zu: 'Zulu'
+        frr: 'Northern Frisian',
+        gag: 'Gagauz',
+        glk: 'Gilaki',
+        gom: 'Goan Konkani',
+        gsw: 'Swiss German-Alemannic-Alsatian',
+        hif: 'Fiji Hindi',
+        hsb: 'Upper Sorbian',
+        jam: 'Jamaican Creole English',
+        kaa: 'Kara-Kalpak',
+        kab: 'Kabyle',
+        kbd: 'Kabardian',
+        kbp: 'Kabiyè',
+        koi: 'Komi-Permyak',
+        krc: 'Karachay-Balkar',
+        lbe: 'Lak',
+        lez: 'Lezghian',
+        lrc: 'Northern Luri',
+        ltg: 'Latgalian',
+        mai: 'Maithili',
+        mdf: 'Moksha',
+        mhr: 'Eastern Mari',
+        mrj: 'Western Mari',
+        myv: 'Erzya',
+        mzn: 'Mazanderani',
+        nb: 'Norwegian bokmål',
+        nov: 'Novial',
+        olo: 'Livvi',
+        pcd: 'Picard',
+        pfl: 'Pfaelzisch',
+        pnb: 'Western Panjabi',
+        pnt: 'Pontic',
+        rue: 'Rusyn',
+        sah: 'Yakut',
+        srn: 'Sranan Tongo',
+        stq: 'Saterfriesisch',
+        szl: 'Silesian',
+        tcy: 'Tulu',
+        tyv: 'Tuvinian',
+        vep: 'Veps',
+        wuu: 'Wu Chinese',
+        xmf: 'Mingrelian',
+        zea: 'Zeeuws'
     };
 
     function requestDownloadLinks(URL, lang) {
@@ -293,10 +423,13 @@ define([], function () {
                     langList = langList.replace(/\b(\w+)\n(?=.*\b\1\n?)/mg, "");
                     langList = "All\n" + langList;
                     var langArray = langList.match(/^\w+$/mg);
+                    //Create dropdown language selector
                     if (langArray) {
-                        var dropdown = '<select id="langs">\r\n';
+                        var dropdown = '<select class="dropdown" id="langs">\r\n';
                         for (var q = 0; q < langArray.length; q++) {
-                            dropdown += '<option value="' + langArray[q] + '">' + langArray[q] + '</option>\r\n';
+                            dropdown += '<option value="' + langArray[q] + '">' +
+                                (langCodes[langArray[q]] ? langArray[q] + ' :  ' + langCodes[langArray[q]] : langArray[q]) +
+                                '</option>\r\n';
                         }
                         dropdown += '</select>\r\n';
                         doc = doc.replace(/<\/h3>/i, '</h3><p>Filter list by language code: ' + dropdown + '</p>');
diff --git a/www/css/app.css b/www/css/app.css
index 71232d28..c32d72ac 100644
--- a/www/css/app.css
+++ b/www/css/app.css
@@ -154,10 +154,13 @@ footer .glyphicon {
     color: lightblue;
 }
 
-.dropdown-menu, .dropdown-menu a {
-    background-color: rgba(255,255,255,0.7) !important;
+pre {
+    font-weight: bold;
 }
 
+.dropdown-menu, .dropdown-menu a {
+    background: rgba(255,255,255,0.7) !important;
+}
 
 .darkfooter .glyphicon, .dark .glyphicon {
     color: lightblue;
@@ -188,6 +191,17 @@ footer .glyphicon {
     color: lightblue !important;
 }
 
+.dark .dropdown {
+    color: #222 !important;
+    background-color: lightblue !important;
+    border-color: lightgray !important;
+}
+
+.dark .dropdown option:focus, .dark .dropdown option:hover {
+    color: lightblue !important;
+    background: darkslategray !important;
+}
+
 .darkfooter .dropdown-menu, .darkfooter .dropdown-menu a {
     color: lightblue !important;
     background-color: rgba(34,34,34,0.6) !important;
diff --git a/www/js/lib/kiwixServe.js b/www/js/lib/kiwixServe.js
index 744476f9..f351cf16 100644
--- a/www/js/lib/kiwixServe.js
+++ b/www/js/lib/kiwixServe.js
@@ -20,195 +20,319 @@
 define([], function () {
 
     var langCodes = {
-        ab: 'Abkhazian',
-        aa: 'Afar',
-        af: 'Afrikaans',
-        ak: 'Akan',
-        sq: 'Albanian',
-        am: 'Amharic',
-        ar: 'Arabic',
-        an: 'Aragonese',
-        hy: 'Armenian',
-        as: 'Assamese',
-        av: 'Avaric',
-        ae: 'Avestan',
-        ay: 'Aymara',
-        az: 'Azerbaijani',
-        bm: 'Bambara',
-        ba: 'Bashkir',
-        eu: 'Basque',
-        be: 'Belarusian',
-        bn: 'Bengali (Bangla)',
-        bh: 'Bihari',
-        bi: 'Bislama',
-        bs: 'Bosnian',
-        br: 'Breton',
-        bg: 'Bulgarian',
-        my: 'Burmese',
-        ca: 'Catalan',
-        ch: 'Chamorro',
-        ce: 'Chechen',
-        ny: 'Chichewa-Chewa-Nyanja',
-        zh: 'Chinese',
-        zh: 'Chinese',
-        cv: 'Chuvash',
-        kw: 'Cornish',
-        co: 'Corsican',
-        cr: 'Cree',
-        hr: 'Croatian',
-        cs: 'Czech',
-        da: 'Danish',
-        dv: 'Divehi-Dhivehi-Maldivian',
-        nl: 'Dutch',
-        dz: 'Dzongkha',
-        en: 'English',
-        eo: 'Esperanto',
-        et: 'Estonian',
-        ee: 'Ewe',
-        fo: 'Faroese',
-        fj: 'Fijian',
-        fi: 'Finnish',
-        fr: 'French',
-        ff: 'Fula-Fulah-Pulaar-Pular',
-        gl: 'Galician',
-        gd: 'Gaelic (Scottish)',
-        gv: 'Gaelic (Manx)',
-        ka: 'Georgian',
-        de: 'German',
-        el: 'Greek',
-        kl: 'Greenlandic-Kalaallisut',
-        gn: 'Guarani',
-        gu: 'Gujarati',
-        ht: 'Haitian Creole',
-        ha: 'Hausa',
-        he: 'Hebrew',
-        hz: 'Herero',
-        hi: 'Hindi',
-        ho: 'Hiri Motu',
-        hu: 'Hungarian',
-        is: 'Icelandic',
-        io: 'Ido',
-        ig: 'Igbo',
-        id: 'Indonesian',
-        in: 'Indonesian',
-        ia: 'Interlingua',
-        ie: 'Interlingue',
-        iu: 'Inuktitut',
-        ik: 'Inupiak',
-        ga: 'Irish',
-        it: 'Italian',
-        ja: 'Japanese',
-        jv: 'Javanese',
-        kn: 'Kannada',
-        kr: 'Kanuri',
-        ks: 'Kashmiri',
-        kk: 'Kazakh',
-        km: 'Khmer',
-        ki: 'Kikuyu',
-        rw: 'Kinyarwanda (Rwanda)',
-        rn: 'Kirundi',
-        ky: 'Kyrgyz',
-        kv: 'Komi',
-        kg: 'Kongo',
-        ko: 'Korean',
-        ku: 'Kurdish',
-        kj: 'Kwanyama',
-        lo: 'Lao',
-        la: 'Latin',
-        lv: 'Latvian (Lettish)',
-        li: 'Limburgish ( Limburger)',
-        ln: 'Lingala',
-        lt: 'Lithuanian',
-        lu: 'Luga-Katanga',
-        lg: 'Luganda-Ganda',
-        lb: 'Luxembourgish',
-        mk: 'Macedonian',
-        mg: 'Malagasy',
-        ms: 'Malay',
-        ml: 'Malayalam',
-        mt: 'Maltese',
-        mi: 'Maori',
-        mr: 'Marathi',
-        mh: 'Marshallese',
-        mo: 'Moldavian',
-        mn: 'Mongolian',
-        na: 'Nauru',
-        nv: 'Navajo',
-        ng: 'Ndonga',
-        nd: 'Northern Ndebele',
-        ne: 'Nepali',
-        no: 'Norwegian',
-        nb: 'Norwegian bokmål',
-        nn: 'Norwegian nynorsk',
-        ii: 'Nuosu (Sichuan Yi)',
-        oc: 'Occitan',
-        oj: 'Ojibwe',
-        cu: 'Old Church Slavonic-Old Bulgarian',
-        or: 'Oriya',
-        om: 'Oromo (Afaan Oromo)',
-        os: 'Ossetian',
-        pi: 'Pāli',
-        ps: 'Pashto-Pushto',
+        aa: 'Afar (Afar)',
+        ab: 'Аҧсуа (Abkhazian)',
+        af: 'Afrikaans (Afrikaans)',
+        ak: 'Akana (Akan)',
+        als: 'Alemannisch (Alemannic)',
+        am: 'አማርኛ (Amharic)',
+        an: 'Aragonés (Aragonese)',
+        ang: 'Englisc (Anglo-Saxon / Old English)',
+        ar: 'العربية (Arabic)',
+        arc: 'ܣܘܪܬ (Aramaic)',
+        as: 'অসমীয়া (Assamese)',
+        ast: 'Asturianu (Asturian)',
+        av: 'Авар (Avar)',
+        ay: 'Aymar (Aymara)',
+        az: 'Azərbaycanca / آذربايجان (Azerbaijani)',
+        ba: 'Башҡорт (Bashkir)',
+        bar: 'Boarisch (Bavarian)',
+        batSmg: 'Žemaitėška (Samogitian)',
+        sgs: 'Žemaitėška (Samogitian)',
+        bcl: 'Bikol Central (Bikol)',
+        be: 'Беларуская (Belarusian)',
+        beXOld: 'Беларуская (тарашкевіца) (Belarusian (Taraškievica))',
+        bg: 'Български (Bulgarian)',
+        bh: 'भोजपुरी (Bihari)',
+        bi: 'Bislama (Bislama)',
+        bm: 'Bamanankan (Bambara)',
+        bn: 'বাংলা (Bengali)',
+        bo: 'བོད་ཡིག / Bod skad (Tibetan)',
+        bpy: 'ইমার ঠার/বিষ্ণুপ্রিয়া মণিপুরী (Bishnupriya Manipuri)',
+        br: 'Brezhoneg (Breton)',
+        bs: 'Bosanski (Bosnian)',
+        bug: 'ᨅᨔ ᨕᨘᨁᨗ / Basa Ugi (Buginese)',
+        bxr: 'Буряад хэлэн (Buriat (Russia))',
+        ca: 'Català (Catalan)',
+        cdo: 'Mìng-dĕ̤ng-ngṳ̄ / 閩東語 (Min Dong Chinese)',
+        ce: 'Нохчийн (Chechen)',
+        ceb: 'Sinugboanong Binisaya (Cebuano)',
+        ch: 'Chamoru (Chamorro)',
+        cho: 'Choctaw (Choctaw)',
+        chr: 'ᏣᎳᎩ (Cherokee)',
+        chy: 'Tsetsêhestâhese (Cheyenne)',
+        co: 'Corsu (Corsican)',
+        cr: 'Nehiyaw (Cree)',
+        cs: 'Česky (Czech)',
+        csb: 'Kaszëbsczi (Kashubian)',
+        cu: 'словѣньскъ / slověnĭskŭ (Old Church Slavonic / Old Bulgarian)',
+        cv: 'Чăваш (Chuvash)',
+        cy: 'Cymraeg (Welsh)',
+        da: 'Dansk (Danish)',
+        de: 'Deutsch (German)',
+        diq: 'Zazaki (Dimli)',
+        dsb: 'Dolnoserbski (Lower Sorbian)',
+        dv: 'ދިވެހިބަސް (Divehi)',
+        dz: 'ཇོང་ཁ (Dzongkha)',
+        ee: 'Ɛʋɛ (Ewe)',
+        far: 'فارسی (Farsi)',
+        el: 'Ελληνικά (Greek)',
+        en: 'English (English)',
+        eo: 'Esperanto (Esperanto)',
+        es: 'Español (Spanish)',
+        et: 'Eesti (Estonian)',
+        eu: 'Euskara (Basque)',
+        ext: 'Estremeñu (Extremaduran)',
+        ff: 'Fulfulde (Peul)',
+        fi: 'Suomi (Finnish)',
+        fiuVro: 'Võro (Võro)',
+        vro: 'Võro (Võro)',
+        fj: 'Na Vosa Vakaviti (Fijian)',
+        fo: 'Føroyskt (Faroese)',
+        fr: 'Français (French)',
+        frp: 'Arpitan / francoprovençal (Arpitan / Franco-Provençal)',
+        fur: 'Furlan (Friulian)',
+        fy: 'Frysk (West Frisian)',
+        ga: 'Gaeilge (Irish)',
+        gan: '贛語 (Gan Chinese)',
+        gbm: 'गढ़वळी (Garhwali)',
+        gd: 'Gàidhlig (Scottish Gaelic)',
+        gil: 'Taetae ni kiribati (Gilbertese)',
+        gl: 'Galego (Galician)',
+        gn: 'Avañe’ẽ (Guarani)',
+        got: 'gutisk (Gothic)',
+        gu: 'ગુજરાતી (Gujarati)',
+        gv: 'Gaelg (Manx)',
+        ha: 'هَوُسَ (Hausa)',
+        hak: '客家語/Hak-kâ-ngî (Hakka Chinese)',
+        haw: 'Hawai`i (Hawaiian)',
+        he: 'עברית (Hebrew)',
+        hi: 'हिन्दी (Hindi)',
+        ho: 'Hiri Motu (Hiri Motu)',
+        hr: 'Hrvatski (Croatian)',
+        ht: 'Krèyol ayisyen (Haitian)',
+        hu: 'Magyar (Hungarian)',
+        hy: 'Հայերեն (Armenian)',
+        hz: 'Otsiherero (Herero)',
+        ia: 'Interlingua (Interlingua)',
+        id: 'Bahasa Indonesia (Indonesian)',
+        ie: 'Interlingue (Interlingue)',
+        ig: 'Igbo (Igbo)',
+        ii: 'ꆇꉙ / 四川彝语 (Sichuan Yi)',
+        ik: 'Iñupiak (Inupiak)',
+        ilo: 'Ilokano (Ilokano)',
+        io: 'Ido (Ido)',
+        is: 'Íslenska (Icelandic)',
+        it: 'Italiano (Italian)',
+        iu: 'ᐃᓄᒃᑎᑐᑦ (Inuktitut)',
+        ja: '日本語 (Japanese)',
+        jbo: 'Lojban (Lojban)',
+        jv: 'Basa Jawa (Javanese)',
+        ka: 'ქართული (Georgian)',
+        kg: 'KiKongo (Kongo)',
+        ki: 'Gĩkũyũ (Kikuyu)',
+        kj: 'Kuanyama (Kuanyama)',
+        kk: 'Қазақша (Kazakh)',
+        kl: 'Kalaallisut (Greenlandic)',
+        km: 'ភាសាខ្មែរ (Cambodian)',
+        kn: 'ಕನ್ನಡ (Kannada)',
+        khw: 'کھوار (Khowar)',
+        ko: '한국어 (Korean)',
+        kr: 'Kanuri (Kanuri)',
+        ks: 'कश्मीरी / كشميري (Kashmiri)',
+        ksh: 'Ripoarisch (Ripuarian)',
+        ku: 'Kurdî / كوردی (Kurdish)',
+        kv: 'Коми (Komi)',
+        kw: 'Kernewek (Cornish)',
+        ky: 'Kırgızca / Кыргызча (Kirghiz)',
+        la: 'Latina (Latin)',
+        lad: 'Dzhudezmo / Djudeo-Espanyol (Ladino / Judeo-Spanish)',
+        lan: 'Leb Lango / Luo (Lango)',
+        lb: 'Lëtzebuergesch (Luxembourgish)',
+        lg: 'Luganda (Ganda)',
+        li: 'Limburgs (Limburgian)',
+        lij: 'Líguru (Ligurian)',
+        lmo: 'Lumbaart (Lombard)',
+        ln: 'Lingála (Lingala)',
+        lo: 'ລາວ / Pha xa lao (Laotian)',
+        lt: 'Lietuvių (Lithuanian)',
+        lv: 'Latviešu (Latvian)',
+        mapBms: 'Basa Banyumasan (Banyumasan)',
+        mg: 'Malagasy (Malagasy)',
+        man: '官話/官话 (Mandarin)',
+        mh: 'Kajin Majel / Ebon (Marshallese)',
+        mi: 'Māori (Maori)',
+        min: 'Minangkabau (Minangkabau)',
+        mk: 'Македонски (Macedonian)',
+        ml: 'മലയാളം (Malayalam)',
+        mn: 'Монгол (Mongolian)',
+        mo: 'Moldovenească (Moldovan)',
+        mr: 'मराठी (Marathi)',
+        ms: 'Bahasa Melayu (Malay)',
+        mt: 'bil-Malti (Maltese)',
+        mus: 'Mvskoke (Creek / Muskogee)',
+        mwl: 'Mirandés (Mirandese)',
+        my: 'Myanmasa (Burmese)',
+        na: 'Dorerin Naoero (Nauruan)',
+        nah: 'Nahuatl (Nahuatl)',
+        nap: 'Nnapulitano (Neapolitan)',
+        nd: 'Sindebele (North Ndebele)',
+        nds: 'Plattdüütsch (Low German / Low Saxon)',
+        ndsNl: 'Nedersaksisch (Dutch Low Saxon)',
+        ne: 'नेपाली (Nepali)',
+        new: 'नेपालभाषा / Newah Bhaye (Newar)',
+        ng: 'Oshiwambo (Ndonga)',
+        nl: 'Nederlands (Dutch)',
+        nn: 'Norsk (nynorsk) (Norwegian Nynorsk)',
+        no: 'Norsk (bokmål / riksmål) (Norwegian)',
+        nr: 'isiNdebele (South Ndebele)',
+        nso: 'Sesotho sa Leboa / Sepedi (Northern Sotho)',
+        nrm: 'Nouormand / Normaund (Norman)',
+        nv: 'Diné bizaad (Navajo)',
+        ny: 'Chi-Chewa (Chichewa)',
+        oc: 'Occitan (Occitan)',
+        oj: 'ᐊᓂᔑᓈᐯᒧᐎᓐ / Anishinaabemowin (Ojibwa)',
+        om: 'Oromoo (Oromo)',
+        or: 'ଓଡ଼ିଆ (Oriya)',
+        os: 'Иронау (Ossetian / Ossetic)',
+        pa: 'ਪੰਜਾਬੀ / पंजाबी / پنجابي (Panjabi / Punjabi)',
+        pag: 'Pangasinan (Pangasinan)',
+        pam: 'Kapampangan (Kapampangan)',
+        pap: 'Papiamentu (Papiamentu)',
+        pdc: 'Deitsch (Pennsylvania German)',
+        pi: 'Pāli / पाऴि (Pali)',
+        pih: 'Norfuk (Norfolk)',
+        pl: 'Polski (Polish)',
+        pms: 'Piemontèis (Piedmontese)',
+        ps: 'پښتو (Pashto)',
+        pt: 'Português (Portuguese)',
+        qu: 'Runa Simi (Quechua)',
+        rm: 'Rumantsch (Raeto Romance)',
+        rmy: 'Romani / रोमानी (Romani)',
+        rn: 'Kirundi (Kirundi)',
+        ro: 'Română (Romanian)',
+        roaRup: 'Armâneashti (Aromanian)',
+        rup: 'Armâneashti (Aromanian)',
+        ru: 'Русский (Russian)',
+        rw: 'Kinyarwandi (Rwandi)',
+        sa: 'संस्कृतम् (Sanskrit)',
+        sc: 'Sardu (Sardinian)',
+        scn: 'Sicilianu (Sicilian)',
+        sco: 'Scots (Scots)',
+        sd: 'सिनधि (Sindhi)',
+        se: 'Davvisámegiella (Northern Sami)',
+        sg: 'Sängö (Sango)',
+        sh: 'Srpskohrvatski / Српскохрватски (Serbo-Croatian)',
+        si: 'සිංහල (Sinhalese)',
+        simple: 'Simple English (Simple English)',
+        sk: 'Slovenčina (Slovak)',
+        sl: 'Slovenščina (Slovenian)',
+        sm: 'Gagana Samoa (Samoan)',
+        sn: 'chiShona (Shona)',
+        so: 'Soomaaliga (Somalia)',
+        sq: 'Shqip (Albanian)',
+        sr: 'Српски (Serbian)',
+        ss: 'SiSwati (Swati)',
+        st: 'Sesotho (Southern Sotho)',
+        su: 'Basa Sunda (Sundanese)',
+        sv: 'Svenska (Swedish)',
+        sw: 'Kiswahili (Swahili)',
+        ta: 'தமிழ் (Tamil)',
+        te: 'తెలుగు (Telugu)',
+        tet: 'Tetun (Tetum)',
+        tg: 'Тоҷикӣ (Tajik)',
+        th: 'ไทย / Phasa Thai (Thai)',
+        ti: 'ትግርኛ (Tigrinya)',
+        tk: 'Туркмен / تركمن (Turkmen)',
+        tl: 'Tagalog (Tagalog)',
+        tlh: 'tlhIngan-Hol (Klingon)',
+        tn: 'Setswana (Tswana)',
+        to: 'Lea Faka-Tonga (Tonga)',
+        tpi: 'Tok Pisin (Tok Pisin)',
+        tr: 'Türkçe (Turkish)',
+        ts: 'Xitsonga (Tsonga)',
+        tt: 'Tatarça (Tatar)',
+        tum: 'chiTumbuka (Tumbuka)',
+        tw: 'Twi (Twi)',
+        ty: 'Reo Mā`ohi (Tahitian)',
+        udm: 'Удмурт кыл (Udmurt)',
+        ug: 'Uyƣurqə / ئۇيغۇرچە (Uyghur)',
+        uk: 'Українська (Ukrainian)',
+        ur: 'اردو (Urdu)',
+        uz: 'Ўзбек (Uzbek)',
+        ve: 'Tshivenḓa (Venda)',
+        vi: 'Việtnam (Vietnamese)',
+        vec: 'Vèneto (Venetian)',
+        vls: 'West-Vlaoms (West Flemish)',
+        vo: 'Volapük (Volapük)',
+        wa: 'Walon (Walloon)',
+        war: 'Winaray / Binisaya Lineyte-Samarnon (Waray / Samar-Leyte Visayan)',
+        wo: 'Wollof (Wolof)',
+        xal: 'Хальмг (Kalmyk)',
+        xh: 'isiXhosa (Xhosa)',
+        yi: 'ייִדיש (Yiddish)',
+        yo: 'Yorùbá (Yoruba)',
+        za: 'Cuengh / Tôô / 壮语 (Zhuang)',
+        zh: '中文 (Chinese)',
+        lzh: '文言 (Classical Chinese)',
+        zhClassical: '文言 (Classical Chinese)',
+        nan: 'Bân-lâm-gú (Minnan)',
+        yue: '粵語 / 粤语 (Cantonese)',
+        zu: 'isiZulu (Zulu)',
+        ace: 'Achinese',
+        ady: 'Adyghe-Adygei',
+        arz: 'Egyptian Arabic',
+        atj: 'Atikamekw',
+        azb: 'South Azerbaijani',
+        bho: 'Bhojpuri',
+        bjn: 'Banjar',
+        ckb: 'Central Kurdish',
+        din: 'Dinka',
+        dty: 'Dotyali',
+        eml: 'Emilian-Romagnol',
         fa: 'Persian (Farsi)',
-        pl: 'Polish',
-        pt: 'Portuguese',
-        pa: 'Punjabi (Eastern)',
-        qu: 'Quechua',
-        rm: 'Romansh',
-        ro: 'Romanian',
-        ru: 'Russian',
-        se: 'Sami',
-        sm: 'Samoan',
-        sg: 'Sango',
-        sa: 'Sanskrit',
-        sr: 'Serbian',
-        sh: 'Serbo-Croatian',
-        st: 'Sesotho',
-        tn: 'Setswana',
-        sn: 'Shona',
-        sd: 'Sindhi',
-        si: 'Sinhalese',
-        ss: 'Siswati',
-        sk: 'Slovak',
-        sl: 'Slovenian',
-        so: 'Somali',
-        nr: 'Southern Ndebele',
-        es: 'Spanish',
-        su: 'Sundanese',
-        sw: 'Swahili (Kiswahili)',
-        sv: 'Swedish',
-        tl: 'Tagalog',
-        ty: 'Tahitian',
-        tg: 'Tajik',
-        ta: 'Tamil',
-        tt: 'Tatar',
-        te: 'Telugu',
-        th: 'Thai',
-        bo: 'Tibetan',
-        ti: 'Tigrinya',
-        to: 'Tonga',
-        ts: 'Tsonga',
-        tr: 'Turkish',
-        tk: 'Turkmen',
-        tum: 'Tumbuka',
-        tw: 'Twi',
-        ug: 'Uyghur',
-        uk: 'Ukrainian',
-        ur: 'Urdu',
-        uz: 'Uzbek',
-        ve: 'Venda',
-        vi: 'Vietnamese',
-        vo: 'Volapük',
-        wa: 'Wallon',
-        cy: 'Welsh',
-        wo: 'Wolof',
-        fy: 'Western Frisian',
-        xh: 'Xhosa',
-        yi: 'Yiddish',
-        ji: 'Yiddish',
-        yo: 'Yoruba',
-        za: 'Zhuang-Chuang',
-        zu: 'Zulu'
+        frr: 'Northern Frisian',
+        gag: 'Gagauz',
+        glk: 'Gilaki',
+        gom: 'Goan Konkani',
+        gsw: 'Swiss German-Alemannic-Alsatian',
+        hif: 'Fiji Hindi',
+        hsb: 'Upper Sorbian',
+        jam: 'Jamaican Creole English',
+        kaa: 'Kara-Kalpak',
+        kab: 'Kabyle',
+        kbd: 'Kabardian',
+        kbp: 'Kabiyè',
+        koi: 'Komi-Permyak',
+        krc: 'Karachay-Balkar',
+        lbe: 'Lak',
+        lez: 'Lezghian',
+        lrc: 'Northern Luri',
+        ltg: 'Latgalian',
+        mai: 'Maithili',
+        mdf: 'Moksha',
+        mhr: 'Eastern Mari',
+        mrj: 'Western Mari',
+        myv: 'Erzya',
+        mzn: 'Mazanderani',
+        nb: 'Norwegian bokmål',
+        nov: 'Novial',
+        olo: 'Livvi',
+        pcd: 'Picard',
+        pfl: 'Pfaelzisch',
+        pnb: 'Western Panjabi',
+        pnt: 'Pontic',
+        rue: 'Rusyn',
+        sah: 'Yakut',
+        srn: 'Sranan Tongo',
+        stq: 'Saterfriesisch',
+        szl: 'Silesian',
+        tcy: 'Tulu',
+        tyv: 'Tuvinian',
+        vep: 'Veps',
+        wuu: 'Wu Chinese',
+        xmf: 'Mingrelian',
+        zea: 'Zeeuws'
     };
 
     function requestDownloadLinks(URL, lang) {
@@ -299,10 +423,13 @@ define([], function () {
                     langList = langList.replace(/\b(\w+)\n(?=.*\b\1\n?)/mg, "");
                     langList = "All\n" + langList;
                     var langArray = langList.match(/^\w+$/mg);
+                    //Create dropdown language selector
                     if (langArray) {
-                        var dropdown = '<select id="langs">\r\n';
+                        var dropdown = '<select class="dropdown" id="langs">\r\n';
                         for (var q = 0; q < langArray.length; q++) {
-                            dropdown += '<option value="' + langArray[q] + '">' + langArray[q] + '</option>\r\n';
+                            dropdown += '<option value="' + langArray[q] + '">' +
+                                (langCodes[langArray[q]] ? langArray[q] + ' :  ' + langCodes[langArray[q]] : langArray[q]) +
+                                '</option>\r\n';
                         }
                         dropdown += '</select>\r\n';
                         doc = doc.replace(/<\/h3>/i, '</h3><p>Filter list by language code: ' + dropdown + '</p>');