From 555070b7faf15c1be9c3f5e8bf91220088e24bc0 Mon Sep 17 00:00:00 2001
From: pdrontzas <philipos.d@esl-asia.com>
Date: Thu, 27 Jan 2022 16:17:24 +0100
Subject: [PATCH] Updated flag_enums and file names for matchmaking -- Symbol (
 - ) cannot be used for enums, instead changed to ( _ ) -- Updated Argentina
 flag

---
 lib/flag_enum.dart                 | 12 ++++++++
 res/1x1/ar.svg                     | 44 ++++++++++++++--------------
 res/1x1/{es-ct.svg => es_ct.svg}   |  2 +-
 res/1x1/{es-ga.svg => es_ga.svg}   |  2 +-
 res/1x1/{gb-eng.svg => gb_eng.svg} |  2 +-
 res/1x1/{gb-nir.svg => gb_nir.svg} |  2 +-
 res/1x1/{gb-sct.svg => gb_sct.svg} |  2 +-
 res/1x1/{gb-wls.svg => gb_wls.svg} |  2 +-
 res/4x3/ar.svg                     | 46 +++++++++++++++---------------
 res/4x3/{es-ct.svg => es_ct.svg}   |  2 +-
 res/4x3/{es-ga.svg => es_ga.svg}   |  2 +-
 res/4x3/{gb-eng.svg => gb_eng.svg} |  2 +-
 res/4x3/{gb-nir.svg => gb_nir.svg} |  2 +-
 res/4x3/{gb-sct.svg => gb_sct.svg} |  2 +-
 res/4x3/{gb-wls.svg => gb_wls.svg} |  2 +-
 15 files changed, 69 insertions(+), 57 deletions(-)
 rename res/1x1/{es-ct.svg => es_ct.svg} (74%)
 rename res/1x1/{es-ga.svg => es_ga.svg} (99%)
 rename res/1x1/{gb-eng.svg => gb_eng.svg} (72%)
 rename res/1x1/{gb-nir.svg => gb_nir.svg} (99%)
 rename res/1x1/{gb-sct.svg => gb_sct.svg} (72%)
 rename res/1x1/{gb-wls.svg => gb_wls.svg} (99%)
 rename res/4x3/{es-ct.svg => es_ct.svg} (74%)
 rename res/4x3/{es-ga.svg => es_ga.svg} (99%)
 rename res/4x3/{gb-eng.svg => gb_eng.svg} (73%)
 rename res/4x3/{gb-nir.svg => gb_nir.svg} (99%)
 rename res/4x3/{gb-sct.svg => gb_sct.svg} (71%)
 rename res/4x3/{gb-wls.svg => gb_wls.svg} (99%)

diff --git a/lib/flag_enum.dart b/lib/flag_enum.dart
index 2be2fb8..2f3c4e3 100644
--- a/lib/flag_enum.dart
+++ b/lib/flag_enum.dart
@@ -62,6 +62,8 @@ enum FlagsCode {
   EH,
   ER,
   ES,
+  ES_CT,
+  ES_GA,
   ET,
   EU,
   FI,
@@ -70,6 +72,10 @@ enum FlagsCode {
   FR,
   GA,
   GB,
+  GB_ENG,
+  GB_NIR,
+  GB_SCT,
+  GB_WLS,
   GD,
   GE,
   GH,
@@ -266,6 +272,8 @@ const List<String> baseFlagsCode = [
   'eh',
   'er',
   'es',
+  'es_ct',
+  'es_ga',
   'et',
   'eu',
   'fi',
@@ -274,6 +282,10 @@ const List<String> baseFlagsCode = [
   'fr',
   'ga',
   'gb',
+  'gb_eng',
+  'gb_nir',
+  'gb_sct',
+  'gb_wls',
   'gd',
   'ge',
   'gh',
diff --git a/res/1x1/ar.svg b/res/1x1/ar.svg
index 9eb9e06..021eb0d 100644
--- a/res/1x1/ar.svg
+++ b/res/1x1/ar.svg
@@ -1,31 +1,31 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-ar" viewBox="0 0 512 512">
   <path fill="#74acdf" d="M0 0h512v512H0z"/>
   <path fill="#fff" d="M0 170.7h512v170.6H0z"/>
-  <g id="c" transform="translate(-153.6) scale(1.024)">
-    <path id="a" fill="#f6b40e" stroke="#85340a" stroke-width="1.1" d="m396.8 251.3 28.5 62s.5 1.2 1.3.9c.8-.4.3-1.5.3-1.5l-23.7-64m-.7 24.1c-.4 9.4 5.4 14.6 4.7 23-.8 8.5 3.8 13.2 5 16.5 1 3.3-1.3 5.2-.3 5.7s3-2.1 2.4-6.8c-.7-4.6-4.2-6-3.4-16.3.8-10.3-4.2-12.7-3-22"/>
-    <use xlink:href="#a" width="100%" height="100%" transform="rotate(22.5 400 250)"/>
-    <use xlink:href="#a" width="100%" height="100%" transform="rotate(45 400 250)"/>
-    <use xlink:href="#a" width="100%" height="100%" transform="rotate(67.5 400 250)"/>
+  <g transform="translate(-153.6) scale(1.024)">
+    <path fill="#f6b40e" stroke="#85340a" stroke-width="1.1" d="m396.8 251.3 28.5 62s.5 1.2 1.3.9c.8-.4.3-1.5.3-1.5l-23.7-64m-.7 24.1c-.4 9.4 5.4 14.6 4.7 23-.8 8.5 3.8 13.2 5 16.5 1 3.3-1.3 5.2-.3 5.7s3-2.1 2.4-6.8c-.7-4.6-4.2-6-3.4-16.3.8-10.3-4.2-12.7-3-22"/>
+    <use width="100%" height="100%" transform="rotate(22.5 400 250)"/>
+    <use width="100%" height="100%" transform="rotate(45 400 250)"/>
+    <use width="100%" height="100%" transform="rotate(67.5 400 250)"/>
     <path id="b" fill="#85340a" d="M404.3 274.4c.5 9 5.6 13 4.6 21.3 2.2-6.5-3.1-11.6-2.8-21.2m-7.7-23.8 19.5 42.6-16.3-43.9"/>
-    <use xlink:href="#b" width="100%" height="100%" transform="rotate(22.5 400 250)"/>
-    <use xlink:href="#b" width="100%" height="100%" transform="rotate(45 400 250)"/>
-    <use xlink:href="#b" width="100%" height="100%" transform="rotate(67.5 400 250)"/>
+    <use width="100%" height="100%" transform="rotate(22.5 400 250)"/>
+    <use width="100%" height="100%" transform="rotate(45 400 250)"/>
+    <use width="100%" height="100%" transform="rotate(67.5 400 250)"/>
   </g>
-  <use xlink:href="#c" width="100%" height="100%" transform="rotate(90 256 256)"/>
-  <use xlink:href="#c" width="100%" height="100%" transform="rotate(180 256 256)"/>
-  <use xlink:href="#c" width="100%" height="100%" transform="rotate(-90 256 256)"/>
+  <use width="100%" height="100%" transform="rotate(90 256 256)"/>
+  <use width="100%" height="100%" transform="rotate(180 256 256)"/>
+  <use width="100%" height="100%" transform="rotate(-90 256 256)"/>
   <circle cx="256" cy="256" r="28.4" fill="#f6b40e" stroke="#85340a" stroke-width="1.5"/>
-  <path id="h" fill="#843511" d="M265.7 250c-2 0-3.8.8-4.9 2.5 2.2 2 7 2.2 10.3-.2a7.5 7.5 0 0 0-5.4-2.4zm0 .4c1.9 0 3.6.8 3.9 1.7-2.2 2.4-5.7 2.2-7.9.4a4.6 4.6 0 0 1 4-2.1z"/>
-  <use xlink:href="#d" width="100%" height="100%" transform="matrix(-1 0 0 1 512.3 0)"/>
-  <use xlink:href="#e" width="100%" height="100%" transform="matrix(-1 0 0 1 512.3 0)"/>
-  <use xlink:href="#f" width="100%" height="100%" transform="translate(19.3)"/>
-  <use xlink:href="#g" width="100%" height="100%" transform="matrix(-1 0 0 1 512.3 0)"/>
+  <path fill="#843511" d="M265.7 250c-2 0-3.8.8-4.9 2.5 2.2 2 7 2.2 10.3-.2a7.5 7.5 0 0 0-5.4-2.4zm0 .4c1.9 0 3.6.8 3.9 1.7-2.2 2.4-5.7 2.2-7.9.4a4.6 4.6 0 0 1 4-2.1z"/>
+  <use width="100%" height="100%" transform="matrix(-1 0 0 1 512.3 0)"/>
+  <use width="100%" height="100%" transform="matrix(-1 0 0 1 512.3 0)"/>
+  <use width="100%" height="100%" transform="translate(19.3)"/>
+  <use width="100%" height="100%" transform="matrix(-1 0 0 1 512.3 0)"/>
   <path fill="#85340a" d="M251.7 260a2 2 0 1 0 2 3c.7.6 1.7.6 2.3.6h.3a4.2 4.2 0 0 0 2.3-.6 2 2 0 1 0 2-3c.5.1.9.6.9 1.2a1.3 1.3 0 0 1-1.3 1.3 1.3 1.3 0 0 1-1.3-1.3 3.3 3.3 0 0 1-2.8 1.8 3.3 3.3 0 0 1-2.7-1.8 1.3 1.3 0 0 1-1.3 1.3 1.3 1.3 0 0 1-1.3-1.3c0-.6.3-1 .8-1.3zm2 5.8c-2.1 0-3 2-5 3.3 1.2-.5 2-1.3 3.6-2.2 1.5-.9 2.8.2 3.7.2.9 0 2.2-1.1 3.7-.2 1.5.9 2.4 1.7 3.5 2.2-2-1.4-2.8-3.3-5-3.3a6 6 0 0 0-2.2.6 5.8 5.8 0 0 0-2.2-.6z"/>
   <path fill="#85340a" d="M253 268.4a15 15 0 0 0-3.6.7c4-1 4.8.4 6.6.4 1.8 0 2.6-1.3 6.6-.5-4.4-1.2-5.3-.4-6.6-.4-.9 0-1.5-.3-3-.3z"/>
   <path fill="#85340a" d="M249.6 269h-.8c4.6.5 2.3 3.1 7.2 3.1 4.8 0 2.6-2.6 7.2-3-4.8-.5-3.3 2.4-7.2 2.4-3.7 0-2.6-2.5-6.4-2.5zm10.3 7.1a4 4 0 0 0-3.9-4 4 4 0 0 0-4 4 4 4 0 0 1 4-3 4 4 0 0 1 4 3z"/>
-  <path id="e" fill="#85340a" d="M238.3 249.9c5-4.4 11.4-5 14.9-1.8a8.6 8.6 0 0 1 1.6 3.7c.5 2.5-.3 5.2-2.3 8 .3 0 .7.1 1 .4 1.6-3.4 2.3-6.8 1.7-10a14.2 14.2 0 0 0-.7-2.5c-4.8-4-11.4-4.4-16.2 2.2z"/>
-  <path id="d" fill="#85340a" d="M246.2 248.6c2.8 0 3.5.6 4.8 1.7 1.3 1.1 2 .9 2.2 1.1.2.2 0 .9-.5.7-.4-.3-1.2-.7-2.6-1.8-1.3-1-2.6-1-4-1-3.8 0-6 3.2-6.5 3-.4-.2 2.2-3.7 6.6-3.7z"/>
-  <use xlink:href="#h" width="100%" height="100%" transform="translate(-19.6)"/>
-  <circle id="f" cx="246.3" cy="252.1" r="2" fill="#85340a"/>
-  <path id="g" fill="#85340a" d="M241 253.4c3.7 2.8 7.4 2.6 9.6 1.3 2.2-1.3 2.2-1.8 1.7-1.8-.4 0-.9.5-2.6 1.3-1.8 1-4.4 1-8.8-.8z"/>
-</svg>
+  <path fill="#85340a" d="M238.3 249.9c5-4.4 11.4-5 14.9-1.8a8.6 8.6 0 0 1 1.6 3.7c.5 2.5-.3 5.2-2.3 8 .3 0 .7.1 1 .4 1.6-3.4 2.3-6.8 1.7-10a14.2 14.2 0 0 0-.7-2.5c-4.8-4-11.4-4.4-16.2 2.2z"/>
+  <path fill="#85340a" d="M246.2 248.6c2.8 0 3.5.6 4.8 1.7 1.3 1.1 2 .9 2.2 1.1.2.2 0 .9-.5.7-.4-.3-1.2-.7-2.6-1.8-1.3-1-2.6-1-4-1-3.8 0-6 3.2-6.5 3-.4-.2 2.2-3.7 6.6-3.7z"/>
+  <use width="100%" height="100%" transform="translate(-19.6)"/>
+  <circle cx="246.3" cy="252.1" r="2" fill="#85340a"/>
+  <path fill="#85340a" d="M241 253.4c3.7 2.8 7.4 2.6 9.6 1.3 2.2-1.3 2.2-1.8 1.7-1.8-.4 0-.9.5-2.6 1.3-1.8 1-4.4 1-8.8-.8z"/>
+</svg>
\ No newline at end of file
diff --git a/res/1x1/es-ct.svg b/res/1x1/es_ct.svg
similarity index 74%
rename from res/1x1/es-ct.svg
rename to res/1x1/es_ct.svg
index a06a2e3..62022fe 100644
--- a/res/1x1/es-ct.svg
+++ b/res/1x1/es_ct.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es-ct" viewBox="0 0 512 512">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es_ct" viewBox="0 0 512 512">
   <path fill="#fcdd09" d="M0 0h512v512H0z"/>
   <path stroke="#da121a" stroke-width="60" d="M0 90h810m0 120H0m0 120h810m0 120H0" transform="scale(.6321 .94815)"/>
 </svg>
diff --git a/res/1x1/es-ga.svg b/res/1x1/es_ga.svg
similarity index 99%
rename from res/1x1/es-ga.svg
rename to res/1x1/es_ga.svg
index 6d8c64f..9a37998 100644
--- a/res/1x1/es-ga.svg
+++ b/res/1x1/es_ga.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es-ga" version="1.0" viewBox="0 0 512 512">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es_ga" version="1.0" viewBox="0 0 512 512">
   <g id="g5162" font-size="12" transform="matrix(.85333 0 0 1.2801 0 -123)">
     <path id="rect733" fill="#fff" fill-opacity="1" fill-rule="evenodd" stroke-width="1pt" d="M0 96h600v400H0z"/>
     <path id="path556" fill="#09c" d="M600 437.8 86 96H0v57l516 343h84v-58.2"/>
diff --git a/res/1x1/gb-eng.svg b/res/1x1/gb_eng.svg
similarity index 72%
rename from res/1x1/gb-eng.svg
rename to res/1x1/gb_eng.svg
index ee48fed..317907d 100644
--- a/res/1x1/gb-eng.svg
+++ b/res/1x1/gb_eng.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb-eng" viewBox="0 0 512 512">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb_eng" viewBox="0 0 512 512">
   <path fill="#fff" d="M0 0h512v512H0z"/>
   <path fill="#ce1124" d="M215 0h82v512h-82z"/>
   <path fill="#ce1124" d="M0 215h512v82H0z"/>
diff --git a/res/1x1/gb-nir.svg b/res/1x1/gb_nir.svg
similarity index 99%
rename from res/1x1/gb-nir.svg
rename to res/1x1/gb_nir.svg
index 91c9659..0e5492b 100644
--- a/res/1x1/gb-nir.svg
+++ b/res/1x1/gb_nir.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-gb-nir" viewBox="0 0 512 512">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-gb_nir" viewBox="0 0 512 512">
   <path id="rect5053" fill="#fff" stroke-width="4.7" d="M0 0h512v512H0z"/>
   <rect id="rect1126" fill="#fff" fill-rule="evenodd" rx="0" ry="0"/>
   <rect id="a" width="512" height="102.4" y="204.8" fill="#c00" fill-rule="evenodd" rx="0" ry="0"/>
diff --git a/res/1x1/gb-sct.svg b/res/1x1/gb_sct.svg
similarity index 72%
rename from res/1x1/gb-sct.svg
rename to res/1x1/gb_sct.svg
index 44d38cc..f408041 100644
--- a/res/1x1/gb-sct.svg
+++ b/res/1x1/gb_sct.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb-sct" viewBox="0 0 512 512">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb_sct" viewBox="0 0 512 512">
   <path fill="#0065bd" d="M0 0h512v512H0z"/>
   <path stroke="#fff" stroke-width=".6" d="m0 0 5 3M0 3l5-3" transform="scale(102.4 170.66667)"/>
 </svg>
diff --git a/res/1x1/gb-wls.svg b/res/1x1/gb_wls.svg
similarity index 99%
rename from res/1x1/gb-wls.svg
rename to res/1x1/gb_wls.svg
index 3126882..b5bf583 100644
--- a/res/1x1/gb-wls.svg
+++ b/res/1x1/gb_wls.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb-wls" viewBox="0 0 512 512">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb_wls" viewBox="0 0 512 512">
   <path fill="#00ab39" d="M0 256h512v256H0z"/>
   <path fill="#fff" d="M0 0h512v256H0z"/>
   <g stroke="#000" stroke-width="1.2">
diff --git a/res/4x3/ar.svg b/res/4x3/ar.svg
index 1daf9bb..3b6ac30 100644
--- a/res/4x3/ar.svg
+++ b/res/4x3/ar.svg
@@ -1,31 +1,31 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-ar" viewBox="0 0 640 480">
   <path fill="#74acdf" d="M0 0h640v480H0z"/>
   <path fill="#fff" d="M0 160h640v160H0z"/>
-  <g id="c" transform="translate(-64) scale(.96)">
-    <path id="a" fill="#f6b40e" stroke="#85340a" stroke-width="1.1" d="m396.8 251.3 28.5 62s.5 1.2 1.3.9c.8-.4.3-1.5.3-1.5l-23.7-64m-.7 24.1c-.4 9.4 5.4 14.6 4.7 23-.8 8.5 3.8 13.2 5 16.5 1 3.3-1.3 5.2-.3 5.7s3-2.1 2.4-6.8c-.7-4.6-4.2-6-3.4-16.3.8-10.3-4.2-12.7-3-22"/>
-    <use xlink:href="#a" width="100%" height="100%" transform="rotate(22.5 400 250)"/>
-    <use xlink:href="#a" width="100%" height="100%" transform="rotate(45 400 250)"/>
-    <use xlink:href="#a" width="100%" height="100%" transform="rotate(67.5 400 250)"/>
-    <path id="b" fill="#85340a" d="M404.3 274.4c.5 9 5.6 13 4.6 21.3 2.2-6.5-3.1-11.6-2.8-21.2m-7.7-23.8 19.5 42.6-16.3-43.9"/>
-    <use xlink:href="#b" width="100%" height="100%" transform="rotate(22.5 400 250)"/>
-    <use xlink:href="#b" width="100%" height="100%" transform="rotate(45 400 250)"/>
-    <use xlink:href="#b" width="100%" height="100%" transform="rotate(67.5 400 250)"/>
+  <g transform="translate(-64) scale(.96)">
+    <path fill="#f6b40e" stroke="#85340a" stroke-width="1.1" d="m396.8 251.3 28.5 62s.5 1.2 1.3.9c.8-.4.3-1.5.3-1.5l-23.7-64m-.7 24.1c-.4 9.4 5.4 14.6 4.7 23-.8 8.5 3.8 13.2 5 16.5 1 3.3-1.3 5.2-.3 5.7s3-2.1 2.4-6.8c-.7-4.6-4.2-6-3.4-16.3.8-10.3-4.2-12.7-3-22"/>
+    <use  width="100%" height="100%" transform="rotate(22.5 400 250)"/>
+    <use  width="100%" height="100%" transform="rotate(45 400 250)"/>
+    <use  width="100%" height="100%" transform="rotate(67.5 400 250)"/>
+    <path fill="#85340a" d="M404.3 274.4c.5 9 5.6 13 4.6 21.3 2.2-6.5-3.1-11.6-2.8-21.2m-7.7-23.8 19.5 42.6-16.3-43.9"/>
+    <use width="100%" height="100%" transform="rotate(22.5 400 250)"/>
+    <use  width="100%" height="100%" transform="rotate(45 400 250)"/>
+    <use width="100%" height="100%" transform="rotate(67.5 400 250)"/>
   </g>
-  <use xlink:href="#c" width="100%" height="100%" transform="rotate(90 320 240)"/>
-  <use xlink:href="#c" width="100%" height="100%" transform="rotate(180 320 240)"/>
-  <use xlink:href="#c" width="100%" height="100%" transform="rotate(-90 320 240)"/>
+  <use  width="100%" height="100%" transform="rotate(90 320 240)"/>
+  <use  width="100%" height="100%" transform="rotate(180 320 240)"/>
+  <use  width="100%" height="100%" transform="rotate(-90 320 240)"/>
   <circle cx="320" cy="240" r="26.7" fill="#f6b40e" stroke="#85340a" stroke-width="1.4"/>
-  <path id="h" fill="#843511" d="M329.1 234.3c-1.8 0-3.6.8-4.6 2.4 2 1.9 6.6 2 9.7-.2a7 7 0 0 0-5.1-2.2zm0 .4c1.7 0 3.4.8 3.6 1.6-2 2.3-5.3 2-7.4.4a4.3 4.3 0 0 1 3.8-2z"/>
-  <use xlink:href="#d" width="100%" height="100%" transform="matrix(-1 0 0 1 640.2 0)"/>
-  <use xlink:href="#e" width="100%" height="100%" transform="matrix(-1 0 0 1 640.2 0)"/>
-  <use xlink:href="#f" width="100%" height="100%" transform="translate(18.1)"/>
-  <use xlink:href="#g" width="100%" height="100%" transform="matrix(-1 0 0 1 640.2 0)"/>
+  <path fill="#843511" d="M329.1 234.3c-1.8 0-3.6.8-4.6 2.4 2 1.9 6.6 2 9.7-.2a7 7 0 0 0-5.1-2.2zm0 .4c1.7 0 3.4.8 3.6 1.6-2 2.3-5.3 2-7.4.4a4.3 4.3 0 0 1 3.8-2z"/>
+  <use  width="100%" height="100%" transform="matrix(-1 0 0 1 640.2 0)"/>
+  <use  width="100%" height="100%" transform="matrix(-1 0 0 1 640.2 0)"/>
+  <use  width="100%" height="100%" transform="translate(18.1)"/>
+  <use  width="100%" height="100%" transform="matrix(-1 0 0 1 640.2 0)"/>
   <path fill="#85340a" d="M316 243.7a1.9 1.9 0 1 0 1.8 2.9 4 4 0 0 0 2.2.6h.2a3.9 3.9 0 0 0 2.3-.6 1.9 1.9 0 1 0 1.8-3c.5.3.8.7.8 1.3 0 .6-.5 1.2-1.2 1.2a1.2 1.2 0 0 1-1.2-1.2 3 3 0 0 1-2.6 1.7 3 3 0 0 1-2.5-1.7 1.2 1.2 0 0 1-1.3 1.2c-.6 0-1.2-.6-1.2-1.2s.3-1 .8-1.2zm2 5.5c-2.1 0-3 1.8-4.8 3 1-.4 1.9-1.2 3.3-2s2.7.2 3.5.2c.8 0 2-1 3.5-.2 1.4.8 2.3 1.6 3.3 2-1.9-1.2-2.7-3-4.8-3a5.5 5.5 0 0 0-2 .6 5.5 5.5 0 0 0-2-.7z"/>
   <path fill="#85340a" d="M317.2 251.6c-.8 0-1.8.2-3.4.6 3.7-.8 4.5.5 6.2.5 1.6 0 2.4-1.3 6.1-.5-4-1.2-4.9-.4-6.1-.4-.8 0-1.4-.3-2.8-.2z"/>
   <path fill="#85340a" d="M314 252.2h-.8c4.3.5 2.3 3 6.8 3s2.5-2.5 6.8-3c-4.5-.4-3.1 2.3-6.8 2.3-3.5 0-2.4-2.3-6-2.3zm9.7 6.7a3.7 3.7 0 0 0-7.4 0 3.8 3.8 0 0 1 7.4 0z"/>
-  <path id="e" fill="#85340a" d="M303.4 234.3c4.7-4.1 10.7-4.8 14-1.7a8 8 0 0 1 1.5 3.5c.4 2.3-.3 4.8-2.1 7.4l.8.4a14.6 14.6 0 0 0 1.6-9.4 13.3 13.3 0 0 0-.6-2.3c-4.5-3.7-10.7-4-15.2 2z"/>
-  <path id="d" fill="#85340a" d="M310.8 233c2.7 0 3.3.7 4.5 1.7 1.2 1 1.9.8 2 1 .3.2 0 .8-.3.6-.5-.2-1.3-.6-2.5-1.6s-2.5-1-3.7-1c-3.7 0-5.7 3-6.2 2.8-.3-.2 2.1-3.5 6.2-3.5z"/>
-  <use xlink:href="#h" width="100%" height="100%" transform="translate(-18.4)"/>
-  <circle id="f" cx="310.9" cy="236.3" r="1.9" fill="#85340a"/>
-  <path id="g" fill="#85340a" d="M305.9 237.5c3.5 2.7 7 2.5 9 1.3 2-1.3 2-1.7 1.6-1.7-.4 0-.8.4-2.4 1.3-1.7.8-4.1.8-8.2-.9z"/>
-</svg>
+  <path  fill="#85340a" d="M303.4 234.3c4.7-4.1 10.7-4.8 14-1.7a8 8 0 0 1 1.5 3.5c.4 2.3-.3 4.8-2.1 7.4l.8.4a14.6 14.6 0 0 0 1.6-9.4 13.3 13.3 0 0 0-.6-2.3c-4.5-3.7-10.7-4-15.2 2z"/>
+  <path  fill="#85340a" d="M310.8 233c2.7 0 3.3.7 4.5 1.7 1.2 1 1.9.8 2 1 .3.2 0 .8-.3.6-.5-.2-1.3-.6-2.5-1.6s-2.5-1-3.7-1c-3.7 0-5.7 3-6.2 2.8-.3-.2 2.1-3.5 6.2-3.5z"/>
+  <use width="100%" height="100%" transform="translate(-18.4)"/>
+  <circle cx="310.9" cy="236.3" r="1.9" fill="#85340a"/>
+  <path  fill="#85340a" d="M305.9 237.5c3.5 2.7 7 2.5 9 1.3 2-1.3 2-1.7 1.6-1.7-.4 0-.8.4-2.4 1.3-1.7.8-4.1.8-8.2-.9z"/>
+</svg>
\ No newline at end of file
diff --git a/res/4x3/es-ct.svg b/res/4x3/es_ct.svg
similarity index 74%
rename from res/4x3/es-ct.svg
rename to res/4x3/es_ct.svg
index 4d85911..9a414ce 100644
--- a/res/4x3/es-ct.svg
+++ b/res/4x3/es_ct.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es-ct" viewBox="0 0 640 480">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es_ct" viewBox="0 0 640 480">
   <path fill="#fcdd09" d="M0 0h640v480H0z"/>
   <path stroke="#da121a" stroke-width="60" d="M0 90h810m0 120H0m0 120h810m0 120H0" transform="scale(.79012 .88889)"/>
 </svg>
diff --git a/res/4x3/es-ga.svg b/res/4x3/es_ga.svg
similarity index 99%
rename from res/4x3/es-ga.svg
rename to res/4x3/es_ga.svg
index f571a89..2d8732e 100644
--- a/res/4x3/es-ga.svg
+++ b/res/4x3/es_ga.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es-ga" version="1.0" viewBox="0 0 640 480">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-es_ga" version="1.0" viewBox="0 0 640 480">
   <g id="g5162" font-size="12" transform="matrix(1.06667 0 0 1.2001 0 -115.3)">
     <path id="rect733" fill="#fff" fill-opacity="1" fill-rule="evenodd" stroke-width="1pt" d="M0 96h600v400H0z"/>
     <path id="path556" fill="#09c" d="M600 437.8 86 96H0v57l516 343h84v-58.2"/>
diff --git a/res/4x3/gb-eng.svg b/res/4x3/gb_eng.svg
similarity index 73%
rename from res/4x3/gb-eng.svg
rename to res/4x3/gb_eng.svg
index 12e3b67..b1851f4 100644
--- a/res/4x3/gb-eng.svg
+++ b/res/4x3/gb_eng.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb-eng" viewBox="0 0 640 480">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb_eng" viewBox="0 0 640 480">
   <path fill="#fff" d="M0 0h640v480H0z"/>
   <path fill="#ce1124" d="M281.6 0h76.8v480h-76.8z"/>
   <path fill="#ce1124" d="M0 201.6h640v76.8H0z"/>
diff --git a/res/4x3/gb-nir.svg b/res/4x3/gb_nir.svg
similarity index 99%
rename from res/4x3/gb-nir.svg
rename to res/4x3/gb_nir.svg
index 4179e89..4ba68a4 100644
--- a/res/4x3/gb-nir.svg
+++ b/res/4x3/gb_nir.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-gb-nir" viewBox="0 0 640 480">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-gb_nir" viewBox="0 0 640 480">
   <path id="rect6943" fill="#fff" stroke-width="8.1" d="M0 0h640v480H0z"/>
   <rect id="rect6703" fill="#fff" fill-rule="evenodd" rx="0" ry="0"/>
   <rect id="a" width="640" height="96" y="192" fill="#c00" fill-rule="evenodd" rx="0" ry="0"/>
diff --git a/res/4x3/gb-sct.svg b/res/4x3/gb_sct.svg
similarity index 71%
rename from res/4x3/gb-sct.svg
rename to res/4x3/gb_sct.svg
index f50cd32..d56e418 100644
--- a/res/4x3/gb-sct.svg
+++ b/res/4x3/gb_sct.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb-sct" viewBox="0 0 640 480">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb_sct" viewBox="0 0 640 480">
   <path fill="#0065bd" d="M0 0h640v480H0z"/>
   <path stroke="#fff" stroke-width=".6" d="m0 0 5 3M0 3l5-3" transform="scale(128 160)"/>
 </svg>
diff --git a/res/4x3/gb-wls.svg b/res/4x3/gb_wls.svg
similarity index 99%
rename from res/4x3/gb-wls.svg
rename to res/4x3/gb_wls.svg
index 6e15fd0..e20d291 100644
--- a/res/4x3/gb-wls.svg
+++ b/res/4x3/gb_wls.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb-wls" viewBox="0 0 640 480">
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb_wls" viewBox="0 0 640 480">
   <path fill="#00ab39" d="M0 240h640v240H0z"/>
   <path fill="#fff" d="M0 0h640v240H0z"/>
   <g stroke="#000" stroke-width="1.4">