diff --git a/externals/cldr/cldr_windows_timezones.xml b/externals/cldr/cldr_windows_timezones.xml
index a81d0beb83..26a62c3f06 100644
--- a/externals/cldr/cldr_windows_timezones.xml
+++ b/externals/cldr/cldr_windows_timezones.xml
@@ -59,7 +59,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Pacific Standard Time" territory="001" type="America/Los_Angeles"/>
 			<mapZone other="Pacific Standard Time" territory="CA" type="America/Vancouver"/>
 			<mapZone other="Pacific Standard Time" territory="US" type="America/Los_Angeles"/>
-			<mapZone other="Pacific Standard Time" territory="ZZ" type="PST8PDT"/>
 
 			<!-- (UTC-07:00) Arizona -->
 			<mapZone other="US Mountain Standard Time" territory="001" type="America/Phoenix"/>
@@ -77,7 +76,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Mountain Standard Time" territory="CA" type="America/Edmonton America/Cambridge_Bay America/Inuvik"/>
 			<mapZone other="Mountain Standard Time" territory="MX" type="America/Ciudad_Juarez"/>
 			<mapZone other="Mountain Standard Time" territory="US" type="America/Denver America/Boise"/>
-			<mapZone other="Mountain Standard Time" territory="ZZ" type="MST7MDT"/>
 
 			<!-- (UTC-07:00) Yukon -->
 			<mapZone other="Yukon Standard Time" territory="001" type="America/Whitehorse"/>
@@ -99,7 +97,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Central Standard Time" territory="CA" type="America/Winnipeg America/Rankin_Inlet America/Resolute"/>
 			<mapZone other="Central Standard Time" territory="MX" type="America/Matamoros America/Ojinaga"/>
 			<mapZone other="Central Standard Time" territory="US" type="America/Chicago America/Indiana/Knox America/Indiana/Tell_City America/Menominee America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem"/>
-			<mapZone other="Central Standard Time" territory="ZZ" type="CST6CDT"/>
 
 			<!-- (UTC-06:00) Easter Island -->
 			<mapZone other="Easter Island Standard Time" territory="001" type="Pacific/Easter"/>
@@ -134,7 +131,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Eastern Standard Time" territory="BS" type="America/Nassau"/>
 			<mapZone other="Eastern Standard Time" territory="CA" type="America/Toronto America/Iqaluit"/>
 			<mapZone other="Eastern Standard Time" territory="US" type="America/New_York America/Detroit America/Indiana/Petersburg America/Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticello America/Louisville"/>
-			<mapZone other="Eastern Standard Time" territory="ZZ" type="EST5EDT"/>
 
 			<!-- (UTC-05:00) Haiti -->
 			<mapZone other="Haiti Standard Time" territory="001" type="America/Port-au-Prince"/>
@@ -239,7 +235,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC-03:00) Punta Arenas -->
 			<mapZone other="Magallanes Standard Time" territory="001" type="America/Punta_Arenas"/>
-			<mapZone other="Magallanes Standard Time" territory="CL" type="America/Punta_Arenas"/>
+			<mapZone other="Magallanes Standard Time" territory="CL" type="America/Punta_Arenas America/Coyhaique"/>
 
 			<!-- (UTC-03:00) Saint Pierre and Miquelon -->
 			<mapZone other="Saint Pierre Standard Time" territory="001" type="America/Miquelon"/>
@@ -652,7 +648,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC+08:00) Ulaanbaatar -->
 			<mapZone other="Ulaanbaatar Standard Time" territory="001" type="Asia/Ulaanbaatar"/>
-			<mapZone other="Ulaanbaatar Standard Time" territory="MN" type="Asia/Ulaanbaatar Asia/Choibalsan"/>
+			<mapZone other="Ulaanbaatar Standard Time" territory="MN" type="Asia/Ulaanbaatar"/>
 
 			<!-- (UTC+08:45) Eucla -->
 			<mapZone other="Aus Central W. Standard Time" territory="001" type="Australia/Eucla"/>
diff --git a/resources/timezones/windows-timezones.json b/resources/timezones/windows-timezones.json
index 7a287b6c55..229bdb8b59 100644
--- a/resources/timezones/windows-timezones.json
+++ b/resources/timezones/windows-timezones.json
@@ -2,8 +2,11 @@
   "Egypt Standard Time": "Africa/Cairo",
   "Morocco Standard Time": "Africa/Casablanca",
   "South Africa Standard Time": "Africa/Johannesburg",
+  "South Sudan Standard Time": "Africa/Juba",
+  "Sudan Standard Time": "Africa/Khartoum",
   "W. Central Africa Standard Time": "Africa/Lagos",
   "E. Africa Standard Time": "Africa/Nairobi",
+  "Sao Tome Standard Time": "Africa/Sao_Tome",
   "Libya Standard Time": "Africa/Tripoli",
   "Namibia Standard Time": "Africa/Windhoek",
   "Aleutian Standard Time": "America/Adak",
@@ -17,7 +20,6 @@
   "Venezuela Standard Time": "America/Caracas",
   "SA Eastern Standard Time": "America/Cayenne",
   "Central Standard Time": "America/Chicago",
-  "Mountain Standard Time (Mexico)": "America/Chihuahua",
   "Central Brazilian Standard Time": "America/Cuiaba",
   "Mountain Standard Time": "America/Denver",
   "Greenland Standard Time": "America/Godthab",
@@ -28,24 +30,27 @@
   "US Eastern Standard Time": "America/Indianapolis",
   "SA Western Standard Time": "America/La_Paz",
   "Pacific Standard Time": "America/Los_Angeles",
+  "Mountain Standard Time (Mexico)": "America/Mazatlan",
   "Central Standard Time (Mexico)": "America/Mexico_City",
   "Saint Pierre Standard Time": "America/Miquelon",
   "Montevideo Standard Time": "America/Montevideo",
   "Eastern Standard Time": "America/New_York",
   "US Mountain Standard Time": "America/Phoenix",
   "Haiti Standard Time": "America/Port-au-Prince",
+  "Magallanes Standard Time": "America/Punta_Arenas",
   "Canada Central Standard Time": "America/Regina",
   "Pacific SA Standard Time": "America/Santiago",
   "E. South America Standard Time": "America/Sao_Paulo",
   "Newfoundland Standard Time": "America/St_Johns",
   "Pacific Standard Time (Mexico)": "America/Tijuana",
-  "Central Asia Standard Time": "Asia/Almaty",
+  "Yukon Standard Time": "America/Whitehorse",
   "Jordan Standard Time": "Asia/Amman",
   "Arabic Standard Time": "Asia/Baghdad",
   "Azerbaijan Standard Time": "Asia/Baku",
   "SE Asia Standard Time": "Asia/Bangkok",
   "Altai Standard Time": "Asia/Barnaul",
   "Middle East Standard Time": "Asia/Beirut",
+  "Central Asia Standard Time": "Asia/Bishkek",
   "India Standard Time": "Asia/Calcutta",
   "Transbaikal Standard Time": "Asia/Chita",
   "Sri Lanka Standard Time": "Asia/Colombo",
@@ -65,6 +70,7 @@
   "N. Central Asia Standard Time": "Asia/Novosibirsk",
   "Omsk Standard Time": "Asia/Omsk",
   "North Korea Standard Time": "Asia/Pyongyang",
+  "Qyzylorda Standard Time": "Asia/Qyzylorda",
   "Myanmar Standard Time": "Asia/Rangoon",
   "Arab Standard Time": "Asia/Riyadh",
   "Sakhalin Standard Time": "Asia/Sakhalin",
@@ -95,6 +101,7 @@
   "W. Australia Standard Time": "Australia/Perth",
   "AUS Eastern Standard Time": "Australia/Sydney",
   "Dateline Standard Time": "Etc/GMT+12",
+  "UTC+13": "Etc/GMT-13",
   "Astrakhan Standard Time": "Europe/Astrakhan",
   "W. Europe Standard Time": "Europe/Berlin",
   "GTB Standard Time": "Europe/Bucharest",
@@ -108,6 +115,8 @@
   "Russian Standard Time": "Europe/Moscow",
   "Romance Standard Time": "Europe/Paris",
   "Russia Time Zone 3": "Europe/Samara",
+  "Saratov Standard Time": "Europe/Saratov",
+  "Volgograd Standard Time": "Europe/Volgograd",
   "Central European Standard Time": "Europe/Warsaw",
   "Mauritius Standard Time": "Indian/Mauritius",
   "Samoa Standard Time": "Pacific/Apia",