diff --git a/src/Squidex.Infrastructure/Languages.cs b/src/Squidex.Infrastructure/Languages.cs
index 403b79996..ead00749d 100644
--- a/src/Squidex.Infrastructure/Languages.cs
+++ b/src/Squidex.Infrastructure/Languages.cs
@@ -197,6 +197,8 @@ namespace Squidex.Infrastructure
         public static readonly Language AfarEthiopia = AddLanguage("aa-ET", "Afar (Ethiopia)");
         public static readonly Language AfrikaansNamibia = AddLanguage("af-NA", "Afrikaans (Namibia)");
         public static readonly Language AfrikaansSouthAfrica = AddLanguage("af-ZA", "Afrikaans (South Africa)");
+        public static readonly Language AkanGhana = AddLanguage("ak-GH", "Akan (Ghana)");
+        public static readonly Language AmharicEthiopia = AddLanguage("am-ET", "Amharic (Ethiopia)");
         public static readonly Language ArabicUnitedArabEmirates = AddLanguage("ar-AE", "Arabic (United Arab Emirates)");
         public static readonly Language ArabicBahrain = AddLanguage("ar-BH", "Arabic (Bahrain)");
         public static readonly Language ArabicDjibouti = AddLanguage("ar-DJ", "Arabic (Djibouti)");
@@ -223,14 +225,23 @@ namespace Squidex.Infrastructure
         public static readonly Language ArabicChad = AddLanguage("ar-TD", "Arabic (Chad)");
         public static readonly Language ArabicTunisia = AddLanguage("ar-TN", "Arabic (Tunisia)");
         public static readonly Language ArabicYemen = AddLanguage("ar-YE", "Arabic (Yemen)");
+        public static readonly Language AssameseIndia = AddLanguage("as-IN", "Assamese (India)");
+        public static readonly Language BashkirRussia = AddLanguage("ba-RU", "Bashkir (Russia)");
+        public static readonly Language BelarusianBelarus = AddLanguage("be-BY", "Belarusian (Belarus)");
+        public static readonly Language BulgarianBulgaria = AddLanguage("bg-BG", "Bulgarian (Bulgaria)");
         public static readonly Language BanglaBangladesh = AddLanguage("bn-BD", "Bangla (Bangladesh)");
         public static readonly Language BanglaIndia = AddLanguage("bn-IN", "Bangla (India)");
         public static readonly Language TibetanChina = AddLanguage("bo-CN", "Tibetan (China)");
         public static readonly Language TibetanIndia = AddLanguage("bo-IN", "Tibetan (India)");
+        public static readonly Language BretonFrance = AddLanguage("br-FR", "Breton (France)");
         public static readonly Language CatalanAndorra = AddLanguage("ca-AD", "Catalan (Andorra)");
         public static readonly Language CatalanCatalan = AddLanguage("ca-ES", "Catalan (Catalan)");
         public static readonly Language CatalanFrance = AddLanguage("ca-FR", "Catalan (France)");
         public static readonly Language CatalanItaly = AddLanguage("ca-IT", "Catalan (Italy)");
+        public static readonly Language ChechenRussia = AddLanguage("ce-RU", "Chechen (Russia)");
+        public static readonly Language CorsicanFrance = AddLanguage("co-FR", "Corsican (France)");
+        public static readonly Language CzechCzechia = AddLanguage("cs-CZ", "Czech (Czechia)");
+        public static readonly Language WelshUnitedKingdom = AddLanguage("cy-GB", "Welsh (United Kingdom)");
         public static readonly Language DanishDenmark = AddLanguage("da-DK", "Danish (Denmark)");
         public static readonly Language DanishGreenland = AddLanguage("da-GL", "Danish (Greenland)");
         public static readonly Language GermanAustria = AddLanguage("de-AT", "German (Austria)");
@@ -240,6 +251,8 @@ namespace Squidex.Infrastructure
         public static readonly Language GermanItaly = AddLanguage("de-IT", "German (Italy)");
         public static readonly Language GermanLiechtenstein = AddLanguage("de-LI", "German (Liechtenstein)");
         public static readonly Language GermanLuxembourg = AddLanguage("de-LU", "German (Luxembourg)");
+        public static readonly Language DivehiMaldives = AddLanguage("dv-MV", "Divehi (Maldives)");
+        public static readonly Language DzongkhaBhutan = AddLanguage("dz-BT", "Dzongkha (Bhutan)");
         public static readonly Language EweGhana = AddLanguage("ee-GH", "Ewe (Ghana)");
         public static readonly Language EweTogo = AddLanguage("ee-TG", "Ewe (Togo)");
         public static readonly Language GreekCyprus = AddLanguage("el-CY", "Greek (Cyprus)");
@@ -371,10 +384,14 @@ namespace Squidex.Infrastructure
         public static readonly Language SpanishUnitedStates = AddLanguage("es-US", "Spanish (United States)");
         public static readonly Language SpanishUruguay = AddLanguage("es-UY", "Spanish (Uruguay)");
         public static readonly Language SpanishVenezuela = AddLanguage("es-VE", "Spanish (Venezuela)");
+        public static readonly Language EstonianEstonia = AddLanguage("et-EE", "Estonian (Estonia)");
+        public static readonly Language BasqueBasque = AddLanguage("eu-ES", "Basque (Basque)");
+        public static readonly Language PersianIran = AddLanguage("fa-IR", "Persian (Iran)");
         public static readonly Language FulahCameroon = AddLanguage("ff-CM", "Fulah (Cameroon)");
         public static readonly Language FulahGuinea = AddLanguage("ff-GN", "Fulah (Guinea)");
         public static readonly Language FulahMauritania = AddLanguage("ff-MR", "Fulah (Mauritania)");
         public static readonly Language FulahNigeria = AddLanguage("ff-NG", "Fulah (Nigeria)");
+        public static readonly Language FinnishFinland = AddLanguage("fi-FI", "Finnish (Finland)");
         public static readonly Language FaroeseDenmark = AddLanguage("fo-DK", "Faroese (Denmark)");
         public static readonly Language FaroeseFaroeIslands = AddLanguage("fo-FO", "Faroese (Faroe Islands)");
         public static readonly Language FrenchBelgium = AddLanguage("fr-BE", "French (Belgium)");
@@ -423,23 +440,63 @@ namespace Squidex.Infrastructure
         public static readonly Language FrenchVanuatu = AddLanguage("fr-VU", "French (Vanuatu)");
         public static readonly Language FrenchWallisandFutuna = AddLanguage("fr-WF", "French (Wallis and Futuna)");
         public static readonly Language FrenchMayotte = AddLanguage("fr-YT", "French (Mayotte)");
+        public static readonly Language WesternFrisianNetherlands = AddLanguage("fy-NL", "Western Frisian (Netherlands)");
+        public static readonly Language IrishIreland = AddLanguage("ga-IE", "Irish (Ireland)");
+        public static readonly Language ScottishGaelicUnitedKingdom = AddLanguage("gd-GB", "Scottish Gaelic (United Kingdom)");
+        public static readonly Language GalicianGalician = AddLanguage("gl-ES", "Galician (Galician)");
+        public static readonly Language GuaraniParaguay = AddLanguage("gn-PY", "Guarani (Paraguay)");
+        public static readonly Language GujaratiIndia = AddLanguage("gu-IN", "Gujarati (India)");
+        public static readonly Language ManxIsleofMan = AddLanguage("gv-IM", "Manx (Isle of Man)");
+        public static readonly Language HebrewIsrael = AddLanguage("he-IL", "Hebrew (Israel)");
+        public static readonly Language HindiIndia = AddLanguage("hi-IN", "Hindi (India)");
         public static readonly Language CroatianBosniaandHerzegovina = AddLanguage("hr-BA", "Croatian (Bosnia and Herzegovina)");
         public static readonly Language CroatianCroatia = AddLanguage("hr-HR", "Croatian (Croatia)");
+        public static readonly Language HungarianHungary = AddLanguage("hu-HU", "Hungarian (Hungary)");
+        public static readonly Language ArmenianArmenia = AddLanguage("hy-AM", "Armenian (Armenia)");
+        public static readonly Language IndonesianIndonesia = AddLanguage("id-ID", "Indonesian (Indonesia)");
+        public static readonly Language IgboNigeria = AddLanguage("ig-NG", "Igbo (Nigeria)");
+        public static readonly Language YiChina = AddLanguage("ii-CN", "Yi (China)");
+        public static readonly Language IcelandicIceland = AddLanguage("is-IS", "Icelandic (Iceland)");
         public static readonly Language ItalianSwitzerland = AddLanguage("it-CH", "Italian (Switzerland)");
         public static readonly Language ItalianItaly = AddLanguage("it-IT", "Italian (Italy)");
         public static readonly Language ItalianSanMarino = AddLanguage("it-SM", "Italian (San Marino)");
         public static readonly Language ItalianVaticanCity = AddLanguage("it-VA", "Italian (Vatican City)");
+        public static readonly Language JapaneseJapan = AddLanguage("ja-JP", "Japanese (Japan)");
+        public static readonly Language GeorgianGeorgia = AddLanguage("ka-GE", "Georgian (Georgia)");
+        public static readonly Language KikuyuKenya = AddLanguage("ki-KE", "Kikuyu (Kenya)");
+        public static readonly Language KazakhKazakhstan = AddLanguage("kk-KZ", "Kazakh (Kazakhstan)");
+        public static readonly Language GreenlandicGreenland = AddLanguage("kl-GL", "Greenlandic (Greenland)");
+        public static readonly Language KhmerCambodia = AddLanguage("km-KH", "Khmer (Cambodia)");
+        public static readonly Language KannadaIndia = AddLanguage("kn-IN", "Kannada (India)");
         public static readonly Language KoreanNorthKorea = AddLanguage("ko-KP", "Korean (North Korea)");
         public static readonly Language KoreanKorea = AddLanguage("ko-KR", "Korean (Korea)");
+        public static readonly Language KanuriNigeria = AddLanguage("kr-NG", "Kanuri (Nigeria)");
+        public static readonly Language CornishUnitedKingdom = AddLanguage("kw-GB", "Cornish (United Kingdom)");
+        public static readonly Language KyrgyzKyrgyzstan = AddLanguage("ky-KG", "Kyrgyz (Kyrgyzstan)");
+        public static readonly Language LuxembourgishLuxembourg = AddLanguage("lb-LU", "Luxembourgish (Luxembourg)");
+        public static readonly Language GandaUganda = AddLanguage("lg-UG", "Ganda (Uganda)");
         public static readonly Language LingalaAngola = AddLanguage("ln-AO", "Lingala (Angola)");
         public static readonly Language LingalaCongoDRC = AddLanguage("ln-CD", "Lingala (Congo DRC)");
         public static readonly Language LingalaCentralAfricanRepublic = AddLanguage("ln-CF", "Lingala (Central African Republic)");
         public static readonly Language LingalaCongo = AddLanguage("ln-CG", "Lingala (Congo)");
+        public static readonly Language LaoLaos = AddLanguage("lo-LA", "Lao (Laos)");
+        public static readonly Language LithuanianLithuania = AddLanguage("lt-LT", "Lithuanian (Lithuania)");
+        public static readonly Language LubaKatangaCongoDRC = AddLanguage("lu-CD", "Luba-Katanga (Congo DRC)");
+        public static readonly Language LatvianLatvia = AddLanguage("lv-LV", "Latvian (Latvia)");
+        public static readonly Language MalagasyMadagascar = AddLanguage("mg-MG", "Malagasy (Madagascar)");
+        public static readonly Language MaoriNewZealand = AddLanguage("mi-NZ", "Maori (New Zealand)");
+        public static readonly Language MacedonianMacedoniaFYRO = AddLanguage("mk-MK", "Macedonian (Macedonia, FYRO)");
+        public static readonly Language MalayalamIndia = AddLanguage("ml-IN", "Malayalam (India)");
+        public static readonly Language MongolianMongolia = AddLanguage("mn-MN", "Mongolian (Mongolia)");
+        public static readonly Language MarathiIndia = AddLanguage("mr-IN", "Marathi (India)");
         public static readonly Language MalayBrunei = AddLanguage("ms-BN", "Malay (Brunei)");
         public static readonly Language MalayMalaysia = AddLanguage("ms-MY", "Malay (Malaysia)");
         public static readonly Language MalaySingapore = AddLanguage("ms-SG", "Malay (Singapore)");
+        public static readonly Language MalteseMalta = AddLanguage("mt-MT", "Maltese (Malta)");
+        public static readonly Language BurmeseMyanmar = AddLanguage("my-MM", "Burmese (Myanmar)");
         public static readonly Language NorwegianBokmålNorway = AddLanguage("nb-NO", "Norwegian Bokmål (Norway)");
         public static readonly Language NorwegianBokmålSvalbardandJanMayen = AddLanguage("nb-SJ", "Norwegian Bokmål (Svalbard and Jan Mayen)");
+        public static readonly Language NorthNdebeleZimbabwe = AddLanguage("nd-ZW", "North Ndebele (Zimbabwe)");
         public static readonly Language NepaliIndia = AddLanguage("ne-IN", "Nepali (India)");
         public static readonly Language NepaliNepal = AddLanguage("ne-NP", "Nepali (Nepal)");
         public static readonly Language DutchAruba = AddLanguage("nl-AW", "Dutch (Aruba)");
@@ -449,8 +506,13 @@ namespace Squidex.Infrastructure
         public static readonly Language DutchNetherlands = AddLanguage("nl-NL", "Dutch (Netherlands)");
         public static readonly Language DutchSuriname = AddLanguage("nl-SR", "Dutch (Suriname)");
         public static readonly Language DutchSintMaarten = AddLanguage("nl-SX", "Dutch (Sint Maarten)");
+        public static readonly Language NorwegianNynorskNorway = AddLanguage("nn-NO", "Norwegian Nynorsk (Norway)");
+        public static readonly Language SouthNdebeleSouthAfrica = AddLanguage("nr-ZA", "South Ndebele (South Africa)");
         public static readonly Language OromoEthiopia = AddLanguage("om-ET", "Oromo (Ethiopia)");
         public static readonly Language OromoKenya = AddLanguage("om-KE", "Oromo (Kenya)");
+        public static readonly Language OdiaIndia = AddLanguage("or-IN", "Odia (India)");
+        public static readonly Language PolishPoland = AddLanguage("pl-PL", "Polish (Poland)");
+        public static readonly Language PashtoAfghanistan = AddLanguage("ps-AF", "Pashto (Afghanistan)");
         public static readonly Language PortugueseAngola = AddLanguage("pt-AO", "Portuguese (Angola)");
         public static readonly Language PortugueseBrazil = AddLanguage("pt-BR", "Portuguese (Brazil)");
         public static readonly Language PortugueseSwitzerland = AddLanguage("pt-CH", "Portuguese (Switzerland)");
@@ -463,6 +525,8 @@ namespace Squidex.Infrastructure
         public static readonly Language PortuguesePortugal = AddLanguage("pt-PT", "Portuguese (Portugal)");
         public static readonly Language PortugueseSãoToméandPríncipe = AddLanguage("pt-ST", "Portuguese (São Tomé and Príncipe)");
         public static readonly Language PortugueseTimorLeste = AddLanguage("pt-TL", "Portuguese (Timor-Leste)");
+        public static readonly Language RomanshSwitzerland = AddLanguage("rm-CH", "Romansh (Switzerland)");
+        public static readonly Language RundiBurundi = AddLanguage("rn-BI", "Rundi (Burundi)");
         public static readonly Language RomanianMoldova = AddLanguage("ro-MD", "Romanian (Moldova)");
         public static readonly Language RomanianRomania = AddLanguage("ro-RO", "Romanian (Romania)");
         public static readonly Language RussianBelarus = AddLanguage("ru-BY", "Russian (Belarus)");
@@ -471,9 +535,15 @@ namespace Squidex.Infrastructure
         public static readonly Language RussianMoldova = AddLanguage("ru-MD", "Russian (Moldova)");
         public static readonly Language RussianRussia = AddLanguage("ru-RU", "Russian (Russia)");
         public static readonly Language RussianUkraine = AddLanguage("ru-UA", "Russian (Ukraine)");
+        public static readonly Language KinyarwandaRwanda = AddLanguage("rw-RW", "Kinyarwanda (Rwanda)");
+        public static readonly Language SanskritIndia = AddLanguage("sa-IN", "Sanskrit (India)");
         public static readonly Language SamiNorthernFinland = AddLanguage("se-FI", "Sami, Northern (Finland)");
         public static readonly Language SamiNorthernNorway = AddLanguage("se-NO", "Sami, Northern (Norway)");
         public static readonly Language SamiNorthernSweden = AddLanguage("se-SE", "Sami, Northern (Sweden)");
+        public static readonly Language SangoCentralAfricanRepublic = AddLanguage("sg-CF", "Sango (Central African Republic)");
+        public static readonly Language SinhalaSriLanka = AddLanguage("si-LK", "Sinhala (Sri Lanka)");
+        public static readonly Language SlovakSlovakia = AddLanguage("sk-SK", "Slovak (Slovakia)");
+        public static readonly Language SlovenianSlovenia = AddLanguage("sl-SI", "Slovenian (Slovenia)");
         public static readonly Language SomaliDjibouti = AddLanguage("so-DJ", "Somali (Djibouti)");
         public static readonly Language SomaliEthiopia = AddLanguage("so-ET", "Somali (Ethiopia)");
         public static readonly Language SomaliKenya = AddLanguage("so-KE", "Somali (Kenya)");
@@ -496,14 +566,26 @@ namespace Squidex.Infrastructure
         public static readonly Language TamilSriLanka = AddLanguage("ta-LK", "Tamil (Sri Lanka)");
         public static readonly Language TamilMalaysia = AddLanguage("ta-MY", "Tamil (Malaysia)");
         public static readonly Language TamilSingapore = AddLanguage("ta-SG", "Tamil (Singapore)");
+        public static readonly Language TeluguIndia = AddLanguage("te-IN", "Telugu (India)");
+        public static readonly Language ThaiThailand = AddLanguage("th-TH", "Thai (Thailand)");
         public static readonly Language TigrinyaEritrea = AddLanguage("ti-ER", "Tigrinya (Eritrea)");
         public static readonly Language TigrinyaEthiopia = AddLanguage("ti-ET", "Tigrinya (Ethiopia)");
+        public static readonly Language TurkmenTurkmenistan = AddLanguage("tk-TM", "Turkmen (Turkmenistan)");
         public static readonly Language SetswanaBotswana = AddLanguage("tn-BW", "Setswana (Botswana)");
         public static readonly Language SetswanaSouthAfrica = AddLanguage("tn-ZA", "Setswana (South Africa)");
+        public static readonly Language TonganTonga = AddLanguage("to-TO", "Tongan (Tonga)");
         public static readonly Language TurkishCyprus = AddLanguage("tr-CY", "Turkish (Cyprus)");
         public static readonly Language TurkishTurkey = AddLanguage("tr-TR", "Turkish (Turkey)");
+        public static readonly Language XitsongaSouthAfrica = AddLanguage("ts-ZA", "Xitsonga (South Africa)");
+        public static readonly Language TatarRussia = AddLanguage("tt-RU", "Tatar (Russia)");
+        public static readonly Language UyghurChina = AddLanguage("ug-CN", "Uyghur (China)");
+        public static readonly Language UkrainianUkraine = AddLanguage("uk-UA", "Ukrainian (Ukraine)");
         public static readonly Language UrduIndia = AddLanguage("ur-IN", "Urdu (India)");
         public static readonly Language UrduPakistan = AddLanguage("ur-PK", "Urdu (Pakistan)");
+        public static readonly Language VendaSouthAfrica = AddLanguage("ve-ZA", "Venda (South Africa)");
+        public static readonly Language VietnameseVietnam = AddLanguage("vi-VN", "Vietnamese (Vietnam)");
+        public static readonly Language WolofSenegal = AddLanguage("wo-SN", "Wolof (Senegal)");
+        public static readonly Language isiXhosaSouthAfrica = AddLanguage("xh-ZA", "isiXhosa (South Africa)");
         public static readonly Language YorubaBenin = AddLanguage("yo-BJ", "Yoruba (Benin)");
         public static readonly Language YorubaNigeria = AddLanguage("yo-NG", "Yoruba (Nigeria)");
         public static readonly Language ChineseSimplifiedChina = AddLanguage("zh-CN", "Chinese (Simplified, China)");
@@ -511,5 +593,6 @@ namespace Squidex.Infrastructure
         public static readonly Language ChineseTraditionalMacaoSAR = AddLanguage("zh-MO", "Chinese (Traditional, Macao SAR)");
         public static readonly Language ChineseSimplifiedSingapore = AddLanguage("zh-SG", "Chinese (Simplified, Singapore)");
         public static readonly Language ChineseTraditionalTaiwan = AddLanguage("zh-TW", "Chinese (Traditional, Taiwan)");
+        public static readonly Language isiZuluSouthAfrica = AddLanguage("zu-ZA", "isiZulu (South Africa)");
     }
 }
diff --git a/tools/GenerateLanguages/Program.cs b/tools/GenerateLanguages/Program.cs
index 6911b350d..7cd25828e 100644
--- a/tools/GenerateLanguages/Program.cs
+++ b/tools/GenerateLanguages/Program.cs
@@ -83,9 +83,6 @@ namespace GenerateLanguages
             return CultureInfo.GetCultures(CultureTypes.SpecificCultures)
                 .Where(x => x.ToString().Length == 5)
                 .Where(x => languages.Any(l => l.Iso2Code.Equals(x.TwoLetterISOLanguageName, StringComparison.OrdinalIgnoreCase)))
-                .GroupBy(x => x.TwoLetterISOLanguageName)
-                .Where(x => x.Count() > 1)
-                .SelectMany(x => x)
                 .Select(x => (x.ToString(), x.EnglishName));
         }