diff --git a/README.md b/README.md
index d7d28cb..6f97697 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 A Ruby addressing library, powered by CLDR and Google's address data.
 
-- Countries, with translations for over 250 locales. Powered by [CLDR](http://cldr.unicode.org) v42.
+- Countries, with translations for over 250 locales. Powered by [CLDR](http://cldr.unicode.org) v43.
 - Address formats for over 200 countries.
 - Subdivisions (administrative areas, localities, dependent localities) for 44 countries.
 - Both latin and local subdivision names, when relevant (e.g: Okinawa / 沖縄県).
diff --git a/data/address_formats.dump b/data/address_formats.dump
index ffd9da0..357cc77 100644
Binary files a/data/address_formats.dump and b/data/address_formats.dump differ
diff --git a/data/address_formats.json b/data/address_formats.json
index e84e00d..ad40806 100644
--- a/data/address_formats.json
+++ b/data/address_formats.json
@@ -11,13 +11,13 @@
 {"country_code":"AT","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","required_fields":["address_line1","locality","postal_code"],"postal_code_pattern":"\\d{4}"}
 {"country_code":"AU","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%locality %administrative_area %postal_code","required_fields":["address_line1","locality","administrative_area","postal_code"],"uppercase_fields":["locality","administrative_area"],"administrative_area_type":"state","locality_type":"suburb","postal_code_pattern":"\\d{4}","subdivision_depth":1}
 {"country_code":"AX","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","required_fields":["address_line1","locality","postal_code"],"postal_code_pattern":"22\\d{3}","postal_code_prefix":"AX-"}
-{"country_code":"AZ","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{4}","postal_code_prefix":"AZ "}
+{"country_code":"AZ","format":"%given_name %additional_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{4}","postal_code_prefix":"AZ "}
 {"country_code":"BA","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{5}"}
 {"country_code":"BB","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality, %administrative_area %postal_code","administrative_area_type":"parish","postal_code_pattern":"BB\\d{5}"}
 {"country_code":"BD","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality - %postal_code","postal_code_pattern":"\\d{4}"}
 {"country_code":"BE","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","required_fields":["address_line1","locality","postal_code"],"postal_code_pattern":"\\d{4}"}
 {"country_code":"BF","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %sorting_code"}
-{"country_code":"BG","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{4}"}
+{"country_code":"BG","format":"%given_name %additional_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{4}"}
 {"country_code":"BH","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %postal_code","postal_code_pattern":"(?:^|\\b)(?:1[0-2]|[1-9])\\d{2}(?:$|\\b)"}
 {"country_code":"BJ","uppercase_fields":["address_line1","address_line2","locality"]}
 {"country_code":"BL","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","required_fields":["address_line1","locality","postal_code"],"uppercase_fields":["address_line1","address_line2","locality"],"postal_code_pattern":"9[78][01]\\d{2}"}
@@ -27,7 +27,7 @@
 {"country_code":"BR","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%dependent_locality\n%locality-%administrative_area\n%postal_code","required_fields":["address_line1","administrative_area","locality","postal_code"],"uppercase_fields":["locality","administrative_area"],"administrative_area_type":"state","dependent_locality_type":"neighborhood","postal_code_pattern":"\\d{5}-?\\d{3}","subdivision_depth":2}
 {"country_code":"BS","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality, %administrative_area","administrative_area_type":"island","subdivision_depth":1}
 {"country_code":"BT","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %postal_code","postal_code_pattern":"\\d{5}"}
-{"country_code":"BY","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code, %locality\n%administrative_area","postal_code_pattern":"\\d{6}"}
+{"country_code":"BY","format":"%organization\n%family_name %given_name %additional_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code, %locality\n%administrative_area","postal_code_pattern":"\\d{6}"}
 {"country_code":"CA","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %administrative_area %postal_code","required_fields":["address_line1","locality","administrative_area","postal_code"],"uppercase_fields":["address_line1","address_line2","locality","family_name","additional_name","given_name","organization","administrative_area","postal_code"],"postal_code_pattern":"[ABCEGHJKLMNPRSTVXY]\\d[ABCEGHJ-NPRSTV-Z] ?\\d[ABCEGHJ-NPRSTV-Z]\\d","subdivision_depth":1}
 {"country_code":"CC","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%locality %administrative_area %postal_code","uppercase_fields":["locality","administrative_area"],"postal_code_pattern":"6799"}
 {"country_code":"CH","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","required_fields":["address_line1","locality","postal_code"],"uppercase_fields":[],"postal_code_pattern":"\\d{4}","postal_code_prefix":"CH-"}
@@ -99,7 +99,7 @@
 {"country_code":"KR","locale":"ko","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%dependent_locality\n%locality\n%administrative_area\n%postal_code","local_format":"%administrative_area %locality%dependent_locality\n%address_line1\n%address_line2\n%address_line3\n%organization\n%given_name %family_name\n%postal_code","required_fields":["address_line1","locality","administrative_area","postal_code"],"uppercase_fields":["postal_code"],"administrative_area_type":"do_si","dependent_locality_type":"district","postal_code_pattern":"\\d{5}","subdivision_depth":3}
 {"country_code":"KW","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{5}"}
 {"country_code":"KY","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%administrative_area %postal_code","required_fields":["address_line1","administrative_area"],"administrative_area_type":"island","postal_code_pattern":"KY\\d-\\d{4}","subdivision_depth":1}
-{"country_code":"KZ","format":"%postal_code\n%administrative_area\n%locality\n%address_line1\n%address_line2\n%address_line3\n%organization\n%given_name %family_name","postal_code_pattern":"\\d{6}"}
+{"country_code":"KZ","format":"%postal_code\n%administrative_area\n%locality\n%address_line1\n%address_line2\n%address_line3\n%organization\n%family_name %given_name %additional_name","postal_code_pattern":"\\d{6}"}
 {"country_code":"LA","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{5}"}
 {"country_code":"LB","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %postal_code","postal_code_pattern":"(?:\\d{4})(?: ?(?:\\d{4}))?"}
 {"country_code":"LI","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","required_fields":["address_line1","locality","postal_code"],"postal_code_pattern":"948[5-9]|949[0-8]","postal_code_prefix":"FL-"}
@@ -159,7 +159,7 @@
 {"country_code":"RE","format":"%organization\n%given_name %family_name\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","required_fields":["address_line1","locality","postal_code"],"uppercase_fields":["address_line1","address_line2","locality"],"postal_code_pattern":"9[78]4\\d{2}"}
 {"country_code":"RO","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","required_fields":["address_line1","locality","postal_code"],"uppercase_fields":["address_line1","address_line2","locality"],"postal_code_pattern":"\\d{6}"}
 {"country_code":"RS","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{5,6}"}
-{"country_code":"RU","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality\n%administrative_area\n%postal_code","required_fields":["address_line1","locality","administrative_area","postal_code"],"uppercase_fields":["address_line1","address_line2","locality"],"administrative_area_type":"oblast","postal_code_pattern":"\\d{6}","subdivision_depth":1}
+{"country_code":"RU","format":"%family_name %given_name %additional_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality\n%administrative_area\n%postal_code","required_fields":["address_line1","locality","administrative_area","postal_code"],"uppercase_fields":["address_line1","address_line2","locality"],"administrative_area_type":"oblast","postal_code_pattern":"\\d{6}","subdivision_depth":1}
 {"country_code":"RW","uppercase_fields":["address_line1","address_line2","locality"]}
 {"country_code":"SA","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %postal_code","postal_code_pattern":"\\d{5}"}
 {"country_code":"SC","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality\n%administrative_area","uppercase_fields":["administrative_area"],"administrative_area_type":"island"}
@@ -187,11 +187,11 @@
 {"country_code":"TV","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality\n%administrative_area","uppercase_fields":["address_line1","address_line2","locality","administrative_area"],"administrative_area_type":"island","subdivision_depth":1}
 {"country_code":"TW","locale":"zh-Hant","format":"%family_name %given_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality, %administrative_area %postal_code","local_format":"%postal_code\n%administrative_area%locality\n%address_line1\n%address_line2\n%address_line3\n%organization\n%family_name %given_name","required_fields":["address_line1","locality","administrative_area","postal_code"],"administrative_area_type":"county","postal_code_pattern":"\\d{3}(?:\\d{2,3})?","subdivision_depth":2}
 {"country_code":"TZ","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"\\d{4,5}"}
-{"country_code":"UA","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality\n%administrative_area\n%postal_code","required_fields":["address_line1","locality","postal_code"],"administrative_area_type":"oblast","postal_code_pattern":"\\d{5}","subdivision_depth":1}
+{"country_code":"UA","format":"%family_name %given_name %additional_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality\n%administrative_area\n%postal_code","required_fields":["address_line1","locality","postal_code"],"administrative_area_type":"oblast","postal_code_pattern":"\\d{5}","subdivision_depth":1}
 {"country_code":"UM","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %administrative_area %postal_code","required_fields":["address_line1","locality","administrative_area"],"uppercase_fields":["address_line1","address_line2","locality","family_name","additional_name","given_name","organization","administrative_area"],"administrative_area_type":"state","postal_code_type":"zip","postal_code_pattern":"96898"}
 {"country_code":"US","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality, %administrative_area %postal_code","required_fields":["address_line1","locality","administrative_area","postal_code"],"uppercase_fields":["locality","administrative_area"],"administrative_area_type":"state","postal_code_type":"zip","postal_code_pattern":"(\\d{5})(?:[ \\-](\\d{4}))?","subdivision_depth":1}
 {"country_code":"UY","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality %administrative_area","uppercase_fields":["locality","administrative_area"],"postal_code_pattern":"\\d{5}","subdivision_depth":1}
-{"country_code":"UZ","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality\n%administrative_area","uppercase_fields":["locality","administrative_area"],"postal_code_pattern":"\\d{6}"}
+{"country_code":"UZ","format":"%given_name %additional_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality\n%administrative_area","uppercase_fields":["locality","administrative_area"],"postal_code_pattern":"\\d{6}"}
 {"country_code":"VA","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%postal_code %locality","postal_code_pattern":"00120"}
 {"country_code":"VC","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %postal_code","postal_code_pattern":"VC\\d{4}"}
 {"country_code":"VE","format":"%given_name %family_name\n%organization\n%address_line1\n%address_line2\n%address_line3\n%locality %postal_code, %administrative_area","required_fields":["address_line1","locality","administrative_area"],"uppercase_fields":["locality","administrative_area"],"administrative_area_type":"state","postal_code_pattern":"\\d{4}","subdivision_depth":1}
diff --git a/data/country/as.json b/data/country/as.json
index 8fb5043..b872d7b 100644
--- a/data/country/as.json
+++ b/data/country/as.json
@@ -139,7 +139,7 @@
 	"TJ": "তাজিকিস্তান",
 	"TZ": "তাঞ্জানিয়া",
 	"TM": "তুৰ্কমেনিস্তান",
-	"TR": "তুৰ্কি",
+	"TR": "তুৰ্কিয়ে",
 	"TA": "ত্ৰিস্তান দ্যা কুনহা",
 	"TH": "থাইলেণ্ড",
 	"ZA": "দক্ষিণ আফ্রিকা",
diff --git a/data/country/chr.json b/data/country/chr.json
deleted file mode 100644
index cafcece..0000000
--- a/data/country/chr.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
-	"AM": "ᎠᎵᎻᏂᎠ",
-	"AL": "ᎠᎵᏇᏂᏯ",
-	"DZ": "ᎠᎵᏥᎵᏯ",
-	"AW": "ᎠᎷᏆ",
-	"AS": "ᎠᎺᎵᎧ ᏌᎼᎠ",
-	"GF": "ᎠᏂᎦᎸᏥ ᎩᎠ",
-	"PF": "ᎠᏂᎦᎸᏥ ᏆᎵᏂᏏᎠ",
-	"TF": "ᎠᏂᎦᎸᏥ ᏧᎦᎾᏮ ᎦᏙᎯ ᎤᎵᏍᏛᎢ",
-	"AI": "ᎠᏂᎩᎳ",
-	"AO": "ᎠᏂᎪᎳ",
-	"PH": "ᎠᏂᏈᎵᎩᏃ",
-	"MX": "ᎠᏂᏍᏆᏂ",
-	"ES": "ᎠᏂᏍᏆᏂᏱ",
-	"AD": "ᎠᏂᏙᎳ",
-	"TC": "ᎠᏂᏛᎵᎩ ᎠᎴ ᎨᎢᎪ ᏚᎦᏚᏛᎢ",
-	"DE": "ᎠᏂᏛᏥ",
-	"AT": "ᎠᏍᏟᏯ",
-	"AZ": "ᎠᏎᏆᏣᏂ",
-	"CK": "ᎠᏓᏍᏓᏴᎲᏍᎩ ᏚᎦᏚᏛᎢ",
-	"VA": "ᎠᏥᎳᏁᏠ ᎦᏚᎲ",
-	"AR": "ᎠᏥᏂᏘᏂᎠ",
-	"AF": "ᎠᏫᎨᏂᏍᏖᏂ",
-	"IE": "ᎠᏲᎳᏂ",
-	"AU": "ᎡᎳᏗᏜ",
-	"SV": "ᎡᎵᏌᎵᏆᏙᎵ",
-	"ER": "ᎡᎵᏟᏯ",
-	"EC": "ᎡᏆᏙᎵ",
-	"GQ": "ᎡᏆᏙᎵᎠᎵ ᎩᎢᏂ",
-	"EE": "ᎡᏍᏙᏂᏯ",
-	"SZ": "ᎡᏍᏩᏘᏂ",
-	"CV": "ᎢᎬᎾᏕᎾ ᎢᏤᏳᏍᏗ",
-	"IQ": "ᎢᎳᎩ",
-	"IR": "ᎢᎴᏂ",
-	"ID": "ᎢᏂᏙᏂᏍᏯ",
-	"IN": "ᎢᏅᏗᎾ",
-	"IL": "ᎢᏏᎵᏱ",
-	"IT": "ᎢᏔᎵ",
-	"ET": "ᎢᏗᎣᏈᎠ",
-	"NC": "ᎢᏤ ᎧᎵᏙᏂᎠᏂ",
-	"NZ": "ᎢᏤ ᏏᎢᎴᏂᏗ",
-	"GL": "ᎢᏤᏍᏛᏱ",
-	"EG": "ᎢᏥᏈᎢ",
-	"CI": "ᎢᏬᎵ ᎾᎿ ᎠᎹᏳᎶᏗ",
-	"AX": "ᎣᎴᏅᏓ ᏚᎦᏚᏛᎢ",
-	"OM": "ᎣᎺᏂ",
-	"AC": "ᎤᎵᏌᎳᏓᏅ ᎤᎦᏚᏛᎢ",
-	"UZ": "ᎤᏍᏇᎩᏍᏖᏂ",
-	"IM": "ᎤᏍᏗ ᎤᎦᏚᏛᎢ ᎾᎿ ᎠᏍᎦᏯ",
-	"KN": "ᎤᏓᏅᏘ ᎨᏘᏏ ᎠᎴ ᏁᏪᏏ",
-	"SH": "ᎤᏓᏅᏘ ᎮᎵᎾ",
-	"LC": "ᎤᏓᏅᏘ ᎷᏏᏯ",
-	"SM": "ᎤᏓᏅᏘ ᎹᎵᎢᏃ",
-	"BL": "ᎤᏓᏅᏘ ᏆᏕᎳᎻ",
-	"PM": "ᎤᏓᏅᏘ ᏈᏰ ᎠᎴ ᎻᏇᎶᏂ",
-	"MF": "ᎤᏓᏅᏘ ᏡᏡ",
-	"VC": "ᎤᏓᏅᏘ ᏫᏂᏏᏂᏗ ᎠᎴ ᎾᏍᎩ ᏇᎾᏗᏁᏍ",
-	"AG": "ᎤᏪᏘ & ᏆᏊᏓ",
-	"GH": "ᎦᎠᎾ",
-	"FR": "ᎦᎸᏥᏱ",
-	"GM": "ᎦᎹᏈᎢᎠ",
-	"CP": "ᎦᏂᏴᏔᏅᎣᏓᎸ ᎤᎦᏚᏛᎢ",
-	"GA": "ᎦᏉᏂ",
-	"GY": "ᎦᏯᎾ",
-	"KI": "ᎧᎵᏆᏘ",
-	"BQ": "ᎧᎵᏈᎢᏂᎯ ᎾᏍᎩᏁᏛᎳᏂ",
-	"HR": "ᎧᎶᎡᏏᎠ",
-	"CM": "ᎧᎹᎷᏂ",
-	"KH": "ᎧᎹᏉᏗᎠᏂ",
-	"CD": "ᎧᏂᎪ - ᎨᏂᏝᏌ",
-	"CG": "ᎧᏂᎪ - ᏆᏌᏩᎵ",
-	"KZ": "ᎧᏎᎧᏍᏕᏂ",
-	"QA": "ᎧᏔᎵ",
-	"KY": "ᎨᎢᎹᏂ ᏚᎦᏚᏛᎢ",
-	"CA": "ᎨᎾᏓ",
-	"KE": "ᎨᏂᏯ",
-	"GN": "ᎩᎢᏂ",
-	"GW": "ᎩᎢᏂ-ᏈᏌᎤᏫ",
-	"GB": "ᎩᎵᏏᏲ",
-	"KG": "ᎩᎵᏣᎢᏍ",
-	"GR": "ᎪᎢᎯ",
-	"CC": "ᎪᎪᏍ (ᎩᎵᏂ) ᏚᎦᏚᏛᎢ",
-	"CO": "ᎪᎸᎻᏈᎢᎠ",
-	"KM": "ᎪᎼᎳᏍ",
-	"CR": "ᎪᏍᏓ ᎵᎧ",
-	"XK": "ᎪᏐᏉ",
-	"CW": "ᎫᎳᎨᎣ",
-	"CU": "ᎫᏆ",
-	"KW": "ᎫᏪᎢᏘ",
-	"CF": "ᎬᎿᎨᏍᏛ ᎠᏰᏟ ᏍᎦᏚᎩ",
-	"GG": "ᎬᏂᏏ",
-	"TR": "ᎬᏃ",
-	"HN": "ᎭᏂᏚᎳᏍ",
-	"HT": "ᎮᎢᏘ",
-	"HK": "ᎰᏂᎩ ᎪᏂᎩ ᎤᏓᏤᎵᏓ ᏧᏂᎸᏫᏍᏓᏁᏗ ᎢᎬᎾᏕᎾ ᏓᎶᏂᎨᏍᏛ",
-	"HU": "ᎲᏂᎦᎵ",
-	"HM": "ᎲᏗ ᎤᎦᏚᏛᎢ ᎠᎴ ᎺᎩᏓᎾᎵᏗ ᏚᎦᏚᏛᎢ",
-	"LR": "ᎳᏈᎵᏯ",
-	"LV": "ᎳᏘᏫᎠ",
-	"LA": "ᎴᎣᏍ",
-	"LB": "ᎴᏆᎾᏂ",
-	"LS": "ᎴᏐᏙ",
-	"RE": "ᎴᏳᏂᎠᏂ",
-	"LI": "ᎵᎦᏗᏂᏍᏓᏂ",
-	"LY": "ᎵᏈᏯ",
-	"LT": "ᎵᏗᏪᏂᎠ",
-	"RO": "ᎶᎹᏂᏯ",
-	"RW": "ᎶᏩᏂᏓ",
-	"LU": "ᎸᎧᏎᏋᎩ",
-	"FM": "ᎹᎢᏉᏂᏏᏯ",
-	"MO": "ᎹᎧᎣ (ᎤᏓᏤᎵᏓ ᏧᏂᎸᏫᏍᏓᏁᏗ ᎢᎬᎾᏕᎾ) ᏣᎢ",
-	"MW": "ᎹᎳᏫ",
-	"MY": "ᎹᎴᏏᎢᎠ",
-	"ML": "ᎹᎵ",
-	"MT": "ᎹᎵᏔ",
-	"MV": "ᎹᎵᏗᏫᏍ",
-	"MD": "ᎹᎵᏙᏫᎠ",
-	"MC": "ᎹᎾᎪ",
-	"MN": "ᎹᏂᎪᎵᎠ",
-	"MS": "ᎹᏂᏘᏌᎳᏗ",
-	"MH": "ᎹᏌᎵ ᏚᎦᏚᏛᎢ",
-	"MG": "ᎹᏓᎦᏍᎧᎵ",
-	"MR": "ᎹᏘᎢᏯ",
-	"MQ": "ᎹᏘᏂᎨ",
-	"MM": "ᎹᏯᎹᎵ (ᏇᎵᎹ)",
-	"YT": "ᎺᏯᏖ",
-	"MU": "ᎼᎵᏏᎥᏍ",
-	"MA": "ᎼᎶᎪ",
-	"ME": "ᎼᏂᏔᏁᎦᎶ",
-	"MZ": "ᎼᏎᎻᏇᎩ",
-	"NE": "ᎾᎢᏨ",
-	"NA": "ᎾᎻᏈᎢᏯ",
-	"BS": "ᎾᏍᎩ ᏆᎭᎹᏍ",
-	"NP": "ᏁᏆᎵ",
-	"NL": "ᏁᏛᎳᏂ",
-	"NI": "ᏂᎧᎳᏆ",
-	"NG": "ᏂᏥᎵᏯ",
-	"NU": "ᏂᏳ",
-	"NR": "ᏃᎤᎷ",
-	"NF": "ᏃᎵᏬᎵᎩ ᎤᎦᏚᏛᎢ",
-	"NO": "ᏃᏪ",
-	"PK": "ᏆᎩᏍᏖᏂ",
-	"BH": "ᏆᎭᎴᎢᏂ",
-	"PY": "ᏆᎳᏇᎢᏯ",
-	"PW": "ᏆᎴᎠᏫ",
-	"PS": "ᏆᎴᏍᏗᏂᎠᏂ ᏄᎬᏫᏳᏌᏕᎩ",
-	"GU": "ᏆᎻ",
-	"PA": "ᏆᎾᎹ",
-	"BJ": "ᏆᏂᎢᏂ",
-	"BD": "ᏆᏂᎦᎵᏕᏍ",
-	"PG": "ᏆᏇ ᎢᏤ ᎩᎢᏂ",
-	"BB": "ᏆᏇᏙᏍ",
-	"BM": "ᏆᏊᏓ",
-	"BR": "ᏆᏏᎵ",
-	"BW": "ᏆᏣᏩᎾ",
-	"PR": "ᏇᎡᏙ ᎵᎢᎪ",
-	"BY": "ᏇᎳᎷᏍ",
-	"BZ": "ᏇᎵᏍ",
-	"BE": "ᏇᎵᏥᎥᎻ",
-	"PE": "ᏇᎷ",
-	"PN": "ᏈᎧᎵᏂ ᏚᎦᏚᏛᎢ",
-	"VG": "ᏈᏗᏍ ᎠᏒᏂᎸ ᏂᎨᏒᎾ ᏚᎦᏚᏛᎢ",
-	"IO": "ᏈᏗᏏ ᏴᏫᏯ ᎠᎺᏉ ᎢᎬᎾᏕᏅ",
-	"PL": "ᏉᎳᏂ",
-	"BO": "ᏉᎵᏫᎠ",
-	"BA": "ᏉᏏᏂᎠ & ᎲᏤᎪᏫᎾ",
-	"PT": "ᏉᏥᎦᎳ",
-	"BG": "ᏊᎵᎨᎵᎠ",
-	"BN": "ᏊᎾᎢ",
-	"BT": "ᏊᏔᏂ",
-	"BV": "ᏊᏪ ᎤᎦᏚᏛᎢ",
-	"BF": "ᏋᎩᎾ ᏩᏐ",
-	"BI": "ᏋᎷᏂᏗ",
-	"GD": "ᏋᎾᏓ",
-	"CY": "ᏌᎢᏆᏍ",
-	"ST": "ᏌᎣ ᏙᎺ ᎠᎴ ᏈᏂᏏᏇ",
-	"SA": "ᏌᎤᏗ ᎡᎴᏈᎠ",
-	"ZM": "ᏌᎻᏈᏯ",
-	"WS": "ᏌᎼᎠ",
-	"AE": "ᏌᏊ ᎢᏳᎾᎵᏍᏔᏅ ᎡᎳᏈ ᎢᎹᎵᏘᏏ",
-	"US": "ᏌᏊ ᎢᏳᎾᎵᏍᏔᏅ ᏍᎦᏚᎩ",
-	"LK": "ᏍᎵ ᎳᏂᎧ",
-	"SK": "ᏍᎶᏩᎩᎠ",
-	"SI": "ᏍᎶᏫᏂᎠ",
-	"SJ": "ᏍᏩᎵᏆᎵᏗ ᎠᎴ ᏤᏂ ᎹᏰᏂ",
-	"CH": "ᏍᏫᏍ",
-	"SE": "ᏍᏫᏕᏂ",
-	"SL": "ᏏᎡᎳ ᎴᎣᏂ",
-	"SC": "ᏏᎡᏥᎵᏍ",
-	"SY": "ᏏᎵᎠ",
-	"ZW": "ᏏᎻᏆᏇ",
-	"SN": "ᏏᏂᎦᎵ",
-	"SG": "ᏏᏂᎦᏉᎵ",
-	"SX": "ᏏᏂᏘ ᎹᏘᏂ",
-	"SB": "ᏐᎶᎹᏂ ᏚᎦᏚᏛᎢ",
-	"SO": "ᏐᎹᎵ",
-	"EA": "ᏑᏔ ᎠᎴ ᎺᎵᏯ",
-	"SD": "ᏑᏕᏂ",
-	"SR": "ᏒᎵᎾᎻ",
-	"RS": "ᏒᏈᏯ",
-	"CN": "ᏓᎶᏂᎨᏍᏛ",
-	"CX": "ᏓᏂᏍᏓᏲᎯᎲ ᎤᎦᏚᏛᎢ",
-	"TW": "ᏔᎢᏩᏂ",
-	"TJ": "ᏔᏥᎩᏍᏕᏂ",
-	"TH": "ᏔᏯᎴᏂ",
-	"TZ": "ᏖᏂᏏᏂᏯ",
-	"DK": "ᏗᏂᎹᎦ",
-	"DG": "ᏗᏰᎪ ᎦᏏᏯ",
-	"TL": "ᏘᎼᎵ-ᎴᏍᏖ",
-	"TK": "ᏙᎨᎳᏭ",
-	"TG": "ᏙᎪ",
-	"DM": "ᏙᎻᏂᎧ",
-	"DO": "ᏙᎻᏂᎧᏂ ᏍᎦᏚᎩ",
-	"TO": "ᏙᎾᎦ",
-	"TN": "ᏚᏂᏏᏍᎠ",
-	"TV": "ᏚᏩᎷ",
-	"TM": "ᏛᎵᎩᎺᏂᏍᏔᏂ",
-	"TT": "ᏟᏂᏕᏗ ᎠᎴ ᏙᏆᎪ",
-	"TA": "ᏟᏍᏛᏂ Ꮣ ᎫᎾᎭ",
-	"GE": "ᏣᎠᏥᎢ",
-	"JM": "ᏣᎺᎢᎧ",
-	"TD": "ᏣᏗ",
-	"JP": "ᏣᏩᏂᏏ",
-	"CZ": "ᏤᎩᎠ",
-	"CL": "ᏥᎵ",
-	"GI": "ᏥᏆᎵᏓ",
-	"DJ": "ᏥᏊᏗ",
-	"IC": "ᏥᏍᏆ ᏚᎦᏚᏛᎢ",
-	"JO": "ᏦᏓᏂ",
-	"ZA": "ᏧᎦᎾᏮ ᎬᎿᎨᏍᏛ",
-	"SS": "ᏧᎦᎾᏮ ᏑᏕᏂ",
-	"KR": "ᏧᎦᏃᏮ ᎪᎵᎠ",
-	"GS": "ᏧᎦᏃᏮ ᏣᎠᏥᎢ ᎠᎴ ᎾᏍᎩ ᏧᎦᏃᏮ ᎠᏍᏛᎭᏟ ᏚᎦᏚᏛᎢ",
-	"AQ": "ᏧᏁᏍᏓᎸ",
-	"IS": "ᏧᏁᏍᏓᎸᎯ",
-	"MK": "ᏧᏴᏜ ᎹᏎᏙᏂᏯ",
-	"KP": "ᏧᏴᏢ ᎪᎵᎠ",
-	"MP": "ᏧᏴᏢ ᏗᏜ ᎹᎵᎠᎾ ᏚᎦᏚᏛᎢ",
-	"JE": "ᏨᎵᏏ",
-	"FK": "ᏩᎩ ᏚᎦᏚᏛᎢ",
-	"WF": "ᏩᎵᏍ ᎠᎴ ᏊᏚᎾ",
-	"VU": "ᏩᏂᎤᏩᏚ",
-	"GP": "ᏩᏓᎷᏇ",
-	"GT": "ᏩᏔᎹᎳ",
-	"FO": "ᏪᎶ ᏚᎦᏚᏛᎢ",
-	"VE": "ᏪᏁᏑᏪᎳ",
-	"VN": "ᏫᎡᏘᎾᎻ",
-	"FI": "ᏫᏂᎦᏙᎯ",
-	"FJ": "ᏫᏥ",
-	"EH": "ᏭᏕᎵᎬ ᏗᏜ ᏌᎮᎳ",
-	"YE": "ᏰᎺᏂ",
-	"RU": "ᏲᏂᎢ",
-	"UG": "ᏳᎦᏂᏓ",
-	"UA": "ᏳᎧᎴᏂ",
-	"UY": "ᏳᎷᏇ",
-	"UM": "U.S. ᎠᏍᏛ ᏚᎦᏚᏛᎢ",
-	"VI": "U.S. ᎠᏒᏂᎸ ᏂᎨᏒᎾ ᏚᎦᏚᏛᎢ"
-}
\ No newline at end of file
diff --git a/data/country/dsb.json b/data/country/dsb.json
deleted file mode 100644
index 09c3141..0000000
--- a/data/country/dsb.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
-	"AF": "Afghanistan",
-	"AX": "Åland",
-	"AL": "Albańska",
-	"DZ": "Algeriska",
-	"UM": "Ameriska Oceaniska",
-	"AS": "Ameriska Samoa",
-	"VI": "Ameriske kněžniske kupy",
-	"AD": "Andorra",
-	"AO": "Angola",
-	"AI": "Anguilla",
-	"AQ": "Antarktis",
-	"AG": "Antigua a Barbuda",
-	"AR": "Argentinska",
-	"AM": "Armeńska",
-	"AW": "Aruba",
-	"AC": "Ascension",
-	"AU": "Awstralska",
-	"AT": "Awstriska",
-	"AZ": "Azerbajdžan",
-	"BS": "Bahamy",
-	"BH": "Bahrain",
-	"BD": "Bangladeš",
-	"BB": "Barbados",
-	"BE": "Belgiska",
-	"BZ": "Belize",
-	"BJ": "Benin",
-	"BM": "Bermudy",
-	"BY": "Běłoruska",
-	"BT": "Bhutan",
-	"BO": "Boliwiska",
-	"BA": "Bosniska a Hercegowina",
-	"BW": "Botswana",
-	"BV": "Bouvetowa kupa",
-	"BR": "Brazilska",
-	"VG": "Britiske kněžniske kupy",
-	"IO": "Britiski indiskooceaniski teritorium",
-	"BN": "Brunei",
-	"BG": "Bulgarska",
-	"BF": "Burkina Faso",
-	"BI": "Burundi",
-	"ME": "Carna Góra",
-	"CF": "Centralnoafriska republika",
-	"EA": "Ceuta a Melilla",
-	"CP": "Clippertonowa kupa",
-	"CK": "Cookowe kupy",
-	"CI": "Côte d’Ivoire",
-	"CW": "Curaçao",
-	"CY": "Cypriska",
-	"TD": "Čad",
-	"CZ": "Česka republika",
-	"DK": "Dańska",
-	"DG": "Diego Garcia",
-	"DM": "Dominika",
-	"DO": "Dominikańska republika",
-	"DJ": "Džibuti",
-	"EG": "Egyptojska",
-	"EC": "Ekwador",
-	"GQ": "Ekwatorialna Gineja",
-	"SV": "El Salvador",
-	"ER": "Eritreja",
-	"EE": "Estniska",
-	"ET": "Etiopiska",
-	"FK": "Falklandske kupy",
-	"FO": "Färöje",
-	"FJ": "Fidži",
-	"PH": "Filipiny",
-	"FI": "Finska",
-	"FR": "Francojska",
-	"GF": "Francojska Guyana",
-	"PF": "Francojska Polyneziska",
-	"TF": "Francojski pódpołdnjowy a antarktiski teritorium",
-	"GA": "Gabun",
-	"GM": "Gambija",
-	"GE": "Georgiska",
-	"GH": "Ghana",
-	"GI": "Gibraltar",
-	"GN": "Gineja",
-	"GW": "Gineja-Bissau",
-	"CX": "Gódowne kupy",
-	"GD": "Grenada",
-	"GR": "Grichiska",
-	"GL": "Grönlandska",
-	"GP": "Guadeloupe",
-	"GU": "Guam",
-	"GT": "Guatemala",
-	"GG": "Guernsey",
-	"GY": "Guyana",
-	"HT": "Haiti",
-	"HM": "Heardowa kupa a McDonaldowe kupy",
-	"HN": "Honduras",
-	"HU": "Hungorska",
-	"CL": "Chilska",
-	"CN": "China",
-	"HR": "Chorwatska",
-	"IN": "Indiska",
-	"ID": "Indoneziska",
-	"IQ": "Irak",
-	"IR": "Iran",
-	"IE": "Irska",
-	"IS": "Islandska",
-	"IL": "Israel",
-	"IT": "Italska",
-	"JM": "Jamaika",
-	"JP": "Japańska",
-	"YE": "Jemen",
-	"JE": "Jersey",
-	"JO": "Jordaniska",
-	"KY": "Kajmaniske kupy",
-	"KH": "Kambodža",
-	"CM": "Kamerun",
-	"CA": "Kanada",
-	"IC": "Kanariske kupy",
-	"CV": "Kap Verde",
-	"BQ": "Karibiska Nižozemska",
-	"QA": "Katar",
-	"KZ": "Kazachstan",
-	"KE": "Kenia",
-	"KG": "Kirgizistan",
-	"KI": "Kiribati",
-	"CC": "Kokosowe kupy",
-	"CO": "Kolumbiska",
-	"KM": "Komory",
-	"CG": "Kongo-Brazzaville",
-	"CD": "Kongo-Kinshasa",
-	"XK": "Kosowo",
-	"CR": "Kosta Rika",
-	"CU": "Kuba",
-	"KW": "Kuwait",
-	"LA": "Laos",
-	"LS": "Lesotho",
-	"LV": "Letiska",
-	"LB": "Libanon",
-	"LR": "Liberija",
-	"LY": "Libyska",
-	"LI": "Liechtenstein",
-	"LT": "Litawska",
-	"LU": "Luxemburgska",
-	"MG": "Madagaskar",
-	"MY": "Malajzija",
-	"MW": "Malawi",
-	"MV": "Malediwy",
-	"ML": "Mali",
-	"MT": "Malta",
-	"IM": "Man",
-	"MA": "Marokko",
-	"MH": "Marshallowe kupy",
-	"MQ": "Martinique",
-	"MU": "Mauritius",
-	"MR": "Mawretańska",
-	"YT": "Mayotte",
-	"MX": "Mexiko",
-	"FM": "Mikroneziska",
-	"MD": "Moldawska",
-	"MC": "Monaco",
-	"MN": "Mongolska",
-	"MS": "Montserrat",
-	"MZ": "Mosambik",
-	"MM": "Myanmar",
-	"NA": "Namibija",
-	"NR": "Nauru",
-	"NP": "Nepal",
-	"NE": "Niger",
-	"NG": "Nigerija",
-	"NI": "Nikaragua",
-	"DE": "Nimska",
-	"NU": "Niue",
-	"NL": "Nižozemska",
-	"NF": "Norfolkowa kupa",
-	"NO": "Norwegska",
-	"NC": "Nowa Kaledoniska",
-	"NZ": "Nowoseelandska",
-	"OM": "Oman",
-	"PK": "Pakistan",
-	"PW": "Palau",
-	"PS": "Palestinski awtonomny teritorium",
-	"PA": "Panama",
-	"PG": "Papua-Neuguinea",
-	"PY": "Paraguay",
-	"PE": "Peru",
-	"PN": "Pitcairnowe kupy",
-	"ZA": "Pódpołdnjowa Afrika (Republika)",
-	"GS": "Pódpołdnjowa Georgiska a Pódpołdnjowe Sandwichowe kupy",
-	"KR": "Pódpołdnjowa Koreja",
-	"SS": "Pódpołdnjowy Sudan",
-	"KP": "Pódpołnocna Koreja",
-	"MK": "Pódpołnocna Makedańska",
-	"MP": "Pódpołnocne Mariany",
-	"EH": "Pódwjacorna Sahara",
-	"PL": "Pólska",
-	"PT": "Portugalska",
-	"PR": "Puerto Rico",
-	"RE": "Réunion",
-	"RW": "Ruanda",
-	"RO": "Rumuńska",
-	"RU": "Ruska",
-	"SB": "Salomony",
-	"ZM": "Sambija",
-	"WS": "Samoa",
-	"SM": "San Marino",
-	"ST": "São Tomé a Príncipe",
-	"SA": "Saudi-Arabiska",
-	"SN": "Senegal",
-	"RS": "Serbiska",
-	"SC": "Seychelle",
-	"SL": "Sierra Leone",
-	"ZW": "Simbabwe",
-	"SG": "Singapur",
-	"SX": "Sint Maarten",
-	"SK": "Słowakska",
-	"SI": "Słowjeńska",
-	"SO": "Somalija",
-	"LK": "Sri Lanka",
-	"BL": "St. Barthélemy",
-	"SH": "St. Helena",
-	"KN": "St. Kitts a Nevis",
-	"LC": "St. Lucia",
-	"MF": "St. Martin",
-	"PM": "St. Pierre a Miquelon",
-	"VC": "St. Vincent a Grenadiny",
-	"SD": "Sudan",
-	"SR": "Surinamska",
-	"SJ": "Svalbard a Jan Mayen",
-	"SZ": "Swasiska",
-	"SY": "Syriska",
-	"ES": "Špańska",
-	"SE": "Šwedska",
-	"CH": "Šwicarska",
-	"TJ": "Tadźikistan",
-	"TW": "Taiwan",
-	"TZ": "Tansanija",
-	"TH": "Thailandska",
-	"TL": "Timor-Leste",
-	"TG": "Togo",
-	"TK": "Tokelau",
-	"TO": "Tonga",
-	"TT": "Trinidad a Tobago",
-	"TA": "Tristan da Cunha",
-	"TN": "Tuneziska",
-	"TM": "Turkmeniska",
-	"TR": "Turkojska",
-	"TC": "Turks a Caicos kupy",
-	"TV": "Tuvalu",
-	"UG": "Uganda",
-	"UA": "Ukraina",
-	"UY": "Uruguay",
-	"UZ": "Uzbekistan",
-	"VU": "Vanuatu",
-	"VA": "Vatikańske město",
-	"VE": "Venezuela",
-	"VN": "Vietnam",
-	"WF": "Wallis a Futuna",
-	"HK": "Wósebna zastojnstwowa cona Hongkong",
-	"MO": "Wósebna zastojnstwowa cona Macao",
-	"AE": "Zjadnośone arabiske emiraty",
-	"GB": "Zjadnośone kralejstwo",
-	"US": "Zjadnośone staty Ameriki"
-}
\ No newline at end of file
diff --git a/data/country/el-polyton.json b/data/country/el-polyton.json
new file mode 100644
index 0000000..dd0bbd9
--- /dev/null
+++ b/data/country/el-polyton.json
@@ -0,0 +1,258 @@
+{
+	"VA": "Ἁγία Ἕδρα (Βατικανό)",
+	"SH": "Ἁγία Ἑλένη",
+	"LC": "Ἁγία Λουκία",
+	"BL": "Άγιος Βαρθολομαίος",
+	"VC": "Ἅγιος Βικέντιος καὶ Γρεναδίνες",
+	"SM": "Ἅγιος Μαρίνος",
+	"MF": "Άγιος Μαρτίνος (Γαλλικό τμήμα)",
+	"SX": "Άγιος Μαρτίνος (Ολλανδικό τμήμα)",
+	"AZ": "Ἀζερμπαϊτζάν",
+	"EG": "Αἴγυπτος",
+	"ET": "Αἰθιοπία",
+	"HT": "Ἁϊτή",
+	"CI": "Ακτή Ελεφαντοστού",
+	"AL": "Ἀλβανία",
+	"DZ": "Ἀλγερία",
+	"VI": "Ἀμερικανικὲς Παρθένοι Νῆσοι",
+	"AS": "Ἀμερικανικὴ Σαμόα",
+	"TL": "Ἀνατολικὸ Τιμόρ",
+	"AO": "Ἀνγκόλα",
+	"AI": "Ἀνγκουίλα",
+	"AD": "Ἀνδόρα",
+	"AQ": "Ἀνταρκτική",
+	"AG": "Ἀντίγκουα καὶ Μπαρμπούντα",
+	"UM": "Ἀπομακρυσμένες Νησίδες τῶν Ἡνωμένων Πολιτειῶν",
+	"AR": "Ἀργεντινή",
+	"AM": "Ἀρμενία",
+	"AW": "Ἀρούμπα",
+	"AU": "Αὐστραλία",
+	"AT": "Αὐστρία",
+	"AF": "Ἀφγανιστάν",
+	"VU": "Βανουάτου",
+	"BE": "Βέλγιο",
+	"VE": "Βενεζουέλα",
+	"BM": "Βερμοῦδες",
+	"VN": "Βιετνάμ",
+	"BO": "Βολιβία",
+	"KP": "Βόρεια Κορέα",
+	"MK": "Βόρεια Μακεδονία",
+	"BA": "Βοσνία - Ἐρζεγοβίνη",
+	"BG": "Βουλγαρία",
+	"BR": "Βραζιλία",
+	"IO": "Βρετανικὰ Ἐδάφη Ἰνδικοῦ Ὠκεανοῦ",
+	"VG": "Βρετανικὲς Παρθένοι Νῆσοι",
+	"FR": "Γαλλία",
+	"TF": "Γαλλικὰ Νότια Ἐδάφη",
+	"GF": "Γαλλικὴ Γουιάνα",
+	"PF": "Γαλλικὴ Πολυνησία",
+	"DE": "Γερμανία",
+	"GE": "Γεωργία",
+	"GI": "Γιβραλτάρ",
+	"GM": "Γκάμπια",
+	"GA": "Γκαμπόν",
+	"GH": "Γκάνα",
+	"GG": "Γκέρνζι",
+	"GU": "Γκουάμ",
+	"GP": "Γουαδελούπη",
+	"GT": "Γουατεμάλα",
+	"GY": "Γουιάνα",
+	"GN": "Γουινέα",
+	"GW": "Γουινέα Μπισάου",
+	"GD": "Γρενάδα",
+	"GL": "Γροιλανδία",
+	"DK": "Δανία",
+	"DO": "Δομινικανὴ Δημοκρατία",
+	"EH": "Δυτικὴ Σαχάρα",
+	"SV": "Ἒλ Σαλβαδόρ",
+	"CH": "Ἑλβετία",
+	"GR": "Ἑλλάδα",
+	"ER": "Ἐρυθραία",
+	"EE": "Ἐσθονία",
+	"SZ": "Εσουατίνι",
+	"ZM": "Ζάμπια",
+	"ZW": "Ζιμπάμπουε",
+	"AE": "Ἠνωμένα Ἀραβικὰ Ἐμιράτα",
+	"US": "Ἡνωμένες Πολιτεῖες",
+	"GB": "Ἡνωμένο Βασίλειο",
+	"EA": "Θέουτα και Μελίγια",
+	"JP": "Ἰαπωνία",
+	"IN": "Ἰνδία",
+	"ID": "Ἰνδονησία",
+	"JO": "Ἰορδανία",
+	"IQ": "Ἰράκ",
+	"IR": "Ἰράν, Ἰσλαμικὴ Δημοκρατία τοῦ",
+	"IE": "Ἰρλανδία",
+	"GQ": "Ἰσημερινὴ Γουινέα",
+	"EC": "Ἰσημερινός",
+	"IS": "Ἰσλανδία",
+	"ES": "Ἱσπανία",
+	"IL": "Ἰσραήλ",
+	"IT": "Ἰταλία",
+	"KZ": "Καζακστάν",
+	"CM": "Καμερούν",
+	"KH": "Καμπότζη",
+	"CA": "Καναδάς",
+	"IC": "Κανάριοι Νήσοι",
+	"QA": "Κατάρ",
+	"CF": "Κεντροαφρικανικὴ Δημοκρατία",
+	"KE": "Κένυα",
+	"CN": "Κίνα",
+	"KG": "Κιργιστάν",
+	"KI": "Κιριμπάτι",
+	"CO": "Κολομβία",
+	"KM": "Κομόρες",
+	"CG": "Κονγκό - Μπραζαβίλ",
+	"CD": "Κονγκό, Λαϊκὴ Δημοκρατία τοῦ",
+	"XK": "Κοσσυφοπέδιο",
+	"CR": "Κόστα Ρίκα",
+	"CU": "Κούβα",
+	"KW": "Κουβέιτ",
+	"CW": "Κουρασάο",
+	"HR": "Κροατία",
+	"CY": "Κύπρος",
+	"LA": "Λατινικὴ Ἀμερική",
+	"LS": "Λεσότο",
+	"LV": "Λετονία",
+	"BY": "Λευκορωσία",
+	"LB": "Λίβανος",
+	"LR": "Λιβερία",
+	"LY": "Λιβύη",
+	"LT": "Λιθουανία",
+	"LI": "Λιχτενστάιν",
+	"LU": "Λουξεμβοῦργο",
+	"YT": "Μαγιότ",
+	"MG": "Μαδαγασκάρη",
+	"MO": "Μακάο, Εἰδικὴ Διοικητικὴ Περιφέρεια τῆς Κίνας",
+	"MY": "Μαλαισία",
+	"MW": "Μαλάουι",
+	"MV": "Μαλδίβες",
+	"ML": "Μαλί",
+	"MT": "Μάλτα",
+	"MA": "Μαρόκο",
+	"MQ": "Μαρτινίκα",
+	"MU": "Μαυρίκιος",
+	"MR": "Μαυριτανία",
+	"ME": "Μαυροβούνιο",
+	"MX": "Μεξικό",
+	"MM": "Μιανμάρ (Βιρμανία)",
+	"FM": "Μικρονησία, Ὁμόσπονδες Πολιτεῖες τῆς",
+	"MN": "Μογγολία",
+	"MZ": "Μοζαμβίκη",
+	"MD": "Μολδαβία, Δημοκρατία τῆς",
+	"MC": "Μονακό",
+	"MS": "Μονσεράτ",
+	"BD": "Μπανγκλαντές",
+	"BB": "Μπαρμπέιντος",
+	"BS": "Μπαχάμες",
+	"BH": "Μπαχρέιν",
+	"BZ": "Μπελίζ",
+	"BJ": "Μπενίν",
+	"BW": "Μποτσουάνα",
+	"BF": "Μπουρκίνα Φάσο",
+	"BI": "Μπουρούντι",
+	"BT": "Μπουτάν",
+	"BN": "Μπρουνέι",
+	"NA": "Ναμίμπια",
+	"NR": "Ναουρού",
+	"NZ": "Νέα Ζηλανδία",
+	"NC": "Νέα Καληδονία",
+	"NP": "Νεπάλ",
+	"MP": "Νῆσοι Βόρειες Μαριάνες",
+	"KY": "Νῆσοι Κέιμαν",
+	"CC": "Νῆσοι Κόκος (Κήλινγκ)",
+	"CK": "Νῆσοι Κούκ",
+	"MH": "Νῆσοι Μάρσαλ",
+	"GS": "Νήσοι Νότια Γεωργία και Νότιες Σάντουιτς",
+	"AX": "Νήσοι Όλαντ",
+	"WF": "Νῆσοι Οὐάλλις καὶ Φουτουνά",
+	"PN": "Νήσοι Πίτκερν",
+	"SJ": "Νῆσοι Σβάλμπαρ καὶ Γιὰν Μαγιέν",
+	"SB": "Νῆσοι Σολομῶντος",
+	"TC": "Νῆσοι Τὲρκς καὶ Κάικος",
+	"FO": "Νῆσοι Φερόες",
+	"FK": "Νήσοι Φόκλαντ",
+	"HM": "Νῆσοι Χὲρντ καὶ Μακντόναλντ",
+	"AC": "Νήσος Ασενσιόν",
+	"CP": "Νήσος Κλίπερτον",
+	"BV": "Νῆσος Μπουβέ",
+	"NF": "Νῆσος Νόρφολκ",
+	"IM": "Νήσος του Μαν",
+	"CX": "Νῆσος Χριστουγέννων",
+	"NE": "Νίγηρας",
+	"NG": "Νιγηρία",
+	"NI": "Νικαράγουα",
+	"NU": "Νιούε",
+	"NO": "Νορβηγία",
+	"ZA": "Νότια Ἀφρική",
+	"KR": "Νότια Κορέα",
+	"SS": "Νότιο Σουδάν",
+	"DG": "Ντιέγκο Γκαρσία",
+	"DM": "Ντομίνικα",
+	"NL": "Ὁλλανδία",
+	"BQ": "Ολλανδία Καραϊβικής",
+	"OM": "Ὀμάν",
+	"HN": "Ὁνδούρα",
+	"HU": "Οὑγγαρία",
+	"UG": "Οὐγκάντα",
+	"UZ": "Οὐζμπεκιστάν",
+	"UA": "Οὐκρανία",
+	"UY": "Οὐρουγουάη",
+	"PK": "Πακιστάν",
+	"PS": "Παλαιστινιακὰ Ἐδάφη",
+	"PW": "Παλάου",
+	"PA": "Παναμάς",
+	"PG": "Παπούα Νέα Γουινέα",
+	"PY": "Παραγουάη",
+	"PE": "Περού",
+	"PL": "Πολωνία",
+	"PT": "Πορτογαλία",
+	"PR": "Πουέρτο Ρίκο",
+	"CV": "Πράσινο Ακρωτήριο",
+	"RE": "Ρεϊνιόν",
+	"RW": "Ρουάντα",
+	"RO": "Ρουμανία",
+	"RU": "Ρωσία",
+	"KN": "Σαὶντ Κὶτς καὶ Νέβις",
+	"PM": "Σαὶντ Πιὲρ καὶ Μικελόν",
+	"WS": "Σαμόα",
+	"ST": "Σάο Τομὲ καὶ Πρίνσιπε",
+	"SA": "Σαουδικὴ Ἀραβία",
+	"SN": "Σενεγάλη",
+	"RS": "Σερβία",
+	"SC": "Σεϋχέλλες",
+	"SG": "Σιγκαπούρη",
+	"SL": "Σιέρα Λεόνε",
+	"SK": "Σλοβακία",
+	"SI": "Σλοβενία",
+	"SO": "Σομαλία",
+	"SD": "Σουδάν",
+	"SE": "Σουηδία",
+	"SR": "Σουρινάμ",
+	"LK": "Σρὶ Λάνκα",
+	"SY": "Συρία, Ἀραβικὴ Δημοκρατία τῆς",
+	"TW": "Ταϊβάν",
+	"TH": "Ταϊλάνδη",
+	"TZ": "Τανζανία",
+	"TJ": "Τατζικιστάν",
+	"JM": "Τζαμάικα",
+	"JE": "Τζέρζι",
+	"DJ": "Τζιμπουτί",
+	"TG": "Τόγκο",
+	"TK": "Τοκελάου",
+	"TO": "Τόνγκα",
+	"TV": "Τουβαλού",
+	"TR": "Τουρκία",
+	"TM": "Τουρκμενιστάν",
+	"TT": "Τρινιδὰδ καὶ Τομπάγκο",
+	"TA": "Τριστάν ντα Κούνια",
+	"TD": "Τσάντ",
+	"CZ": "Τσεχία",
+	"TN": "Τυνησία",
+	"YE": "Ὑεμένη",
+	"PH": "Φιλιππίνες",
+	"FI": "Φινλανδία",
+	"FJ": "Φίτζι",
+	"CL": "Χιλή",
+	"HK": "Χὸνγκ Κόνγκ, Εἰδικὴ Διοικητικὴ Περιφέρεια τῆς Κίνας"
+}
\ No newline at end of file
diff --git a/data/country/en-001.json b/data/country/en-001.json
index c0ed8a2..f51071b 100644
--- a/data/country/en-001.json
+++ b/data/country/en-001.json
@@ -233,7 +233,7 @@
 	"TT": "Trinidad & Tobago",
 	"TA": "Tristan da Cunha",
 	"TN": "Tunisia",
-	"TR": "Turkey",
+	"TR": "Türkiye",
 	"TM": "Turkmenistan",
 	"TC": "Turks & Caicos Islands",
 	"TV": "Tuvalu",
diff --git a/data/country/en-AU.json b/data/country/en-AU.json
index 0e062f0..74ba551 100644
--- a/data/country/en-AU.json
+++ b/data/country/en-AU.json
@@ -233,7 +233,7 @@
 	"TT": "Trinidad & Tobago",
 	"TA": "Tristan da Cunha",
 	"TN": "Tunisia",
-	"TR": "Turkey",
+	"TR": "Türkiye",
 	"TM": "Turkmenistan",
 	"TC": "Turks & Caicos Islands",
 	"TV": "Tuvalu",
diff --git a/data/country/en-CA.json b/data/country/en-CA.json
index 5088250..7c3418b 100644
--- a/data/country/en-CA.json
+++ b/data/country/en-CA.json
@@ -233,7 +233,7 @@
 	"TT": "Trinidad and Tobago",
 	"TA": "Tristan da Cunha",
 	"TN": "Tunisia",
-	"TR": "Turkey",
+	"TR": "Türkiye",
 	"TM": "Turkmenistan",
 	"TC": "Turks and Caicos Islands",
 	"TV": "Tuvalu",
diff --git a/data/country/en-MV.json b/data/country/en-MV.json
index c0ed8a2..f51071b 100644
--- a/data/country/en-MV.json
+++ b/data/country/en-MV.json
@@ -233,7 +233,7 @@
 	"TT": "Trinidad & Tobago",
 	"TA": "Tristan da Cunha",
 	"TN": "Tunisia",
-	"TR": "Turkey",
+	"TR": "Türkiye",
 	"TM": "Turkmenistan",
 	"TC": "Turks & Caicos Islands",
 	"TV": "Tuvalu",
diff --git a/data/country/en.json b/data/country/en.json
index 7dfe29e..b7f768b 100644
--- a/data/country/en.json
+++ b/data/country/en.json
@@ -233,7 +233,7 @@
 	"TT": "Trinidad & Tobago",
 	"TA": "Tristan da Cunha",
 	"TN": "Tunisia",
-	"TR": "Turkey",
+	"TR": "Türkiye",
 	"TM": "Turkmenistan",
 	"TC": "Turks & Caicos Islands",
 	"TV": "Tuvalu",
diff --git a/data/country/fil.json b/data/country/fil.json
index 19cf93d..73e0f05 100644
--- a/data/country/fil.json
+++ b/data/country/fil.json
@@ -235,7 +235,7 @@
 	"TT": "Trinidad & Tobago",
 	"TA": "Tristan de Cunha",
 	"TN": "Tunisia",
-	"TR": "Turkey",
+	"TR": "Türkiye",
 	"TM": "Turkmenistan",
 	"TC": "Turks & Caicos Islands",
 	"TV": "Tuvalu",
diff --git a/data/country/gu.json b/data/country/gu.json
index 8623b09..f8a01ff 100644
--- a/data/country/gu.json
+++ b/data/country/gu.json
@@ -106,7 +106,7 @@
 	"TJ": "તાજીકિસ્તાન",
 	"TL": "તિમોર-લેસ્તે",
 	"TM": "તુર્કમેનિસ્તાન",
-	"TR": "તુર્કી",
+	"TR": "તુર્કિયે",
 	"TC": "તુર્ક્સ અને કેકોઝ આઇલેન્ડ્સ",
 	"TV": "તુવાલુ",
 	"TA": "ત્રિસ્તાન દા કુન્હા",
diff --git a/data/country/hi-Latn.json b/data/country/hi-Latn.json
index b085794..67e26ed 100644
--- a/data/country/hi-Latn.json
+++ b/data/country/hi-Latn.json
@@ -233,7 +233,7 @@
 	"TT": "Trinidad & Tobago",
 	"TA": "Tristan da Cunha",
 	"TN": "Tunisia",
-	"TR": "Turkey",
+	"TR": "Turkiye",
 	"TM": "Turkmenistan",
 	"TC": "Turks & Caicos Islands",
 	"TV": "Tuvalu",
diff --git a/data/country/hi.json b/data/country/hi.json
index 55ebb24..4f3e3b1 100644
--- a/data/country/hi.json
+++ b/data/country/hi.json
@@ -104,7 +104,7 @@
 	"TL": "तिमोर-लेस्त",
 	"TC": "तुर्क और कैकोज़ द्वीपसमूह",
 	"TM": "तुर्कमेनिस्तान",
-	"TR": "तुर्की",
+	"TR": "तुर्किये",
 	"TV": "तुवालू",
 	"TK": "तोकेलाउ",
 	"TT": "त्रिनिदाद और टोबैगो",
diff --git a/data/country/hsb.json b/data/country/hsb.json
deleted file mode 100644
index 06bbbc3..0000000
--- a/data/country/hsb.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
-	"AF": "Afghanistan",
-	"AX": "Åland",
-	"AL": "Albanska",
-	"DZ": "Algeriska",
-	"UM": "Ameriska Oceaniska",
-	"AS": "Ameriska Samoa",
-	"VI": "Ameriske knježniske kupy",
-	"AD": "Andorra",
-	"AO": "Angola",
-	"AI": "Anguilla",
-	"AQ": "Antarktika",
-	"AG": "Antigua a Barbuda",
-	"AR": "Argentinska",
-	"AM": "Armenska",
-	"AW": "Aruba",
-	"AC": "Ascension",
-	"AU": "Awstralska",
-	"AT": "Awstriska",
-	"AZ": "Azerbajdźan",
-	"BS": "Bahamy",
-	"BH": "Bahrain",
-	"BD": "Bangladeš",
-	"BB": "Barbados",
-	"BE": "Belgiska",
-	"BZ": "Belize",
-	"BJ": "Benin",
-	"BM": "Bermudy",
-	"BY": "Běłoruska",
-	"BT": "Bhutan",
-	"BG": "Bołharska",
-	"BO": "Boliwiska",
-	"BA": "Bosniska a Hercegowina",
-	"BW": "Botswana",
-	"BV": "Bouvetowa kupa",
-	"BR": "Brazilska",
-	"VG": "Britiske knježniske kupy",
-	"IO": "Britiski teritorij w Indiskim oceanje",
-	"BN": "Brunei",
-	"BF": "Burkina Faso",
-	"BI": "Burundi",
-	"CF": "Centralnoafriska republika",
-	"EA": "Ceuta a Melilla",
-	"CP": "Clippertonowa kupa",
-	"CK": "Cookowe kupy",
-	"CI": "Côte d’Ivoire",
-	"CW": "Curaçao",
-	"CY": "Cypern",
-	"TD": "Čad",
-	"CZ": "Čěska republika",
-	"DK": "Danska",
-	"DG": "Diego Garcia",
-	"DM": "Dominika",
-	"DO": "Dominikanska republika",
-	"DJ": "Dźibuti",
-	"EG": "Egyptowska",
-	"EC": "Ekwador",
-	"GQ": "Ekwatorialna Gineja",
-	"SV": "El Salvador",
-	"ER": "Eritreja",
-	"EE": "Estiska",
-	"ET": "Etiopiska",
-	"FK": "Falklandske kupy",
-	"FO": "Färöske kupy",
-	"FJ": "Fidźi",
-	"PH": "Filipiny",
-	"FI": "Finska",
-	"FR": "Francoska",
-	"GF": "Francoska Guyana",
-	"PF": "Francoska Polyneziska",
-	"TF": "Francoski južny a antarktiski teritorij",
-	"GA": "Gabun",
-	"GM": "Gambija",
-	"GE": "Georgiska",
-	"GH": "Ghana",
-	"GI": "Gibraltar",
-	"GN": "Gineja",
-	"GW": "Gineja-Bissau",
-	"GD": "Grenada",
-	"GR": "Grjekska",
-	"GL": "Grönlandska",
-	"GP": "Guadeloupe",
-	"GU": "Guam",
-	"GT": "Guatemala",
-	"GG": "Guernsey",
-	"GY": "Guyana",
-	"HT": "Haiti",
-	"HM": "Heardowa kupa a McDonaldowe kupy",
-	"CX": "Hodowna kupa",
-	"HN": "Honduras",
-	"CL": "Chilska",
-	"CN": "China",
-	"HR": "Chorwatska",
-	"IN": "Indiska",
-	"ID": "Indoneska",
-	"IQ": "Irak",
-	"IR": "Iran",
-	"IE": "Irska",
-	"IS": "Islandska",
-	"IL": "Israel",
-	"IT": "Italska",
-	"JM": "Jamaika",
-	"JP": "Japanska",
-	"YE": "Jemen",
-	"JE": "Jersey",
-	"JO": "Jordaniska",
-	"ZA": "Južna Afrika (Republika)",
-	"GS": "Južna Georgiska a Južne Sandwichowe kupy",
-	"KR": "Južna Koreja",
-	"SS": "Južny Sudan",
-	"KY": "Kajmanske kupy",
-	"KH": "Kambodźa",
-	"CM": "Kamerun",
-	"CA": "Kanada",
-	"IC": "Kanariske kupy",
-	"CV": "Kap Verde",
-	"BQ": "Karibiska Nižozemska",
-	"QA": "Katar",
-	"KZ": "Kazachstan",
-	"KE": "Kenija",
-	"KG": "Kirgizistan",
-	"KI": "Kiribati",
-	"CC": "Kokosowe kupy",
-	"CO": "Kolumbiska",
-	"KM": "Komory",
-	"CG": "Kongo-Brazzaville",
-	"CD": "Kongo-Kinshasa",
-	"XK": "Kosowo",
-	"CR": "Kosta Rika",
-	"CU": "Kuba",
-	"TC": "kupy Turks a Caicos",
-	"KW": "Kuwait",
-	"LA": "Laos",
-	"LS": "Lesotho",
-	"LV": "Letiska",
-	"LB": "Libanon",
-	"LR": "Liberija",
-	"LY": "Libyska",
-	"LI": "Liechtenstein",
-	"LT": "Litawska",
-	"LU": "Luxemburgska",
-	"MG": "Madagaskar",
-	"HU": "Madźarska",
-	"MY": "Malajzija",
-	"MW": "Malawi",
-	"MV": "Malediwy",
-	"ML": "Mali",
-	"MT": "Malta",
-	"IM": "Man",
-	"MA": "Marokko",
-	"MH": "Marshallowe kupy",
-	"MQ": "Martinique",
-	"MU": "Mauritius",
-	"MR": "Mawretanska",
-	"YT": "Mayotte",
-	"MX": "Mexiko",
-	"FM": "Mikroneziska",
-	"MD": "Moldawska",
-	"MC": "Monaco",
-	"MN": "Mongolska",
-	"ME": "Montenegro",
-	"MS": "Montserrat",
-	"MZ": "Mosambik",
-	"MM": "Myanmar",
-	"NA": "Namibija",
-	"NR": "Nauru",
-	"NP": "Nepal",
-	"DE": "Němska",
-	"NE": "Niger",
-	"NG": "Nigerija",
-	"NI": "Nikaragua",
-	"NU": "Niue",
-	"NL": "Nižozemska",
-	"NF": "Norfolkowa kupa",
-	"NO": "Norwegska",
-	"NC": "Nowa Kaledoniska",
-	"NZ": "Nowoseelandska",
-	"OM": "Oman",
-	"PK": "Pakistan",
-	"PW": "Palau",
-	"PS": "Palestinski awtonomny teritorij",
-	"PA": "Panama",
-	"PG": "Papuwa-Nowa Gineja",
-	"PY": "Paraguay",
-	"PE": "Peru",
-	"PN": "Pitcairnowe kupy",
-	"PL": "Pólska",
-	"PT": "Portugalska",
-	"PR": "Puerto Rico",
-	"RE": "Réunion",
-	"RW": "Ruanda",
-	"RO": "Rumunska",
-	"RU": "Ruska",
-	"SB": "Salomony",
-	"ZM": "Sambija",
-	"WS": "Samoa",
-	"SM": "San Marino",
-	"ST": "São Tomé a Príncipe",
-	"SA": "Sawdi-Arabska",
-	"SN": "Senegal",
-	"RS": "Serbiska",
-	"MK": "Serwjerna Makedonska",
-	"KP": "Sewjerna Koreja",
-	"MP": "Sewjerne Mariany",
-	"SC": "Seychelle",
-	"SL": "Sierra Leone",
-	"ZW": "Simbabwe",
-	"SG": "Singapur",
-	"SX": "Sint Maarten",
-	"SK": "Słowakska",
-	"SI": "Słowjenska",
-	"SO": "Somalija",
-	"LK": "Sri Lanka",
-	"BL": "St. Barthélemy",
-	"SH": "St. Helena",
-	"KN": "St. Kitts a Nevis",
-	"LC": "St. Lucia",
-	"MF": "St. Martin",
-	"PM": "St. Pierre a Miquelon",
-	"VC": "St. Vincent a Grenadiny",
-	"SD": "Sudan",
-	"SR": "Surinam",
-	"SJ": "Svalbard a Jan Mayen",
-	"SZ": "Swaziska",
-	"SY": "Syriska",
-	"ES": "Španiska",
-	"SE": "Šwedska",
-	"CH": "Šwicarska",
-	"TJ": "Tadźikistan",
-	"TW": "Taiwan",
-	"TZ": "Tansanija",
-	"TH": "Thailandska",
-	"TL": "Timor-Leste",
-	"TG": "Togo",
-	"TK": "Tokelau",
-	"TO": "Tonga",
-	"TT": "Trinidad a Tobago",
-	"TA": "Tristan da Cunha",
-	"TN": "Tuneziska",
-	"TM": "Turkmeniska",
-	"TR": "Turkowska",
-	"TV": "Tuvalu",
-	"UG": "Uganda",
-	"UA": "Ukraina",
-	"UY": "Uruguay",
-	"UZ": "Uzbekistan",
-	"VU": "Vanuatu",
-	"VA": "Vatikanske město",
-	"VE": "Venezuela",
-	"VN": "Vietnam",
-	"WF": "Wallis a Futuna",
-	"HK": "Wosebita zarjadniska cona Hongkong",
-	"MO": "Wosebita zarjadniska cona Macao",
-	"EH": "Zapadna Sahara",
-	"AE": "Zjednoćene arabske emiraty",
-	"GB": "Zjednoćene kralestwo",
-	"US": "Zjednoćene staty Ameriki"
-}
\ No newline at end of file
diff --git a/data/country/ko-KP.json b/data/country/ko-KP.json
index 3787169..c09c77e 100644
--- a/data/country/ko-KP.json
+++ b/data/country/ko-KP.json
@@ -223,13 +223,13 @@
 	"TZ": "탄자니아",
 	"TH": "태국",
 	"TC": "터크스 케이커스 제도",
-	"TR": "터키",
 	"TG": "토고",
 	"TK": "토켈라우",
 	"TO": "통가",
 	"TM": "투르크메니스탄",
 	"TV": "투발루",
 	"TN": "튀니지",
+	"TR": "튀르키예",
 	"TT": "트리니다드 토바고",
 	"TA": "트리스탄다쿠나",
 	"PA": "파나마",
diff --git a/data/country/ko.json b/data/country/ko.json
index 2af02fe..94da3c3 100644
--- a/data/country/ko.json
+++ b/data/country/ko.json
@@ -223,13 +223,13 @@
 	"TZ": "탄자니아",
 	"TH": "태국",
 	"TC": "터크스 케이커스 제도",
-	"TR": "터키",
 	"TG": "토고",
 	"TK": "토켈라우",
 	"TO": "통가",
 	"TM": "투르크메니스탄",
 	"TV": "투발루",
 	"TN": "튀니지",
+	"TR": "튀르키예",
 	"TT": "트리니다드 토바고",
 	"TA": "트리스탄다쿠나",
 	"PA": "파나마",
diff --git a/data/country/ml.json b/data/country/ml.json
index abb656e..26c1b4e 100644
--- a/data/country/ml.json
+++ b/data/country/ml.json
@@ -109,7 +109,7 @@
 	"TH": "തായ്‌ലാൻഡ്",
 	"TW": "തായ്‌വാൻ",
 	"TL": "തിമോർ-ലെസ്റ്റെ",
-	"TR": "തുർക്കി",
+	"TR": "തുർക്കിയെ",
 	"TM": "തുർക്ക്മെനിസ്ഥാൻ",
 	"GS": "ദക്ഷിണ ജോർജ്ജിയയും ദക്ഷിണ സാൻഡ്‌വിച്ച് ദ്വീപുകളും",
 	"SS": "ദക്ഷിണ സുഡാൻ",
diff --git a/data/country/mr.json b/data/country/mr.json
index a73a00b..b5a810a 100644
--- a/data/country/mr.json
+++ b/data/country/mr.json
@@ -106,7 +106,7 @@
 	"TJ": "ताजिकिस्तान",
 	"TL": "तिमोर-लेस्ते",
 	"TM": "तुर्कमेनिस्तान",
-	"TR": "तुर्की",
+	"TR": "तुर्किये",
 	"TW": "तैवान",
 	"TK": "तोकेलाउ",
 	"TT": "त्रिनिदाद आणि टोबॅगो",
diff --git a/data/country/ms.json b/data/country/ms.json
index 7fa0674..aade571 100644
--- a/data/country/ms.json
+++ b/data/country/ms.json
@@ -237,7 +237,7 @@
 	"TT": "Trinidad dan Tobago",
 	"TA": "Tristan da Cunha",
 	"TN": "Tunisia",
-	"TR": "Turki",
+	"TR": "Turkiye",
 	"TM": "Turkmenistan",
 	"TV": "Tuvalu",
 	"UG": "Uganda",
diff --git a/data/country/ne.json b/data/country/ne.json
index 92a55a7..443cfbd 100644
--- a/data/country/ne.json
+++ b/data/country/ne.json
@@ -89,7 +89,6 @@
 	"GI": "जिब्राल्टार",
 	"ZW": "जिम्बाबवे",
 	"JO": "जोर्डन",
-	"TR": "टर्की",
 	"TL": "टिमोर-लेस्टे",
 	"TO": "टोंगा",
 	"TG": "टोगो",
@@ -106,6 +105,7 @@
 	"TV": "तुभालु",
 	"TC": "तुर्क र काइकोस टापु",
 	"TM": "तुर्कमेनिस्तान",
+	"TR": "तुर्किये",
 	"TK": "तोकेलाउ",
 	"TT": "त्रिनिडाड एण्ड टोबागो",
 	"TH": "थाइल्याण्ड",
diff --git a/data/country/qu.json b/data/country/qu.json
deleted file mode 100644
index 8586b7f..0000000
--- a/data/country/qu.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
-	"AF": "Afganistán",
-	"AL": "Albania",
-	"DE": "Alemania",
-	"AD": "Andorra",
-	"AO": "Angola",
-	"AI": "Anguila",
-	"AQ": "Antártida",
-	"AG": "Antigua y Barbuda",
-	"SA": "Arabia Saudí",
-	"DZ": "Argelia",
-	"AR": "Argentina",
-	"AM": "Armenia",
-	"AW": "Aruba",
-	"AU": "Australia",
-	"AT": "Austria",
-	"AZ": "Azerbaiyán",
-	"BS": "Bahamas",
-	"BD": "Bangladesh",
-	"BB": "Barbados",
-	"BH": "Baréin",
-	"BY": "Belarús",
-	"BE": "Bélgica",
-	"BZ": "Belice",
-	"BJ": "Benín",
-	"BM": "Bermudas",
-	"BO": "Bolivia",
-	"BQ": "Bonaire",
-	"BA": "Bosnia y Herzegovina",
-	"BW": "Botsuana",
-	"BR": "Brasil",
-	"BN": "Brunéi",
-	"BG": "Bulgaria",
-	"BF": "Burkina Faso",
-	"BI": "Burundi",
-	"BT": "Bután",
-	"CV": "Cabo Verde",
-	"KH": "Camboya",
-	"CM": "Camerún",
-	"CA": "Canadá",
-	"EA": "Ceuta y Melilla",
-	"TD": "Chad",
-	"CZ": "Chequia",
-	"CL": "Chile",
-	"CN": "China",
-	"CY": "Chipre",
-	"CO": "Colombia",
-	"KM": "Comoras",
-	"CG": "Congo",
-	"CD": "Congo (RDC)",
-	"KP": "Corea del Norte",
-	"KR": "Corea del Sur",
-	"CR": "Costa Rica",
-	"CI": "Côte d’Ivoire",
-	"HR": "Croacia",
-	"CU": "Cuba",
-	"CW": "Curazao",
-	"DG": "Diego García",
-	"DK": "Dinamarca",
-	"DM": "Dominica",
-	"EC": "Ecuador",
-	"VI": "EE.UU. Islas Vírgenes",
-	"EG": "Egipto",
-	"SV": "El Salvador",
-	"AE": "Emiratos Árabes Unidos",
-	"ER": "Eritrea",
-	"SK": "Eslovaquia",
-	"SI": "Eslovenia",
-	"ES": "España",
-	"US": "Estados Unidos",
-	"EE": "Estonia",
-	"SZ": "Esuatini",
-	"ET": "Etiopía",
-	"PH": "Filipinas",
-	"FI": "Finlandia",
-	"FJ": "Fiyi",
-	"FR": "Francia",
-	"GA": "Gabón",
-	"GM": "Gambia",
-	"GE": "Georgia",
-	"GS": "Georgia del Sur e Islas Sandwich del Sur",
-	"GH": "Ghana",
-	"GI": "Gibraltar",
-	"GD": "Granada",
-	"GR": "Grecia",
-	"GL": "Groenlandia",
-	"GP": "Guadalupe",
-	"GU": "Guam",
-	"GT": "Guatemala",
-	"GF": "Guayana Francesa",
-	"GG": "Guernesey",
-	"GN": "Guinea",
-	"GQ": "Guinea Ecuatorial",
-	"GW": "Guinea-Bisáu",
-	"GY": "Guyana",
-	"HT": "Haití",
-	"HN": "Honduras",
-	"HK": "Hong Kong RAE China",
-	"HU": "Hungría",
-	"IN": "India",
-	"ID": "Indonesia",
-	"IQ": "Irak",
-	"IR": "Irán",
-	"IE": "Irlanda",
-	"BV": "Isla Bouvet",
-	"CX": "Isla Christmas",
-	"CP": "Isla Clipperton",
-	"IM": "Isla de Man",
-	"NF": "Isla Norfolk",
-	"IS": "Islandia",
-	"AX": "Islas Åland",
-	"AC": "Islas Ascensión",
-	"KY": "Islas Caimán",
-	"IC": "Islas Canarias",
-	"CC": "Islas Cocos",
-	"CK": "Islas Cook",
-	"FO": "Islas Feroe",
-	"HM": "Islas Heard y McDonald",
-	"FK": "Islas Malvinas",
-	"MP": "Islas Marianas del Norte",
-	"MH": "Islas Marshall",
-	"UM": "Islas menores alejadas de los EE.UU.",
-	"PN": "Islas Pitcairn",
-	"SB": "Islas Salomón",
-	"TC": "Islas Turcas y Caicos",
-	"VG": "Islas Vírgenes Británicas",
-	"IL": "Israel",
-	"IT": "Italia",
-	"JM": "Jamaica",
-	"JP": "Japón",
-	"JE": "Jersey",
-	"JO": "Jordania",
-	"KZ": "Kazajistán",
-	"KE": "Kenia",
-	"KG": "Kirguistán",
-	"KI": "Kiribati",
-	"XK": "Kosovo",
-	"KW": "Kuwait",
-	"LA": "Laos",
-	"LS": "Lesoto",
-	"LV": "Letonia",
-	"LB": "Líbano",
-	"LR": "Liberia",
-	"LY": "Libia",
-	"LI": "Liechtenstein",
-	"LT": "Lituania",
-	"LU": "Luxemburgo",
-	"MO": "Macao RAE China",
-	"MK": "Macedonia del Norte",
-	"MG": "Madagascar",
-	"MY": "Malasia",
-	"MW": "Malawi",
-	"MV": "Maldivas",
-	"ML": "Malí",
-	"MT": "Malta",
-	"MA": "Marruecos",
-	"MQ": "Martinica",
-	"MU": "Mauricio",
-	"MR": "Mauritania",
-	"YT": "Mayotte",
-	"MX": "México",
-	"FM": "Micronesia",
-	"MD": "Moldova",
-	"MC": "Mónaco",
-	"MN": "Mongolia",
-	"ME": "Montenegro",
-	"MS": "Montserrat",
-	"MZ": "Mozambique",
-	"MM": "Myanmar",
-	"NA": "Namibia",
-	"NR": "Nauru",
-	"NP": "Nepal",
-	"NI": "Nicaragua",
-	"NE": "Níger",
-	"NG": "Nigeria",
-	"NU": "Niue",
-	"NO": "Noruega",
-	"NC": "Nueva Caledonia",
-	"NZ": "Nueva Zelanda",
-	"OM": "Omán",
-	"NL": "Países Bajos",
-	"PK": "Pakistán",
-	"PW": "Palaos",
-	"PS": "Palestina Kamachikuq",
-	"PA": "Panamá",
-	"PG": "Papúa Nueva Guinea",
-	"PY": "Paraguay",
-	"PE": "Perú",
-	"PF": "Polinesia Francesa",
-	"PL": "Polonia",
-	"PT": "Portugal",
-	"PR": "Puerto Rico",
-	"QA": "Qatar",
-	"GB": "Reino Unido",
-	"CF": "República Centroafricana",
-	"DO": "República Dominicana",
-	"RE": "Reunión",
-	"RW": "Ruanda",
-	"RO": "Rumania",
-	"RU": "Rusia",
-	"EH": "Sahara Occidental",
-	"WS": "Samoa",
-	"AS": "Samoa Americana",
-	"BL": "San Bartolomé",
-	"KN": "San Cristóbal y Nieves",
-	"SM": "San Marino",
-	"MF": "San Martín",
-	"PM": "San Pedro y Miquelón",
-	"VC": "San Vicente y las Granadinas",
-	"SH": "Santa Elena",
-	"LC": "Santa Lucia",
-	"VA": "Santa Sede (Ciudad del Vaticano)",
-	"ST": "Santo Tomé y Príncipe",
-	"SN": "Senegal",
-	"RS": "Serbia",
-	"SC": "Seychelles",
-	"SL": "Sierra Leona",
-	"SG": "Singapur",
-	"SX": "Sint Maarten",
-	"SY": "Siria",
-	"SO": "Somalia",
-	"LK": "Sri Lanka",
-	"ZA": "Sudáfrica",
-	"SD": "Sudán",
-	"SS": "Sudán del Sur",
-	"SE": "Suecia",
-	"CH": "Suiza",
-	"SR": "Surinam",
-	"SJ": "Svalbard y Jan Mayen",
-	"TH": "Tailandia",
-	"TW": "Taiwán",
-	"TZ": "Tanzania",
-	"TJ": "Tayikistán",
-	"IO": "Territorio Británico del Océano Índico",
-	"TF": "Territorios Australes Franceses",
-	"TL": "Timor-Leste",
-	"TG": "Togo",
-	"TK": "Tokelau",
-	"TO": "Tonga",
-	"TT": "Trinidad y Tobago",
-	"TA": "Tristán de Acuña",
-	"TN": "Túnez",
-	"TM": "Turkmenistán",
-	"TR": "Turquía",
-	"TV": "Tuvalu",
-	"UA": "Ucrania",
-	"UG": "Uganda",
-	"UY": "Uruguay",
-	"UZ": "Uzbekistán",
-	"VU": "Vanuatu",
-	"VE": "Venezuela",
-	"VN": "Vietnam",
-	"WF": "Wallis y Futuna",
-	"YE": "Yemen",
-	"DJ": "Yibuti",
-	"ZM": "Zambia",
-	"ZW": "Zimbabue"
-}
\ No newline at end of file
diff --git a/data/country/ta.json b/data/country/ta.json
index 09afbc2..063f21c 100644
--- a/data/country/ta.json
+++ b/data/country/ta.json
@@ -129,7 +129,7 @@
 	"TZ": "தான்சானியா",
 	"TL": "திமோர்-லெஸ்தே",
 	"TM": "துர்க்மெனிஸ்தான்",
-	"TR": "துருக்கி",
+	"TR": "துருக்கியே",
 	"TV": "துவாலு",
 	"SS": "தெற்கு சூடான்",
 	"GS": "தெற்கு ஜார்ஜியா மற்றும் தெற்கு சாண்ட்விச் தீவுகள்",
diff --git a/data/country/te.json b/data/country/te.json
index 3afb0ba..2f6f019 100644
--- a/data/country/te.json
+++ b/data/country/te.json
@@ -95,7 +95,6 @@
 	"GI": "జిబ్రాల్టర్",
 	"JE": "జెర్సీ",
 	"JO": "జోర్డాన్",
-	"TR": "టర్కీ",
 	"TM": "టర్క్‌మెనిస్తాన్",
 	"TC": "టర్క్స్ మరియు కైకోస్ దీవులు",
 	"TZ": "టాంజానియా",
@@ -112,6 +111,7 @@
 	"DO": "డొమినికన్ రిపబ్లిక్",
 	"DM": "డొమినికా",
 	"TJ": "తజికిస్తాన్",
+	"TR": "తుర్కియె",
 	"TW": "తైవాన్",
 	"TH": "థాయిలాండ్",
 	"ZA": "దక్షిణ ఆఫ్రికా",
diff --git a/data/country/ur-IN.json b/data/country/ur-IN.json
index 01425e3..9130fc0 100644
--- a/data/country/ur-IN.json
+++ b/data/country/ur-IN.json
@@ -65,7 +65,7 @@
 	"TW": "تائیوان",
 	"TA": "ترسٹان دا کونیا",
 	"TM": "ترکمانستان",
-	"TR": "ترکی",
+	"TR": "ترکیہ",
 	"TT": "ترینیداد اور ٹوباگو",
 	"TZ": "تنزانیہ",
 	"TN": "تونس",
diff --git a/data/country/ur.json b/data/country/ur.json
index d8cbc29..3cbfd1a 100644
--- a/data/country/ur.json
+++ b/data/country/ur.json
@@ -68,7 +68,7 @@
 	"TJ": "تاجکستان",
 	"TW": "تائیوان",
 	"TM": "ترکمانستان",
-	"TR": "ترکی",
+	"TR": "ترکیہ",
 	"TT": "ترینیداد اور ٹوباگو",
 	"TZ": "تنزانیہ",
 	"TN": "تونس",
diff --git a/lib/addressing/country.rb b/lib/addressing/country.rb
index 5d67725..5ca6b8c 100644
--- a/lib/addressing/country.rb
+++ b/lib/addressing/country.rb
@@ -7,20 +7,20 @@ class << self
 
       @@available_locales = [
         "af", "am", "ar", "ar-LY", "ar-SA", "as", "az", "be", "bg", "bn",
-        "bn-IN", "bs", "ca", "chr", "cs", "cy", "da", "de", "de-AT", "de-CH",
-        "dsb", "el", "en", "en-001", "en-AU", "en-CA", "en-MV", "es", "es-419",
-        "es-AR", "es-BO", "es-CL", "es-CO", "es-CR", "es-DO", "es-EC", "es-GT",
-        "es-HN", "es-MX", "es-NI", "es-PA", "es-PE", "es-PR", "es-PY", "es-SV",
-        "es-US", "es-VE", "et", "eu", "fa", "fa-AF", "fi", "fil", "fr",
+        "bn-IN", "bs", "ca", "cs", "cy", "da", "de", "de-AT", "de-CH",
+        "el", "el-polyton", "en", "en-001", "en-AU", "en-CA", "en-MV", "es",
+        "es-419", "es-AR", "es-BO", "es-CL", "es-CO", "es-CR", "es-DO", "es-EC",
+        "es-GT", "es-HN", "es-MX", "es-NI", "es-PA", "es-PE", "es-PR", "es-PY",
+        "es-SV", "es-US", "es-VE", "et", "eu", "fa", "fa-AF", "fi", "fil", "fr",
         "fr-BE", "fr-CA", "ga", "gd", "gl", "gu", "he", "hi", "hi-Latn", "hr",
-        "hsb", "hu", "hy", "id", "ig", "is", "it", "ja", "ka", "kk", "km",
-        "ko", "ko-KP", "kok", "ky", "lo", "lt", "lv", "mk", "ml", "mn", "mr",
-        "ms", "my", "ne", "nl", "nn", "no", "or", "pa", "pcm", "pl", "ps",
-        "ps-PK", "pt", "pt-PT", "qu", "ro", "ro-MD", "ru", "ru-UA", "si", "sk",
-        "sl", "so", "sq", "sr", "sr-Cyrl-BA", "sr-Cyrl-ME", "sr-Cyrl-XK",
-        "sr-Latn", "sr-Latn-BA", "sr-Latn-ME", "sr-Latn-XK", "sv", "sw",
-        "sw-CD", "sw-KE", "ta", "te", "th", "tk", "tr", "uk", "ur", "ur-IN",
-        "uz", "vi", "yue", "yue-Hans", "zh", "zh-Hant", "zh-Hant-HK", "zu"
+        "hu", "hy", "id", "ig", "is", "it", "ja", "ka", "kk", "km", "ko", "ko-KP",
+        "kok", "ky", "lo", "lt", "lv", "mk", "ml", "mn", "mr", "ms", "my", "ne",
+        "nl", "nn", "no", "or", "pa", "pcm", "pl", "ps", "ps-PK", "pt", "pt-PT",
+        "ro", "ro-MD", "ru", "ru-UA", "si", "sk", "sl", "so", "sq", "sr",
+        "sr-Cyrl-BA", "sr-Cyrl-ME", "sr-Cyrl-XK", "sr-Latn", "sr-Latn-BA",
+        "sr-Latn-ME", "sr-Latn-XK", "sv", "sw", "sw-CD", "sw-KE", "ta", "te",
+        "th", "tk", "tr", "uk", "ur", "ur-IN", "uz", "vi", "yue", "yue-Hans",
+        "zh", "zh-Hant", "zh-Hant-HK", "zu"
       ]
 
       def get(country_code, locale = "en", fallback_locale = "en")