diff --git a/src/data.csv b/src/data.csv
index 3ccdbf3f..5bd6ae25 100644
--- a/src/data.csv
+++ b/src/data.csv
@@ -11,7 +11,7 @@ lr1v|Atq>-,Greece,Griechenland,,,Athens,Athen,,,,,"",,,"",UG::Europe
kOKi`(Zy9C,Hungary,Ungarn,,,Budapest,Budapest,,,,,"",,,"","UG::Europe UG::European_Union UG::Sovereign_State"
e#egEUHJ3(,Albania,Albanien,,,Tirana,Tirana,,,,,"",,,"","UG::Europe UG::Mediterranean UG::Sovereign_State"
-b|eaD7qKo],Andorra,Andorra,,,"Andorra la Vella","Andorra la Vella",,,,,"","Moldova (wider, different coat of arms with eagle)","Republik Moldau/Moldawien (breiter, anderes Wappen mit Adler)","","UG::Europe UG::Sovereign_State"
+b|eaD7qKo],Andorra,Andorra,,,"Andorra la Vella","Andorra la Vella",,,,,"","Moldova (wider, different coat of arms with eagle)","Republik Moldau/Moldawien (breiter, anderes Wappen mit Adler)","","UG::Europe UG::Sovereign_State"
pAI(peiC8R,Austria,Österreich,,,Vienna,Wien,,,,,"","Latvia (darker red, narrower white band)","Lettland (dunkleres rot, dünneres weißes Band)","","UG::Europe UG::European_Union UG::Sovereign_State"
ii$pXyvZl*,Azerbaijan,Aserbaidschan,,,Baku,Baku,,,,,"",,,"","UG::Europe UG::Sovereign_State"
"jl7,HNQ-*C",Belarus,Weißrussland,,,Minsk,Minsk,,,,,"",,,"","UG::Europe UG::Sovereign_State"
@@ -46,7 +46,7 @@ his*oE$.bt,"San Marino","San Marino",,,"City of San Marino","San Marino",,,,,"",,,"","UG::Europe UG::Sovereign_State"
o_Qs1fsA*`,Slovakia,Slowakei,,,Bratislava,Bratislava,,,,,"",,,"","UG::Europe UG::European_Union UG::Sovereign_State"
etAIJgAn)8,Slovenia,Slowenien,,,Ljubljana,Ljubljana,,,,,"",,,"","UG::Europe UG::European_Union UG::Mediterranean UG::Sovereign_State"
-db{up5I>x|,Spain,Spanien,,,Madrid,Madrid,,,,,"",,,"","UG::Europe UG::European_Union UG::Mediterranean UG::Sovereign_State"
+db{up5I>x|,Spain,Spanien,,,Madrid,Madrid,,,,,"",,,"","UG::Europe UG::European_Union UG::Mediterranean UG::Sovereign_State"
q]au(Cz(^`,Sweden,Schweden,,,Stockholm,Stockholm,,,,,"",,,"","UG::Europe UG::European_Union UG::Sovereign_State"
j^y9}r#a`i,Switzerland,Schweiz,,,Bern,Bern,,,,,"",,,"","UG::Europe UG::Sovereign_State"
h(8o@usM_h,Turkey,Türkei,,,Ankara,Ankara,,,,,"",,,"","UG::Asia UG::Middle_East UG::Mediterranean UG::Sovereign_State"
@@ -149,7 +149,7 @@ stDJ0UMUpB,Turkmenistan,Turkmenistan,,,Ashgabat,Aschgabat,,,,,"","Egypt (with emblem), Iraq (with text) and Syria (with two stars)","Ägypten (mit Emblem), Irak (mit Text) und Syrien (mit zwei Sternen)","","UG::Asia UG::Middle_East UG::Sovereign_State"
n(u/Le9LCH,Vietnam,Vietnam,,,Hanoi,Hanoi,,,,,"",,,"","UG::Asia UG::Southeast_Asia UG::Sovereign_State"
kN&[K]7`>c,Uzbekistan,Usbekistan,,,Tashkent,Taschkent,,,,,"",,,"","UG::Asia UG::Sovereign_State"
-e%F*sk0uaT,Fiji,Fidschi,,,Suva,Suva,,,,,"",,,"","UG::Oceania UG::Sovereign_State"
+e%F*sk0uaT,Fiji,Fidschi,,,Suva,Suva,,,,,"",,,"","UG::Oceania UG::Sovereign_State"
jT[(te+7i%,"Papua New Guinea",Papua-Neuguinea,,,"Port Moresby","Port Moresby",,,,,"",,,"","UG::Oceania UG::Sovereign_State"
i~E.z}UxNF,Australia,Australien,,,Canberra,Canberra,,,,,"","New Zealand (red stars, two fewer stars)","Neuseeland (rote Sterne, zwei Sterne weniger)","","UG::Oceania UG::Sovereign_State"
pAOtFl&>U#,"Solomon Islands",Salomonen,,"Auch Salomoninseln.",Honiara,Honiara,,,,,"",,,"","UG::Oceania UG::Sovereign_State"
@@ -185,7 +185,7 @@ cIMc3Nzy>W,Barbados,Barbados,,,Bridgetown,Bridgetown,,,,,"",,,"","UG::America UG::North+Central_America UG::Sovereign_State"
"s,m:kRL/53","Costa Rica","Costa Rica",,,"San José","San José",,,,,"","Thailand (red and blue inverted)","Thailand (Rot und Blau vertauscht)","","UG::America UG::North+Central_America UG::Sovereign_State"
il{B6F&ui9,"El Salvador","El Salvador",,,"San Salvador","San Salvador",,,,,"","Nicaragua (different coat of arms)","Nicaragua (anderes Wappen)","","UG::America UG::North+Central_America UG::Sovereign_State"
-b^_Av:%|%E,Guatemala,Guatemala,,,"Guatemala City",Guatemala-Stadt,,,,,"",,,"","UG::America UG::North+Central_America UG::Sovereign_State"
+b^_Av:%|%E,Guatemala,Guatemala,,,"Guatemala City",Guatemala-Stadt,,,,,"",,,"","UG::America UG::North+Central_America UG::Sovereign_State"
rGPlNG/dw%,Honduras,Honduras,,,Tegucigalpa,Tegucigalpa,,,,,"",,,"","UG::America UG::North+Central_America UG::Sovereign_State"
oz4yuR}6W$,Nicaragua,Nicaragua,,,Managua,Managua,,,,,"","El Salvador (different coat of arms)","El Salvador (anderes Wappen)","","UG::America UG::North+Central_America UG::Sovereign_State"
t1/=+}2*3>,Panama,Panama,,,"Panama City",Panama-Stadt,,,,,"",,,"","UG::America UG::North+Central_America UG::Sovereign_State"
@@ -212,7 +212,7 @@ ogLVp1-2mC,"Turks and Caicos Islands","Turks- und Caicosinseln","Overseas territ
t8K|Gnw[k$,"Cayman Islands","Cayman Islands (Kaimaninseln)","Overseas territory of the United Kingdom.","Überseegebiet des Vereinigten Königreichs.","George Town","George Town",,,"Two-word country name",Zwei-Wort-Ländername,"",,,"","UG::America UG::Caribbean"
cy]sz097{A,Anguilla,Anguilla,"Overseas territory of the United Kingdom.","Britisches Überseegebiet.","The Valley","The Valley",,,,,"",,,"","UG::America UG::Caribbean"
"hz,n^64X%i",Azores,"Azoren (Habichtsinseln)","Autonomous region of Portugal.","Autonome Region von Portugal.","Ponta Delgada","Ponta Delgada",,,,,"",,,"",UG::Europe
-"rHh8*,y.yc",Ceuta,Ceuta,"Autonomous city of Spain.","Autonome spanische Stadt.",,,,,,,"",,,"",UG::Europe
+"rHh8*,y.yc",Ceuta,Ceuta,"Autonomous city of Spain.","Autonome spanische Stadt.",,,,,,,"",,,"",UG::Europe
k3]]2^DP1R,"Christmas Island",Weihnachtsinsel,"External territory of Australia.","Australisches Außengebiet.","Flying Fish Cove","Flying Fish Cove",,,,,"",,,"","UG::Asia UG::Southeast_Asia"
mMdbj-!g%k,Curaçao,Curaçao,"Constituent country of the Kingdom of the Netherlands.","Autonomes Land innerhalb des Königreichs der Niederlande.",Willemstad,Willemstad,,,,,"","Nauru (single star below yellow band)","Nauru (einzelner Stern unter gelbem Band)","","UG::America UG::Caribbean"
rNv|0qxR]K,"Easter Island",Osterinsel,"Polynesian island and special territory of Chile.","Polynesische Insel unter Chilenischer Regierung.",,,,,,,"",,,"",UG::Oceania
@@ -243,11 +243,11 @@ mCh>s18~IX,"Pitcairn Islands",Pitcairninseln,"Overseas territory of the United K
bHD8m}tJ&v,"Åland Islands",Åland,"Autonomous region of Finland.","Autonome Region Finnlands.
Auch Ålandinseln.",Mariehamn,Mariehamn,,,,,"",,,"",UG::Europe
mvNnHkGnVl,"Cocos (Keeling) Islands",Kokosinseln,"External territory of Australia.","Australisches Außengebiet.","West Island","West Island",,,,,"",,,"","UG::Asia UG::Southeast_Asia"
-khTp#J9C!!,"Saint Helena","St. Helena","Part of Saint Helena, Ascension and Tristan da Cunha, an overseas territory of the United Kingdom.","Teil von St. Helena, Ascension und Tristan da Cunha, einem Überseegebiet des Vereinigten Königreichs.",Jamestown,Jamestown,,,,,"",,,"",UG::Africa
+khTp#J9C!!,"Saint Helena","St. Helena","Part of Saint Helena, Ascension and Tristan da Cunha, an overseas territory of the United Kingdom.","Teil von St. Helena, Ascension und Tristan da Cunha, einem Überseegebiet des Vereinigten Königreichs.",Jamestown,Jamestown,,,,,"",,,"",UG::Africa
r3?J{NB0J3,"Sint Eustatius","Sint Eustatius","Special municipality of the Netherlands.","Besondere Gemeinde der Niederlande.",Oranjestad,Oranjestad,,,"Special municipality","Besondere Gemeinde","",,,"","UG::America UG::Caribbean"
nE1cs;TFgo,"South Ossetia",Südossetien,"Independent state claimed by Georgia.","Unabhängiger Staat, von Georgien beansprucht.",Tskhinvali,Zchinwali,,,,,"",,,"","UG::Asia UG::Sovereign_State"
nN",,,"",UG::Oceania
-lU*>%[&e|.,"American Samoa",Amerikanisch-Samoa,"Unincorporated territory of the United States.","Nichtinkorporiertes US-amerikanisches Außengebiet.","Pago Pago","Pago Pago",,,,,"",,,"",UG::Oceania
+lU*>%[&e|.,"American Samoa",Amerikanisch-Samoa,"Unincorporated territory of the United States.","Nichtinkorporiertes US-amerikanisches Außengebiet.","Pago Pago","Pago Pago",,,,,"",,,"",UG::Oceania
nK;HFcd-1P,"Northern Mariana Islands","Nördliche Marianen","Unincorporated territory of the United States.","Nichtinkorporiertes US-amerikanisches Außengebiet.",Saipan,Saipan,,,,,"",,,"",UG::Oceania
s7{M&?)+C&,Aruba,Aruba,"Constituent country of the Kingdom of the Netherlands.","Autonomes Land innerhalb des Königreichs der Niederlande.",Oranjestad,Oranjestad,,,"Constituent country",,"",,,"","UG::America UG::Caribbean"
q@4oQPt%lt,Abkhazia,Abchasien,"Independent state claimed by Georgia.","Unabhängiger Staat, der von Georgien beansprucht wird.",Sukhumi,Sochumi,,,,,"",,,"","UG::Europe UG::Sovereign_State"
diff --git a/src/media/ug-flag-american_samoa.png b/src/media/ug-flag-american_samoa.png
deleted file mode 100644
index f9512c3d..00000000
Binary files a/src/media/ug-flag-american_samoa.png and /dev/null differ
diff --git a/src/media/ug-flag-american_samoa.svg b/src/media/ug-flag-american_samoa.svg
new file mode 100644
index 00000000..b9f5d5ba
--- /dev/null
+++ b/src/media/ug-flag-american_samoa.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/media/ug-flag-andorra.png b/src/media/ug-flag-andorra.png
deleted file mode 100644
index dfc398e0..00000000
Binary files a/src/media/ug-flag-andorra.png and /dev/null differ
diff --git a/src/media/ug-flag-andorra.svg b/src/media/ug-flag-andorra.svg
new file mode 100644
index 00000000..f9ce3135
--- /dev/null
+++ b/src/media/ug-flag-andorra.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/media/ug-flag-ceuta.png b/src/media/ug-flag-ceuta.png
deleted file mode 100644
index 81ec551a..00000000
Binary files a/src/media/ug-flag-ceuta.png and /dev/null differ
diff --git a/src/media/ug-flag-ceuta.svg b/src/media/ug-flag-ceuta.svg
new file mode 100644
index 00000000..4624fe81
--- /dev/null
+++ b/src/media/ug-flag-ceuta.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/media/ug-flag-fiji.png b/src/media/ug-flag-fiji.png
deleted file mode 100644
index 97089ea2..00000000
Binary files a/src/media/ug-flag-fiji.png and /dev/null differ
diff --git a/src/media/ug-flag-fiji.svg b/src/media/ug-flag-fiji.svg
new file mode 100644
index 00000000..4d39f3ec
--- /dev/null
+++ b/src/media/ug-flag-fiji.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/media/ug-flag-guatemala.png b/src/media/ug-flag-guatemala.png
deleted file mode 100644
index 04c371ba..00000000
Binary files a/src/media/ug-flag-guatemala.png and /dev/null differ
diff --git a/src/media/ug-flag-guatemala.svg b/src/media/ug-flag-guatemala.svg
new file mode 100644
index 00000000..513f552c
--- /dev/null
+++ b/src/media/ug-flag-guatemala.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/media/ug-flag-saint_helena.png b/src/media/ug-flag-saint_helena.png
deleted file mode 100644
index e5caa401..00000000
Binary files a/src/media/ug-flag-saint_helena.png and /dev/null differ
diff --git a/src/media/ug-flag-saint_helena.svg b/src/media/ug-flag-saint_helena.svg
new file mode 100644
index 00000000..7e2747aa
--- /dev/null
+++ b/src/media/ug-flag-saint_helena.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/media/ug-flag-spain.png b/src/media/ug-flag-spain.png
deleted file mode 100644
index d9f93a2d..00000000
Binary files a/src/media/ug-flag-spain.png and /dev/null differ
diff --git a/src/media/ug-flag-spain.svg b/src/media/ug-flag-spain.svg
new file mode 100644
index 00000000..4aac9402
--- /dev/null
+++ b/src/media/ug-flag-spain.svg
@@ -0,0 +1 @@
+
\ No newline at end of file