diff --git a/Makefile b/Makefile
index 716a0aa47..e8d53b5a4 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ ADD_GLYPHS_FLAGS = -a emoji_aliases.txt
PUA_ADDER = map_pua_emoji.py
VS_ADDER = add_vs_cmap.py # from nototools
-EMOJI_SRC_DIR := png/128
+EMOJI_SRC_DIR ?= png/128
FLAGS_SRC_DIR := third_party/region-flags/png
BUILD_DIR := build
@@ -53,7 +53,7 @@ COMPRESSED_DIR := $(BUILD_DIR)/compressed_pngs
LIMITED_FLAGS = CN DE ES FR GB IT JP KR RU US
SELECTED_FLAGS = AC AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ \
- BA BB BD BE BF BG BH BI BJ BM BN BO BR BS BT BW BY BZ \
+ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BW BY BZ \
CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ \
DE DJ DK DM DO DZ \
EC EE EG EH ER ES ET EU \
@@ -64,14 +64,14 @@ SELECTED_FLAGS = AC AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ \
JE JM JO JP \
KE KG KH KI KM KN KP KR KW KY KZ \
LA LB LC LI LK LR LS LT LU LV LY \
- MA MC MD ME MG MH MK ML MM MN MO MP MR MS MT MU MV MW MX MY MZ \
+ MA MC MD ME MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ \
NA NC NE NF NG NI NL NO NP NR NU NZ \
OM \
PA PE PF PG PH PK PL PM PN PR PS PT PW PY \
QA \
- RO RS RU RW \
+ RE RO RS RU RW \
SA SB SC SD SE SG SH SI SK SL SM SN SO SR SS ST SV SX SY SZ \
- TA TC TD TG TH TJ TK TL TM TN TO TR TT TV TW TZ \
+ TA TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ \
UA UG UN US UY UZ \
VA VC VE VG VI VN VU \
WF WS \
diff --git a/third_party/region-flags/png/BL.png b/third_party/region-flags/png/BL.png
deleted file mode 120000
index becff2222..000000000
--- a/third_party/region-flags/png/BL.png
+++ /dev/null
@@ -1 +0,0 @@
-FR.png
\ No newline at end of file
diff --git a/third_party/region-flags/png/BL.png b/third_party/region-flags/png/BL.png
new file mode 100644
index 000000000..0cbc6b347
Binary files /dev/null and b/third_party/region-flags/png/BL.png differ
diff --git a/third_party/region-flags/png/BQ.png b/third_party/region-flags/png/BQ.png
deleted file mode 120000
index 0eb272cf4..000000000
--- a/third_party/region-flags/png/BQ.png
+++ /dev/null
@@ -1 +0,0 @@
-NL.png
\ No newline at end of file
diff --git a/third_party/region-flags/png/BQ.png b/third_party/region-flags/png/BQ.png
new file mode 100644
index 000000000..e22a2cde5
Binary files /dev/null and b/third_party/region-flags/png/BQ.png differ
diff --git a/third_party/region-flags/png/MQ.png b/third_party/region-flags/png/MQ.png
index 80d48564b..7bf70360a 100644
Binary files a/third_party/region-flags/png/MQ.png and b/third_party/region-flags/png/MQ.png differ
diff --git a/third_party/region-flags/png/RE.png b/third_party/region-flags/png/RE.png
index ace09f9a3..a45f5f217 100644
Binary files a/third_party/region-flags/png/RE.png and b/third_party/region-flags/png/RE.png differ
diff --git a/third_party/region-flags/png/TF.png b/third_party/region-flags/png/TF.png
deleted file mode 120000
index becff2222..000000000
--- a/third_party/region-flags/png/TF.png
+++ /dev/null
@@ -1 +0,0 @@
-FR.png
\ No newline at end of file
diff --git a/third_party/region-flags/png/TF.png b/third_party/region-flags/png/TF.png
new file mode 100644
index 000000000..3291b83e7
Binary files /dev/null and b/third_party/region-flags/png/TF.png differ
diff --git a/third_party/region-flags/png/XK.png b/third_party/region-flags/png/XK.png
index 395311f9c..221ecd807 100644
Binary files a/third_party/region-flags/png/XK.png and b/third_party/region-flags/png/XK.png differ
diff --git a/third_party/region-flags/svg/BL.svg b/third_party/region-flags/svg/BL.svg
deleted file mode 120000
index 61f045a37..000000000
--- a/third_party/region-flags/svg/BL.svg
+++ /dev/null
@@ -1 +0,0 @@
-FR.svg
\ No newline at end of file
diff --git a/third_party/region-flags/svg/BL.svg b/third_party/region-flags/svg/BL.svg
new file mode 100644
index 000000000..41b232ea1
--- /dev/null
+++ b/third_party/region-flags/svg/BL.svg
@@ -0,0 +1,161 @@
+
+
\ No newline at end of file
diff --git a/third_party/region-flags/svg/BQ.svg b/third_party/region-flags/svg/BQ.svg
deleted file mode 120000
index d8d68909f..000000000
--- a/third_party/region-flags/svg/BQ.svg
+++ /dev/null
@@ -1 +0,0 @@
-NL.svg
\ No newline at end of file
diff --git a/third_party/region-flags/svg/BQ.svg b/third_party/region-flags/svg/BQ.svg
new file mode 100644
index 000000000..747daee5d
--- /dev/null
+++ b/third_party/region-flags/svg/BQ.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/third_party/region-flags/svg/MQ.svg b/third_party/region-flags/svg/MQ.svg
index 173d25b69..b9dc8ee1c 100644
--- a/third_party/region-flags/svg/MQ.svg
+++ b/third_party/region-flags/svg/MQ.svg
@@ -1,98 +1,83 @@
-
diff --git a/third_party/region-flags/svg/RE.svg b/third_party/region-flags/svg/RE.svg
index d36ef46e0..5f725f27f 100644
--- a/third_party/region-flags/svg/RE.svg
+++ b/third_party/region-flags/svg/RE.svg
@@ -1,3 +1,9 @@
-
-
-
+
\ No newline at end of file
diff --git a/third_party/region-flags/svg/TF.svg b/third_party/region-flags/svg/TF.svg
deleted file mode 120000
index 61f045a37..000000000
--- a/third_party/region-flags/svg/TF.svg
+++ /dev/null
@@ -1 +0,0 @@
-FR.svg
\ No newline at end of file
diff --git a/third_party/region-flags/svg/TF.svg b/third_party/region-flags/svg/TF.svg
new file mode 100644
index 000000000..198d6d2ea
--- /dev/null
+++ b/third_party/region-flags/svg/TF.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/third_party/region-flags/svg/XK.svg b/third_party/region-flags/svg/XK.svg
index 62490e663..ef804e196 100644
--- a/third_party/region-flags/svg/XK.svg
+++ b/third_party/region-flags/svg/XK.svg
@@ -1,466 +1 @@
-
-
-
-
+
\ No newline at end of file