diff --git a/source/Ox.Geo/Ox.Geo.js b/source/Ox.Geo/Ox.Geo.js
index 850e1aa4..12a7e484 100644
--- a/source/Ox.Geo/Ox.Geo.js
+++ b/source/Ox.Geo/Ox.Geo.js
@@ -113,7 +113,8 @@ Ox.load.Geo = function(options, callback) {
             geoname = geoname.replace(' - United Arab Emirates', ', United Arab Emirates')
             return Ox.getCountryByName(
                 geoname.split(', ').pop()
-                .replace('Sint Eustatius', 'Bonaire, Sint Eustatius')
+                .replace('Sint Eustatius and Saba', 'Bonaire, Sint Eustatius and Saba')
+                .replace('Ascension and Tristan da Cunha', 'Saint Helena, Ascension and Tristan da Cunha')
             );
         }
 
diff --git a/source/Ox.Geo/json/Ox.Geo.json b/source/Ox.Geo/json/Ox.Geo.json
index 43abaa20..c0ad1173 100644
--- a/source/Ox.Geo/json/Ox.Geo.json
+++ b/source/Ox.Geo/json/Ox.Geo.json
@@ -36,6 +36,7 @@
         "code": "AE", 
         "continent": "Asia", 
         "created": {
+            "country": "Sharjah", 
             "date": "1971-12-02"
         }, 
         "east": 56.4395, 
@@ -48,6 +49,171 @@
         "south": 22.633219, 
         "west": 51.4723
     }, 
+    {
+        "area": 6166717138.001065, 
+        "code": "AE-AJ", 
+        "continent": "Asia", 
+        "created": {
+            "country": "Trucial States", 
+            "date": "1971-12-01"
+        }, 
+        "dissolved": {
+            "country": "United Arab Emirates", 
+            "date": "1971-12-02", 
+            "dissolved": "merged"
+        }, 
+        "east": 56.126743, 
+        "flag": "AE-DU", 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/07/Flag_of_Dubai.svg", 
+        "lat": 25.4052165, 
+        "lng": 55.5136433, 
+        "name": "Ajman", 
+        "north": 25.4975409, 
+        "region": "Western Asia", 
+        "south": 24.73617, 
+        "west": 55.4048764
+    }, 
+    {
+        "area": 141024723072.33008, 
+        "code": "AE-AZ", 
+        "continent": "Asia", 
+        "created": {
+            "country": "Trucial States", 
+            "date": "1971-12-01"
+        }, 
+        "dissolved": {
+            "country": "United Arab Emirates", 
+            "date": "1971-12-02", 
+            "dissolved": "merged"
+        }, 
+        "east": 56.023933, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d8/Flag_of_Abu_Dhabi.svg", 
+        "lat": 23.4677235, 
+        "lng": 53.7369154, 
+        "name": "Abu Dhabi", 
+        "north": 25.246815, 
+        "region": "Western Asia", 
+        "south": 22.497065, 
+        "west": 51.497665
+    }, 
+    {
+        "area": 11545066724.606611, 
+        "code": "AE-DU", 
+        "continent": "Asia", 
+        "created": {
+            "country": "Trucial States", 
+            "date": "1971-12-01"
+        }, 
+        "dissolved": {
+            "country": "United Arab Emirates", 
+            "date": "1971-12-02", 
+            "dissolved": "merged"
+        }, 
+        "east": 56.1867915, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/07/Flag_of_Dubai.svg", 
+        "lat": 24.9821547, 
+        "lng": 55.402868, 
+        "name": "Dubai", 
+        "north": 25.394746, 
+        "region": "Western Asia", 
+        "south": 24.6128254, 
+        "west": 54.8720741
+    }, 
+    {
+        "area": 4622522201.305576, 
+        "code": "AE-FU", 
+        "continent": "Asia", 
+        "created": {
+            "country": "Trucial States", 
+            "date": "1971-12-01"
+        }, 
+        "dissolved": {
+            "country": "United Arab Emirates", 
+            "date": "1971-12-02", 
+            "dissolved": "merged"
+        }, 
+        "east": 56.4693832, 
+        "flag": "AE", 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/cb/Flag_of_the_United_Arab_Emirates.svg", 
+        "lat": 25.4110762, 
+        "lng": 56.2482277, 
+        "name": "Fujairah", 
+        "north": 25.667782, 
+        "region": "Western Asia", 
+        "south": 24.8528748, 
+        "west": 55.96323
+    }, 
+    {
+        "area": 7577458056.104693, 
+        "code": "AE-RK", 
+        "continent": "Asia", 
+        "created": {
+            "country": "Trucial States", 
+            "date": "1971-12-01"
+        }, 
+        "dissolved": {
+            "country": "United Arab Emirates", 
+            "date": "1972-02-11", 
+            "dissolved": "joined"
+        }, 
+        "east": 56.297054, 
+        "flag": "AE-SH", 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/6d/Flag_of_Sharjah.svg", 
+        "lat": 25.5675233, 
+        "lng": 55.8913207, 
+        "name": "Ras al-Khaimah", 
+        "north": 26.078848, 
+        "region": "Western Asia", 
+        "south": 24.834166, 
+        "west": 55.752945
+    }, 
+    {
+        "area": 8390666888.381632, 
+        "code": "AE-SH", 
+        "continent": "Asia", 
+        "created": {
+            "country": "Trucial States", 
+            "date": "1971-12-01"
+        }, 
+        "dissolved": {
+            "country": "United Arab Emirates", 
+            "date": "1971-12-02", 
+            "dissolved": "merged"
+        }, 
+        "east": 56.3797928, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/6d/Flag_of_Sharjah.svg", 
+        "lat": 25.0753974, 
+        "lng": 55.7578403, 
+        "name": "Sharjah", 
+        "north": 25.515083, 
+        "region": "Western Asia", 
+        "south": 24.79167, 
+        "west": 55.345749, 
+        "wikipediaName": "Sharjah (emirate)"
+    }, 
+    {
+        "area": 1683822896.4478557, 
+        "code": "AE-UQ", 
+        "continent": "Asia", 
+        "created": {
+            "country": "Trucial States", 
+            "date": "1971-12-01"
+        }, 
+        "dissolved": {
+            "country": "United Arab Emirates", 
+            "date": "1971-12-02", 
+            "dissolved": "merged"
+        }, 
+        "east": 55.953869, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fb/Flag_of_Umm_al-Qaiwain.svg", 
+        "lat": 25.5204824, 
+        "lng": 55.7133909, 
+        "name": "Umm al-Quwain", 
+        "north": 25.666396, 
+        "region": "Western Asia", 
+        "south": 25.323967, 
+        "west": 55.514248
+    }, 
     {
         "area": 1345341004912.8557, 
         "code": "AF", 
@@ -84,7 +250,10 @@
         "area": 3206900138.0668025, 
         "code": "AI", 
         "continent": "South America", 
-        "created": {}, 
+        "created": {
+            "country": "Saint Christopher-Nevis-Anguilla", 
+            "date": "1983-09-19"
+        }, 
         "dependency": [
             "United Kingdom"
         ], 
@@ -145,7 +314,7 @@
         "continent": "Asia", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 46.634222, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/2f/Flag_of_Armenia.svg", 
@@ -394,6 +563,9 @@
         "area": 1886218115.7079582, 
         "code": "AX", 
         "continent": "Europe", 
+        "dependency": [
+            "Finland"
+        ], 
         "east": 20.3024036, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/52/Flag_of_%C3%85land.svg", 
         "lat": 60.177002, 
@@ -410,7 +582,7 @@
         "continent": "Asia", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "disputes": [
             "Nagorno-Karabakh"
@@ -704,6 +876,7 @@
         "east": -34.1016, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/en/0/05/Flag_of_Brazil.svg", 
         "languages": [
+            "Tupi", 
             "Brazilian"
         ], 
         "lat": -14.235004, 
@@ -750,7 +923,7 @@
         "continent": "Asia", 
         "dissolved": {
             "country": "Myanmar", 
-            "date": "1989", 
+            "date": "1989-06-18", 
             "dissolved": "renamed"
         }, 
         "east": 101.1702717, 
@@ -802,10 +975,6 @@
         "area": 345533033526.65155, 
         "code": "BY", 
         "continent": "Europe", 
-        "created": {
-            "country": "Soviet Union", 
-            "date": "1991-12-21"
-        }, 
         "east": 32.77682, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/85/Flag_of_Belarus.svg", 
         "languages": [
@@ -1120,7 +1289,7 @@
         "west": -86.0449
     }, 
     {
-        "area": 280624359208.4659, 
+        "area": 280624359208.4667, 
         "code": "CSHH", 
         "continent": "Europe", 
         "dissolved": {
@@ -1533,7 +1702,7 @@
         "continent": "Europe", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 28.210139, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/8f/Flag_of_Estonia.svg", 
@@ -1565,10 +1734,33 @@
         "south": 22, 
         "west": 24.6954964
     }, 
+    {
+        "area": 1338716329443.3928, 
+        "code": "EGEG", 
+        "continent": "Africa", 
+        "dissolved": {
+            "country": "Egypt", 
+            "date": "1971-09-01", 
+            "dissolved": "renamed"
+        }, 
+        "east": 37.0569, 
+        "flag": "SY", 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/53/Flag_of_Syria.svg", 
+        "lat": 26.820553, 
+        "lng": 30.802498, 
+        "name": "United Arab Republic", 
+        "north": 31.8122, 
+        "region": "Northern Africa", 
+        "south": 22, 
+        "west": 24.6954964
+    }, 
     {
         "area": 725096722726.9398, 
         "code": "EH", 
         "continent": "Africa", 
+        "disputed": [
+            "Morocco"
+        ], 
         "east": -8.6666659, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/26/Flag_of_the_Sahrawi_Arab_Democratic_Republic.svg", 
         "googleName": "Western Sahara", 
@@ -1656,7 +1848,7 @@
         "code": "FI", 
         "continent": "Europe", 
         "dependencies": [
-            "\u00c5land"
+            "\u00c5land Islands"
         ], 
         "east": 31.5871, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/b/bc/Flag_of_Finland.svg", 
@@ -1747,6 +1939,9 @@
         "area": 57945336234756.42, 
         "code": "FQHH", 
         "continent": "Antarctica", 
+        "dependency": [
+            "France"
+        ], 
         "dissolved": {
             "country": [
                 "Ad\u00e9lie Land', 'French Southern Territories"
@@ -1780,8 +1975,8 @@
             "French Afar and Issas", 
             "French Guiana", 
             "French Polynesia", 
-            "French Southern and Antarctic Lands", 
-            "French Southern Lands", 
+            "French Southern and Antarctic Territories", 
+            "French Southern Territories", 
             "Guadeloupe", 
             "Martinique", 
             "Mayotte", 
@@ -1828,6 +2023,7 @@
         "west": 136.0333333333
     }, 
     {
+        "alias": true, 
         "area": 1277176367200.3474, 
         "code": "FXFR", 
         "continent": "Europe", 
@@ -1872,6 +2068,7 @@
             "Ascension", 
             "Bermuda", 
             "British Antarctic Territory", 
+            "British Honduras", 
             "British Indian Ocean Territory", 
             "British Virgin Islands", 
             "Cayman Islands", 
@@ -1886,15 +2083,21 @@
             "Montserrat", 
             "Northern Ireland", 
             "Pitcairn Islands", 
-            "Saint Helena", 
+            "Saint Christopher-Nevis-Anguilla", 
+            "Saint Helena, Ascension and Tristan da Cunha", 
             "Scotland", 
             "South Georgia and the South Sandwich Islands", 
+            "Southern Rhodesia", 
             "Tristan da Cunha", 
+            "Trucial States", 
             "Turks and Caicos Islands", 
             "Wales", 
             "Antarctica", 
             "New Hebrides"
         ], 
+        "disputes": [
+            "Sealand"
+        ], 
         "east": 1.768926, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/en/a/ae/Flag_of_the_United_Kingdom.svg", 
         "googleName": "UK", 
@@ -1984,6 +2187,23 @@
         "south": 54.631564, 
         "west": -8.662663
     }, 
+    {
+        "area": 2225.6905961695456, 
+        "code": "GB-SL", 
+        "continent": "Europe", 
+        "disputed": [
+            "United Kingdom"
+        ], 
+        "east": 1.4808727056, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e5/Flag_of_Sealand.svg", 
+        "lat": 51.8951666666, 
+        "lng": 1.4805, 
+        "name": "Sealand", 
+        "north": 51.8953618934, 
+        "region": "Northern Europe", 
+        "south": 51.8949714399, 
+        "west": 1.4801272944
+    }, 
     {
         "area": 44071499133.04909, 
         "code": "GB-WLS", 
@@ -2004,6 +2224,83 @@
         "south": 51.3726411, 
         "west": -5.364147
     }, 
+    {
+        "area": 193056207987.621, 
+        "code": "GBAE", 
+        "continent": "Asia", 
+        "dependency": [
+            "United Kingdom"
+        ], 
+        "dissolved": {
+            "country": [
+                "Abu Dhabi", 
+                "Ajman", 
+                "Dubai", 
+                "Fujairah", 
+                "Ras al-Khaimah", 
+                "Sharjah", 
+                "Umm al-Quwain"
+            ], 
+            "date": "1971-12-01", 
+            "dissolved": "split"
+        }, 
+        "east": 56.4395, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/03/Flag_of_the_Trucial_States.svg", 
+        "lat": 23.424076, 
+        "lng": 53.847818, 
+        "name": "Trucial States", 
+        "north": 26.0765, 
+        "region": "Western Asia", 
+        "south": 22.633219, 
+        "west": 51.4723
+    }, 
+    {
+        "area": 56065510906.2725, 
+        "code": "GBBZ", 
+        "continent": "South America", 
+        "dependency": [
+            "United Kingdom"
+        ], 
+        "dissolved": {
+            "country": "Belize", 
+            "date": "1973-06-01", 
+            "dissolved": "renamed"
+        }, 
+        "east": -87.4127, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/8a/Flag_of_British_Honduras.svg", 
+        "lat": 17.189877, 
+        "lng": -88.49765, 
+        "name": "British Honduras", 
+        "north": 18.4958198, 
+        "region": "Central America", 
+        "south": 15.8861967, 
+        "west": -89.2276392
+    }, 
+    {
+        "area": 17541848537.319035, 
+        "code": "GBKN", 
+        "continent": "South America", 
+        "dependency": [
+            "United Kingdom"
+        ], 
+        "dissolved": {
+            "country": [
+                "Anguilla", 
+                "Saint Kitts and Nevis"
+            ], 
+            "date": "1983-09-19", 
+            "dissolved": "split"
+        }, 
+        "east": -62.5237083, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d3/Flag_of_St_Kitts-Nevis-Anguilla.svg", 
+        "lat": 17.85592135, 
+        "lng": -63.00204275, 
+        "name": "Saint Christopher-Nevis-Anguilla", 
+        "north": 18.6332326, 
+        "region": "Caribbean", 
+        "south": 17.0786101, 
+        "west": -63.4803772
+    }, 
     {
         "area": 3141247236.2962723, 
         "code": "GD", 
@@ -2024,7 +2321,7 @@
         "continent": "Asia", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "disputes": [
             "Abkhazia", 
@@ -2551,6 +2848,9 @@
         "area": 9895140766257.494, 
         "code": "ID", 
         "continent": "Asia", 
+        "disputes": [
+            "East Timor"
+        ], 
         "east": 141.0425, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/9f/Flag_of_Indonesia.svg", 
         "languages": [
@@ -2826,6 +3126,9 @@
         "area": 4566161.281369122, 
         "code": "JTUM", 
         "continent": "Oceania", 
+        "dependency": [
+            "United States"
+        ], 
         "dissolved": {
             "country": "United States Minor Outlying Islands", 
             "date": "1986", 
@@ -2842,6 +3145,26 @@
         "west": -169.543488, 
         "wikipediaName": "Johnston Atoll"
     }, 
+    {
+        "area": 353674993648.2922, 
+        "code": "KAKH", 
+        "continent": "Asia", 
+        "dissolved": {
+            "country": "Cambodia", 
+            "date": "1989-05-01", 
+            "dissolved": "renamed"
+        }, 
+        "east": 107.627687, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/f1/PROKFlag1979-1989.svg", 
+        "lat": 12.565679, 
+        "lng": 104.990963, 
+        "name": "Kampuchea", 
+        "north": 14.690179, 
+        "region": "South-Eastern Asia", 
+        "south": 9.178, 
+        "west": 102.333542, 
+        "wikipediaName": "People's Republic of Kampuchea"
+    }, 
     {
         "area": 965810505570.0994, 
         "code": "KE", 
@@ -2865,7 +3188,7 @@
         "continent": "Asia", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 80.2265593, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/c7/Flag_of_Kyrgyzstan.svg", 
@@ -2897,12 +3220,31 @@
         "south": 9.178, 
         "west": 102.333542
     }, 
+    {
+        "area": 353674993648.2922, 
+        "code": "KHKA", 
+        "continent": "Asia", 
+        "dissolved": {
+            "country": "Kampuchea", 
+            "date": "1975-04-17", 
+            "dissolved": "renamed"
+        }, 
+        "east": 107.627687, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/a8/Flag_of_the_Khmer_Republic.svg", 
+        "lat": 12.565679, 
+        "lng": 104.990963, 
+        "name": "Khmer Republic", 
+        "north": 14.690179, 
+        "region": "South-Eastern Asia", 
+        "south": 9.178, 
+        "west": 102.333542
+    }, 
     {
         "area": 11244884817288.629, 
         "code": "KI", 
         "continent": "Oceania", 
         "created": {
-            "country": "Gilbert and Ellice Islands", 
+            "country": "Canton and Enderbury Islands", 
             "date": "1979-07-12"
         }, 
         "east": -144.2285156, 
@@ -2920,7 +3262,8 @@
         "code": "KM", 
         "continent": "Africa", 
         "disputes": [
-            "Anjouan"
+            "Anjouan", 
+            "Moh\u00e9li"
         ], 
         "east": 44.5646667, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/94/Flag_of_the_Comoros.svg", 
@@ -2932,10 +3275,58 @@
         "south": -12.4687601, 
         "west": 43.1968689
     }, 
+    {
+        "area": 1351202044.3968482, 
+        "code": "KM-A", 
+        "continent": "Africa", 
+        "disputed": [
+            "Comoros"
+        ], 
+        "dissolved": {
+            "country": "Comoros", 
+            "date": "2002-03-10", 
+            "dissolved": "joined"
+        }, 
+        "east": 44.536171, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/58/Flag_of_Anjouan.svg", 
+        "lat": -12.2138145, 
+        "lng": 44.4370606, 
+        "name": "Anjouan", 
+        "north": -12.0634182, 
+        "region": "Eastern Africa", 
+        "south": -12.388629, 
+        "west": 44.1931057
+    }, 
+    {
+        "area": 433890115.14031255, 
+        "code": "KM-M", 
+        "continent": "Africa", 
+        "disputed": [
+            "Comoros"
+        ], 
+        "dissolved": {
+            "country": "Comoros", 
+            "date": "2002-03-10", 
+            "dissolved": "joined"
+        }, 
+        "east": 43.8763046, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/32/Flag_of_Moh%C3%A9li.svg", 
+        "lat": -12.3377376, 
+        "lng": 43.7334089, 
+        "name": "Moh\u00e9li", 
+        "north": -12.2490952, 
+        "region": "Eastern Africa", 
+        "south": -12.3899703, 
+        "west": 43.6219025
+    }, 
     {
         "area": 1399730784.0328739, 
         "code": "KN", 
         "continent": "South America", 
+        "created": {
+            "country": "Saint Christopher-Nevis-Anguilla", 
+            "date": "1983-09-19"
+        }, 
         "east": -62.5237083, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/fe/Flag_of_Saint_Kitts_and_Nevis.svg", 
         "lat": 17.357822, 
@@ -3034,7 +3425,7 @@
         "continent": "Asia", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 87.315415, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d3/Flag_of_Kazakhstan.svg", 
@@ -3126,6 +3517,27 @@
         "south": 5.6816, 
         "west": 79.2677
     }, 
+    {
+        "area": 153674507803.81046, 
+        "code": "LKLK", 
+        "continent": "Asia", 
+        "dissolved": {
+            "country": "Sri Lanka", 
+            "date": "1972-05-22", 
+            "dissolved": "renamed"
+        }, 
+        "east": 82.1448, 
+        "flag": "LK", 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/11/Flag_of_Sri_Lanka.svg", 
+        "lat": 7.873054, 
+        "lng": 80.771797, 
+        "name": "Ceylon", 
+        "north": 10.03377, 
+        "region": "Southern Asia", 
+        "south": 5.6816, 
+        "west": 79.2677, 
+        "wikipediaName": "Dominion of Ceylon"
+    }, 
     {
         "area": 219658482343.5953, 
         "code": "LR", 
@@ -3163,7 +3575,7 @@
         "continent": "Europe", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 26.83565, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/11/Flag_of_Lithuania.svg", 
@@ -3193,12 +3605,12 @@
         "west": 5.73567
     }, 
     {
-        "area": 120694156663.70496, 
+        "area": 120694156663.70555, 
         "code": "LV", 
         "continent": "Europe", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 28.241403, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/84/Flag_of_Latvia.svg", 
@@ -3231,6 +3643,9 @@
         "area": 1070732028319.7855, 
         "code": "MA", 
         "continent": "Africa", 
+        "disputes": [
+            "Sahrawi"
+        ], 
         "east": -0.9969758, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/2c/Flag_of_Morocco.svg", 
         "languages": [
@@ -3264,7 +3679,7 @@
         "continent": "Europe", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "disputes": [
             "Transnistria"
@@ -3754,6 +4169,28 @@
         "south": 4.1821, 
         "west": 2.676932
     }, 
+    {
+        "area": 132758517433.91803, 
+        "code": "NG-BI", 
+        "continent": "Africa", 
+        "disputed": [
+            "Nigeria"
+        ], 
+        "dissolved": {
+            "country": "Nigeria", 
+            "date": "1970-01-15", 
+            "dissolved": "joined"
+        }, 
+        "east": 9.472486, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/82/Flag_of_Biafra.svg", 
+        "lat": 5.5884125, 
+        "lng": 7.420023, 
+        "name": "Biafra", 
+        "north": 6.899681, 
+        "region": "Western Africa", 
+        "south": 4.277144, 
+        "west": 5.36756
+    }, 
     {
         "area": 407416223831.0918, 
         "code": "NHVU", 
@@ -3762,6 +4199,11 @@
             "France", 
             "United Kingdom"
         ], 
+        "disputes": [
+            "Tafea", 
+            "Tanna", 
+            "Vemerana"
+        ], 
         "dissolved": {
             "country": "Vanuatu", 
             "date": "1980-07-30", 
@@ -3777,6 +4219,73 @@
         "south": -20.5350773, 
         "west": 166.0583496
     }, 
+    {
+        "area": 23864998829.522575, 
+        "code": "NHVU-TF", 
+        "continent": "Oceania", 
+        "disputed": [
+            "New Hebrides"
+        ], 
+        "dissolved": {
+            "country": "New Hebrides", 
+            "date": "1980-05-26", 
+            "dissolved": "joined"
+        }, 
+        "east": 170.237299, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/en/6/64/Tafea_Flag.svg", 
+        "lat": -18.7237827, 
+        "lng": 169.0645056, 
+        "name": "Tafea", 
+        "north": -18.619115, 
+        "region": "Melanesia", 
+        "south": -20.250696, 
+        "west": 168.985588
+    }, 
+    {
+        "area": 1134264923.2200754, 
+        "code": "NHVU-TN", 
+        "continent": "Oceania", 
+        "disputed": [
+            "New Hebrides"
+        ], 
+        "dissolved": {
+            "country": "New Hebrides", 
+            "date": "1974-06-29", 
+            "dissolved": "joined"
+        }, 
+        "east": 169.5043659, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/6d/Bandera_Tanna_Vanuatu.svg", 
+        "lat": -19.5154862, 
+        "lng": 169.3578201, 
+        "name": "Tanna", 
+        "north": -19.3156794, 
+        "region": "Melanesia", 
+        "south": -19.6575415, 
+        "west": 169.2203522, 
+        "wikipediaName": "Tanna (island)"
+    }, 
+    {
+        "area": 8851104280.460808, 
+        "code": "NHVU-VE", 
+        "continent": "Oceania", 
+        "disputed": [
+            "New Hebrides"
+        ], 
+        "dissolved": {
+            "country": "New Hebrides", 
+            "date": "1980-07-24", 
+            "dissolved": "joined"
+        }, 
+        "east": 167.2610092, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/90/Flag_of_Vemerana.svg", 
+        "lat": -15.3003549, 
+        "lng": 166.9182097, 
+        "name": "Vemerana", 
+        "north": -14.6430502, 
+        "region": "Melanesia", 
+        "south": -15.6714696, 
+        "west": 166.5414476
+    }, 
     {
         "area": 286188994654.2155, 
         "code": "NI", 
@@ -4086,6 +4595,9 @@
         "area": 2682616451610.2505, 
         "code": "PG", 
         "continent": "Oceania", 
+        "disputes": [
+            "Bougainville"
+        ], 
         "east": 159.9609, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e3/Flag_of_Papua_New_Guinea.svg", 
         "languages": [
@@ -4099,6 +4611,29 @@
         "south": -12.0823, 
         "west": 140.8419695
     }, 
+    {
+        "area": 19888880004.49537, 
+        "code": "PG-NSA", 
+        "continent": "Oceania", 
+        "disputed": [
+            "Papua New Guinea"
+        ], 
+        "dissolved": {
+            "country": "Papua New Guinea", 
+            "date": "1998-12-24", 
+            "dissolved": "joined"
+        }, 
+        "east": 155.8630371, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e4/Flag_of_Bougainville.svg", 
+        "lat": -6.053602, 
+        "lng": 155.1907309, 
+        "name": "Bougainville", 
+        "north": -5.4232655, 
+        "region": "Melanesia", 
+        "south": -6.8043077, 
+        "west": 154.6942144, 
+        "wikipediaName": "Autonomous Region of Bougainville"
+    }, 
     {
         "area": 2205280531223.852, 
         "code": "PH", 
@@ -4392,12 +4927,41 @@
         "area": 624153359139.742, 
         "code": "RHZW", 
         "continent": "Africa", 
+        "dependency": [
+            "United Kingdom"
+        ], 
+        "disputes": [
+            "Rhodesia", 
+            "Zimbabwe Rhodesia"
+        ], 
         "dissolved": {
             "country": "Zimbabwe", 
             "date": "1980-04-18", 
             "dissolved": "renamed"
         }, 
         "east": 33.0682356, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/af/Flag_of_Southern_Rhodesia.svg", 
+        "lat": -19.015438, 
+        "lng": 29.154857, 
+        "name": "Southern Rhodesia", 
+        "north": -15.6161108, 
+        "region": "Eastern Africa", 
+        "south": -22.4234291, 
+        "west": 25.2373684
+    }, 
+    {
+        "area": 624153359139.742, 
+        "code": "RHZW-RH", 
+        "continent": "Africa", 
+        "disputed": [
+            "Southern Rhodesia"
+        ], 
+        "dissolved": {
+            "country": "Zimbabwe Rhodesia", 
+            "date": "1979-06-01", 
+            "dissolved": "renamed"
+        }, 
+        "east": 33.0682356, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/e1/Flag_of_Rhodesia.svg", 
         "lat": -19.015438, 
         "lng": 29.154857, 
@@ -4407,6 +4971,28 @@
         "south": -22.4234291, 
         "west": 25.2373684
     }, 
+    {
+        "area": 624153359139.742, 
+        "code": "RHZW-ZR", 
+        "continent": "Africa", 
+        "disputed": [
+            "Southern Rhodesia"
+        ], 
+        "dissolved": {
+            "country": "Southern Rhodesia", 
+            "date": "1979-06-01", 
+            "dissolved": "renamed"
+        }, 
+        "east": 33.0682356, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/3f/Flag_of_Zimbabwe_Rhodesia.svg", 
+        "lat": -19.015438, 
+        "lng": 29.154857, 
+        "name": "Zimbabwe Rhodesia", 
+        "north": -15.6161108, 
+        "region": "Eastern Africa", 
+        "south": -22.4234291, 
+        "west": 25.2373684
+    }, 
     {
         "area": 380928709169.3101, 
         "code": "RO", 
@@ -4433,6 +5019,9 @@
             "country": "Serbia and Montenegro", 
             "date": "2006-06-05"
         }, 
+        "disputes": [
+            "Kosovo"
+        ], 
         "east": 23.0063915, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/f/ff/Flag_of_Serbia.svg", 
         "languages": [
@@ -4452,8 +5041,11 @@
         "continent": "Europe", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
+        "disputes": [
+            "Chechnia"
+        ], 
         "east": -168.97788, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/en/f/f3/Flag_of_Russia.svg", 
         "languages": [
@@ -4470,6 +5062,29 @@
         "south": 41.185353, 
         "west": 19.6161
     }, 
+    {
+        "area": 25331595081.20272, 
+        "code": "RU-CE", 
+        "continent": "Europe", 
+        "disputed": [
+            "Russia"
+        ], 
+        "dissolved": {
+            "country": "Russia", 
+            "date": "2000-02-06", 
+            "dissolved": "joined"
+        }, 
+        "east": 46.6587, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d6/Flag_of_Chechen_Republic_of_Ichkeria.svg", 
+        "lat": 43.4023301, 
+        "lng": 45.7187468, 
+        "name": "Chechnia", 
+        "north": 44.0124001, 
+        "region": "Eastern Europe", 
+        "south": 42.4747, 
+        "west": 44.8336999, 
+        "wikipediaName": "Chechen Republic of Ichkeria"
+    }, 
     {
         "area": 44627378317.07488, 
         "code": "RW", 
@@ -4586,14 +5201,14 @@
         ], 
         "east": -5.6786442, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/00/Flag_of_Saint_Helena.svg", 
+        "imdbName": "Saint Helena", 
         "lat": -22.52888935, 
         "lng": -10.05107405, 
-        "name": "Saint Helena", 
+        "name": "Saint Helena, Ascension and Tristan da Cunha", 
         "north": -7.8876128, 
         "region": "Western Africa", 
         "south": -37.1701659, 
-        "west": -14.4235039, 
-        "wikipediaName": "Saint Helena, Ascension and Tristan da Cunha"
+        "west": -14.4235039
     }, 
     {
         "area": 40411341662.19755, 
@@ -4830,13 +5445,13 @@
         "code": "SUHH", 
         "continent": "Europe", 
         "dependencies": [
-            "Byelorussian Soviet Socialist Republic"
+            "Byelorussian Soviet Socialist Republic", 
+            "Ukrainian Soviet Socialist Republic"
         ], 
         "dissolved": {
             "country": [
                 "Armenia", 
                 "Azerbaijan", 
-                "Belarus", 
                 "Estonia", 
                 "Georgia", 
                 "Kazakhstan", 
@@ -4847,10 +5462,9 @@
                 "Russia", 
                 "Tajikistan", 
                 "Turkmenistan", 
-                "Ukraine", 
                 "Uzbekistan"
             ], 
-            "date": "1991-12-21", 
+            "date": "1991-12-25", 
             "dissolved": "split"
         }, 
         "east": -168.97788, 
@@ -4981,6 +5595,9 @@
         "area": 15161411044199.537, 
         "code": "TF", 
         "continent": "Antarctica", 
+        "dependency": [
+            "France"
+        ], 
         "east": 77.598801, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/a7/Flag_of_the_French_Southern_and_Antarctic_Lands.svg", 
         "lat": -30.6443971, 
@@ -5029,7 +5646,7 @@
         "continent": "Asia", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 75.1539563, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d0/Flag_of_Tajikistan.svg", 
@@ -5081,7 +5698,7 @@
         "continent": "Asia", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 66.707353, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/1b/Flag_of_Turkmenistan.svg", 
@@ -5131,6 +5748,9 @@
         "area": 61551190637.092255, 
         "code": "TPTL", 
         "continent": "Asia", 
+        "disputed": [
+            "Indonesia"
+        ], 
         "dissolved": {
             "country": "Timor-Leste", 
             "date": "2002-05-20", 
@@ -5230,10 +5850,6 @@
         "area": 1204347824305.5496, 
         "code": "UA", 
         "continent": "Europe", 
-        "created": {
-            "country": "Soviet Union", 
-            "date": "1991-12-21"
-        }, 
         "east": 40.228581, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg", 
         "languages": [
@@ -5247,10 +5863,35 @@
         "south": 44.2924, 
         "west": 22.1357201
     }, 
+    {
+        "area": 1204347824305.5496, 
+        "code": "UAUA", 
+        "continent": "Europe", 
+        "dependency": [
+            "Soviet Union"
+        ], 
+        "dissolved": {
+            "country": "Ukraine", 
+            "date": "1991-08-24", 
+            "dissolved": "renamed"
+        }, 
+        "east": 40.228581, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/a/a6/Flag_of_Ukrainian_SSR.svg", 
+        "lat": 48.379433, 
+        "lng": 31.16558, 
+        "name": "Ukrainian Soviet Socialist Republic", 
+        "north": 52.379581, 
+        "region": "Eastern Europe", 
+        "south": 44.2924, 
+        "west": 22.1357201
+    }, 
     {
         "area": 385307822308.7195, 
         "code": "UG", 
         "continent": "Africa", 
+        "disputes": [
+            "Rwenzururu"
+        ], 
         "east": 35.0330493, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4e/Flag_of_Uganda.svg", 
         "lat": 1.373333, 
@@ -5262,6 +5903,29 @@
         "west": 29.5734335
     }, 
     {
+        "area": 15769845756.564339, 
+        "code": "UG-RW", 
+        "continent": "Africa", 
+        "disputed": [
+            "Uganda"
+        ], 
+        "dissolved": {
+            "country": "Uganda", 
+            "date": "1982-08-13", 
+            "dissolved": "joined"
+        }, 
+        "east": 30.54524, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/9/9c/Rwenzururu_flag.png", 
+        "lat": 0.54643825, 
+        "lng": 30.12373235, 
+        "name": "Rwenzururu", 
+        "north": 1.301273, 
+        "region": "Eastern Africa", 
+        "south": -0.2083965, 
+        "west": 29.7022247
+    }, 
+    {
+        "alias": true, 
         "area": 805250615187.3992, 
         "code": "UK", 
         "continent": "Europe", 
@@ -5272,6 +5936,7 @@
             "Ascension", 
             "Bermuda", 
             "British Antarctic Territory", 
+            "British Honduras", 
             "British Indian Ocean Territory", 
             "British Virgin Islands", 
             "Cayman Islands", 
@@ -5286,15 +5951,21 @@
             "Montserrat", 
             "Northern Ireland", 
             "Pitcairn Islands", 
-            "Saint Helena", 
+            "Saint Christopher-Nevis-Anguilla", 
+            "Saint Helena, Ascension and Tristan da Cunha", 
             "Scotland", 
             "South Georgia and the South Sandwich Islands", 
+            "Southern Rhodesia", 
             "Tristan da Cunha", 
+            "Trucial States", 
             "Turks and Caicos Islands", 
             "Wales", 
             "Antarctica", 
             "New Hebrides"
         ], 
+        "disputes": [
+            "Sealand"
+        ], 
         "east": 1.768926, 
         "flag": "GB", 
         "flagURL": "http://upload.wikimedia.org/wikipedia/en/a/ae/Flag_of_the_United_Kingdom.svg", 
@@ -5317,7 +5988,7 @@
         "code": "UM", 
         "continent": "Oceania", 
         "created": {
-            "country": "United States Miscellaneous Pacific Islands", 
+            "country": "Wake Island", 
             "date": "1986"
         }, 
         "dependency": [
@@ -5343,7 +6014,7 @@
             "American Samoa", 
             "Guam", 
             "Northern Mariana Islands", 
-            "Johnston Atoll", 
+            "Johnston Island", 
             "Midway Islands", 
             "Pacific Islands", 
             "Panama Canal Zone", 
@@ -5395,7 +6066,7 @@
         "continent": "Asia", 
         "created": {
             "country": "Soviet Union", 
-            "date": "1991-12-21"
+            "date": "1991-12-25"
         }, 
         "east": 73.148946, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/8/84/Flag_of_Uzbekistan.svg", 
@@ -5625,6 +6296,9 @@
             "country": "Serbia", 
             "date": "2008-02-17"
         }, 
+        "disputed": [
+            "Serbia"
+        ], 
         "east": 21.789867, 
         "flagURL": "http://upload.wikimedia.org/wikipedia/commons/1/1f/Flag_of_Kosovo.svg", 
         "googleName": "Kosova (Kosovo)", 
@@ -5734,7 +6408,7 @@
         "west": 13.3649
     }, 
     {
-        "area": 2338673347483.458, 
+        "area": 2338673347483.4565, 
         "code": "ZA", 
         "continent": "Africa", 
         "dependencies": [
@@ -5758,6 +6432,94 @@
         "south": -34.967, 
         "west": 16.2817
     }, 
+    {
+        "area": 295848014656.62195, 
+        "code": "ZA-BO", 
+        "continent": "Africa", 
+        "dependency": [
+            "South Africa"
+        ], 
+        "dissolved": {
+            "country": "South Africa", 
+            "date": "1994-04-27", 
+            "dissolved": "joined"
+        }, 
+        "east": 28.282804, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/77/Flag_of_Bophuthatswana.svg", 
+        "lat": -26.9573071, 
+        "lng": 25.54969195, 
+        "name": "Bophuthatswana", 
+        "north": -24.5065762, 
+        "region": "Southern Africa", 
+        "south": -29.408038, 
+        "west": 22.8165799
+    }, 
+    {
+        "area": 22412105286.45522, 
+        "code": "ZA-CI", 
+        "continent": "Africa", 
+        "dependency": [
+            "South Africa"
+        ], 
+        "dissolved": {
+            "country": "South Africa", 
+            "date": "1994-04-27", 
+            "dissolved": "joined"
+        }, 
+        "east": 28.0353449, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/c/cc/Flag_of_Ciskei.svg", 
+        "lat": -32.72633345, 
+        "lng": 27.4326999, 
+        "name": "Ciskei", 
+        "north": -31.8344569, 
+        "region": "Southern Africa", 
+        "south": -33.61821, 
+        "west": 26.8300549
+    }, 
+    {
+        "area": 60886160857.12034, 
+        "code": "ZA-TR", 
+        "continent": "Africa", 
+        "dependency": [
+            "South Africa"
+        ], 
+        "dissolved": {
+            "country": "South Africa", 
+            "date": "1994-04-27", 
+            "dissolved": "joined"
+        }, 
+        "east": 30.284706, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/0/05/Flag_of_Transkei.svg", 
+        "lat": -31.116703, 
+        "lng": 28.55738045, 
+        "name": "Transkei", 
+        "north": -30.286041, 
+        "region": "Southern Africa", 
+        "south": -31.947365, 
+        "west": 26.8300549
+    }, 
+    {
+        "area": 20818350910.40925, 
+        "code": "ZA-VE", 
+        "continent": "Africa", 
+        "dependency": [
+            "South Africa"
+        ], 
+        "dissolved": {
+            "country": "South Africa", 
+            "date": "1994-04-27", 
+            "dissolved": "joined"
+        }, 
+        "east": 31.3348961, 
+        "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/3a/Flag_of_Venda.svg", 
+        "lat": -23.1701894, 
+        "lng": 30.703745, 
+        "name": "Venda", 
+        "north": -22.4463439, 
+        "region": "Southern Africa", 
+        "south": -23.8940349, 
+        "west": 30.0725939
+    }, 
     {
         "area": 1392922905979.0715, 
         "code": "ZM", 
diff --git a/source/Ox.Geo/png/flags/16/AU-AQ.png b/source/Ox.Geo/png/flags/16/AU-AQ.png
index 06470e13..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/16/AU-AQ.png
+++ b/source/Ox.Geo/png/flags/16/AU-AQ.png
@@ -1 +1 @@
-AU-AC.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/AU-CS.png b/source/Ox.Geo/png/flags/16/AU-CS.png
index 67afb100..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/16/AU-CS.png
+++ b/source/Ox.Geo/png/flags/16/AU-CS.png
@@ -1 +1 @@
-AU-AQ.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/CP.png b/source/Ox.Geo/png/flags/16/CP.png
index b7f05a62..becff222 120000
--- a/source/Ox.Geo/png/flags/16/CP.png
+++ b/source/Ox.Geo/png/flags/16/CP.png
@@ -1 +1 @@
-AIDJ.png
\ No newline at end of file
+FR.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/FR-AQ.png b/source/Ox.Geo/png/flags/16/FR-AQ.png
index 80430ab2..a431095c 120000
--- a/source/Ox.Geo/png/flags/16/FR-AQ.png
+++ b/source/Ox.Geo/png/flags/16/FR-AQ.png
@@ -1 +1 @@
-FQHH.png
\ No newline at end of file
+TF.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/FXFR.png b/source/Ox.Geo/png/flags/16/FXFR.png
index 5912ba29..becff222 120000
--- a/source/Ox.Geo/png/flags/16/FXFR.png
+++ b/source/Ox.Geo/png/flags/16/FXFR.png
@@ -1 +1 @@
-CP.png
\ No newline at end of file
+FR.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/HM.png b/source/Ox.Geo/png/flags/16/HM.png
index 99ad8c10..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/16/HM.png
+++ b/source/Ox.Geo/png/flags/16/HM.png
@@ -1 +1 @@
-AU-CS.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/NO-PI.png b/source/Ox.Geo/png/flags/16/NO-PI.png
index 37903444..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/16/NO-PI.png
+++ b/source/Ox.Geo/png/flags/16/NO-PI.png
@@ -1 +1 @@
-BV.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/NQAQ.png b/source/Ox.Geo/png/flags/16/NQAQ.png
index a86a5f25..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/16/NQAQ.png
+++ b/source/Ox.Geo/png/flags/16/NQAQ.png
@@ -1 +1 @@
-NO-PI.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/RHZW.png b/source/Ox.Geo/png/flags/16/RHZW.png
index 483ef8da..cedb781b 100644
Binary files a/source/Ox.Geo/png/flags/16/RHZW.png and b/source/Ox.Geo/png/flags/16/RHZW.png differ
diff --git a/source/Ox.Geo/png/flags/16/SJ.png b/source/Ox.Geo/png/flags/16/SJ.png
index 47da3049..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/16/SJ.png
+++ b/source/Ox.Geo/png/flags/16/SJ.png
@@ -1 +1 @@
-NQAQ.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/16/SY.png b/source/Ox.Geo/png/flags/16/SY.png
index 97a12f11..debb49e3 100644
Binary files a/source/Ox.Geo/png/flags/16/SY.png and b/source/Ox.Geo/png/flags/16/SY.png differ
diff --git a/source/Ox.Geo/png/flags/16/UM.png b/source/Ox.Geo/png/flags/16/UM.png
index c11dfcd2..e4aaa306 120000
--- a/source/Ox.Geo/png/flags/16/UM.png
+++ b/source/Ox.Geo/png/flags/16/UM.png
@@ -1 +1 @@
-PUUM.png
\ No newline at end of file
+US.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/AU-AQ.png b/source/Ox.Geo/png/flags/256/AU-AQ.png
index 06470e13..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/256/AU-AQ.png
+++ b/source/Ox.Geo/png/flags/256/AU-AQ.png
@@ -1 +1 @@
-AU-AC.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/AU-CS.png b/source/Ox.Geo/png/flags/256/AU-CS.png
index 67afb100..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/256/AU-CS.png
+++ b/source/Ox.Geo/png/flags/256/AU-CS.png
@@ -1 +1 @@
-AU-AQ.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/CP.png b/source/Ox.Geo/png/flags/256/CP.png
index b7f05a62..becff222 120000
--- a/source/Ox.Geo/png/flags/256/CP.png
+++ b/source/Ox.Geo/png/flags/256/CP.png
@@ -1 +1 @@
-AIDJ.png
\ No newline at end of file
+FR.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/FR-AQ.png b/source/Ox.Geo/png/flags/256/FR-AQ.png
index 80430ab2..a431095c 120000
--- a/source/Ox.Geo/png/flags/256/FR-AQ.png
+++ b/source/Ox.Geo/png/flags/256/FR-AQ.png
@@ -1 +1 @@
-FQHH.png
\ No newline at end of file
+TF.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/FXFR.png b/source/Ox.Geo/png/flags/256/FXFR.png
index 5912ba29..becff222 120000
--- a/source/Ox.Geo/png/flags/256/FXFR.png
+++ b/source/Ox.Geo/png/flags/256/FXFR.png
@@ -1 +1 @@
-CP.png
\ No newline at end of file
+FR.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/HM.png b/source/Ox.Geo/png/flags/256/HM.png
index 99ad8c10..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/256/HM.png
+++ b/source/Ox.Geo/png/flags/256/HM.png
@@ -1 +1 @@
-AU-CS.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/NO-PI.png b/source/Ox.Geo/png/flags/256/NO-PI.png
index 37903444..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/256/NO-PI.png
+++ b/source/Ox.Geo/png/flags/256/NO-PI.png
@@ -1 +1 @@
-BV.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/NQAQ.png b/source/Ox.Geo/png/flags/256/NQAQ.png
index a86a5f25..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/256/NQAQ.png
+++ b/source/Ox.Geo/png/flags/256/NQAQ.png
@@ -1 +1 @@
-NO-PI.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/RHZW.png b/source/Ox.Geo/png/flags/256/RHZW.png
index 26551c0f..3ff89bce 100644
Binary files a/source/Ox.Geo/png/flags/256/RHZW.png and b/source/Ox.Geo/png/flags/256/RHZW.png differ
diff --git a/source/Ox.Geo/png/flags/256/SJ.png b/source/Ox.Geo/png/flags/256/SJ.png
index 47da3049..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/256/SJ.png
+++ b/source/Ox.Geo/png/flags/256/SJ.png
@@ -1 +1 @@
-NQAQ.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/256/SY.png b/source/Ox.Geo/png/flags/256/SY.png
index 9c9e0e05..9124b224 100644
Binary files a/source/Ox.Geo/png/flags/256/SY.png and b/source/Ox.Geo/png/flags/256/SY.png differ
diff --git a/source/Ox.Geo/png/flags/256/UM.png b/source/Ox.Geo/png/flags/256/UM.png
index c11dfcd2..e4aaa306 120000
--- a/source/Ox.Geo/png/flags/256/UM.png
+++ b/source/Ox.Geo/png/flags/256/UM.png
@@ -1 +1 @@
-PUUM.png
\ No newline at end of file
+US.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/AU-AQ.png b/source/Ox.Geo/png/flags/64/AU-AQ.png
index 06470e13..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/64/AU-AQ.png
+++ b/source/Ox.Geo/png/flags/64/AU-AQ.png
@@ -1 +1 @@
-AU-AC.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/AU-CS.png b/source/Ox.Geo/png/flags/64/AU-CS.png
index 67afb100..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/64/AU-CS.png
+++ b/source/Ox.Geo/png/flags/64/AU-CS.png
@@ -1 +1 @@
-AU-AQ.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/CP.png b/source/Ox.Geo/png/flags/64/CP.png
index b7f05a62..becff222 120000
--- a/source/Ox.Geo/png/flags/64/CP.png
+++ b/source/Ox.Geo/png/flags/64/CP.png
@@ -1 +1 @@
-AIDJ.png
\ No newline at end of file
+FR.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/FR-AQ.png b/source/Ox.Geo/png/flags/64/FR-AQ.png
index 80430ab2..a431095c 120000
--- a/source/Ox.Geo/png/flags/64/FR-AQ.png
+++ b/source/Ox.Geo/png/flags/64/FR-AQ.png
@@ -1 +1 @@
-FQHH.png
\ No newline at end of file
+TF.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/FXFR.png b/source/Ox.Geo/png/flags/64/FXFR.png
index 5912ba29..becff222 120000
--- a/source/Ox.Geo/png/flags/64/FXFR.png
+++ b/source/Ox.Geo/png/flags/64/FXFR.png
@@ -1 +1 @@
-CP.png
\ No newline at end of file
+FR.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/HM.png b/source/Ox.Geo/png/flags/64/HM.png
index 99ad8c10..f479e2f7 120000
--- a/source/Ox.Geo/png/flags/64/HM.png
+++ b/source/Ox.Geo/png/flags/64/HM.png
@@ -1 +1 @@
-AU-CS.png
\ No newline at end of file
+AU.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/NO-PI.png b/source/Ox.Geo/png/flags/64/NO-PI.png
index 37903444..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/64/NO-PI.png
+++ b/source/Ox.Geo/png/flags/64/NO-PI.png
@@ -1 +1 @@
-BV.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/NQAQ.png b/source/Ox.Geo/png/flags/64/NQAQ.png
index a86a5f25..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/64/NQAQ.png
+++ b/source/Ox.Geo/png/flags/64/NQAQ.png
@@ -1 +1 @@
-NO-PI.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/RHZW.png b/source/Ox.Geo/png/flags/64/RHZW.png
index b79b0ba2..8ea5edb5 100644
Binary files a/source/Ox.Geo/png/flags/64/RHZW.png and b/source/Ox.Geo/png/flags/64/RHZW.png differ
diff --git a/source/Ox.Geo/png/flags/64/SJ.png b/source/Ox.Geo/png/flags/64/SJ.png
index 47da3049..f4c2f4ad 120000
--- a/source/Ox.Geo/png/flags/64/SJ.png
+++ b/source/Ox.Geo/png/flags/64/SJ.png
@@ -1 +1 @@
-NQAQ.png
\ No newline at end of file
+NO.png
\ No newline at end of file
diff --git a/source/Ox.Geo/png/flags/64/SY.png b/source/Ox.Geo/png/flags/64/SY.png
index 7e675489..408b4d49 100644
Binary files a/source/Ox.Geo/png/flags/64/SY.png and b/source/Ox.Geo/png/flags/64/SY.png differ
diff --git a/source/Ox.Geo/png/flags/64/UM.png b/source/Ox.Geo/png/flags/64/UM.png
index c11dfcd2..e4aaa306 120000
--- a/source/Ox.Geo/png/flags/64/UM.png
+++ b/source/Ox.Geo/png/flags/64/UM.png
@@ -1 +1 @@
-PUUM.png
\ No newline at end of file
+US.png
\ No newline at end of file