diff --git a/Sources/ManageMembers.php b/Sources/ManageMembers.php
index f49bf597bf..54be9eba90 100644
--- a/Sources/ManageMembers.php
+++ b/Sources/ManageMembers.php
@@ -286,14 +286,12 @@ function ViewMemberlist()
 			// Make sure numeric values are really numeric.
 			if (in_array($param_info['type'], array('int', 'age')))
 				$search_params[$param_name] = (int) $search_params[$param_name];
-			// Date values have to match the specified format.
+			// Date values have to match a date format that PHP recognizes.
 			elseif ($param_info['type'] == 'date')
 			{
-				// Check if this date format is valid.
-				if (preg_match('/^\d{4}-\d{1,2}-\d{1,2}$/', $search_params[$param_name]) == 0)
+				$search_params[$param_name] = strtotime($search_params[$param_name] . ' ' . getUserTimezone());
+				if (!is_int($search_params[$param_name]))
 					continue;
-
-				$search_params[$param_name] = strtotime($search_params[$param_name]);
 			}
 			elseif ($param_info['type'] == 'inet')
 			{
@@ -336,20 +334,20 @@ function ViewMemberlist()
 				{
 					if ($search_params['types'][$param_name] == '=')
 					{
-						$query_parts[] = $param_info['db_fields'][0] . ' >= ' . forum_time(true, $search_params[$param_name], true) . ' AND ' . $param_info['db_fields'][0] . ' < ' . (forum_time(true, $search_params[$param_name], true) + 86400);
+						$query_parts[] = $param_info['db_fields'][0] . ' >= ' . forum_time(true, $search_params[$param_name]) . ' AND ' . $param_info['db_fields'][0] . ' < ' . (forum_time(true, $search_params[$param_name]) + 86400);
 					}
 					// Less than or equal to
 					elseif ($search_params['types'][$param_name] == '-')
 					{
-						$query_parts[] = $param_info['db_fields'][0] . ' < ' . (forum_time(true, $search_params[$param_name], true) + 86400);
+						$query_parts[] = $param_info['db_fields'][0] . ' < ' . (forum_time(true, $search_params[$param_name]) + 86400);
 					}
 					// Greater than
 					elseif ($search_params['types'][$param_name] == '++')
 					{
-						$query_parts[] = $param_info['db_fields'][0] . ' >= ' . (forum_time(true, $search_params[$param_name], true) + 86400);
+						$query_parts[] = $param_info['db_fields'][0] . ' >= ' . (forum_time(true, $search_params[$param_name]) + 86400);
 					}
 					else
-						$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . forum_time(true, $search_params[$param_name], true);
+						$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . forum_time(true, $search_params[$param_name]);
 				}
 				else
 					$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
diff --git a/Sources/ManageSettings.php b/Sources/ManageSettings.php
index d664fc4187..37d1ff6443 100644
--- a/Sources/ManageSettings.php
+++ b/Sources/ManageSettings.php
@@ -213,7 +213,7 @@ function ModifyBasicSettings($return_config = false)
 			'min' => -23.5,
 			'max' => 23.5
 		),
-		'default_timezone' => array('select', 'default_timezone', array()),
+		array('select', 'default_timezone', array_filter(smf_list_timezones(), 'is_string', ARRAY_FILTER_USE_KEY)),
 		array('text', 'timezone_priority_countries', 'subtext' => $txt['setting_timezone_priority_countries_note']),
 		'',
 
@@ -243,17 +243,6 @@ function ModifyBasicSettings($return_config = false)
 		),
 	);
 
-	// Get all the time zones.
-	if (function_exists('timezone_identifiers_list') && function_exists('date_default_timezone_set'))
-	{
-		$all_zones = timezone_identifiers_list();
-		// Make sure we set the value to the same as the printed value.
-		foreach ($all_zones as $zone)
-			$config_vars['default_timezone'][2][$zone] = $zone;
-	}
-	else
-		unset($config_vars['default_timezone']);
-
 	call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
 
 	if ($return_config)
diff --git a/Sources/Post.php b/Sources/Post.php
index 58f46bbcde..b8112f60ea 100644
--- a/Sources/Post.php
+++ b/Sources/Post.php
@@ -1461,7 +1461,7 @@ function Post($post_errors = array())
 	}
 
 	// Gotta post it somewhere.
-	if (empty($board) && !$context['make_event'])
+	if (empty($board))
 	{
 		$context['posting_fields']['board'] = array(
 			'label' => array(
diff --git a/Sources/Subs-Calendar.php b/Sources/Subs-Calendar.php
index 1632c0b806..d536faef54 100644
--- a/Sources/Subs-Calendar.php
+++ b/Sources/Subs-Calendar.php
@@ -1776,56 +1776,6 @@ function buildEventDatetimes($row)
 	return array($start, $end, $allday, $span, $tz, $tz_abbrev);
 }
 
-/**
- * Gets a member's selected timezone identifier directly from the database
- *
- * @param int $id_member The member id to look up. If not provided, the current user's id will be used.
- * @return string The timezone identifier string for the user's timezone.
- */
-function getUserTimezone($id_member = null)
-{
-	global $smcFunc, $context, $user_info, $modSettings, $user_settings;
-	static $member_cache = array();
-
-	if (is_null($id_member) && $user_info['is_guest'] == false)
-		$id_member = $context['user']['id'];
-
-	//check if the cache got the data
-	if (isset($id_member) && isset($member_cache[$id_member]))
-	{
-		return $member_cache[$id_member];
-	}
-
-	//maybe the current user is the one
-	if (isset($user_settings['id_member']) && $user_settings['id_member'] == $id_member && !empty($user_settings['timezone']))
-	{
-		$member_cache[$id_member] = $user_settings['timezone'];
-		return $user_settings['timezone'];
-	}
-
-	if (isset($id_member))
-	{
-		$request = $smcFunc['db_query']('', '
-			SELECT timezone
-			FROM {db_prefix}members
-			WHERE id_member = {int:id_member}',
-			array(
-				'id_member' => $id_member,
-			)
-		);
-		list($timezone) = $smcFunc['db_fetch_row']($request);
-		$smcFunc['db_free_result']($request);
-	}
-
-	if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get();
-
-	if (isset($id_member))
-		$member_cache[$id_member] = $timezone;
-
-	return $timezone;
-}
-
 /**
  * Gets all of the holidays for the listing
  *
diff --git a/Sources/Subs-Timezones.php b/Sources/Subs-Timezones.php
new file mode 100644
index 0000000000..7121878ee3
--- /dev/null
+++ b/Sources/Subs-Timezones.php
@@ -0,0 +1,1519 @@
+<?php
+
+/**
+ * This file provides some functions to simplify working with time zones.
+ *
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2020 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 2.1 RC3
+ */
+
+if (!defined('SMF'))
+	die('No direct access...');
+
+/**
+ * Returns an array that instructs SMF how to map specific time zones
+ * (e.g. "America/Denver") onto the user-friendly "meta-zone" labels that
+ * most people think of as time zones (e.g. "Mountain Time").
+ *
+ * @return array An array relating time zones to "meta-zones"
+ */
+function get_tzid_metazones()
+{
+	/*
+		This array lists a series of representative time zones and their
+		corresponding "meta-zone" labels.
+
+		The term "representative" here means that a given time zone can
+		represent others that use exactly the same rules for DST
+		transitions, UTC offsets, and abbreviations. For example,
+		Europe/Berlin can be representative for Europe/Rome,
+		Europe/Paris, etc., because these cities all use exactly the
+		same time zone rules and values.
+
+		Meta-zone labels are the user friendly strings shown to the end
+		user, e.g. "Mountain Standard Time". The values of this array
+		are keys of strings defined in Timezones.{language}.php, which
+		in turn are sprintf format strings used to generate the final
+		label text.
+
+		Sometimes several representative time zones will map onto the
+		same meta-zone label. This usually happens when there are
+		different rules for Daylight Saving time in locations that are
+		otherwise the same. For example, both America/Denver and
+		America/Phoenix map to North_America_Mountain, but the ultimate
+		output will be 'Mountain Time (MST/MDT)' for America/Denver vs.
+		'Mountain Standard Time (MST)' for America/Phoenix.
+	 */
+	$tzid_metazones =  array(
+		// Africa_Central (no DST)
+		'Africa/Maputo' => 'Africa_Central',
+
+		// Africa_East (no DST)
+		'Africa/Nairobi' => 'Africa_East',
+
+		// Africa_Morocco (uses DST)
+		'Africa/Casablanca' => 'Africa_Morocco',
+
+		// Africa_South (no DST)
+		'Africa/Johannesburg' => 'Africa_South',
+
+		// Africa_West (no DST)
+		'Africa/Lagos' => 'Africa_West',
+
+		// Antarctica_Casey (no DST)
+		'Antarctica/Casey' => 'Antarctica_Casey',
+
+		// Antarctica_Davis (no DST)
+		'Antarctica/Davis' => 'Antarctica_Davis',
+
+		// Antarctica_DumontDUrville (no DST)
+		'Antarctica/DumontDUrville' => 'Antarctica_DumontDUrville',
+
+		// Antarctica_Macquarie (no DST)
+		'Antarctica/Macquarie' => 'Antarctica_Macquarie',
+
+		// Antarctica_Mawson (no DST)
+		'Antarctica/Mawson' => 'Antarctica_Mawson',
+
+		// Antarctica_McMurdo (uses DST)
+		'Antarctica/McMurdo' => 'Antarctica_McMurdo',
+
+		// Antarctica_Palmer (no DST)
+		'Antarctica/Palmer' => 'Antarctica_Palmer',
+
+		// Antarctica_Rothera (no DST)
+		'Antarctica/Rothera' => 'Antarctica_Rothera',
+
+		// Antarctica_Syowa (no DST)
+		'Antarctica/Syowa' => 'Antarctica_Syowa',
+
+		// Antarctica_Troll (uses DST)
+		'Antarctica/Troll' => 'Antarctica_Troll',
+
+		// Antarctica_Vostok (no DST)
+		'Antarctica/Vostok' => 'Antarctica_Vostok',
+
+		// Asia_Afghanistan (no DST)
+		'Asia/Kabul' => 'Asia_Afghanistan',
+
+		// Asia_Arabian (no DST)
+		'Asia/Riyadh' => 'Asia_Arabian',
+
+		// Asia_Armenia (no DST)
+		'Asia/Yerevan' => 'Asia_Armenia',
+
+		// Asia_Azerbaijan (no DST)
+		'Asia/Baku' => 'Asia_Azerbaijan',
+
+		// Asia_Bangladesh (no DST)
+		'Asia/Dhaka' => 'Asia_Bangladesh',
+
+		// Asia_Bhutan (no DST)
+		'Asia/Thimphu' => 'Asia_Bhutan',
+
+		// Asia_Brunei (no DST)
+		'Asia/Brunei' => 'Asia_Brunei',
+
+		// Asia_China (no DST)
+		'Asia/Shanghai' => 'Asia_China',
+
+		// Asia_Damascus (uses DST)
+		'Asia/Damascus' => 'Asia_Damascus',
+
+		// Asia_East_Timor (no DST)
+		'Asia/Dili' => 'Asia_East_Timor',
+
+		// Asia_Georgia (no DST)
+		'Asia/Tbilisi' => 'Asia_Georgia',
+
+		// Asia_Gulf (no DST)
+		'Asia/Dubai' => 'Asia_Gulf',
+
+		// Asia_Hong_Kong (no DST)
+		'Asia/Hong_Kong' => 'Asia_Hong_Kong',
+
+		// Asia_India (no DST)
+		'Asia/Kolkata' => 'Asia_India',
+
+		// Asia_Indonesia_Central (no DST)
+		'Asia/Makassar' => 'Asia_Indonesia_Central',
+
+		// Asia_Indonesia_Eastern (no DST)
+		'Asia/Jayapura' => 'Asia_Indonesia_Eastern',
+
+		// Asia_Indonesia_Western (no DST)
+		'Asia/Jakarta' => 'Asia_Indonesia_Western',
+
+		// Asia_Iran (uses DST)
+		'Asia/Tehran' => 'Asia_Iran',
+
+		// Asia_Irkutsk (no DST)
+		'Asia/Irkutsk' => 'Asia_Irkutsk',
+
+		// Asia_Israel (uses DST)
+		'Asia/Jerusalem' => 'Asia_Israel',
+
+		// Asia_Japan (no DST)
+		'Asia/Tokyo' => 'Asia_Japan',
+
+		// Asia_Jordan (uses DST)
+		'Asia/Amman' => 'Asia_Jordan',
+
+		// Asia_Kamchatka (no DST)
+		'Asia/Kamchatka' => 'Asia_Kamchatka',
+
+		// Asia_Kazakhstan_Eastern (no DST)
+		'Asia/Almaty' => 'Asia_Kazakhstan_Eastern',
+
+		// Asia_Kazakhstan_Western (no DST)
+		'Asia/Aqtau' => 'Asia_Kazakhstan_Western',
+
+		// Asia_Korea (no DST)
+		'Asia/Seoul' => 'Asia_Korea',
+
+		// Asia_Krasnoyarsk (no DST)
+		'Asia/Krasnoyarsk' => 'Asia_Krasnoyarsk',
+
+		// Asia_Kyrgystan (no DST)
+		'Asia/Bishkek' => 'Asia_Kyrgystan',
+
+		// Asia_Libya (uses DST)
+		'Asia/Beirut' => 'Asia_Libya',
+
+		// Asia_Magadan (no DST)
+		'Asia/Magadan' => 'Asia_Magadan',
+
+		// Asia_Malaysia (no DST)
+		'Asia/Kuala_Lumpur' => 'Asia_Malaysia',
+
+		// Asia_Mongolia_Western (no DST)
+		'Asia/Hovd' => 'Asia_Mongolia_Western',
+
+		// Asia_Mongolia_EAstern (no DST)
+		'Asia/Ulaanbaatar' => 'Asia_Mongolia_Eastern',
+
+		// Asia_Myanmar (no DST)
+		'Asia/Yangon' => 'Asia_Myanmar',
+
+		// Asia_Nepal (no DST)
+		'Asia/Kathmandu' => 'Asia_Nepal',
+
+		// Asia_Omsk (no DST)
+		'Asia/Omsk' => 'Asia_Omsk',
+
+		// Asia_Pakistan (no DST)
+		'Asia/Karachi' => 'Asia_Pakistan',
+
+		// Asia_Palestine (uses DST)
+		'Asia/Hebron' => 'Asia_Palestine',
+
+		// Asia_Philippines (no DST)
+		'Asia/Manila' => 'Asia_Philippines',
+
+		// Asia_Singapore (no DST)
+		'Asia/Singapore' => 'Asia_Singapore',
+
+		// Asia_Southeast (no DST)
+		'Asia/Bangkok' => 'Asia_Southeast',
+
+		// Asia_Taiwan (no DST)
+		'Asia/Taipei' => 'Asia_Taiwan',
+
+		// Asia_Tajikistan (no DST)
+		'Asia/Dushanbe' => 'Asia_Tajikistan',
+
+		// Asia_Turkey (no DST)
+		'Europe/Istanbul' => 'Asia_Turkey',
+
+		// Asia_Turkmenistan (no DST)
+		'Asia/Ashgabat' => 'Asia_Turkmenistan',
+
+		// Asia_Uzbekistan (no DST)
+		'Asia/Tashkent' => 'Asia_Uzbekistan',
+
+		// Asia_Vladivostok (no DST)
+		'Asia/Vladivostok' => 'Asia_Vladivostok',
+
+		// Asia_Yakutsk (no DST)
+		'Asia/Yakutsk' => 'Asia_Yakutsk',
+
+		// Asia_Yekaterinburg (no DST)
+		'Asia/Yekaterinburg' => 'Asia_Yekaterinburg',
+
+		// Atlantic_Azores (uses DST)
+		'Atlantic/Azores' => 'Atlantic_Azores',
+
+		// Atlantic_Cape_Verde (no DST)
+		'Atlantic/Cape_Verde' => 'Atlantic_Cape_Verde',
+
+		// Atlantic_Falkland (no DST)
+		'Atlantic/Stanley' => 'Atlantic_Falkland',
+
+		// Atlantic_South_Georgia (no DST)
+		'Atlantic/South_Georgia' => 'Atlantic_South_Georgia',
+
+		// Australia_Central (uses DST)
+		'Australia/Adelaide' => 'Australia_Central',
+
+		// Australia_Central (no DST)
+		'Australia/Darwin' => 'Australia_Central',
+
+		// Australia_CentralWestern (no DST)
+		'Australia/Eucla' => 'Australia_CentralWestern',
+
+		// Australia_Eastern (uses DST)
+		'Australia/Melbourne' => 'Australia_Eastern',
+
+		// Australia_Eastern (no DST)
+		'Australia/Brisbane' => 'Australia_Eastern',
+
+		// Australia_Lord_Howe (uses DST)
+		'Australia/Lord_Howe' => 'Australia_Lord_Howe',
+
+		// Australia_Western (no DST)
+		'Australia/Perth' => 'Australia_Western',
+
+		// Europe_Central (uses DST)
+		'Europe/Berlin' => 'Europe_Central',
+
+		// Europe_Central (no DST)
+		'Africa/Algiers' => 'Europe_Central',
+
+		// Europe_Eastern (uses DST)
+		'Europe/Helsinki' => 'Europe_Eastern',
+
+		// Europe_Eastern (no DST)
+		'Europe/Kaliningrad' => 'Europe_Eastern',
+
+		// Europe_Eire (uses DST)
+		'Europe/Dublin' => 'Europe_Eire',
+
+		// Europe_UK (uses DST)
+		'Europe/London' => 'Europe_UK',
+
+		// Europe_Minsk (no DST)
+		'Europe/Minsk' => 'Europe_Minsk',
+
+		// Europe_Moldova (uses DST)
+		'Europe/Chisinau' => 'Europe_Moldova',
+
+		// Europe_Moscow (no DST)
+		'Europe/Moscow' => 'Europe_Moscow',
+
+		// Europe_Samara (no DST)
+		'Europe/Samara' => 'Europe_Samara',
+
+		// Europe_Volgograd (no DST)
+		'Europe/Volgograd' => 'Europe_Volgograd',
+
+		// Europe_Western (uses DST)
+		'Europe/Lisbon' => 'Europe_Western',
+
+		// GMT (no DST)
+		'Africa/Abidjan' => 'GMT',
+
+		// Indian_Chagos (no DST)
+		'Indian/Chagos' => 'Indian_Chagos',
+
+		// Indian_Christmas (no DST)
+		'Indian/Christmas' => 'Indian_Christmas',
+
+		// Indian_Cocos (no DST)
+		'Indian/Cocos' => 'Indian_Cocos',
+
+		// Indian_Kerguelen (no DST)
+		'Indian/Kerguelen' => 'Indian_Kerguelen',
+
+		// Indian_Maldives (no DST)
+		'Indian/Maldives' => 'Indian_Maldives',
+
+		// Indian_Mauritius (no DST)
+		'Indian/Mauritius' => 'Indian_Mauritius',
+
+		// Indian_Reunion (no DST)
+		'Indian/Reunion' => 'Indian_Reunion',
+
+		// Indian_Seychelles (no DST)
+		'Indian/Mahe' => 'Indian_Seychelles',
+
+		// North_America_Alaska (uses DST)
+		'America/Anchorage' => 'North_America_Alaska',
+
+		// North_America_Atlantic (uses DST)
+		'America/Halifax' => 'North_America_Atlantic',
+
+		// North_America_Atlantic (no DST)
+		'America/Port_of_Spain' => 'North_America_Atlantic',
+
+		// North_America_Central (uses DST)
+		'America/Chicago' => 'North_America_Central',
+
+		// North_America_Central (no DST)
+		'America/Belize' => 'North_America_Central',
+
+		// North_America_Mexico_Central (uses DST)
+		'America/Mexico_City' => 'North_America_Mexico_Central',
+
+		// North_America_Cuba (uses DST)
+		'America/Havana' => 'North_America_Cuba',
+
+		// North_America_Eastern (uses DST)
+		'America/New_York' => 'North_America_Eastern',
+
+		// North_America_Eastern (no DST)
+		'America/Jamaica' => 'North_America_Eastern',
+
+		// North_America_Greenland_Eastern (uses DST)
+		'America/Scoresbysund' => 'North_America_Greenland_Eastern',
+
+		// North_America_Greenland_Western (uses DST)
+		'America/Godthab' => 'North_America_Greenland_Western',
+
+		// North_America_Hawaii_Aleutian (uses DST)
+		'America/Adak' => 'North_America_Hawaii_Aleutian',
+
+		// North_America_Mountain (uses DST)
+		'America/Denver' => 'North_America_Mountain',
+
+		// North_America_Mountain (no DST)
+		'America/Phoenix' => 'North_America_Mountain',
+
+		// North_America_Mexico_Pacific (uses DST)
+		'America/Chihuahua' => 'North_America_Mexico_Pacific',
+
+		// North_America_Newfoundland (uses DST)
+		'America/St_Johns' => 'North_America_Newfoundland',
+
+		// North_America_Pacific (uses DST)
+		'America/Los_Angeles' => 'North_America_Pacific',
+
+		// North_America_St_Pierre_Miquelon (uses DST)
+		'America/Miquelon' => 'North_America_St_Pierre_Miquelon',
+
+		// Pacific_Bougainville (no DST)
+		'Pacific/Bougainville' => 'Pacific_Bougainville',
+
+		// Pacific_Chamorro (no DST)
+		'Pacific/Guam' => 'Pacific_Chamorro',
+
+		// Pacific_Chatham (uses DST)
+		'Pacific/Chatham' => 'Pacific_Chatham',
+
+		// Pacific_Chuuk (no DST)
+		'Pacific/Chuuk' => 'Pacific_Chuuk',
+
+		// Pacific_Cook (no DST)
+		'Pacific/Rarotonga' => 'Pacific_Cook',
+
+		// Pacific_Easter (uses DST)
+		'Pacific/Easter' => 'Pacific_Easter',
+
+		// Pacific_Fiji (uses DST)
+		'Pacific/Fiji' => 'Pacific_Fiji',
+
+		// Pacific_Galapagos (no DST)
+		'Pacific/Galapagos' => 'Pacific_Galapagos',
+
+		// Pacific_Gambier (no DST)
+		'Pacific/Gambier' => 'Pacific_Gambier',
+
+		// Pacific_Gilbert (no DST)
+		'Pacific/Tarawa' => 'Pacific_Gilbert',
+
+		// Pacific_Hawaii (no DST)
+		'Pacific/Honolulu' => 'Pacific_Hawaii',
+
+		// Pacific_Line (no DST)
+		'Pacific/Kiritimati' => 'Pacific_Line',
+
+		// Pacific_Marquesas (no DST)
+		'Pacific/Marquesas' => 'Pacific_Marquesas',
+
+		// Pacific_Marshall (no DST)
+		'Pacific/Kwajalein' => 'Pacific_Marshall',
+
+		// Pacific_Nauru (no DST)
+		'Pacific/Nauru' => 'Pacific_Nauru',
+
+		// Pacific_New_Caledonia (no DST)
+		'Pacific/Noumea' => 'Pacific_New_Caledonia',
+
+		// Pacific_Apia (uses DST)
+		'Pacific/Apia' => 'Pacific_Apia',
+
+		// Pacific_New_Zealand (uses DST)
+		'Pacific/Auckland' => 'Pacific_New_Zealand',
+
+		// Pacific_Niue (no DST)
+		'Pacific/Niue' => 'Pacific_Niue',
+
+		// Pacific_Norfolk (no DST)
+		'Pacific/Norfolk' => 'Pacific_Norfolk',
+
+		// Pacific_Palau (no DST)
+		'Pacific/Palau' => 'Pacific_Palau',
+
+		// Pacific_Papua_New_Guinea (no DST)
+		'Pacific/Port_Moresby' => 'Pacific_Papua_New_Guinea',
+
+		// Pacific_Phoenix_Islands (no DST)
+		'Pacific/Enderbury' => 'Pacific_Phoenix_Islands',
+
+		// Pacific_Pitcairn (no DST)
+		'Pacific/Pitcairn' => 'Pacific_Pitcairn',
+
+		// Pacific_Pohnpei (no DST)
+		'Pacific/Pohnpei' => 'Pacific_Pohnpei',
+
+		// Pacific_American_Samoa (no DST)
+		'Pacific/Pago_Pago' => 'Pacific_Samoa',
+
+		// Pacific_Solomon (no DST)
+		'Pacific/Guadalcanal' => 'Pacific_Solomon',
+
+		// Pacific_Tahiti (no DST)
+		'Pacific/Tahiti' => 'Pacific_Tahiti',
+
+		// Pacific_Tokelau (no DST)
+		'Pacific/Fakaofo' => 'Pacific_Tokelau',
+
+		// Pacific_Tonga (no DST)
+		'Pacific/Tongatapu' => 'Pacific_Tonga',
+
+		// Pacific_Tuvalu (no DST)
+		'Pacific/Funafuti' => 'Pacific_Tuvalu',
+
+		// Pacific_Vanuatu (no DST)
+		'Pacific/Efate' => 'Pacific_Vanuatu',
+
+		// Pacific_Wake (no DST)
+		'Pacific/Wake' => 'Pacific_Wake',
+
+		// Pacific_Wallis (no DST)
+		'Pacific/Wallis' => 'Pacific_Wallis',
+
+		// South_America_Acre (no DST)
+		'America/Rio_Branco' => 'South_America_Acre',
+
+		// South_America_Amazon (no DST)
+		'America/Manaus' => 'South_America_Amazon',
+
+		// South_America_Argentina (no DST)
+		'America/Argentina/Buenos_Aires' => 'South_America_Argentina',
+
+		// South_America_Bolivia (no DST)
+		'America/La_Paz' => 'South_America_Bolivia',
+
+		// South_America_Brasilia (no DST)
+		'America/Sao_Paulo' => 'South_America_Brasilia',
+
+		// South_America_Chile (uses DST)
+		'America/Santiago' => 'South_America_Chile',
+
+		// South_America_Chile (no DST)
+		'America/Punta_Arenas' => 'South_America_Chile',
+
+		// South_America_Colombia (no DST)
+		'America/Bogota' => 'South_America_Colombia',
+
+		// South_America_Ecuador (no DST)
+		'America/Guayaquil' => 'South_America_Ecuador',
+
+		// South_America_French_Guiana (no DST)
+		'America/Cayenne' => 'South_America_French_Guiana',
+
+		// South_America_Guyana (no DST)
+		'America/Guyana' => 'South_America_Guyana',
+
+		// South_America_Noronha (no DST)
+		'America/Noronha' => 'South_America_Noronha',
+
+		// South_America_Paraguay (uses DST)
+		'America/Asuncion' => 'South_America_Paraguay',
+
+		// South_America_Peru (no DST)
+		'America/Lima' => 'South_America_Peru',
+
+		// South_America_Suriname (no DST)
+		'America/Paramaribo' => 'South_America_Suriname',
+
+		// South_America_Uruguay (no DST)
+		'America/Montevideo' => 'South_America_Uruguay',
+
+		// South_America_Venezuela (no DST)
+		'America/Caracas' => 'South_America_Venezuela',
+	);
+
+	return $tzid_metazones;
+}
+
+/**
+ * Returns an array of all the time zones in a country, ranked according
+ * to population and/or politically significance.
+ *
+ * @param string $country_code The two-character ISO-3166 code for a country.
+ * @return array An array relating time zones to "meta-zones"
+ */
+function get_sorted_tzids_for_country($country_code)
+{
+	/*
+		This array lists all the individual time zones in each country,
+		sorted by population (as reported in statistics available on
+		Wikipedia in November 2020). Sorting this way enables us to
+		consistently select the most appropriate individual time zone to
+		represent all others that share its DST transition rules and values.
+		For example, this ensures that New York will be preferred over
+		random small towns in Indiana.
+
+		If future versions of the time zone database add new time zone
+		identifiers beyond those included here, they should be added to this
+		list appropriate. However, SMF will gracefully handle unexpected new
+		time zones, so nothing will break in the meantime.
+	 */
+	$sorted_tzids = array(
+		// '??' means international.
+		'??' => array(
+			'UTC',
+		),
+		'AD' => array(
+			'Europe/Andorra',
+		),
+		'AE' => array(
+			'Asia/Dubai',
+		),
+		'AF' => array(
+			'Asia/Kabul',
+		),
+		'AG' => array(
+			'America/Antigua',
+		),
+		'AI' => array(
+			'America/Anguilla',
+		),
+		'AL' => array(
+			'Europe/Tirane',
+		),
+		'AM' => array(
+			'Asia/Yerevan',
+		),
+		'AO' => array(
+			'Africa/Luanda',
+		),
+		'AQ' => array(
+			// Sorted based on summer population.
+			'Antarctica/McMurdo',
+			'Antarctica/Casey',
+			'Antarctica/Davis',
+			'Antarctica/Mawson',
+			'Antarctica/Rothera',
+			'Antarctica/Syowa',
+			'Antarctica/Palmer',
+			'Antarctica/Troll',
+			'Antarctica/DumontDUrville',
+			'Antarctica/Vostok',
+		),
+		'AR' => array(
+			'America/Argentina/Buenos_Aires',
+			'America/Argentina/Cordoba',
+			'America/Argentina/Tucuman',
+			'America/Argentina/Salta',
+			'America/Argentina/Jujuy',
+			'America/Argentina/La_Rioja',
+			'America/Argentina/San_Luis',
+			'America/Argentina/Catamarca',
+			'America/Argentina/Mendoza',
+			'America/Argentina/San_Juan',
+			'America/Argentina/Rio_Gallegos',
+			'America/Argentina/Ushuaia',
+		),
+		'AS' => array(
+			'Pacific/Pago_Pago',
+		),
+		'AT' => array(
+			'Europe/Vienna',
+		),
+		'AU' => array(
+			'Australia/Sydney',
+			'Australia/Melbourne',
+			'Australia/Brisbane',
+			'Australia/Perth',
+			'Australia/Adelaide',
+			'Australia/Hobart',
+			'Australia/Darwin',
+			'Australia/Broken_Hill',
+			'Australia/Currie',
+			'Australia/Lord_Howe',
+			'Australia/Eucla',
+			'Australia/Lindeman',
+			'Antarctica/Macquarie',
+		),
+		'AW' => array(
+			'America/Aruba',
+		),
+		'AX' => array(
+			'Europe/Mariehamn',
+		),
+		'AZ' => array(
+			'Asia/Baku',
+		),
+		'BA' => array(
+			'Europe/Sarajevo',
+		),
+		'BB' => array(
+			'America/Barbados',
+		),
+		'BD' => array(
+			'Asia/Dhaka',
+		),
+		'BE' => array(
+			'Europe/Brussels',
+		),
+		'BF' => array(
+			'Africa/Ouagadougou',
+		),
+		'BG' => array(
+			'Europe/Sofia',
+		),
+		'BH' => array(
+			'Asia/Bahrain',
+		),
+		'BI' => array(
+			'Africa/Bujumbura',
+		),
+		'BJ' => array(
+			'Africa/Porto-Novo',
+		),
+		'BL' => array(
+			'America/St_Barthelemy',
+		),
+		'BM' => array(
+			'Atlantic/Bermuda',
+		),
+		'BN' => array(
+			'Asia/Brunei',
+		),
+		'BO' => array(
+			'America/La_Paz',
+		),
+		'BQ' => array(
+			'America/Kralendijk',
+		),
+		'BR' => array(
+			'America/Sao_Paulo',
+			'America/Bahia',
+			'America/Fortaleza',
+			'America/Manaus',
+			'America/Recife',
+			'America/Belem',
+			'America/Maceio',
+			'America/Campo_Grande',
+			'America/Cuiaba',
+			'America/Porto_Velho',
+			'America/Rio_Branco',
+			'America/Boa_Vista',
+			'America/Santarem',
+			'America/Araguaina',
+			'America/Eirunepe',
+			'America/Noronha',
+		),
+		'BS' => array(
+			'America/Nassau',
+		),
+		'BT' => array(
+			'Asia/Thimphu',
+		),
+		'BW' => array(
+			'Africa/Gaborone',
+		),
+		'BY' => array(
+			'Europe/Minsk',
+		),
+		'BZ' => array(
+			'America/Belize',
+		),
+		'CA' => array(
+			'America/Toronto',
+			'America/Vancouver',
+			'America/Edmonton',
+			'America/Winnipeg',
+			'America/Halifax',
+			'America/Regina',
+			'America/St_Johns',
+			'America/Moncton',
+			'America/Thunder_Bay',
+			'America/Whitehorse',
+			'America/Glace_Bay',
+			'America/Yellowknife',
+			'America/Swift_Current',
+			'America/Dawson_Creek',
+			'America/Goose_Bay',
+			'America/Iqaluit',
+			'America/Creston',
+			'America/Fort_Nelson',
+			'America/Inuvik',
+			'America/Atikokan',
+			'America/Rankin_Inlet',
+			'America/Nipigon',
+			'America/Cambridge_Bay',
+			'America/Pangnirtung',
+			'America/Dawson',
+			'America/Blanc-Sablon',
+			'America/Rainy_River',
+			'America/Resolute',
+		),
+		'CC' => array(
+			'Indian/Cocos',
+		),
+		'CD' => array(
+			'Africa/Kinshasa',
+
+			'Africa/Lubumbashi',
+		),
+		'CF' => array(
+			'Africa/Bangui',
+		),
+		'CG' => array(
+			'Africa/Brazzaville',
+		),
+		'CH' => array(
+			'Europe/Zurich',
+		),
+		'CI' => array(
+			'Africa/Abidjan',
+		),
+		'CK' => array(
+			'Pacific/Rarotonga',
+		),
+		'CL' => array(
+			'America/Santiago',
+			'America/Punta_Arenas',
+			'Pacific/Easter',
+		),
+		'CM' => array(
+			'Africa/Douala',
+		),
+		'CN' => array(
+			'Asia/Shanghai',
+
+			'Asia/Urumqi',
+		),
+		'CO' => array(
+			'America/Bogota',
+		),
+		'CR' => array(
+			'America/Costa_Rica',
+		),
+		'CU' => array(
+			'America/Havana',
+		),
+		'CV' => array(
+			'Atlantic/Cape_Verde',
+		),
+		'CW' => array(
+			'America/Curacao',
+		),
+		'CX' => array(
+			'Indian/Christmas',
+		),
+		'CY' => array(
+			'Asia/Nicosia',
+			'Asia/Famagusta',
+		),
+		'CZ' => array(
+			'Europe/Prague',
+		),
+		'DE' => array(
+			'Europe/Berlin',
+			'Europe/Busingen',
+		),
+		'DJ' => array(
+			'Africa/Djibouti',
+		),
+		'DK' => array(
+			'Europe/Copenhagen',
+		),
+		'DM' => array(
+			'America/Dominica',
+		),
+		'DO' => array(
+			'America/Santo_Domingo',
+		),
+		'DZ' => array(
+			'Africa/Algiers',
+		),
+		'EC' => array(
+			'America/Guayaquil',
+			'Pacific/Galapagos',
+		),
+		'EE' => array(
+			'Europe/Tallinn',
+		),
+		'EG' => array(
+			'Africa/Cairo',
+		),
+		'EH' => array(
+			'Africa/El_Aaiun',
+		),
+		'ER' => array(
+			'Africa/Asmara',
+		),
+		'ES' => array(
+			'Europe/Madrid',
+			'Atlantic/Canary',
+			'Africa/Ceuta',
+		),
+		'ET' => array(
+			'Africa/Addis_Ababa',
+		),
+		'FI' => array(
+			'Europe/Helsinki',
+		),
+		'FJ' => array(
+			'Pacific/Fiji',
+		),
+		'FK' => array(
+			'Atlantic/Stanley',
+		),
+		'FM' => array(
+			'Pacific/Chuuk',
+			'Pacific/Kosrae',
+			'Pacific/Pohnpei',
+		),
+		'FO' => array(
+			'Atlantic/Faroe',
+		),
+		'FR' => array(
+			'Europe/Paris',
+		),
+		'GA' => array(
+			'Africa/Libreville',
+		),
+		'GB' => array(
+			'Europe/London',
+		),
+		'GD' => array(
+			'America/Grenada',
+		),
+		'GE' => array(
+			'Asia/Tbilisi',
+		),
+		'GF' => array(
+			'America/Cayenne',
+		),
+		'GG' => array(
+			'Europe/Guernsey',
+		),
+		'GH' => array(
+			'Africa/Accra',
+		),
+		'GI' => array(
+			'Europe/Gibraltar',
+		),
+		'GL' => array(
+			'America/Godthab',
+			'America/Thule',
+			'America/Scoresbysund',
+			'America/Danmarkshavn',
+		),
+		'GM' => array(
+			'Africa/Banjul',
+		),
+		'GN' => array(
+			'Africa/Conakry',
+		),
+		'GP' => array(
+			'America/Guadeloupe',
+		),
+		'GQ' => array(
+			'Africa/Malabo',
+		),
+		'GR' => array(
+			'Europe/Athens',
+		),
+		'GS' => array(
+			'Atlantic/South_Georgia',
+		),
+		'GT' => array(
+			'America/Guatemala',
+		),
+		'GU' => array(
+			'Pacific/Guam',
+		),
+		'GW' => array(
+			'Africa/Bissau',
+		),
+		'GY' => array(
+			'America/Guyana',
+		),
+		'HK' => array(
+			'Asia/Hong_Kong',
+		),
+		'HN' => array(
+			'America/Tegucigalpa',
+		),
+		'HR' => array(
+			'Europe/Zagreb',
+		),
+		'HT' => array(
+			'America/Port-au-Prince',
+		),
+		'HU' => array(
+			'Europe/Budapest',
+		),
+		'ID' => array(
+			'Asia/Jakarta',
+			'Asia/Makassar',
+			'Asia/Pontianak',
+			'Asia/Jayapura',
+		),
+		'IE' => array(
+			'Europe/Dublin',
+		),
+		'IL' => array(
+			'Asia/Jerusalem',
+		),
+		'IM' => array(
+			'Europe/Isle_of_Man',
+		),
+		'IN' => array(
+			'Asia/Kolkata',
+		),
+		'IO' => array(
+			'Indian/Chagos',
+		),
+		'IQ' => array(
+			'Asia/Baghdad',
+		),
+		'IR' => array(
+			'Asia/Tehran',
+		),
+		'IS' => array(
+			'Atlantic/Reykjavik',
+		),
+		'IT' => array(
+			'Europe/Rome',
+		),
+		'JE' => array(
+			'Europe/Jersey',
+		),
+		'JM' => array(
+			'America/Jamaica',
+		),
+		'JO' => array(
+			'Asia/Amman',
+		),
+		'JP' => array(
+			'Asia/Tokyo',
+		),
+		'KE' => array(
+			'Africa/Nairobi',
+		),
+		'KG' => array(
+			'Asia/Bishkek',
+		),
+		'KH' => array(
+			'Asia/Phnom_Penh',
+		),
+		'KI' => array(
+			'Pacific/Tarawa',
+			'Pacific/Kiritimati',
+			'Pacific/Enderbury',
+		),
+		'KM' => array(
+			'Indian/Comoro',
+		),
+		'KN' => array(
+			'America/St_Kitts',
+		),
+		'KP' => array(
+			'Asia/Pyongyang',
+		),
+		'KR' => array(
+			'Asia/Seoul',
+		),
+		'KW' => array(
+			'Asia/Kuwait',
+		),
+		'KY' => array(
+			'America/Cayman',
+		),
+		'KZ' => array(
+			'Asia/Almaty',
+			'Asia/Aqtobe',
+			'Asia/Atyrau',
+			'Asia/Qostanay',
+			'Asia/Qyzylorda',
+			'Asia/Aqtau',
+			'Asia/Oral',
+		),
+		'LA' => array(
+			'Asia/Vientiane',
+		),
+		'LB' => array(
+			'Asia/Beirut',
+		),
+		'LC' => array(
+			'America/St_Lucia',
+		),
+		'LI' => array(
+			'Europe/Vaduz',
+		),
+		'LK' => array(
+			'Asia/Colombo',
+		),
+		'LR' => array(
+			'Africa/Monrovia',
+		),
+		'LS' => array(
+			'Africa/Maseru',
+		),
+		'LT' => array(
+			'Europe/Vilnius',
+		),
+		'LU' => array(
+			'Europe/Luxembourg',
+		),
+		'LV' => array(
+			'Europe/Riga',
+		),
+		'LY' => array(
+			'Africa/Tripoli',
+		),
+		'MA' => array(
+			'Africa/Casablanca',
+		),
+		'MC' => array(
+			'Europe/Monaco',
+		),
+		'MD' => array(
+			'Europe/Chisinau',
+		),
+		'ME' => array(
+			'Europe/Podgorica',
+		),
+		'MF' => array(
+			'America/Marigot',
+		),
+		'MG' => array(
+			'Indian/Antananarivo',
+		),
+		'MH' => array(
+			'Pacific/Majuro',
+			'Pacific/Kwajalein',
+		),
+		'MK' => array(
+			'Europe/Skopje',
+		),
+		'ML' => array(
+			'Africa/Bamako',
+		),
+		'MM' => array(
+			'Asia/Yangon',
+		),
+		'MN' => array(
+			'Asia/Ulaanbaatar',
+			'Asia/Choibalsan',
+			'Asia/Hovd',
+		),
+		'MO' => array(
+			'Asia/Macau',
+		),
+		'MP' => array(
+			'Pacific/Saipan',
+		),
+		'MQ' => array(
+			'America/Martinique',
+		),
+		'MR' => array(
+			'Africa/Nouakchott',
+		),
+		'MS' => array(
+			'America/Montserrat',
+		),
+		'MT' => array(
+			'Europe/Malta',
+		),
+		'MU' => array(
+			'Indian/Mauritius',
+		),
+		'MV' => array(
+			'Indian/Maldives',
+		),
+		'MW' => array(
+			'Africa/Blantyre',
+		),
+		'MX' => array(
+			'America/Mexico_City',
+			'America/Tijuana',
+			'America/Monterrey',
+			'America/Chihuahua',
+			'America/Merida',
+			'America/Hermosillo',
+			'America/Cancun',
+			'America/Matamoros',
+			'America/Mazatlan',
+			'America/Bahia_Banderas',
+			'America/Ojinaga',
+		),
+		'MY' => array(
+			'Asia/Kuala_Lumpur',
+			'Asia/Kuching',
+		),
+		'MZ' => array(
+			'Africa/Maputo',
+		),
+		'NA' => array(
+			'Africa/Windhoek',
+		),
+		'NC' => array(
+			'Pacific/Noumea',
+		),
+		'NE' => array(
+			'Africa/Niamey',
+		),
+		'NF' => array(
+			'Pacific/Norfolk',
+		),
+		'NG' => array(
+			'Africa/Lagos',
+		),
+		'NI' => array(
+			'America/Managua',
+		),
+		'NL' => array(
+			'Europe/Amsterdam',
+		),
+		'NO' => array(
+			'Europe/Oslo',
+		),
+		'NP' => array(
+			'Asia/Kathmandu',
+		),
+		'NR' => array(
+			'Pacific/Nauru',
+		),
+		'NU' => array(
+			'Pacific/Niue',
+		),
+		'NZ' => array(
+			'Pacific/Auckland',
+			'Pacific/Chatham',
+		),
+		'OM' => array(
+			'Asia/Muscat',
+		),
+		'PA' => array(
+			'America/Panama',
+		),
+		'PE' => array(
+			'America/Lima',
+		),
+		'PF' => array(
+			'Pacific/Tahiti',
+			'Pacific/Marquesas',
+			'Pacific/Gambier',
+		),
+		'PG' => array(
+			'Pacific/Port_Moresby',
+			'Pacific/Bougainville',
+		),
+		'PH' => array(
+			'Asia/Manila',
+		),
+		'PK' => array(
+			'Asia/Karachi',
+		),
+		'PL' => array(
+			'Europe/Warsaw',
+		),
+		'PM' => array(
+			'America/Miquelon',
+		),
+		'PN' => array(
+			'Pacific/Pitcairn',
+		),
+		'PR' => array(
+			'America/Puerto_Rico',
+		),
+		'PS' => array(
+			'Asia/Gaza',
+			'Asia/Hebron',
+		),
+		'PT' => array(
+			'Europe/Lisbon',
+			'Atlantic/Madeira',
+			'Atlantic/Azores',
+		),
+		'PW' => array(
+			'Pacific/Palau',
+		),
+		'PY' => array(
+			'America/Asuncion',
+		),
+		'QA' => array(
+			'Asia/Qatar',
+		),
+		'RE' => array(
+			'Indian/Reunion',
+		),
+		'RO' => array(
+			'Europe/Bucharest',
+		),
+		'RS' => array(
+			'Europe/Belgrade',
+		),
+		'RU' => array(
+			'Europe/Moscow',
+			'Asia/Novosibirsk',
+			'Asia/Yekaterinburg',
+			'Europe/Samara',
+			'Asia/Omsk',
+			'Asia/Krasnoyarsk',
+			'Europe/Volgograd',
+			'Europe/Saratov',
+			'Asia/Barnaul',
+			'Europe/Ulyanovsk',
+			'Asia/Irkutsk',
+			'Asia/Vladivostok',
+			'Asia/Tomsk',
+			'Asia/Novokuznetsk',
+			'Europe/Astrakhan',
+			'Europe/Kirov',
+			'Europe/Kaliningrad',
+			'Asia/Chita',
+			'Asia/Yakutsk',
+			'Asia/Sakhalin',
+			'Asia/Kamchatka',
+			'Asia/Magadan',
+			'Asia/Anadyr',
+			'Asia/Khandyga',
+			'Asia/Ust-Nera',
+			'Asia/Srednekolymsk',
+		),
+		'RW' => array(
+			'Africa/Kigali',
+		),
+		'SA' => array(
+			'Asia/Riyadh',
+		),
+		'SB' => array(
+			'Pacific/Guadalcanal',
+		),
+		'SC' => array(
+			'Indian/Mahe',
+		),
+		'SD' => array(
+			'Africa/Khartoum',
+		),
+		'SE' => array(
+			'Europe/Stockholm',
+		),
+		'SG' => array(
+			'Asia/Singapore',
+		),
+		'SH' => array(
+			'Atlantic/St_Helena',
+		),
+		'SI' => array(
+			'Europe/Ljubljana',
+		),
+		'SJ' => array(
+			'Arctic/Longyearbyen',
+		),
+		'SK' => array(
+			'Europe/Bratislava',
+		),
+		'SL' => array(
+			'Africa/Freetown',
+		),
+		'SM' => array(
+			'Europe/San_Marino',
+		),
+		'SN' => array(
+			'Africa/Dakar',
+		),
+		'SO' => array(
+			'Africa/Mogadishu',
+		),
+		'SR' => array(
+			'America/Paramaribo',
+		),
+		'SS' => array(
+			'Africa/Juba',
+		),
+		'ST' => array(
+			'Africa/Sao_Tome',
+		),
+		'SV' => array(
+			'America/El_Salvador',
+		),
+		'SX' => array(
+			'America/Lower_Princes',
+		),
+		'SY' => array(
+			'Asia/Damascus',
+		),
+		'SZ' => array(
+			'Africa/Mbabane',
+		),
+		'TC' => array(
+			'America/Grand_Turk',
+		),
+		'TD' => array(
+			'Africa/Ndjamena',
+		),
+		'TF' => array(
+			'Indian/Kerguelen',
+		),
+		'TG' => array(
+			'Africa/Lome',
+		),
+		'TH' => array(
+			'Asia/Bangkok',
+		),
+		'TJ' => array(
+			'Asia/Dushanbe',
+		),
+		'TK' => array(
+			'Pacific/Fakaofo',
+		),
+		'TL' => array(
+			'Asia/Dili',
+		),
+		'TM' => array(
+			'Asia/Ashgabat',
+		),
+		'TN' => array(
+			'Africa/Tunis',
+		),
+		'TO' => array(
+			'Pacific/Tongatapu',
+		),
+		'TR' => array(
+			'Europe/Istanbul',
+		),
+		'TT' => array(
+			'America/Port_of_Spain',
+		),
+		'TV' => array(
+			'Pacific/Funafuti',
+		),
+		'TW' => array(
+			'Asia/Taipei',
+		),
+		'TZ' => array(
+			'Africa/Dar_es_Salaam',
+		),
+		'UA' => array(
+			'Europe/Kiev',
+			'Europe/Zaporozhye',
+			'Europe/Simferopol',
+			'Europe/Uzhgorod',
+		),
+		'UG' => array(
+			'Africa/Kampala',
+		),
+		'UM' => array(
+			'Pacific/Midway',
+
+			'Pacific/Wake',
+		),
+		'US' => array(
+			'America/New_York',
+			'America/Los_Angeles',
+			'America/Chicago',
+			'America/Denver',
+			'America/Phoenix',
+			'America/Indiana/Indianapolis',
+			'America/Detroit',
+			'America/Kentucky/Louisville',
+			'Pacific/Honolulu',
+			'America/Anchorage',
+			'America/Boise',
+			'America/Juneau',
+			'America/Indiana/Vincennes',
+			'America/Sitka',
+			'America/Menominee',
+			'America/Indiana/Tell_City',
+			'America/Kentucky/Monticello',
+			'America/Nome',
+			'America/Indiana/Knox',
+			'America/North_Dakota/Beulah',
+			'America/Indiana/Winamac',
+			'America/Indiana/Petersburg',
+			'America/Indiana/Vevay',
+			'America/Metlakatla',
+			'America/North_Dakota/New_Salem',
+			'America/Indiana/Marengo',
+			'America/Yakutat',
+			'America/North_Dakota/Center',
+			'America/Adak',
+		),
+		'UY' => array(
+			'America/Montevideo',
+		),
+		'UZ' => array(
+			'Asia/Tashkent',
+			'Asia/Samarkand',
+		),
+		'VA' => array(
+			'Europe/Vatican',
+		),
+		'VC' => array(
+			'America/St_Vincent',
+		),
+		'VE' => array(
+			'America/Caracas',
+		),
+		'VG' => array(
+			'America/Tortola',
+		),
+		'VI' => array(
+			'America/St_Thomas',
+		),
+		'VN' => array(
+			'Asia/Ho_Chi_Minh',
+		),
+		'VU' => array(
+			'Pacific/Efate',
+		),
+		'WF' => array(
+			'Pacific/Wallis',
+		),
+		'WS' => array(
+			'Pacific/Apia',
+		),
+		'YE' => array(
+			'Asia/Aden',
+		),
+		'YT' => array(
+			'Indian/Mayotte',
+		),
+		'ZA' => array(
+			'Africa/Johannesburg',
+		),
+		'ZM' => array(
+			'Africa/Lusaka',
+		),
+		'ZW' => array(
+			'Africa/Harare',
+		),
+	);
+
+	$country_tzids = isset($sorted_tzids[$country_code]) ? $sorted_tzids[$country_code] : array();
+
+	// Ensure we haven't missed anything, but never include obsolete ones either.
+	$temp = array_intersect(@timezone_identifiers_list(DateTimeZone::PER_COUNTRY, $country_code), timezone_identifiers_list());
+	if (!empty($temp))
+		$country_tzids = array_unique(array_merge($country_tzids, $temp));
+
+	return $country_tzids;
+}
+
+?>
\ No newline at end of file
diff --git a/Sources/Subs.php b/Sources/Subs.php
index 6aed89cad0..402f12bc8a 100755
--- a/Sources/Subs.php
+++ b/Sources/Subs.php
@@ -1124,46 +1124,22 @@ function shorten_subject($subject, $len)
  *
  * @param bool $use_user_offset Whether to apply the user's offset as well
  * @param int $timestamp A timestamp (null to use current time)
- * @param bool $local_to_server sometimes you need to go the other way - from user prompt to server time
  * @return int Seconds since the unix epoch, with forum time offset and (optionally) user time offset applied
  */
-function forum_time($use_user_offset = true, $timestamp = null, $local_to_server = false)
+function forum_time($use_user_offset = true, $timestamp = null)
 {
-	global $user_info, $modSettings, $user_settings;
+	global $user_info, $modSettings;
 
 	// Ensure required values are set
 	$modSettings['time_offset'] = !empty($modSettings['time_offset']) ? $modSettings['time_offset'] : 0;
+	$user_info['time_offset'] = !empty($user_info['time_offset']) ? $user_info['time_offset'] : 0;
 
 	if ($timestamp === null)
 		$timestamp = time();
 	elseif ($timestamp == 0)
 		return 0;
 
-	$user_offset = 0;
-
-	if ($use_user_offset)
-	{
-		// Fall back on current user offset setting if you must
-		$user_offset = !empty($user_info['time_offset']) ? $user_info['time_offset'] : 0;
-
-		// But finding the user offset for the time in question is better
-		if (!empty($user_settings['timezone']))
-		{
-			$dtz_user = new DateTimeZone($user_settings['timezone']);
-			if ($dtz_user !== false)
-			{
-				$dt_user = new DateTime('@' . $timestamp);
-				$temp_offset = $dtz_user->getOffset($dt_user);
-				if ($temp_offset !== false)
-					$user_offset = $temp_offset/3600;
-			}
-		}
-	}
-
-	if ($local_to_server)
-		return $timestamp - ($modSettings['time_offset'] + $user_offset) * 3600;
-	else
-		return $timestamp + ($modSettings['time_offset'] + $user_offset) * 3600;
+	return $timestamp + ($modSettings['time_offset'] + ($use_user_offset ? $user_info['time_offset'] : 0)) * 3600;
 }
 
 /**
@@ -5951,14 +5927,10 @@ function get_gravatar_url($email_address)
  */
 function smf_list_timezones($when = 'now')
 {
-	global $smcFunc, $modSettings, $tztxt, $txt, $cur_profile;
-	static $timezones = null, $lastwhen = null;
+	global $modSettings, $tztxt, $txt, $context, $cur_profile, $sourcedir;
+	static $timezones_when = array();
 
-	// No point doing this over if we already did it once
-	if (!empty($timezones) && $when == $lastwhen)
-		return $timezones;
-	else
-		$lastwhen = $when;
+	require_once($sourcedir . '/Subs-Timezones.php');
 
 	// Parseable datetime string?
 	if (is_int($timestamp = strtotime($when)))
@@ -5972,6 +5944,10 @@ function smf_list_timezones($when = 'now')
 	else
 		$when = time();
 
+	// No point doing this over if we already did it once
+	if (isset($timezones_when[$when]))
+		return $timezones_when[$when];
+
 	// We'll need these too
 	$date_when = date_create('@' . $when);
 	$later = strtotime('@' . $when . ' + 1 year');
@@ -5979,12 +5955,16 @@ function smf_list_timezones($when = 'now')
 	// Load up any custom time zone descriptions we might have
 	loadLanguage('Timezones');
 
+	$tzid_metazones = get_tzid_metazones();
+
 	// Should we put time zones from certain countries at the top of the list?
 	$priority_countries = !empty($modSettings['timezone_priority_countries']) ? explode(',', $modSettings['timezone_priority_countries']) : array();
+
 	$priority_tzids = array();
 	foreach ($priority_countries as $country)
 	{
-		$country_tzids = @timezone_identifiers_list(DateTimeZone::PER_COUNTRY, strtoupper(trim($country)));
+		$country_tzids = get_sorted_tzids_for_country($country);
+
 		if (!empty($country_tzids))
 			$priority_tzids = array_merge($priority_tzids, $country_tzids);
 	}
@@ -5992,10 +5972,15 @@ function smf_list_timezones($when = 'now')
 	// Antarctic research stations should be listed last, unless you're running a penguin forum
 	$low_priority_tzids = !in_array('AQ', $priority_countries) ? timezone_identifiers_list(DateTimeZone::ANTARCTICA) : array();
 
+	$normal_priority_tzids = array_diff(array_unique(array_merge(array_keys($tzid_metazones), timezone_identifiers_list())), $priority_tzids, $low_priority_tzids);
+
 	// Process the preferred timezones first, then the normal ones, then the low priority ones.
-	$tzids = array_merge(array_keys($tztxt), array_diff(timezone_identifiers_list(), array_keys($tztxt), $low_priority_tzids), $low_priority_tzids);
+	$tzids = array_merge($priority_tzids, array('UTC'), $normal_priority_tzids, $low_priority_tzids);
 
 	// Idea here is to get exactly one representative identifier for each and every unique set of time zone rules.
+	$dst_types = array();
+	$labels = array();
+	$offsets = array();
 	foreach ($tzids as $tzid)
 	{
 		// We don't want UTC right now
@@ -6010,14 +5995,30 @@ function smf_list_timezones($when = 'now')
 		// Use the entire set of transition rules as the array *key* so we can avoid duplicates
 		$tzkey = serialize($tzinfo);
 
-		// Next, get the geographic info for this tzid
-		$tzgeo = timezone_location_get($tz);
+		// ...But make sure to include all explicitly defined meta-zones.
+		if (isset($zones[$tzkey]['metazone']) && isset($tzid_metazones[$tzid]))
+			$tzkey = serialize(array_merge($tzinfo, array('metazone' => $tzid_metazones[$tzid])));
 
 		// Don't overwrite our preferred tzids
 		if (empty($zones[$tzkey]['tzid']))
 		{
 			$zones[$tzkey]['tzid'] = $tzid;
-			$zones[$tzkey]['abbr'] = $tzinfo[0]['abbr'];
+			$zones[$tzkey]['dst_type'] = count($tzinfo) > 1 ? 1 : ($tzinfo[0]['isdst'] ? 2 : 0);
+
+			foreach ($tzinfo as $transition) {
+				$zones[$tzkey]['abbrs'][] = $transition['abbr'];
+			}
+
+			if (isset($tzid_metazones[$tzid]))
+				$zones[$tzkey]['metazone'] = $tzid_metazones[$tzid];
+			else
+			{
+				$tzgeo = timezone_location_get($tz);
+				$country_tzids = get_sorted_tzids_for_country($tzgeo['country_code']);
+
+				if (count($country_tzids) === 1)
+					$zones[$tzkey]['metazone'] = $txt['iso3166'][$tzgeo['country_code']];
+			}
 		}
 
 		// A time zone from a prioritized country?
@@ -6033,15 +6034,25 @@ function smf_list_timezones($when = 'now')
 			$zones[$tzkey]['locations'][] = str_replace(array('St_', '_'), array('St. ', ' '), array_pop($tzid_parts));
 		}
 		$offsets[$tzkey] = $tzinfo[0]['offset'];
-		$longitudes[$tzkey] = empty($longitudes[$tzkey]) ? $tzgeo['longitude'] : $longitudes[$tzkey];
+
+		// Figure out the "metazone" info for the label
+		if (empty($zones[$tzkey]['metazone']) && isset($tzid_metazones[$tzid]))
+		{
+			$zones[$tzkey]['metazone'] = $tzid_metazones[$tzid];
+			$zones[$tzkey]['dst_type'] = count($tzinfo) > 1 ? 1 : ($tzinfo[0]['isdst'] ? 2 : 0);
+		}
+		$dst_types[$tzkey] = count($tzinfo) > 1 ? 'c' : ($tzinfo[0]['isdst'] ? 't' : 'f');
+		$labels[$tzkey] = !empty($zones[$tzkey]['metazone']) && !empty($tztxt[$zones[$tzkey]['metazone']]) ? $tztxt[$zones[$tzkey]['metazone']] : '';
 
 		// Remember this for later
 		if (isset($cur_profile['timezone']) && $cur_profile['timezone'] == $tzid)
 			$member_tzkey = $tzkey;
+		if (isset($context['event']['tz']) && $context['event']['tz'] == $tzid)
+			$event_tzkey = $tzkey;
 	}
 
-	// Sort by offset then longitude
-	array_multisort($offsets, SORT_ASC, SORT_NUMERIC, $longitudes, SORT_ASC, SORT_NUMERIC, $zones);
+	// Sort by offset, then label, then DST type.
+	array_multisort($offsets, SORT_ASC, SORT_NUMERIC, $labels, SORT_ASC, $dst_types, SORT_ASC, $zones);
 
 	// Build the final array of formatted values
 	$priority_timezones = array();
@@ -6050,24 +6061,53 @@ function smf_list_timezones($when = 'now')
 	{
 		date_timezone_set($date_when, timezone_open($tzvalue['tzid']));
 
-		// Use the custom description, if there is one
-		if (!empty($tztxt[$tzvalue['tzid']]))
-			$desc = $tztxt[$tzvalue['tzid']];
+		// Use the human friendly time zone name, if there is one.
+		$desc = '';
+		if (!empty($tzvalue['metazone']))
+		{
+			if (!empty($tztxt[$tzvalue['metazone']]))
+				$metazone = $tztxt[$tzvalue['metazone']];
+			else
+				$metazone = sprintf($tztxt['generic_timezone'], $tzvalue['metazone'], '%1$s');
+
+			switch ($tzvalue['dst_type'])
+			{
+				case 0:
+					$desc = sprintf($metazone, $tztxt['daylight_saving_time_false']);
+					break;
+
+				case 1:
+					$desc = sprintf($metazone, '');
+					break;
+
+				case 2:
+					$desc = sprintf($metazone, $tztxt['daylight_saving_time_true']);
+					break;
+			}
+		}
 		// Otherwise, use the list of locations (max 5, so things don't get silly)
 		else
 			$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
 
-		// Show the UTC offset and the abbreviation, if it's something like 'MST' and not '-06'
-		$desc = '[UTC' . date_format($date_when, 'P') . '] - ' . (!strspn($tzvalue['abbr'], '+-') ? $tzvalue['abbr'] . ' - ' : '') . $desc;
+		// We don't want abbreviations like '+03' or '-11'.
+		$abbrs = array_filter($tzvalue['abbrs'], function ($abbr) {
+			return !strspn($abbr, '+-');
+		});
+		$abbrs = count($abbrs) == count($tzvalue['abbrs']) ? array_unique($abbrs) : array();
+
+		// Show the UTC offset and abbreviation(s).
+		$desc = '[UTC' . date_format($date_when, 'P') . '] - ' . str_replace('  ', ' ', $desc) . (!empty($abbrs) ? ' (' . implode('/', $abbrs) . ')' : '');
 
 		if (isset($priority_zones[$tzkey]))
 			$priority_timezones[$tzvalue['tzid']] = $desc;
 		else
 			$timezones[$tzvalue['tzid']] = $desc;
 
-		// Automatically fix orphaned timezones on the member profile page
+		// Automatically fix orphaned time zones.
 		if (isset($member_tzkey) && $member_tzkey == $tzkey)
 			$cur_profile['timezone'] = $tzvalue['tzid'];
+		if (isset($event_tzkey) && $event_tzkey == $tzkey)
+			$context['event']['tz'] = $tzvalue['tzid'];
 	}
 
 	if (!empty($priority_timezones))
@@ -6079,7 +6119,62 @@ function smf_list_timezones($when = 'now')
 		$timezones
 	);
 
-	return $timezones;
+	$timezones_when[$when] = $timezones;
+
+	return $timezones_when[$when];
+}
+
+/**
+ * Gets a member's selected timezone identifier
+ *
+ * @param int $id_member The member id to look up. If not provided, the current user's id will be used.
+ * @return string The timezone identifier string for the user's timezone.
+ */
+function getUserTimezone($id_member = null)
+{
+	global $smcFunc, $context, $user_info, $modSettings, $user_settings;
+	static $member_cache = array();
+
+	if (is_null($id_member) && $user_info['is_guest'] == false)
+		$id_member = $context['user']['id'];
+
+	// Did we already look this up?
+	if (isset($id_member) && isset($member_cache[$id_member]))
+	{
+		return $member_cache[$id_member];
+	}
+
+	// Check if we already have this in $user_settings.
+	if (isset($user_settings['id_member']) && $user_settings['id_member'] == $id_member && !empty($user_settings['timezone']))
+	{
+		$member_cache[$id_member] = $user_settings['timezone'];
+		return $user_settings['timezone'];
+	}
+
+	// Look it up in the database.
+	if (isset($id_member))
+	{
+		$request = $smcFunc['db_query']('', '
+			SELECT timezone
+			FROM {db_prefix}members
+			WHERE id_member = {int:id_member}',
+			array(
+				'id_member' => $id_member,
+			)
+		);
+		list($timezone) = $smcFunc['db_fetch_row']($request);
+		$smcFunc['db_free_result']($request);
+	}
+
+	// If it is invalid, fall back to the default.
+	if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
+		$timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get();
+
+	// Save for later.
+	if (isset($id_member))
+		$member_cache[$id_member] = $timezone;
+
+	return $timezone;
 }
 
 /**
diff --git a/Themes/default/Post.template.php b/Themes/default/Post.template.php
index 5331e52641..433a6f6b50 100644
--- a/Themes/default/Post.template.php
+++ b/Themes/default/Post.template.php
@@ -137,80 +137,55 @@ function addPollOption()
 	// Are you posting a calendar event?
 	if ($context['make_event'])
 	{
+		// Note to theme writers: The JavaScripts expect the input fields for the start and end dates & times to be contained in a wrapper element with the id "event_time_input"
 		echo '
 					<hr class="clear">
 					<div id="post_event">
-						<fieldset id="event_main">
-							<legend><span', isset($context['post_error']['no_event']) ? ' class="error"' : '', '>', $txt['calendar_event_title'], '</span></legend>
+						<fieldset id="event_options">
+							<legend', isset($context['post_error']['no_event']) ? ' class="error"' : '', '>', $txt['calendar_event_options'], '</legend>
 							<input type="hidden" name="calendar" value="1">
-							<div class="event_options_left" id="event_title">
+							<div class="event_options" id="event_title">
 								<div>
-									<input type="text" id="evtitle" name="evtitle" maxlength="255" size="55" value="', $context['event']['title'], '" tabindex="', $context['tabindex']++, '">
+									<span class="label">', $txt['calendar_event_title'], '</span>
+									<input type="text" id="evtitle" name="evtitle" maxlength="255" value="', $context['event']['title'], '" tabindex="', $context['tabindex']++, '">
 								</div>
-							</div>';
+							</div>
+							<div class="event_options">
+								<div class="event_options_left" id="event_time_input">
+									<div>
+										<span class="label">', $txt['start'], '</span>
+										<input type="text" name="start_date" id="start_date" maxlength="10" value="', $context['event']['start_date'], '" tabindex="', $context['tabindex']++, '" class="date_input start" data-type="date">
+										<input type="text" name="start_time" id="start_time" maxlength="11" value="', $context['event']['start_time'], '" tabindex="', $context['tabindex']++, '" class="time_input start" data-type="time"', !empty($context['event']['allday']) ? ' disabled' : '', '>
+									</div>
+									<div>
+										<span class="label">', $txt['end'], '</span>
+										<input type="text" name="end_date" id="end_date" maxlength="10" value="', $context['event']['end_date'], '" tabindex="', $context['tabindex']++, '" class="date_input end" data-type="date"', $modSettings['cal_maxspan'] == 1 ? ' disabled' : '', '>
+										<input type="text" name="end_time" id="end_time" maxlength="11" value="', $context['event']['end_time'], '" tabindex="', $context['tabindex']++, '" class="time_input end" data-type="time"', !empty($context['event']['allday']) ? ' disabled' : '', '>
+									</div>
+								</div>
+								<div class="event_options_right" id="event_time_options">
+									<div id="event_allday">
+										<label for="allday"><span class="label">', $txt['calendar_allday'], '</span></label>
+										<input type="checkbox" name="allday" id="allday"', !empty($context['event']['allday']) ? ' checked' : '', ' tabindex="', $context['tabindex']++, '">
+									</div>
+									<div id="event_timezone">
+										<span class="label">', $txt['calendar_timezone'], '</span>
+										<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
 
-		// If this is a new event let the user specify which board they want the linked post to be put into.
-		if ($context['event']['new'] && $context['is_new_post'])
-		{
-			echo '
-							<div class="event_options_right" id="event_board">
-								<div>
-									<span class="label">', $txt['calendar_post_in'], '</span>
-								<select name="board">';
-			foreach ($context['event']['categories'] as $category)
-			{
+			foreach ($context['all_timezones'] as $tz => $tzname)
 				echo '
-										<optgroup label="', $category['name'], '">';
+											<option', is_numeric($tz) ? ' value="" disabled' : ' value="' . $tz . '"', $tz === $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
 
-				foreach ($category['boards'] as $board)
-					echo '
-											<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
-				echo '
-										</optgroup>';
-			}
 			echo '
-									</select>
-								</div>
-							</div><!-- #event_board -->';
-		}
-
-		// Note to theme writers: The JavaScripts expect the input fields for the start and end dates & times to be contained in a wrapper element with the id "event_time_input"
-		echo '
-						</fieldset>
-						<fieldset id="event_options">
-							<legend>', $txt['calendar_event_options'], '</legend>
-							<div class="event_options_left" id="event_time_input">
-								<div>
-									<span class="label">', $txt['start'], '</span>
-									<input type="text" name="start_date" id="start_date" maxlength="10" value="', $context['event']['start_date'], '" tabindex="', $context['tabindex']++, '" class="date_input start" data-type="date">
-									<input type="text" name="start_time" id="start_time" maxlength="11" value="', $context['event']['start_time'], '" tabindex="', $context['tabindex']++, '" class="time_input start" data-type="time"', !empty($context['event']['allday']) ? ' disabled' : '', '>
-								</div>
-								<div>
-									<span class="label">', $txt['end'], '</span>
-									<input type="text" name="end_date" id="end_date" maxlength="10" value="', $context['event']['end_date'], '" tabindex="', $context['tabindex']++, '" class="date_input end" data-type="date"', $modSettings['cal_maxspan'] == 1 ? ' disabled' : '', '>
-									<input type="text" name="end_time" id="end_time" maxlength="11" value="', $context['event']['end_time'], '" tabindex="', $context['tabindex']++, '" class="time_input end" data-type="time"', !empty($context['event']['allday']) ? ' disabled' : '', '>
+										</select>
+									</div>
 								</div>
 							</div>
-							<div class="event_options_right" id="event_time_options">
-								<div id="event_allday">
-									<label for="allday"><span class="label">', $txt['calendar_allday'], '</span></label>
-									<input type="checkbox" name="allday" id="allday"', !empty($context['event']['allday']) ? ' checked' : '', ' tabindex="', $context['tabindex']++, '">
-								</div>
-								<div id="event_timezone">
-									<span class="label">', $txt['calendar_timezone'], '</span>
-									<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
-
-		foreach ($context['all_timezones'] as $tz => $tzname)
-			echo '
-										<option', is_numeric($tz) ? ' value="" disabled' : ' value="' . $tz . '"', $tz === $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
-
-		echo '
-									</select>
+							<div class="event_options">
+								<div>
+									<span class="label">', $txt['location'], '</span>
+									<input type="text" name="event_location" id="event_location" maxlength="255" value="', $context['event']['location'], '" tabindex="', $context['tabindex']++, '">
 								</div>
-							</div><!-- #event_time_options -->
-							<div>
-								<span class="label">', $txt['location'], '</span>
-								<input type="text" name="event_location" id="event_location" maxlength="255" value="', $context['event']['location'], '" tabindex="', $context['tabindex']++, '">
 							</div>
 						</fieldset>
 					</div><!-- #post_event -->';
diff --git a/Themes/default/css/index.css b/Themes/default/css/index.css
index 8ec9e0f00b..6be2b445cb 100644
--- a/Themes/default/css/index.css
+++ b/Themes/default/css/index.css
@@ -1470,37 +1470,41 @@ ul li.greeting {
 	padding: 6px;
 	clear: both;
 }
-div.event_options {
-	line-height: 25px;
-	margin-top: 5px;
-}
 #post_event span.label {
 	margin: 0 0.5em 0 2px;
 	min-width: 60px;
 	display: inline-block;
 }
 
+.event_options {
+	line-height: 25px;
+	display: flex;
+	flex-flow: row wrap;
+}
+.event_options div {
+	min-height: 25px;
+	margin-bottom: 5px;
+	flex: 1 0 auto;
+}
 .event_options_left {
-	display: inline-block;
+	box-sizing: border-box;
 	width: 49%;
 	padding-right: 1em;
 	min-width: 238px;
 }
 .event_options_right {
-	display: inline-block;
+	box-sizing: border-box;
 	width: 50%;
+	min-width: 270px;
 }
-.event_options_left div, .event_options_right div {
-	min-height: 25px;
-	margin-bottom: 5px;
+.event_options_left div,
+.event_options_right div {
+	white-space: nowrap;
 }
 
 #post_event #event_main input {
 	margin: 0;
 }
-#evtitle {
-	max-width: 100%;
-}
 #event_time_input {
 	clear: left;
 }
@@ -1517,7 +1521,7 @@ div.event_options {
 #post_event select, #event_options input[type="text"], #tz {
 	max-width: calc(100% - 75px);
 }
-#post_event select, #event_location {
+#post_event select, #evtitle, #event_location {
 	width: calc(100% - 75px);
 }
 #post_event input[type="checkbox"] + select {
diff --git a/Themes/default/languages/Help.english.php b/Themes/default/languages/Help.english.php
index 9e7eaa0208..45b9983552 100644
--- a/Themes/default/languages/Help.english.php
+++ b/Themes/default/languages/Help.english.php
@@ -638,8 +638,8 @@
 $helptxt['languages_txt'] = 'These language entries are used throughout SMF to define localized versions of text for different languages.<br><br>If you see a value like <code>&#37;1$s</code> in an entry, it is a placeholder that SMF fills in with a real value at runtime. Make sure to keep such placeholders in your customized text.';
 $helptxt['languages_helptxt'] = 'These language entries are used to show floating help text popups (like this one).';
 $helptxt['languages_editortxt'] = 'These language entries are used for user interface elements in the post editor.';
-$helptxt['languages_tztxt'] = 'These language entries define custom descriptions for entire time zones.<br><br>Each of these language entries uses a specific location, such as <code>Africa/Khartoum</code> or <code>America/New_York</code>, to represent all locations that share its time zone, and then defines a custom description to use for that time zone.<br><br>If no description is set for a given time zone, SMF will generate one using a list of locations within that time zone. If a location is set for a given time zone, but the description is empty, SMF will generate a description in the same way, but will make sure to put the defined location first in the list.';
-$helptxt['languages_txt_for_timezones'] = 'These language entries allow you to define custom names for individual locations anywhere they might be used in a context related to time zones.<br><br>For example, you can tell SMF to show "Greenland" for the location "America/Godthab" instead of "Godthab".';
+$helptxt['languages_tztxt'] = 'These language entries are used to build descriptions for time zones.<br><br>For example, the <code>Europe_Western</code> string may be combined with the <code>daylight_saving_time_false</code> string to produce "Western Europe Standard Time".<br><br>Note: If no description is provided for a given time zone, SMF will generate a description using a list of locations within that time zone.';
+$helptxt['languages_txt_for_timezones'] = 'These language entries allow you to do the following:<br><ol class="bbc_list" style="list-style-type: decimal;"><li>Edit the names shown for individual locations anywhere they might be used in a context related to time zones. For example, you can tell SMF to show "Qaanaaq" for the location "America/Thule" instead of "Thule".</li><li>Edit the names shown for different countries. This can be done by editing the relevant <code>iso3166[]</code> string.</li></ol>';
 $helptxt['languages_txt_for_email_templates'] = 'These language entries are used to create the email messages that SMF sends to your members.';
 $helptxt['languages_native_name'] = 'The language\'s name for itself, represented in its own script.';
 $helptxt['languages_character_set'] = 'The character encoding used for this language. As of SMF 2.1, this should always be "UTF-8".';
diff --git a/Themes/default/languages/ManageSettings.english.php b/Themes/default/languages/ManageSettings.english.php
index 15a03478d5..e3ef58ce57 100755
--- a/Themes/default/languages/ManageSettings.english.php
+++ b/Themes/default/languages/ManageSettings.english.php
@@ -399,7 +399,7 @@
 $txt['languages_helptxt'] = 'Help text';
 $txt['languages_editortxt'] = 'User interface for the editor';
 $txt['languages_tztxt'] = 'Time zone descriptions';
-$txt['languages_txt_for_timezones'] = 'Custom location names';
+$txt['languages_txt_for_timezones'] = 'Place names';
 $txt['languages_txt_for_email_templates'] = 'Email message templates';
 $txt['languages_enter_key'] = 'Enter a variable name for this text string';
 $txt['languages_invalid_key'] = 'Sorry, but this variable name is invalid: ';
diff --git a/Themes/default/languages/Timezones.english.php b/Themes/default/languages/Timezones.english.php
index 5c3d13544c..51314e7cd1 100644
--- a/Themes/default/languages/Timezones.english.php
+++ b/Themes/default/languages/Timezones.english.php
@@ -1,101 +1,850 @@
 <?php
 // Version: 2.1 RC3; Timezones
 
-/**
- * This file defines custom descriptions for certain time zones to be used in
- * the time zone select menu, calendar event info, etc.
- *
- * It is not necessary to define a custom description for every time zone. By
- * default SMF will populate the description with a list of locations (usually
- * cities) that are in the given time zone, so a custom description is only
- * needed if the default description doesn't work well in a particular case.
- *
- * Translators do not need to use the same list of locations that the English
- * version uses. If you need to add, replace, or remove locations in order to
- * meet the needs of your language, SMF will handle your changes gracefully.
- *
- * HOW THIS FILE WORKS:
- *
- * There are three sections to this file. The first two sections use the $tztxt
- * variable, and the third uses the $txt variable.
- *
- * The first section uses this format:
- *
- *     $tztxt['America/Anchorage'] = 'Alaska';
- *
- * This tells SMF (1) to use 'America/Anchorage' as the specific location to
- * represent all locations that use the same time zone rules that Anchorage
- * does, and (2) to use 'Alaska' as the description string to show the user in
- * the select menu.
- *
- * The second section uses this format:
- *
- *     $tztxt['Europe/London'] = '';
- *
- * This tells SMF (1) to use 'Europe/London' as the specific location to
- * represent all locations that use the same time zone rules that London does,
- * and (2) to place London first in the list of locations used as the
- * description string shown to the user in the select menu.
- *
- * The third section uses this format:
- *
- *     $txt['America/Adak'] = 'Aleutian Islands';
- *
- * This simply tells SMF to replace 'Adak' with 'Aleutian Islands' anywhere it
- * might be used, including in the select menu, on the calendar, in event info
- * in a topic, etc. It does not tell SMF anything in particular about where or
- * how it should use the 'America/Adak' location.
- */
-
 global $tztxt;
 
-// Descriptions for entire time zones to use instead of a list of locations
-$tztxt['UTC'] = 'Coordinated Universal Time';
-$tztxt['America/Anchorage'] = 'Alaska';
-$tztxt['America/Los_Angeles'] = 'Pacific Time (USA, Canada)';
-$tztxt['America/Denver'] = 'Mountain Time (USA, Canada)';
-$tztxt['America/Phoenix'] = 'Mountain Time (no DST)';
-$tztxt['America/Chicago'] = 'Central Time (USA, Canada)';
-$tztxt['America/Belize'] = 'Central Time (no DST)';
-$tztxt['America/New_York'] = 'Eastern Time (USA, Canada)';
-$tztxt['America/Jamaica'] = 'Eastern Time (no DST)';
-$tztxt['America/Halifax'] = 'Atlantic Time (Canada)';
-$tztxt['America/Anguilla'] = 'Atlantic Time (no DST)';
-$tztxt['America/Sao_Paulo'] = 'Brasilia Time';
-$tztxt['America/Araguaina'] = 'Brasilia Time (no DST)';
-$tztxt['Atlantic/Reykjavik'] = 'Greenwich Mean Time (no DST)';
-$tztxt['Europe/Berlin'] = 'Central European Time';
-$tztxt['Africa/Khartoum'] = 'Eastern African Time';
-$tztxt['Europe/Helsinki'] = 'Eastern European Time';
-$tztxt['Asia/Riyadh'] = 'Arabian Time';
+// Standard Time or Daylight Saving Time
+$tztxt['daylight_saving_time_false'] = 'Standard';
+$tztxt['daylight_saving_time_true'] = 'Daylight Saving';
 
-// Use a list of locations as the description, but force the named one to always be first
-$tztxt['Europe/London'] = '';
-$tztxt['Europe/Moscow'] = '';
+// Labels for "meta-zones"
+$tztxt['generic_timezone'] = '%1$s %2$s Time';
+$tztxt['GMT'] = 'Greenwich Mean Time';
+$tztxt['UTC'] = 'Coordinated Universal Time';
+$tztxt['Africa_Central'] = 'Central Africa %1$s Time';
+$tztxt['Africa_East'] = 'East Africa %1$s Time';
+$tztxt['Africa_Morocco'] = 'Morocco %1$s Time';
+$tztxt['Africa_South'] = 'South Africa %1$s Time';
+$tztxt['Africa_West'] = 'West Africa %1$s Time';
+$tztxt['Antarctica_Casey'] = 'Casey Station %1$s Time';
+$tztxt['Antarctica_Davis'] = 'Davis Station %1$s Time';
+$tztxt['Antarctica_DumontDUrville'] = 'Dumont d\'Urville Station %1$s Time';
+$tztxt['Antarctica_Macquarie'] = 'Macquarie Island %1$s Time';
+$tztxt['Antarctica_Mawson'] = 'Mawson Station %1$s Time';
+$tztxt['Antarctica_McMurdo'] = 'McMurdo Station %1$s Time';
+$tztxt['Antarctica_Palmer'] = 'Palmer Station %1$s Time';
+$tztxt['Antarctica_Rothera'] = 'Rothera Station %1$s Time';
+$tztxt['Antarctica_Syowa'] = 'Syowa Station %1$s Time';
+$tztxt['Antarctica_Troll'] = 'Troll Station %1$s Time';
+$tztxt['Antarctica_Vostok'] = 'Vostok Station %1$s Time';
+$tztxt['Asia_Afghanistan'] = 'Afghanistan %1$s Time';
+$tztxt['Asia_Arabian'] = 'Arabian %1$s Time';
+$tztxt['Asia_Armenia'] = 'Armenia %1$s Time';
+$tztxt['Asia_Azerbaijan'] = 'Azerbaijan %1$s Time';
+$tztxt['Asia_Bangladesh'] = 'Bangladesh %1$s Time';
+$tztxt['Asia_Bhutan'] = 'Bhutan %1$s Time';
+$tztxt['Asia_Brunei'] = 'Brunei %1$s Time';
+$tztxt['Asia_China'] = 'China %1$s Time';
+$tztxt['Asia_Damascus'] = 'Syria %1$s Time';
+$tztxt['Asia_East_Timor'] = 'East Timor %1$s Time';
+$tztxt['Asia_Georgia'] = 'Georgia %1$s Time';
+$tztxt['Asia_Gulf'] = 'Persian Gulf %1$s Time';
+$tztxt['Asia_Hong_Kong'] = 'Hong Kong %1$s Time';
+$tztxt['Asia_India'] = 'India %1$s Time';
+$tztxt['Asia_Indonesia_Central'] = 'Central Indonesia %1$s Time';
+$tztxt['Asia_Indonesia_Eastern'] = 'Eastern Indonesia %1$s Time';
+$tztxt['Asia_Indonesia_Western'] = 'Western Indonesia %1$s Time';
+$tztxt['Asia_Iran'] = 'Iran %1$s Time';
+$tztxt['Asia_Irkutsk'] = 'Irkutsk %1$s Time';
+$tztxt['Asia_Israel'] = 'Israel %1$s Time';
+$tztxt['Asia_Japan'] = 'Japan %1$s Time';
+$tztxt['Asia_Jordan'] = 'Jordan %1$s Time';
+$tztxt['Asia_Kamchatka'] = 'Kamchatka %1$s Time';
+$tztxt['Asia_Kazakhstan_Eastern'] = 'Eastern Kazakhstan %1$s Time';
+$tztxt['Asia_Kazakhstan_Western'] = 'Western Kazakhstan %1$s Time';
+$tztxt['Asia_Korea'] = 'Korea %1$s Time';
+$tztxt['Asia_Krasnoyarsk'] = 'Krasnoyarsk %1$s Time';
+$tztxt['Asia_Kyrgystan'] = 'Kyrgystan %1$s Time';
+$tztxt['Asia_Libya'] = 'Libya %1$s Time';
+$tztxt['Asia_Magadan'] = 'Magadan %1$s Time';
+$tztxt['Asia_Malaysia'] = 'Malaysia %1$s Time';
+$tztxt['Asia_Mongolia_Eastern'] = 'Eastern Mongolia %1$s Time';
+$tztxt['Asia_Mongolia_Western'] = 'Western Mongolia %1$s Time';
+$tztxt['Asia_Myanmar'] = 'Myanmar %1$s Time';
+$tztxt['Asia_Nepal'] = 'Nepal %1$s Time';
+$tztxt['Asia_Omsk'] = 'Omsk %1$s Time';
+$tztxt['Asia_Pakistan'] = 'Pakistan %1$s Time';
+$tztxt['Asia_Palestine'] = 'Palestine %1$s Time';
+$tztxt['Asia_Philippines'] = 'Philippines %1$s Time';
+$tztxt['Asia_Singapore'] = 'Singapore %1$s Time';
+$tztxt['Asia_Southeast'] = 'Southeast Asia %1$s Time';
+$tztxt['Asia_Taiwan'] = 'Taiwan %1$s Time';
+$tztxt['Asia_Tajikistan'] = 'Tajikistan %1$s Time';
+$tztxt['Asia_Turkey'] = 'Turkey %1$s Time';
+$tztxt['Asia_Turkmenistan'] = 'Turkmenistan %1$s Time';
+$tztxt['Asia_Uzbekistan'] = 'Uzbekistan %1$s Time';
+$tztxt['Asia_Vladivostok'] = 'Vladivostok %1$s Time';
+$tztxt['Asia_Yakutsk'] = 'Yakutsk %1$s Time';
+$tztxt['Asia_Yekaterinburg'] = 'Yekaterinburg %1$s Time';
+$tztxt['Atlantic_Azores'] = 'Azores %1$s Time';
+$tztxt['Atlantic_Cape_Verde'] = 'Cape Verde %1$s Time';
+$tztxt['Atlantic_Falkland'] = 'Falkland Islands %1$s Time';
+$tztxt['Atlantic_South_Georgia'] = 'South Georgia %1$s Time';
+$tztxt['Australia_Central'] = 'Australian Central %1$s Time';
+$tztxt['Australia_CentralWestern'] = 'Australian Central Western %1$s Time';
+$tztxt['Australia_Eastern'] = 'Australian Eastern %1$s Time';
+$tztxt['Australia_Lord_Howe'] = 'Lord Howe Island %1$s Time';
+$tztxt['Australia_Western'] = 'Australian Western %1$s Time';
+$tztxt['Europe_Central'] = 'Central European %1$s Time';
+$tztxt['Europe_Eastern'] = 'Eastern European %1$s Time';
+$tztxt['Europe_Eire'] = 'Ireland %1$s Time';
+$tztxt['Europe_UK'] = 'United Kingdom %1$s Time';
+$tztxt['Europe_Minsk'] = 'Minsk %1$s Time';
+$tztxt['Europe_Moldova'] = 'Moldova %1$s Time';
+$tztxt['Europe_Moscow'] = 'Moscow %1$s Time';
+$tztxt['Europe_Samara'] = 'Samara %1$s Time';
+$tztxt['Europe_Volgograd'] = 'Volgograd %1$s Time';
+$tztxt['Europe_Western'] = 'Western European %1$s Time';
+$tztxt['Indian_Chagos'] = 'Chagos Islands %1$s Time';
+$tztxt['Indian_Christmas'] = 'Christmas Island %1$s Time';
+$tztxt['Indian_Cocos'] = 'Cocos (Keeling) Islands %1$s Time';
+$tztxt['Indian_Kerguelen'] = 'French Southern Territories %1$s Time';
+$tztxt['Indian_Maldives'] = 'Maldives %1$s Time';
+$tztxt['Indian_Mauritius'] = 'Mauritius %1$s Time';
+$tztxt['Indian_Reunion'] = 'Réunion %1$s Time';
+$tztxt['Indian_Seychelles'] = 'Seychelles %1$s Time';
+$tztxt['North_America_Alaska'] = 'Alaska %1$s Time';
+$tztxt['North_America_Atlantic'] = 'Atlantic %1$s Time';
+$tztxt['North_America_Central'] = 'Central %1$s Time';
+$tztxt['North_America_Mexico_Central'] = 'Mexican Central %1$s Time';
+$tztxt['North_America_Cuba'] = 'Cuba %1$s Time';
+$tztxt['North_America_Eastern'] = 'Eastern %1$s Time';
+$tztxt['North_America_Greenland_Eastern'] = 'Eastern Greenland %1$s Time';
+$tztxt['North_America_Greenland_Western'] = 'Western Greenland %1$s Time';
+$tztxt['North_America_Hawaii_Aleutian'] = 'Hawaii-Aleutian %1$s Time';
+$tztxt['North_America_Mountain'] = 'Mountain %1$s Time';
+$tztxt['North_America_Mexico_Pacific'] = 'Mexican Pacific %1$s Time';
+$tztxt['North_America_Newfoundland'] = 'Newfoundland %1$s Time';
+$tztxt['North_America_Pacific'] = 'Pacific %1$s Time';
+$tztxt['North_America_St_Pierre_Miquelon'] = 'St. Pierre & Miquelon %1$s Time';
+$tztxt['Pacific_Apia'] = 'Apia %1$s Time';
+$tztxt['Pacific_Bougainville'] = 'Bougainville %1$s Time';
+$tztxt['Pacific_Chamorro'] = 'Chamorro %1$s Time';
+$tztxt['Pacific_Chatham'] = 'Chatham Islands %1$s Time';
+$tztxt['Pacific_Chuuk'] = 'Chuuk %1$s Time';
+$tztxt['Pacific_Cook'] = 'Cook Islands %1$s Time';
+$tztxt['Pacific_Easter'] = 'Easter Island %1$s Time';
+$tztxt['Pacific_Fiji'] = 'Fiji %1$s Time';
+$tztxt['Pacific_Galapagos'] = 'Galapagos Islands %1$s Time';
+$tztxt['Pacific_Gambier'] = 'Gambier Islands %1$s Time';
+$tztxt['Pacific_Gilbert'] = 'Gilbert Islands %1$s Time';
+$tztxt['Pacific_Hawaii'] = 'Hawaii %1$s Time';
+$tztxt['Pacific_Line'] = 'Line Islands %1$s Time';
+$tztxt['Pacific_Marquesas'] = 'Marquesas Islands %1$s Time';
+$tztxt['Pacific_Marshall'] = 'Marshall Islands %1$s Time';
+$tztxt['Pacific_Nauru'] = 'Nauru %1$s Time';
+$tztxt['Pacific_New_Caledonia'] = 'New Caledonia %1$s Time';
+$tztxt['Pacific_New_Zealand'] = 'New Zealand %1$s Time';
+$tztxt['Pacific_Niue'] = 'Niue %1$s Time';
+$tztxt['Pacific_Norfolk'] = 'Norfolk Island %1$s Time';
+$tztxt['Pacific_Palau'] = 'Palau %1$s Time';
+$tztxt['Pacific_Papua_New_Guinea'] = 'Papua New Guinea %1$s Time';
+$tztxt['Pacific_Phoenix_Islands'] = 'Phoenix Islands %1$s Time';
+$tztxt['Pacific_Pitcairn'] = 'Pitcairn %1$s Time';
+$tztxt['Pacific_Pohnpei'] = 'Pohnpei %1$s Time';
+$tztxt['Pacific_Samoa'] = 'Samoa %1$s Time';
+$tztxt['Pacific_Solomon'] = 'Solomon Islands %1$s Time';
+$tztxt['Pacific_Tahiti'] = 'Tahiti %1$s Time';
+$tztxt['Pacific_Tokelau'] = 'Tokelau %1$s Time';
+$tztxt['Pacific_Tonga'] = 'Tonga %1$s Time';
+$tztxt['Pacific_Tuvalu'] = 'Tuvalu %1$s Time';
+$tztxt['Pacific_Vanuatu'] = 'Vanuatu %1$s Time';
+$tztxt['Pacific_Wake'] = 'Wake %1$s Time';
+$tztxt['Pacific_Wallis'] = 'Wallis & Futuna %1$s Time';
+$tztxt['South_America_Acre'] = 'Acre %1$s Time';
+$tztxt['South_America_Amazon'] = 'Amazon %1$s Time';
+$tztxt['South_America_Argentina'] = 'Argentina %1$s Time';
+$tztxt['South_America_Bolivia'] = 'Bolivia %1$s Time';
+$tztxt['South_America_Brasilia'] = 'Brasília %1$s Time';
+$tztxt['South_America_Chile'] = 'Chile %1$s Time';
+$tztxt['South_America_Colombia'] = 'Colombia %1$s Time';
+$tztxt['South_America_Ecuador'] = 'Ecuador %1$s Time';
+$tztxt['South_America_French_Guiana'] = 'French Guiana %1$s Time';
+$tztxt['South_America_Guyana'] = 'Guyana %1$s Time';
+$tztxt['South_America_Noronha'] = 'Fernando de Noronha %1$s Time';
+$tztxt['South_America_Paraguay'] = 'Paraguay %1$s Time';
+$tztxt['South_America_Peru'] = 'Peru %1$s Time';
+$tztxt['South_America_Suriname'] = 'Suriname %1$s Time';
+$tztxt['South_America_Uruguay'] = 'Uruguay %1$s Time';
+$tztxt['South_America_Venezuela'] = 'Venezuela %1$s Time';
 
-// Custom descriptions for individual locations
+// Location names.
+$txt['Pacific/Midway'] = 'Midway Islands';
+$txt['Pacific/Niue'] = 'Alofi';
+$txt['Pacific/Pago_Pago'] = 'Pago Pago';
 $txt['America/Adak'] = 'Aleutian Islands';
-$txt['Pacific/Marquesas'] = 'Marquesas Islands';
+$txt['Pacific/Honolulu'] = 'Honolulu';
+$txt['Pacific/Rarotonga'] = 'Rarotonga';
+$txt['Pacific/Tahiti'] = 'Tahiti';
+$txt['Pacific/Marquesas'] = 'Taiohae';
+$txt['America/Anchorage'] = 'Anchorage';
+$txt['America/Juneau'] = 'Juneau';
+$txt['America/Metlakatla'] = 'Metlakatla';
+$txt['America/Nome'] = 'Nome';
+$txt['America/Sitka'] = 'Sitka';
+$txt['America/Yakutat'] = 'Yakutat';
 $txt['Pacific/Gambier'] = 'Gambier Islands';
+$txt['America/Los_Angeles'] = 'Los Angeles';
+$txt['America/Tijuana'] = 'Tijuana';
+$txt['America/Vancouver'] = 'Vancouver';
 $txt['Pacific/Pitcairn'] = 'Pitcairn Islands';
-$txt['America/St_Johns'] = 'Newfoundland';
+$txt['America/Boise'] = 'Boise';
+$txt['America/Cambridge_Bay'] = 'Cambridge Bay';
+$txt['America/Chihuahua'] = 'Chihuahua';
+$txt['America/Creston'] = 'Creston';
+$txt['America/Dawson'] = 'Dawson';
+$txt['America/Dawson_Creek'] = 'Dawson Creek';
+$txt['America/Denver'] = 'Denver';
+$txt['America/Edmonton'] = 'Edmonton';
+$txt['America/Fort_Nelson'] = 'Fort Nelson';
+$txt['America/Hermosillo'] = 'Hermosillo';
+$txt['America/Inuvik'] = 'Inuvik';
+$txt['America/Mazatlan'] = 'Mazatlán';
+$txt['America/Ojinaga'] = 'Ojinaga';
+$txt['America/Phoenix'] = 'Phoenix';
+$txt['America/Whitehorse'] = 'Whitehorse';
+$txt['America/Yellowknife'] = 'Yellowknife';
+$txt['America/Bahia_Banderas'] = 'Bahía de Banderas';
+$txt['America/Belize'] = 'Belize City';
+$txt['America/Chicago'] = 'Chicago';
+$txt['America/Costa_Rica'] = 'San José';
+$txt['America/El_Salvador'] = 'San Salvador';
+$txt['America/Guatemala'] = 'Guatemala City';
+$txt['America/Indiana/Knox'] = 'Knox';
+$txt['America/Indiana/Tell_City'] = 'Tell City';
+$txt['America/Managua'] = 'Managua';
+$txt['America/Matamoros'] = 'Matamoros';
+$txt['America/Menominee'] = 'Menominee';
+$txt['America/Merida'] = 'Mérida';
+$txt['America/Mexico_City'] = 'Mexico City';
+$txt['America/Monterrey'] = 'Monterrey';
+$txt['America/North_Dakota/Beulah'] = 'Beulah';
+$txt['America/North_Dakota/Center'] = 'Center';
+$txt['America/North_Dakota/New_Salem'] = 'Mandan';
+$txt['America/Rainy_River'] = 'Rainy River';
+$txt['America/Rankin_Inlet'] = 'Rankin Inlet';
+$txt['America/Regina'] = 'Regina';
+$txt['America/Resolute'] = 'Resolute';
+$txt['America/Swift_Current'] = 'Swift Current';
+$txt['America/Tegucigalpa'] = 'Tegucigalpa';
+$txt['America/Winnipeg'] = 'Winnipeg';
 $txt['Pacific/Easter'] = 'Easter Island';
-$txt['Atlantic/Stanley'] = 'Falkland Islands';
-$txt['America/Miquelon'] = 'St. Pierre and Miquelon';
-$txt['America/Godthab'] = 'Greenland';
-$txt['America/Noronha'] = 'Fernando de Noronha';
-$txt['Asia/Kolkata'] = 'India';
-$txt['Asia/Colombo'] = 'Sri Lanka';
-$txt['Asia/Dhaka'] = 'Bangladesh';
-$txt['Antarctica/DumontDUrville'] = 'Dumont D\'Urville Station';
+$txt['Pacific/Galapagos'] = 'Puerto Ayora';
+$txt['America/Atikokan'] = 'Atikokan';
+$txt['America/Bogota'] = 'Bogotá';
+$txt['America/Cancun'] = 'Cancún';
+$txt['America/Cayman'] = 'George Town';
+$txt['America/Detroit'] = 'Detroit';
+$txt['America/Eirunepe'] = 'Eirunepé';
+$txt['America/Grand_Turk'] = 'Cockburn Town';
+$txt['America/Guayaquil'] = 'Guayaquil';
+$txt['America/Havana'] = 'Havana';
+$txt['America/Indiana/Indianapolis'] = 'Indianapolis';
+$txt['America/Indiana/Marengo'] = 'Marengo';
+$txt['America/Indiana/Petersburg'] = 'Petersburg';
+$txt['America/Indiana/Vevay'] = 'Vevay';
+$txt['America/Indiana/Vincennes'] = 'Vincennes';
+$txt['America/Indiana/Winamac'] = 'Winamac';
+$txt['America/Iqaluit'] = 'Iqaluit';
+$txt['America/Jamaica'] = 'Kingston';
+$txt['America/Kentucky/Louisville'] = 'Louisville';
+$txt['America/Kentucky/Monticello'] = 'Monticello';
+$txt['America/Lima'] = 'Lima';
+$txt['America/Nassau'] = 'Nassau';
+$txt['America/New_York'] = 'New York';
+$txt['America/Nipigon'] = 'Nipigon';
+$txt['America/Panama'] = 'Panamá';
+$txt['America/Pangnirtung'] = 'Pangnirtung';
+$txt['America/Port-au-Prince'] = 'Port-au-Prince';
+$txt['America/Rio_Branco'] = 'Rio Branco';
+$txt['America/Thunder_Bay'] = 'Thunder Bay';
+$txt['America/Toronto'] = 'Toronto';
+$txt['America/Anguilla'] = 'Anguilla';
+$txt['America/Antigua'] = 'Antigua';
+$txt['America/Aruba'] = 'Aruba';
+$txt['America/Asuncion'] = 'Asunción';
+$txt['America/Barbados'] = 'Barbados';
+$txt['America/Blanc-Sablon'] = 'Lévis';
+$txt['America/Boa_Vista'] = 'Boa Vista';
+$txt['America/Campo_Grande'] = 'Campo Grande';
+$txt['America/Caracas'] = 'Caracas';
+$txt['America/Cuiaba'] = 'Cuiabá';
+$txt['America/Curacao'] = 'Curaçao';
+$txt['America/Dominica'] = 'Dominica';
+$txt['America/Glace_Bay'] = 'Glace Bay';
+$txt['America/Goose_Bay'] = 'Happy Valley-Goose Bay';
+$txt['America/Grenada'] = 'Grenada';
+$txt['America/Guadeloupe'] = 'Guadeloupe';
+$txt['America/Guyana'] = 'Guyana';
+$txt['America/Halifax'] = 'Halifax';
+$txt['America/Kralendijk'] = 'Kralendijk';
+$txt['America/La_Paz'] = 'La Paz';
+$txt['America/Lower_Princes'] = 'Lower Prince\'s Quarter';
+$txt['America/Manaus'] = 'Manaus';
+$txt['America/Marigot'] = 'Marigot';
+$txt['America/Martinique'] = 'Martinique';
+$txt['America/Moncton'] = 'Moncton';
+$txt['America/Montserrat'] = 'Montserrat';
+$txt['America/Porto_Velho'] = 'Porto Velho';
+$txt['America/Port_of_Spain'] = 'Port of Spain';
+$txt['America/Puerto_Rico'] = 'Puerto Rico';
+$txt['America/Santiago'] = 'Santiago';
+$txt['America/Santo_Domingo'] = 'Santo Domingo';
+$txt['America/St_Barthelemy'] = 'Gustavia';
+$txt['America/St_Kitts'] = 'St. Kitts & Nevis';
+$txt['America/St_Lucia'] = 'St. Lucia';
+$txt['America/St_Thomas'] = 'St. Thomas';
+$txt['America/St_Vincent'] = 'St. Vincent & the Grenadines';
+$txt['America/Thule'] = 'Qaanaaq (Thule)';
+$txt['America/Tortola'] = 'Road Town';
+$txt['Atlantic/Bermuda'] = 'Hamilton';
+$txt['America/St_Johns'] = 'St. John\'s';
+$txt['America/Araguaina'] = 'Araguaína';
+$txt['America/Argentina/Buenos_Aires'] = 'Buenos Aires';
+$txt['America/Argentina/Catamarca'] = 'San Fernando del Valle de Catamarca';
+$txt['America/Argentina/Cordoba'] = 'Córdoba';
+$txt['America/Argentina/Jujuy'] = 'San Salvador de Jujuy';
+$txt['America/Argentina/La_Rioja'] = 'La Rioja';
+$txt['America/Argentina/Mendoza'] = 'Mendoza';
+$txt['America/Argentina/Rio_Gallegos'] = 'Río Gallegos';
+$txt['America/Argentina/Salta'] = 'Salta';
+$txt['America/Argentina/San_Juan'] = 'San Juan';
+$txt['America/Argentina/San_Luis'] = 'San Luis';
+$txt['America/Argentina/Tucuman'] = 'San Miguel de Tucumán';
+$txt['America/Argentina/Ushuaia'] = 'Ushuaia';
+$txt['America/Bahia'] = 'Bahia';
+$txt['America/Belem'] = 'Belém';
+$txt['America/Cayenne'] = 'Cayenne';
+$txt['America/Fortaleza'] = 'Fortaleza';
+$txt['America/Godthab'] = 'Nuuk (Godthåb)';
+$txt['America/Maceio'] = 'Maceió';
+$txt['America/Miquelon'] = 'St. Pierre & Miquelon';
+$txt['America/Montevideo'] = 'Montevideo';
+$txt['America/Paramaribo'] = 'Paramaribo';
+$txt['America/Punta_Arenas'] = 'Punta Arenas';
+$txt['America/Recife'] = 'Recife';
+$txt['America/Santarem'] = 'Santarém';
+$txt['America/Sao_Paulo'] = 'São Paulo';
+$txt['Antarctica/Palmer'] = 'Palmer Station';
+$txt['Antarctica/Rothera'] = 'Rothera Station';
+$txt['Atlantic/Stanley'] = 'Stanley';
+$txt['America/Noronha'] = 'Itamaracá';
+$txt['Atlantic/South_Georgia'] = 'Grytviken';
+$txt['America/Scoresbysund'] = 'Ittoqqortoormiit (Scoresbysund)';
+$txt['Atlantic/Azores'] = 'Azores';
+$txt['Atlantic/Cape_Verde'] = 'Cape Verde';
+$txt['Africa/Abidjan'] = 'Abidjan';
+$txt['Africa/Accra'] = 'Accra';
+$txt['Africa/Bamako'] = 'Bamako';
+$txt['Africa/Banjul'] = 'Banjul';
+$txt['Africa/Bissau'] = 'Bissau';
+$txt['Africa/Conakry'] = 'Conakry';
+$txt['Africa/Dakar'] = 'Dakar';
+$txt['Africa/Freetown'] = 'Freetown';
+$txt['Africa/Lome'] = 'Lomé';
+$txt['Africa/Monrovia'] = 'Monrovia';
+$txt['Africa/Nouakchott'] = 'Nouakchott';
+$txt['Africa/Ouagadougou'] = 'Ouagadougou';
+$txt['Africa/Sao_Tome'] = 'São Tomé';
+$txt['America/Danmarkshavn'] = 'Danmarkshavn';
 $txt['Antarctica/Troll'] = 'Troll Station';
+$txt['Atlantic/Canary'] = 'Canary Islands';
+$txt['Atlantic/Faroe'] = 'Faroe Islands';
+$txt['Atlantic/Madeira'] = 'Madeira';
+$txt['Atlantic/Reykjavik'] = 'Reykjavík';
+$txt['Atlantic/St_Helena'] = 'St. Helena';
+$txt['Europe/Guernsey'] = 'Guernsey';
+$txt['Europe/Isle_of_Man'] = 'Isle of Man';
+$txt['Europe/Jersey'] = 'Jersey';
+$txt['Europe/Lisbon'] = 'Lisbon';
+$txt['Europe/London'] = 'London';
+$txt['Africa/Algiers'] = 'Algiers';
+$txt['Africa/Bangui'] = 'Bangui';
+$txt['Africa/Brazzaville'] = 'Brazzaville';
+$txt['Africa/Casablanca'] = 'Casablanca';
+$txt['Africa/Ceuta'] = 'Ceuta';
+$txt['Africa/Douala'] = 'Douala';
+$txt['Africa/El_Aaiun'] = 'Laayoune (El Aaiún)';
+$txt['Africa/Kinshasa'] = 'Kinshasa';
+$txt['Africa/Lagos'] = 'Lagos';
+$txt['Africa/Libreville'] = 'Libreville';
+$txt['Africa/Luanda'] = 'Luanda';
+$txt['Africa/Malabo'] = 'Malabo';
+$txt['Africa/Ndjamena'] = 'N\'Djamena';
+$txt['Africa/Niamey'] = 'Niamey';
+$txt['Africa/Porto-Novo'] = 'Porto-Novo';
+$txt['Africa/Tunis'] = 'Tunis';
+$txt['Arctic/Longyearbyen'] = 'Longyearbyen';
+$txt['Europe/Amsterdam'] = 'Amsterdam';
+$txt['Europe/Andorra'] = 'Andorra la Vella';
+$txt['Europe/Belgrade'] = 'Belgrade';
+$txt['Europe/Berlin'] = 'Berlin';
+$txt['Europe/Bratislava'] = 'Bratislava';
+$txt['Europe/Brussels'] = 'Brussels';
+$txt['Europe/Budapest'] = 'Budapest';
+$txt['Europe/Busingen'] = 'Büsingen';
+$txt['Europe/Copenhagen'] = 'Copenhagen';
+$txt['Europe/Dublin'] = 'Dublin';
+$txt['Europe/Gibraltar'] = 'Gibraltar';
+$txt['Europe/Ljubljana'] = 'Ljubljana';
+$txt['Europe/Luxembourg'] = 'Luxembourg';
+$txt['Europe/Madrid'] = 'Madrid';
+$txt['Europe/Malta'] = 'Malta';
+$txt['Europe/Monaco'] = 'Monaco';
+$txt['Europe/Oslo'] = 'Oslo';
+$txt['Europe/Paris'] = 'Paris';
+$txt['Europe/Podgorica'] = 'Podgorica';
+$txt['Europe/Prague'] = 'Prague';
+$txt['Europe/Rome'] = 'Rome';
+$txt['Europe/San_Marino'] = 'San Marino';
+$txt['Europe/Sarajevo'] = 'Sarajevo';
+$txt['Europe/Skopje'] = 'Skopje';
+$txt['Europe/Stockholm'] = 'Stockholm';
+$txt['Europe/Tirane'] = 'Tirana';
+$txt['Europe/Vaduz'] = 'Vaduz';
+$txt['Europe/Vatican'] = 'Vatican City';
+$txt['Europe/Vienna'] = 'Vienna';
+$txt['Europe/Warsaw'] = 'Warsaw';
+$txt['Europe/Zagreb'] = 'Zagreb';
+$txt['Europe/Zurich'] = 'Zürich';
+$txt['Africa/Blantyre'] = 'Blantyre';
+$txt['Africa/Bujumbura'] = 'Bujumbura';
+$txt['Africa/Cairo'] = 'Cairo';
+$txt['Africa/Gaborone'] = 'Gaborone';
+$txt['Africa/Harare'] = 'Harare';
+$txt['Africa/Johannesburg'] = 'Johannesburg';
+$txt['Africa/Khartoum'] = 'Khartoum';
+$txt['Africa/Kigali'] = 'Kigali';
+$txt['Africa/Lubumbashi'] = 'Lubumbashi';
+$txt['Africa/Lusaka'] = 'Lusaka';
+$txt['Africa/Maputo'] = 'Maputo';
+$txt['Africa/Maseru'] = 'Maseru';
+$txt['Africa/Mbabane'] = 'Mbabane';
+$txt['Africa/Tripoli'] = 'Tripoli';
+$txt['Africa/Windhoek'] = 'Windhoek';
+$txt['Asia/Amman'] = 'Amman';
+$txt['Asia/Beirut'] = 'Beirut';
+$txt['Asia/Damascus'] = 'Damascus';
+$txt['Asia/Famagusta'] = 'Famagusta';
+$txt['Asia/Gaza'] = 'Gaza';
+$txt['Asia/Hebron'] = 'Hebron';
+$txt['Asia/Jerusalem'] = 'Jerusalem';
+$txt['Asia/Nicosia'] = 'Nicosia';
+$txt['Europe/Athens'] = 'Athens';
+$txt['Europe/Bucharest'] = 'Bucharest';
+$txt['Europe/Chisinau'] = 'Chisinau';
+$txt['Europe/Helsinki'] = 'Helsinki';
+$txt['Europe/Kaliningrad'] = 'Kaliningrad';
+$txt['Europe/Kiev'] = 'Kyiv';
+$txt['Europe/Mariehamn'] = 'Mariehamn';
+$txt['Europe/Riga'] = 'Riga';
+$txt['Europe/Sofia'] = 'Sofia';
+$txt['Europe/Tallinn'] = 'Tallinn';
+$txt['Europe/Uzhgorod'] = 'Uzhgorod';
+$txt['Europe/Vilnius'] = 'Vilnius';
+$txt['Europe/Zaporozhye'] = 'Zaporizhia';
+$txt['Africa/Addis_Ababa'] = 'Addis Ababa';
+$txt['Africa/Asmara'] = 'Asmara';
+$txt['Africa/Dar_es_Salaam'] = 'Dar es Salaam';
+$txt['Africa/Djibouti'] = 'Djibouti';
+$txt['Africa/Juba'] = 'Juba';
+$txt['Africa/Kampala'] = 'Kampala';
+$txt['Africa/Mogadishu'] = 'Mogadishu';
+$txt['Africa/Nairobi'] = 'Nairobi';
+$txt['Antarctica/Syowa'] = 'Showa Station';
+$txt['Asia/Aden'] = 'Aden';
+$txt['Asia/Baghdad'] = 'Baghdad';
+$txt['Asia/Bahrain'] = 'Bahrain';
+$txt['Asia/Kuwait'] = 'Kuwait';
+$txt['Asia/Qatar'] = 'Qatar';
+$txt['Asia/Riyadh'] = 'Riyadh';
+$txt['Europe/Istanbul'] = 'Istanbul';
+$txt['Europe/Kirov'] = 'Kirov';
+$txt['Europe/Minsk'] = 'Minsk';
+$txt['Europe/Moscow'] = 'Moscow';
+$txt['Europe/Simferopol'] = 'Simferopol';
+$txt['Indian/Antananarivo'] = 'Antananarivo';
+$txt['Indian/Comoro'] = 'Comoro';
+$txt['Indian/Mayotte'] = 'Mayotte';
+$txt['Asia/Tehran'] = 'Tehran';
+$txt['Asia/Baku'] = 'Baku';
+$txt['Asia/Dubai'] = 'Dubai';
+$txt['Asia/Muscat'] = 'Muscat';
+$txt['Asia/Tbilisi'] = 'Tbilisi';
+$txt['Asia/Yerevan'] = 'Yerevan';
+$txt['Europe/Astrakhan'] = 'Astrakhan';
+$txt['Europe/Samara'] = 'Samara';
+$txt['Europe/Saratov'] = 'Saratov';
+$txt['Europe/Ulyanovsk'] = 'Ulyanovsk';
+$txt['Europe/Volgograd'] = 'Volgograd';
+$txt['Indian/Mahe'] = 'Mahe';
+$txt['Indian/Mauritius'] = 'Mauritius';
+$txt['Indian/Reunion'] = 'Réunion';
+$txt['Asia/Kabul'] = 'Kabul';
+$txt['Antarctica/Mawson'] = 'Mawson Station';
+$txt['Asia/Aqtau'] = 'Aqtau';
+$txt['Asia/Aqtobe'] = 'Aktobe';
+$txt['Asia/Ashgabat'] = 'Ashgabat';
+$txt['Asia/Atyrau'] = 'Atyrau';
+$txt['Asia/Dushanbe'] = 'Dushanbe';
+$txt['Asia/Karachi'] = 'Karachi';
+$txt['Asia/Oral'] = 'Oral';
+$txt['Asia/Qyzylorda'] = 'Kyzylorda';
+$txt['Asia/Samarkand'] = 'Samarkand';
+$txt['Asia/Tashkent'] = 'Tashkent';
+$txt['Asia/Yekaterinburg'] = 'Yekaterinburg';
+$txt['Indian/Kerguelen'] = 'Port-aux-Français';
+$txt['Indian/Maldives'] = 'Maldives';
+$txt['Asia/Colombo'] = 'Colombo';
+$txt['Asia/Kolkata'] = 'Kolkāta';
+$txt['Asia/Kathmandu'] = 'Kathmandu';
 $txt['Antarctica/Vostok'] = 'Vostok Station';
+$txt['Asia/Almaty'] = 'Almaty';
+$txt['Asia/Bishkek'] = 'Bishkek';
+$txt['Asia/Dhaka'] = 'Dhaka';
+$txt['Asia/Omsk'] = 'Omsk';
+$txt['Asia/Qostanay'] = 'Kostanay';
+$txt['Asia/Thimphu'] = 'Thimphu';
+$txt['Asia/Urumqi'] = 'Ürümqi';
+$txt['Indian/Chagos'] = 'Chagos Archipelago';
+$txt['Asia/Yangon'] = 'Yangon';
+$txt['Indian/Cocos'] = 'West Island';
+$txt['Antarctica/Davis'] = 'Davis Station';
+$txt['Asia/Bangkok'] = 'Bangkok';
+$txt['Asia/Barnaul'] = 'Barnaul';
+$txt['Asia/Hovd'] = 'Khovd';
+$txt['Asia/Ho_Chi_Minh'] = 'Ho Chi Minh City';
+$txt['Asia/Jakarta'] = 'Jakarta';
+$txt['Asia/Krasnoyarsk'] = 'Krasnoyarsk';
+$txt['Asia/Novokuznetsk'] = 'Novokuznetsk';
+$txt['Asia/Novosibirsk'] = 'Novosibirsk';
+$txt['Asia/Phnom_Penh'] = 'Phnom Penh';
+$txt['Asia/Pontianak'] = 'Pontianak';
+$txt['Asia/Tomsk'] = 'Tomsk';
+$txt['Asia/Vientiane'] = 'Vientiane';
+$txt['Indian/Christmas'] = 'Flying Fish Cove';
+$txt['Antarctica/Casey'] = 'Casey Station';
+$txt['Asia/Brunei'] = 'Brunei';
+$txt['Asia/Choibalsan'] = 'Choibalsan';
+$txt['Asia/Hong_Kong'] = 'Hong Kong';
+$txt['Asia/Irkutsk'] = 'Irkutsk';
+$txt['Asia/Kuala_Lumpur'] = 'Kuala Lumpur';
+$txt['Asia/Kuching'] = 'Kuching';
+$txt['Asia/Macau'] = 'Macau';
+$txt['Asia/Makassar'] = 'Makassar';
+$txt['Asia/Manila'] = 'Manila';
+$txt['Asia/Shanghai'] = 'Shanghai';
+$txt['Asia/Singapore'] = 'Singapore';
+$txt['Asia/Taipei'] = 'Taipei';
+$txt['Asia/Ulaanbaatar'] = 'Ulan Bator';
+$txt['Australia/Perth'] = 'Perth';
+$txt['Australia/Eucla'] = 'Eucla';
+$txt['Asia/Chita'] = 'Chita';
+$txt['Asia/Dili'] = 'Dili';
+$txt['Asia/Jayapura'] = 'Jayapura';
+$txt['Asia/Khandyga'] = 'Khandyga';
+$txt['Asia/Pyongyang'] = 'Pyongyang';
+$txt['Asia/Seoul'] = 'Seoul';
+$txt['Asia/Tokyo'] = 'Tokyo';
+$txt['Asia/Yakutsk'] = 'Yakutsk';
+$txt['Pacific/Palau'] = 'Palau';
+$txt['Australia/Adelaide'] = 'Adelaide';
+$txt['Australia/Broken_Hill'] = 'Broken Hill';
+$txt['Australia/Darwin'] = 'Darwin';
+$txt['Antarctica/DumontDUrville'] = 'Dumont d\'Urville Station';
+$txt['Asia/Ust-Nera'] = 'Ust-Nera';
+$txt['Asia/Vladivostok'] = 'Vladivostok';
+$txt['Australia/Brisbane'] = 'Brisbane';
+$txt['Australia/Currie'] = 'Currie';
+$txt['Australia/Hobart'] = 'Hobart';
+$txt['Australia/Lindeman'] = 'Lindeman';
+$txt['Australia/Melbourne'] = 'Melbourne';
+$txt['Australia/Sydney'] = 'Sydney';
+$txt['Pacific/Chuuk'] = 'Chuuk';
+$txt['Pacific/Guam'] = 'Guam';
+$txt['Pacific/Port_Moresby'] = 'Port Moresby';
+$txt['Pacific/Saipan'] = 'Saipan';
 $txt['Australia/Lord_Howe'] = 'Lord Howe Island';
-$txt['Pacific/Guadalcanal'] = 'Solomon Islands';
-$txt['Pacific/Norfolk'] = 'Norfolk Island';
-$txt['Pacific/Noumea'] = 'New Caledonia';
+$txt['Antarctica/Macquarie'] = 'Macquarie Island';
+$txt['Asia/Magadan'] = 'Magadan';
+$txt['Asia/Sakhalin'] = 'Yuzhno-Sakhalinsk';
+$txt['Asia/Srednekolymsk'] = 'Srednekolymsk';
+$txt['Pacific/Bougainville'] = 'Bougainville';
+$txt['Pacific/Efate'] = 'Efate';
+$txt['Pacific/Guadalcanal'] = 'Guadalcanal';
+$txt['Pacific/Kosrae'] = 'Tofol';
+$txt['Pacific/Norfolk'] = 'Kingston';
+$txt['Pacific/Noumea'] = 'Nouméa';
+$txt['Pacific/Pohnpei'] = 'Pohnpei';
 $txt['Antarctica/McMurdo'] = 'McMurdo Station';
-$txt['Pacific/Kwajalein'] = 'Marshall Islands';
-$txt['Pacific/Chatham'] = 'Chatham Islands';
+$txt['Asia/Anadyr'] = 'Anadyr';
+$txt['Asia/Kamchatka'] = 'Petropavlovsk-Kamchatsky';
+$txt['Pacific/Auckland'] = 'Auckland';
+$txt['Pacific/Fiji'] = 'Fiji';
+$txt['Pacific/Funafuti'] = 'Funafuti';
+$txt['Pacific/Kwajalein'] = 'Kwajalein';
+$txt['Pacific/Majuro'] = 'Majuro';
+$txt['Pacific/Nauru'] = 'Nauru';
+$txt['Pacific/Tarawa'] = 'Tarawa';
+$txt['Pacific/Wake'] = 'Wake Island';
+$txt['Pacific/Wallis'] = 'Wallis';
+$txt['Pacific/Chatham'] = 'Waitangi';
+$txt['Pacific/Apia'] = 'Apia';
+$txt['Pacific/Enderbury'] = 'Enderbury Island';
+$txt['Pacific/Fakaofo'] = 'Fakaofo';
+$txt['Pacific/Tongatapu'] = 'Tongatapu';
+$txt['Pacific/Kiritimati'] = 'Kiritimati';
+
+// Countries
+$txt['iso3166']['??'] = 'International';
+$txt['iso3166']['AD'] = 'Andorra';
+$txt['iso3166']['AE'] = 'United Arab Emirates';
+$txt['iso3166']['AF'] = 'Afghanistan';
+$txt['iso3166']['AG'] = 'Antigua & Barbuda';
+$txt['iso3166']['AI'] = 'Anguilla';
+$txt['iso3166']['AL'] = 'Albania';
+$txt['iso3166']['AM'] = 'Armenia';
+$txt['iso3166']['AO'] = 'Angola';
+$txt['iso3166']['AQ'] = 'Antarctica';
+$txt['iso3166']['AR'] = 'Argentina';
+$txt['iso3166']['AS'] = 'American Samoa';
+$txt['iso3166']['AT'] = 'Austria';
+$txt['iso3166']['AU'] = 'Australia';
+$txt['iso3166']['AW'] = 'Aruba';
+$txt['iso3166']['AX'] = 'Åland Islands';
+$txt['iso3166']['AZ'] = 'Azerbaijan';
+$txt['iso3166']['BA'] = 'Bosnia & Herzegovina';
+$txt['iso3166']['BB'] = 'Barbados';
+$txt['iso3166']['BD'] = 'Bangladesh';
+$txt['iso3166']['BE'] = 'Belgium';
+$txt['iso3166']['BF'] = 'Burkina Faso';
+$txt['iso3166']['BG'] = 'Bulgaria';
+$txt['iso3166']['BH'] = 'Bahrain';
+$txt['iso3166']['BI'] = 'Burundi';
+$txt['iso3166']['BJ'] = 'Benin';
+$txt['iso3166']['BL'] = 'St. Barthélemy';
+$txt['iso3166']['BM'] = 'Bermuda';
+$txt['iso3166']['BN'] = 'Brunei';
+$txt['iso3166']['BO'] = 'Bolivia';
+$txt['iso3166']['BQ'] = 'Bonaire, Sint Eustatius, & Saba';
+$txt['iso3166']['BR'] = 'Brazil';
+$txt['iso3166']['BS'] = 'Bahamas';
+$txt['iso3166']['BT'] = 'Bhutan';
+$txt['iso3166']['BV'] = 'Bouvet Island';
+$txt['iso3166']['BW'] = 'Botswana';
+$txt['iso3166']['BY'] = 'Belarus';
+$txt['iso3166']['BZ'] = 'Belize';
+$txt['iso3166']['CA'] = 'Canada';
+$txt['iso3166']['CC'] = 'Cocos (Keeling) Islands';
+$txt['iso3166']['CD'] = 'Democratic Republic of the Congo';
+$txt['iso3166']['CF'] = 'Central African Republic';
+$txt['iso3166']['CG'] = 'Congo';
+$txt['iso3166']['CH'] = 'Switzerland';
+$txt['iso3166']['CI'] = 'Côte d\'Ivoire';
+$txt['iso3166']['CK'] = 'Cook Islands';
+$txt['iso3166']['CL'] = 'Chile';
+$txt['iso3166']['CM'] = 'Cameroon';
+$txt['iso3166']['CN'] = 'China';
+$txt['iso3166']['CO'] = 'Colombia';
+$txt['iso3166']['CR'] = 'Costa Rica';
+$txt['iso3166']['CU'] = 'Cuba';
+$txt['iso3166']['CV'] = 'Cabo Verde';
+$txt['iso3166']['CW'] = 'Curaçao';
+$txt['iso3166']['CX'] = 'Christmas Island';
+$txt['iso3166']['CY'] = 'Cyprus';
+$txt['iso3166']['CZ'] = 'Czechia';
+$txt['iso3166']['DE'] = 'Germany';
+$txt['iso3166']['DJ'] = 'Djibouti';
+$txt['iso3166']['DK'] = 'Denmark';
+$txt['iso3166']['DM'] = 'Dominica';
+$txt['iso3166']['DO'] = 'Dominican Republic';
+$txt['iso3166']['DZ'] = 'Algeria';
+$txt['iso3166']['EC'] = 'Ecuador';
+$txt['iso3166']['EE'] = 'Estonia';
+$txt['iso3166']['EG'] = 'Egypt';
+$txt['iso3166']['EH'] = 'Western Sahara';
+$txt['iso3166']['ER'] = 'Eritrea';
+$txt['iso3166']['ES'] = 'Spain';
+$txt['iso3166']['ET'] = 'Ethiopia';
+$txt['iso3166']['FI'] = 'Finland';
+$txt['iso3166']['FJ'] = 'Fiji';
+$txt['iso3166']['FK'] = 'Falkland Islands (Malvinas)';
+$txt['iso3166']['FM'] = 'Micronesia';
+$txt['iso3166']['FO'] = 'Faroe Islands';
+$txt['iso3166']['FR'] = 'France';
+$txt['iso3166']['GA'] = 'Gabon';
+$txt['iso3166']['GB'] = 'United Kingdom';
+$txt['iso3166']['GD'] = 'Grenada';
+$txt['iso3166']['GE'] = 'Georgia';
+$txt['iso3166']['GF'] = 'French Guiana';
+$txt['iso3166']['GG'] = 'Guernsey';
+$txt['iso3166']['GH'] = 'Ghana';
+$txt['iso3166']['GI'] = 'Gibraltar';
+$txt['iso3166']['GL'] = 'Greenland';
+$txt['iso3166']['GM'] = 'Gambia';
+$txt['iso3166']['GN'] = 'Guinea';
+$txt['iso3166']['GP'] = 'Guadeloupe';
+$txt['iso3166']['GQ'] = 'Equatorial Guinea';
+$txt['iso3166']['GR'] = 'Greece';
+$txt['iso3166']['GS'] = 'South Georgia & the South Sandwich Islands';
+$txt['iso3166']['GT'] = 'Guatemala';
+$txt['iso3166']['GU'] = 'Guam';
+$txt['iso3166']['GW'] = 'Guinea-Bissau';
+$txt['iso3166']['GY'] = 'Guyana';
+$txt['iso3166']['HK'] = 'Hong Kong';
+$txt['iso3166']['HM'] = 'Heard Island & McDonald Islands';
+$txt['iso3166']['HN'] = 'Honduras';
+$txt['iso3166']['HR'] = 'Croatia';
+$txt['iso3166']['HT'] = 'Haiti';
+$txt['iso3166']['HU'] = 'Hungary';
+$txt['iso3166']['ID'] = 'Indonesia';
+$txt['iso3166']['IE'] = 'Ireland';
+$txt['iso3166']['IL'] = 'Israel';
+$txt['iso3166']['IM'] = 'Isle of Man';
+$txt['iso3166']['IN'] = 'India';
+$txt['iso3166']['IO'] = 'British Indian Ocean Territory';
+$txt['iso3166']['IQ'] = 'Iraq';
+$txt['iso3166']['IR'] = 'Iran';
+$txt['iso3166']['IS'] = 'Iceland';
+$txt['iso3166']['IT'] = 'Italy';
+$txt['iso3166']['JE'] = 'Jersey';
+$txt['iso3166']['JM'] = 'Jamaica';
+$txt['iso3166']['JO'] = 'Jordan';
+$txt['iso3166']['JP'] = 'Japan';
+$txt['iso3166']['KE'] = 'Kenya';
+$txt['iso3166']['KG'] = 'Kyrgyzstan';
+$txt['iso3166']['KH'] = 'Cambodia';
+$txt['iso3166']['KI'] = 'Kiribati';
+$txt['iso3166']['KM'] = 'Comoros';
+$txt['iso3166']['KN'] = 'St. Kitts & Nevis';
+$txt['iso3166']['KP'] = 'North Korea';
+$txt['iso3166']['KR'] = 'South Korea';
+$txt['iso3166']['KW'] = 'Kuwait';
+$txt['iso3166']['KY'] = 'Cayman Islands';
+$txt['iso3166']['KZ'] = 'Kazakhstan';
+$txt['iso3166']['LA'] = 'Laos';
+$txt['iso3166']['LB'] = 'Lebanon';
+$txt['iso3166']['LC'] = 'St. Lucia';
+$txt['iso3166']['LI'] = 'Liechtenstein';
+$txt['iso3166']['LK'] = 'Sri Lanka';
+$txt['iso3166']['LR'] = 'Liberia';
+$txt['iso3166']['LS'] = 'Lesotho';
+$txt['iso3166']['LT'] = 'Lithuania';
+$txt['iso3166']['LU'] = 'Luxembourg';
+$txt['iso3166']['LV'] = 'Latvia';
+$txt['iso3166']['LY'] = 'Libya';
+$txt['iso3166']['MA'] = 'Morocco';
+$txt['iso3166']['MC'] = 'Monaco';
+$txt['iso3166']['MD'] = 'Moldova';
+$txt['iso3166']['ME'] = 'Montenegro';
+$txt['iso3166']['MF'] = 'St. Martin';
+$txt['iso3166']['MG'] = 'Madagascar';
+$txt['iso3166']['MH'] = 'Marshall Islands';
+$txt['iso3166']['MK'] = 'North Macedonia';
+$txt['iso3166']['ML'] = 'Mali';
+$txt['iso3166']['MM'] = 'Myanmar';
+$txt['iso3166']['MN'] = 'Mongolia';
+$txt['iso3166']['MO'] = 'Macao';
+$txt['iso3166']['MP'] = 'Northern Mariana Islands';
+$txt['iso3166']['MQ'] = 'Martinique';
+$txt['iso3166']['MR'] = 'Mauritania';
+$txt['iso3166']['MS'] = 'Montserrat';
+$txt['iso3166']['MT'] = 'Malta';
+$txt['iso3166']['MU'] = 'Mauritius';
+$txt['iso3166']['MV'] = 'Maldives';
+$txt['iso3166']['MW'] = 'Malawi';
+$txt['iso3166']['MX'] = 'Mexico';
+$txt['iso3166']['MY'] = 'Malaysia';
+$txt['iso3166']['MZ'] = 'Mozambique';
+$txt['iso3166']['NA'] = 'Namibia';
+$txt['iso3166']['NC'] = 'New Caledonia';
+$txt['iso3166']['NE'] = 'Niger';
+$txt['iso3166']['NF'] = 'Norfolk Island';
+$txt['iso3166']['NG'] = 'Nigeria';
+$txt['iso3166']['NI'] = 'Nicaragua';
+$txt['iso3166']['NL'] = 'Netherlands';
+$txt['iso3166']['NO'] = 'Norway';
+$txt['iso3166']['NP'] = 'Nepal';
+$txt['iso3166']['NR'] = 'Nauru';
+$txt['iso3166']['NU'] = 'Niue';
+$txt['iso3166']['NZ'] = 'New Zealand';
+$txt['iso3166']['OM'] = 'Oman';
+$txt['iso3166']['PA'] = 'Panama';
+$txt['iso3166']['PE'] = 'Peru';
+$txt['iso3166']['PF'] = 'French Polynesia';
+$txt['iso3166']['PG'] = 'Papua New Guinea';
+$txt['iso3166']['PH'] = 'Philippines';
+$txt['iso3166']['PK'] = 'Pakistan';
+$txt['iso3166']['PL'] = 'Poland';
+$txt['iso3166']['PM'] = 'St. Pierre & Miquelon';
+$txt['iso3166']['PN'] = 'Pitcairn';
+$txt['iso3166']['PR'] = 'Puerto Rico';
+$txt['iso3166']['PS'] = 'Palestine';
+$txt['iso3166']['PT'] = 'Portugal';
+$txt['iso3166']['PW'] = 'Palau';
+$txt['iso3166']['PY'] = 'Paraguay';
+$txt['iso3166']['QA'] = 'Qatar';
+$txt['iso3166']['RE'] = 'Réunion';
+$txt['iso3166']['RO'] = 'Romania';
+$txt['iso3166']['RS'] = 'Serbia';
+$txt['iso3166']['RU'] = 'Russia';
+$txt['iso3166']['RW'] = 'Rwanda';
+$txt['iso3166']['SA'] = 'Saudi Arabia';
+$txt['iso3166']['SB'] = 'Solomon Islands';
+$txt['iso3166']['SC'] = 'Seychelles';
+$txt['iso3166']['SD'] = 'Sudan';
+$txt['iso3166']['SE'] = 'Sweden';
+$txt['iso3166']['SG'] = 'Singapore';
+$txt['iso3166']['SH'] = 'St. Helena';
+$txt['iso3166']['SI'] = 'Slovenia';
+$txt['iso3166']['SJ'] = 'Svalbard & Jan Mayen';
+$txt['iso3166']['SK'] = 'Slovakia';
+$txt['iso3166']['SL'] = 'Sierra Leone';
+$txt['iso3166']['SM'] = 'San Marino';
+$txt['iso3166']['SN'] = 'Senegal';
+$txt['iso3166']['SO'] = 'Somalia';
+$txt['iso3166']['SR'] = 'Suriname';
+$txt['iso3166']['SS'] = 'South Sudan';
+$txt['iso3166']['ST'] = 'Sao Tome & Principe';
+$txt['iso3166']['SV'] = 'El Salvador';
+$txt['iso3166']['SX'] = 'Sint Maarten';
+$txt['iso3166']['SY'] = 'Syria';
+$txt['iso3166']['SZ'] = 'Eswatini';
+$txt['iso3166']['TC'] = 'Turks & Caicos Islands';
+$txt['iso3166']['TD'] = 'Chad';
+$txt['iso3166']['TF'] = 'French Southern Territories';
+$txt['iso3166']['TG'] = 'Togo';
+$txt['iso3166']['TH'] = 'Thailand';
+$txt['iso3166']['TJ'] = 'Tajikistan';
+$txt['iso3166']['TK'] = 'Tokelau';
+$txt['iso3166']['TL'] = 'Timor-Leste';
+$txt['iso3166']['TM'] = 'Turkmenistan';
+$txt['iso3166']['TN'] = 'Tunisia';
+$txt['iso3166']['TO'] = 'Tonga';
+$txt['iso3166']['TR'] = 'Turkey';
+$txt['iso3166']['TT'] = 'Trinidad & Tobago';
+$txt['iso3166']['TV'] = 'Tuvalu';
+$txt['iso3166']['TW'] = 'Taiwan';
+$txt['iso3166']['TZ'] = 'Tanzania';
+$txt['iso3166']['UA'] = 'Ukraine';
+$txt['iso3166']['UG'] = 'Uganda';
+$txt['iso3166']['UM'] = 'United States Minor Outlying Islands';
+$txt['iso3166']['US'] = 'United States of America';
+$txt['iso3166']['UY'] = 'Uruguay';
+$txt['iso3166']['UZ'] = 'Uzbekistan';
+$txt['iso3166']['VA'] = 'Holy See';
+$txt['iso3166']['VC'] = 'St. Vincent & the Grenadines';
+$txt['iso3166']['VE'] = 'Venezuela';
+$txt['iso3166']['VG'] = 'Virgin Islands (British)';
+$txt['iso3166']['VI'] = 'Virgin Islands (U.S.)';
+$txt['iso3166']['VN'] = 'Viet Nam';
+$txt['iso3166']['VU'] = 'Vanuatu';
+$txt['iso3166']['WF'] = 'Wallis & Futuna';
+$txt['iso3166']['WS'] = 'Samoa';
+$txt['iso3166']['YE'] = 'Yemen';
+$txt['iso3166']['YT'] = 'Mayotte';
+$txt['iso3166']['ZA'] = 'South Africa';
+$txt['iso3166']['ZM'] = 'Zambia';
+$txt['iso3166']['ZW'] = 'Zimbabwe';
 
 ?>
\ No newline at end of file