diff --git a/map-generator/assets/maps/arctic/info.json b/map-generator/assets/maps/arctic/info.json
index d4b9a9887..7fc2f006a 100644
--- a/map-generator/assets/maps/arctic/info.json
+++ b/map-generator/assets/maps/arctic/info.json
@@ -24,47 +24,47 @@
     {
       "coordinates": [485, 927],
       "name": "Nunavut",
-      "flag": "ca"
+      "flag": "Nunavut"
     },
     {
       "coordinates": [432, 550],
       "name": "Northwest Territories",
-      "flag": "ca"
+      "flag": "northwestterritories"
     },
     {
       "coordinates": [608, 447],
       "name": "Yukon",
-      "flag": "ca"
+      "flag": "Yukon"
     },
     {
       "coordinates": [344, 320],
       "name": "British Columbia",
-      "flag": "ca"
+      "flag": "britishcolumbia"
     },
     {
       "coordinates": [64, 601],
       "name": "Manitoba",
-      "flag": "ca"
+      "flag": "manitoba"
     },
     {
       "coordinates": [247, 571],
       "name": "Saskatchewan",
-      "flag": "ca"
+      "flag": "saskatchewan"
     },
     {
       "coordinates": [136, 401],
       "name": "Alberta",
-      "flag": "ca"
+      "flag": "alberta"
     },
     {
       "coordinates": [67, 795],
       "name": "Ontario",
-      "flag": "ca"
+      "flag": "ontario"
     },
     {
       "coordinates": [49, 1313],
       "name": "Newfoundland and Labrador",
-      "flag": "ca"
+      "flag": "newfoundlandandlabrador"
     },
     {
       "coordinates": [74, 226],
@@ -74,27 +74,27 @@
     {
       "coordinates": [1457, 1381],
       "name": "Soviet Union",
-      "flag": "Communist flag"
+      "flag": "ussr"
     },
     {
       "coordinates": [1683, 1414],
       "name": "Kazakh SSR",
-      "flag": "Communist flag"
+      "flag": "Kazakh SSR"
     },
     {
       "coordinates": [1709, 1603],
       "name": "Uzbek SSR",
-      "flag": "Communist flag"
+      "flag": "Uzbek SSR"
     },
     {
       "coordinates": [1784, 1744],
       "name": "Turkmen SSR",
-      "flag": "Communist flag"
+      "flag": "Turkmen SSR"
     },
     {
       "coordinates": [1803, 1265],
       "name": "Kirghiz SSR",
-      "flag": "Communist flag"
+      "flag": "Kirghiz SSR"
     },
     {
       "coordinates": [745, 1736],
@@ -114,37 +114,37 @@
     {
       "coordinates": [1333, 1774],
       "name": "Ukrainian SSR",
-      "flag": "Communist flag"
+      "flag": "Ukrainian SSR"
     },
     {
       "coordinates": [1194, 1814],
-      "name": "Moldovan SSR",
-      "flag": "Communist flag"
+      "name": "Moldavian SSR",
+      "flag": "Moldavian SSR"
     },
     {
       "coordinates": [1197, 1626],
-      "name": "Belorussian SSR",
-      "flag": "Communist flag"
+      "name": "Byelorussian SSR",
+      "flag": "Byelorussian SSR"
     },
     {
       "coordinates": [1091, 1744],
-      "name": "Poland",
+      "name": "Polish People's Republic",
       "flag": "pl"
     },
     {
       "coordinates": [1805, 1486],
       "name": "Tajik SSR",
-      "flag": "Communist flag"
+      "flag": "Tajik SSR"
     },
     {
       "coordinates": [1442, 1807],
       "name": "Georgian SSR",
-      "flag": "Communist flag"
+      "flag": "Georgian SSR"
     },
     {
       "coordinates": [1573, 1790],
       "name": "Azerbaijan SSR",
-      "flag": "Communist flag"
+      "flag": "Azerbaijan SSR"
     },
     {
       "coordinates": [1089, 1519],
@@ -179,17 +179,17 @@
     {
       "coordinates": [1773, 961],
       "name": "Tannu Tuva",
-      "flag": "Communist flag"
+      "flag": "tannutuva"
     },
     {
       "coordinates": [1142, 382],
-      "name": "Far East",
-      "flag": "Communist flag"
+      "name": "Far Eastern Republic",
+      "flag": "fareasternrepublic"
     },
     {
       "coordinates": [1410, 625],
       "name": "Yakut ASSR",
-      "flag": "Communist flag"
+      "flag": "Russian SSR"
     },
     {
       "coordinates": [1817, 364],
@@ -199,12 +199,12 @@
     {
       "coordinates": [1664, 689],
       "name": "Buryat ASSR",
-      "flag": "Communist flag"
+      "flag": "Russian SSR"
     },
     {
       "coordinates": [1440, 1170],
       "name": "Komi ASSR",
-      "flag": "Communist flag"
+      "flag": "Russian SSR"
     },
     {
       "coordinates": [1383, 875],
diff --git a/map-generator/assets/maps/mediterranean/info.json b/map-generator/assets/maps/mediterranean/info.json
index c12fa8159..6055aef6f 100644
--- a/map-generator/assets/maps/mediterranean/info.json
+++ b/map-generator/assets/maps/mediterranean/info.json
@@ -4,97 +4,97 @@
     {
       "coordinates": [141, 574],
       "name": "Lusitania",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [464, 519],
       "name": "Terraconensis",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [353, 787],
       "name": "Baetica",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [699, 340],
       "name": "Narbonensis",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [596, 91],
       "name": "Aquitania",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [910, 218],
       "name": "Alpes",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1053, 39],
       "name": "Raetia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1316, 88],
       "name": "Noricum",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1307, 479],
       "name": "Italia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1058, 534],
       "name": "Corsica et Sardinia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1350, 762],
       "name": "Sicilia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1553, 42],
       "name": "Pannonia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1522, 301],
       "name": "Dalmatia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1910, 119],
       "name": "Dacia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1811, 402],
       "name": "Macedonia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1654, 560],
       "name": "Epirus",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1774, 774],
       "name": "Achaia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2030, 457],
       "name": "Thracia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2114, 250],
       "name": "Moesia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2428, 200],
@@ -104,67 +104,67 @@
     {
       "coordinates": [2065, 690],
       "name": "Asia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2354, 505],
       "name": "Pontus",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2325, 669],
       "name": "Galatia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2447, 809],
       "name": "Cilicia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2196, 828],
       "name": "Lycia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2379, 942],
       "name": "Cyprus",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2516, 648],
       "name": "Cappadocia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2772, 845],
       "name": "Mesopotamia",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2584, 990],
       "name": "Syria",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2490, 1141],
       "name": "Judaea",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2481, 1292],
       "name": "Arabia Petraea",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2263, 1240],
       "name": "Aegyptus",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [1799, 1096],
       "name": "Cyrenaica et Creta",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [2815, 659],
@@ -174,17 +174,17 @@
     {
       "coordinates": [1091, 989],
       "name": "Africa Proconsularis",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [597, 910],
       "name": "Mauretania Caesariensis",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [264, 1028],
       "name": "Mauretania Tingitania",
-      "flag": "West Roman Empire"
+      "flag": "SPQR"
     },
     {
       "coordinates": [584, 1199],
diff --git a/resources/countries.json b/resources/countries.json
index 58c35e086..af7e645dc 100644
--- a/resources/countries.json
+++ b/resources/countries.json
@@ -1640,7 +1640,7 @@
     "name": "Nova Scotia"
   },
   {
-    "code": "nunavut",
+    "code": "Nunavut",
     "continent": "North America",
     "name": "Nunavut"
   },
@@ -1853,6 +1853,11 @@
     "continent": "South America",
     "name": "Rio de Janeiro"
   },
+  {
+    "code": "SPQR",
+    "continent": "Europe",
+    "name": "Roman Empire"
+  },
   {
     "code": "Romanov Russia",
     "continent": "Europe",
@@ -2114,11 +2119,6 @@
     "continent": "Europe",
     "name": "Sparta"
   },
-  {
-    "code": "SPQR",
-    "continent": "Europe",
-    "name": "SPQR"
-  },
   {
     "code": "lk",
     "continent": "Asia",
@@ -2184,6 +2184,11 @@
     "continent": "Asia",
     "name": "Taiwan"
   },
+  {
+    "code": "Tajik SSR",
+    "continent": "Asia",
+    "name": "Tajik SSR"
+  },
   {
     "code": "tj",
     "continent": "Asia",
@@ -2483,7 +2488,7 @@
     "name": "Yugoslavia"
   },
   {
-    "code": "yukon",
+    "code": "Yukon",
     "continent": "North America",
     "name": "Yukon"
   },
diff --git a/resources/flags/tajikssr.svg b/resources/flags/Tajik SSR.svg
similarity index 100%
rename from resources/flags/tajikssr.svg
rename to resources/flags/Tajik SSR.svg
diff --git a/resources/maps/arctic/manifest.json b/resources/maps/arctic/manifest.json
index e040bc8e9..adbd6a242 100644
--- a/resources/maps/arctic/manifest.json
+++ b/resources/maps/arctic/manifest.json
@@ -38,47 +38,47 @@
     },
     {
       "coordinates": [485, 927],
-      "flag": "ca",
+      "flag": "Nunavut",
       "name": "Nunavut"
     },
     {
       "coordinates": [432, 550],
-      "flag": "ca",
+      "flag": "northwestterritories",
       "name": "Northwest Territories"
     },
     {
       "coordinates": [608, 447],
-      "flag": "ca",
+      "flag": "Yukon",
       "name": "Yukon"
     },
     {
       "coordinates": [344, 320],
-      "flag": "ca",
+      "flag": "britishcolumbia",
       "name": "British Columbia"
     },
     {
       "coordinates": [64, 601],
-      "flag": "ca",
+      "flag": "manitoba",
       "name": "Manitoba"
     },
     {
       "coordinates": [247, 571],
-      "flag": "ca",
+      "flag": "saskatchewan",
       "name": "Saskatchewan"
     },
     {
       "coordinates": [136, 401],
-      "flag": "ca",
+      "flag": "alberta",
       "name": "Alberta"
     },
     {
       "coordinates": [67, 795],
-      "flag": "ca",
+      "flag": "ontario",
       "name": "Ontario"
     },
     {
       "coordinates": [49, 1313],
-      "flag": "ca",
+      "flag": "newfoundlandandlabrador",
       "name": "Newfoundland and Labrador"
     },
     {
@@ -88,27 +88,27 @@
     },
     {
       "coordinates": [1457, 1381],
-      "flag": "Communist flag",
+      "flag": "ussr",
       "name": "Soviet Union"
     },
     {
       "coordinates": [1683, 1414],
-      "flag": "Communist flag",
+      "flag": "Kazakh SSR",
       "name": "Kazakh SSR"
     },
     {
       "coordinates": [1709, 1603],
-      "flag": "Communist flag",
+      "flag": "Uzbek SSR",
       "name": "Uzbek SSR"
     },
     {
       "coordinates": [1784, 1744],
-      "flag": "Communist flag",
+      "flag": "Turkmen SSR",
       "name": "Turkmen SSR"
     },
     {
       "coordinates": [1803, 1265],
-      "flag": "Communist flag",
+      "flag": "Kirghiz SSR",
       "name": "Kirghiz SSR"
     },
     {
@@ -128,37 +128,37 @@
     },
     {
       "coordinates": [1333, 1774],
-      "flag": "Communist flag",
+      "flag": "Ukrainian SSR",
       "name": "Ukrainian SSR"
     },
     {
       "coordinates": [1194, 1814],
-      "flag": "Communist flag",
-      "name": "Moldovan SSR"
+      "flag": "Moldavian SSR",
+      "name": "Moldavian SSR"
     },
     {
       "coordinates": [1197, 1626],
-      "flag": "Communist flag",
-      "name": "Belorussian SSR"
+      "flag": "Byelorussian SSR",
+      "name": "Byelorussian SSR"
     },
     {
       "coordinates": [1091, 1744],
       "flag": "pl",
-      "name": "Poland"
+      "name": "Polish People's Republic"
     },
     {
       "coordinates": [1805, 1486],
-      "flag": "Communist flag",
+      "flag": "Tajik SSR",
       "name": "Tajik SSR"
     },
     {
       "coordinates": [1442, 1807],
-      "flag": "Communist flag",
+      "flag": "Georgian SSR",
       "name": "Georgian SSR"
     },
     {
       "coordinates": [1573, 1790],
-      "flag": "Communist flag",
+      "flag": "Azerbaijan SSR",
       "name": "Azerbaijan SSR"
     },
     {
@@ -193,17 +193,17 @@
     },
     {
       "coordinates": [1773, 961],
-      "flag": "Communist flag",
+      "flag": "tannutuva",
       "name": "Tannu Tuva"
     },
     {
       "coordinates": [1142, 382],
-      "flag": "Communist flag",
-      "name": "Far East"
+      "flag": "fareasternrepublic",
+      "name": "Far Eastern Republic"
     },
     {
       "coordinates": [1410, 625],
-      "flag": "Communist flag",
+      "flag": "Russian SSR",
       "name": "Yakut ASSR"
     },
     {
@@ -213,12 +213,12 @@
     },
     {
       "coordinates": [1664, 689],
-      "flag": "Communist flag",
+      "flag": "Russian SSR",
       "name": "Buryat ASSR"
     },
     {
       "coordinates": [1440, 1170],
-      "flag": "Communist flag",
+      "flag": "Russian SSR",
       "name": "Komi ASSR"
     },
     {
diff --git a/resources/maps/mediterranean/manifest.json b/resources/maps/mediterranean/manifest.json
index c1ca75398..1f8f94e08 100644
--- a/resources/maps/mediterranean/manifest.json
+++ b/resources/maps/mediterranean/manifest.json
@@ -18,167 +18,167 @@
   "nations": [
     {
       "coordinates": [141, 574],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Lusitania"
     },
     {
       "coordinates": [464, 519],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Terraconensis"
     },
     {
       "coordinates": [353, 787],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Baetica"
     },
     {
       "coordinates": [699, 340],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Narbonensis"
     },
     {
       "coordinates": [596, 91],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Aquitania"
     },
     {
       "coordinates": [910, 218],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Alpes"
     },
     {
       "coordinates": [1053, 39],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Raetia"
     },
     {
       "coordinates": [1316, 88],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Noricum"
     },
     {
       "coordinates": [1307, 479],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Italia"
     },
     {
       "coordinates": [1058, 534],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Corsica et Sardinia"
     },
     {
       "coordinates": [1350, 762],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Sicilia"
     },
     {
       "coordinates": [1553, 42],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Pannonia"
     },
     {
       "coordinates": [1522, 301],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Dalmatia"
     },
     {
       "coordinates": [1910, 119],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Dacia"
     },
     {
       "coordinates": [1811, 402],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Macedonia"
     },
     {
       "coordinates": [1654, 560],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Epirus"
     },
     {
       "coordinates": [1774, 774],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Achaia"
     },
     {
       "coordinates": [2030, 457],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Thracia"
     },
     {
       "coordinates": [2114, 250],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Moesia"
     },
     {
       "coordinates": [2428, 200],
-      "name": "Bosporan Kingdom",
-      "flag": ""
+      "flag": "",
+      "name": "Bosporan Kingdom"
     },
     {
       "coordinates": [2065, 690],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Asia"
     },
     {
       "coordinates": [2354, 505],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Pontus"
     },
     {
       "coordinates": [2325, 669],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Galatia"
     },
     {
       "coordinates": [2447, 809],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Cilicia"
     },
     {
       "coordinates": [2196, 828],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Lycia"
     },
     {
       "coordinates": [2379, 942],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Cyprus"
     },
     {
       "coordinates": [2516, 648],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Cappadocia"
     },
     {
       "coordinates": [2772, 845],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Mesopotamia"
     },
     {
       "coordinates": [2584, 990],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Syria"
     },
     {
       "coordinates": [2490, 1141],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Judaea"
     },
     {
       "coordinates": [2481, 1292],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Arabia Petraea"
     },
     {
       "coordinates": [2263, 1240],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Aegyptus"
     },
     {
       "coordinates": [1799, 1096],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Cyrenaica et Creta"
     },
     {
@@ -188,17 +188,17 @@
     },
     {
       "coordinates": [1091, 989],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Africa Proconsularis"
     },
     {
       "coordinates": [597, 910],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Mauretania Caesariensis"
     },
     {
       "coordinates": [264, 1028],
-      "flag": "West Roman Empire",
+      "flag": "SPQR",
       "name": "Mauretania Tingitania"
     },
     {