diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 8244e15..ee728e7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -84,7 +84,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
                     "The current Internet Time is: ${bold(internetTime())} $BEATS_KEYWORD"
                 } else {
                     (ZonedDateTime.now().withZoneSameInstant(ZoneId.of(tz)).format(dtf)
-                            + bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' ')))
+                            + bold(tz.substring(tz.lastIndexOf('/') + 1).replace('_', ' ')))
                 }
             } else {
                 return ErrorMessage("Unsupported country/zone. Please try again.")
@@ -98,13 +98,19 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["AD"] = "Europe/Andorra"
             countries["AE"] = "Asia/Dubai"
             countries["AF"] = "Asia/Kabul"
+            countries["AG"] = "America/Antigua"
+            countries["AI"] = "America/Anguilla"
             countries["AKDT"] = "America/Anchorage"
             countries["AKST"] = "America/Anchorage"
+            countries["AL"] = "Europe/Tirane"
+            countries["AM"] = "Asia/Yerevan"
+            countries["AO"] = "Africa/Luanda"
             countries["AQ"] = "Antarctica/South_Pole"
             countries["AR"] = "America/Argentina/Buenos_Aires"
             countries["AS"] = "Pacific/Pago_Pago"
             countries["AT"] = "Europe/Vienna"
             countries["AU"] = "Australia/Sydney"
+            countries["AW"] = "America/Aruba"
             countries["AX"] = "Europe/Mariehamn"
             countries["AZ"] = "Asia/Baku"
             countries["BA"] = "Europe/Sarajevo"
@@ -121,9 +127,10 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["BM"] = "Atlantic/Bermuda"
             countries["BMT"] = BEATS_KEYWORD
             countries["BN"] = "Asia/Brunei"
+            countries["BO"] = "America/La_Paz"
             countries["BQ"] = "America/Kralendijk"
             countries["BR"] = "America/Sao_Paulo"
-            countries["BS"] = "America/Toronto"
+            countries["BS"] = "America/Nassau"
             countries["BT"] = "Asia/Thimphu"
             countries["BW"] = "Africa/Gaborone"
             countries["BY"] = "Europe/Minsk"
@@ -139,6 +146,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["CI"] = "Africa/Abidjan"
             countries["CK"] = "Pacific/Rarotonga"
             countries["CL"] = "America/Santiago"
+            countries["CM"] = "Africa/Douala"
             countries["CN"] = "Asia/Shanghai"
             countries["CO"] = "America/Bogota"
             countries["CR"] = "America/Costa_Rica"
@@ -167,15 +175,15 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["FI"] = "Europe/Helsinki"
             countries["FJ"] = "Pacific/Fiji"
             countries["FK"] = "Atlantic/Stanley"
-            countries["FM"] = "Pacific/Port_Moresby"
+            countries["FM"] = "Pacific/Yap"
             countries["FO"] = "Atlantic/Faroe"
             countries["FR"] = "Europe/Paris"
-            countries["GA"] = "Asia/Tbilisi"
+            countries["GA"] = "Africa/Libreville"
             countries["GB"] = "Europe/London"
             countries["GD"] = "America/Grenada"
             countries["GE"] = "Asia/Tbilisi"
             countries["GF"] = "America/Cayenne"
-            countries["GG"] = "Europe/London"
+            countries["GG"] = "Europe/Guernsey"
             countries["GH"] = "Africa/Accra"
             countries["GI"] = "Europe/Gibraltar"
             countries["GL"] = "America/Thule"
@@ -199,13 +207,14 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["ID"] = "Asia/Jakarta"
             countries["IE"] = "Europe/Dublin"
             countries["IL"] = "Asia/Tel_Aviv"
-            countries["IM"] = "Europe/London"
+            countries["IM"] = "Europe/Isle_of_Man"
             countries["IN"] = "Asia/Kolkata"
+            countries["IO"] = "Indian/Chagos"
             countries["IQ"] = "Asia/Baghdad"
             countries["IR"] = "Asia/Tehran"
             countries["IS"] = "Atlantic/Reykjavik"
             countries["IT"] = "Europe/Rome"
-            countries["JE"] = "Europe/London"
+            countries["JE"] = "Europe/Jersey"
             countries["JM"] = "Jamaica"
             countries["JO"] = "Asia/Amman"
             countries["JP"] = "Asia/Tokyo"
@@ -238,9 +247,9 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["ME"] = "Europe/Podgorica"
             countries["MF"] = "America/Marigot"
             countries["MG"] = "Indian/Antananarivo"
-            countries["MH"] = "Kwajalein"
+            countries["MH"] = "Pacific/Majuro"
             countries["MK"] = "Europe/Skopje"
-            countries["ML"] = "Africa/Bamako"
+            countries["ML"] = "Africa/Timbuktu"
             countries["MM"] = "Asia/Yangon"
             countries["MN"] = "Asia/Ulaanbaatar"
             countries["MO"] = "Asia/Macau"
@@ -273,7 +282,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["PDT"] = "America/Los_Angeles"
             countries["PE"] = "America/Lima"
             countries["PF"] = "Pacific/Tahiti"
-            countries["PG"] = "Pacific/Pohnpei"
+            countries["PG"] = "Pacific/Port_Moresby"
             countries["PH"] = "Asia/Manila"
             countries["PK"] = "Asia/Karachi"
             countries["PL"] = "Europe/Warsaw"
@@ -291,7 +300,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["RS"] = "Europe/Belgrade"
             countries["RU"] = "Europe/Moscow"
             countries["RW"] = "Africa/Kigali"
-            countries["SA"] = "Africa/Johannesburg"
+            countries["SA"] = "Asia/Riyadh"
             countries["SB"] = "Pacific/Guadalcanal"
             countries["SC"] = "Indian/Mahe"
             countries["SD"] = "Africa/Khartoum"
@@ -309,7 +318,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["SS"] = "Africa/Juba"
             countries["ST"] = "Africa/Sao_Tome"
             countries["SV"] = "America/El_Salvador"
-            countries["SX"] = "America/Marigot"
+            countries["SX"] = "America/Lower_Princes"
             countries["SY"] = "Asia/Damascus"
             countries["SZ"] = "Africa/Mbabane"
             countries["TC"] = "America/Grand_Turk"
@@ -331,7 +340,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["UA"] = "Europe/Kiev"
             countries["UG"] = "Africa/Kampala"
             countries["UK"] = "Europe/London"
-            countries["UM"] = "Pacific/Johnston"
+            countries["UM"] = "Pacific/Wake"
             countries["US"] = "America/New_York"
             countries["UTC"] = "UTC"
             countries["UY"] = "America/Montevideo"
@@ -340,7 +349,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["VC"] = "America/St_Vincent"
             countries["VE"] = "America/Caracas"
             countries["VG"] = "America/Tortola"
-            countries["VI"] = "America/St_Johns"
+            countries["VI"] = "America/St_Thomas"
             countries["VN"] = "Asia/Ho_Chi_Minh"
             countries["VU"] = "Pacific/Efate"
             countries["WF"] = "Pacific/Wallis"
@@ -350,6 +359,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["ZA"] = "Africa/Johannesburg"
             countries["ZM"] = "Africa/Lusaka"
             countries["ZULU"] = "Zulu"
+            countries["ZW"] = "Africa/Harare"
             @Suppress("MagicNumber")
             ZoneId.getAvailableZoneIds().stream()
                 .filter { tz: String ->