diff --git a/app-config/firefox/alpine-monobiome.xpi b/app-config/firefox/alpine-monobiome.xpi
index a9e63a1..f3825b6 100644
Binary files a/app-config/firefox/alpine-monobiome.xpi and b/app-config/firefox/alpine-monobiome.xpi differ
diff --git a/app-config/firefox/badlands-monobiome.xpi b/app-config/firefox/badlands-monobiome.xpi
index b4bb214..6f5216b 100644
Binary files a/app-config/firefox/badlands-monobiome.xpi and b/app-config/firefox/badlands-monobiome.xpi differ
diff --git a/app-config/firefox/chaparral-monobiome.xpi b/app-config/firefox/chaparral-monobiome.xpi
index dd86fa7..ac0f0b9 100644
Binary files a/app-config/firefox/chaparral-monobiome.xpi and b/app-config/firefox/chaparral-monobiome.xpi differ
diff --git a/app-config/firefox/grassland-monobiome.xpi b/app-config/firefox/grassland-monobiome.xpi
index a551e6b..fb63a29 100644
Binary files a/app-config/firefox/grassland-monobiome.xpi and b/app-config/firefox/grassland-monobiome.xpi differ
diff --git a/app-config/firefox/savanna-monobiome.xpi b/app-config/firefox/savanna-monobiome.xpi
index 1a64fa0..2f34b58 100644
Binary files a/app-config/firefox/savanna-monobiome.xpi and b/app-config/firefox/savanna-monobiome.xpi differ
diff --git a/app-config/firefox/tundra-monobiome.xpi b/app-config/firefox/tundra-monobiome.xpi
index 120424e..3523932 100644
Binary files a/app-config/firefox/tundra-monobiome.xpi and b/app-config/firefox/tundra-monobiome.xpi differ
diff --git a/images/firefox/themes.png b/images/firefox/themes.png
index 44a6ac2..6707bc9 100644
Binary files a/images/firefox/themes.png and b/images/firefox/themes.png differ
diff --git a/templates/apps/firefox/templates/none-dark.manifest.json b/templates/apps/firefox/templates/none-dark.manifest.json
index 4973f2d..69a1c21 100644
--- a/templates/apps/firefox/templates/none-dark.manifest.json
+++ b/templates/apps/firefox/templates/none-dark.manifest.json
@@ -14,7 +14,7 @@
         "popup": "rgbx{{ tuple(int(f{{theme.vim.fg0}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "popup_text": "rgbx{{ tuple(int(f{{theme.vim.bg0}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "ntp_background": "rgbx{{ tuple(int(f{{theme.vim.fg2}}[1:][i:i+2],16) for i in (0,2,4)) }}",
-        "popup_border": "rgbx{{ tuple(int(f{{theme.vim.fg3}}[1:][i:i+2],16) for i in (0,2,4)) }}",
+        "popup_border": "rgbx{{ tuple(int(f{{theme.vim.grey}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "popup_highlight_text": "rgbx{{ tuple(int(f{{theme.vim.bg0}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "popup_highlight": "rgbx{{ tuple(int(f{{theme.vim.fg0}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "toolbar_bottom_separator": "rgbx{{ tuple(int(f{{theme.vim.grey}}[1:][i:i+2],16) for i in (0,2,4)) }}",
@@ -37,7 +37,7 @@
         "popup": "rgbx{{ tuple(int(f{{theme.vim.bg2}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "popup_text": "rgbx{{ tuple(int(f{{theme.vim.fg0}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "ntp_background": "rgbx{{ tuple(int(f{{theme.vim.bg0}}[1:][i:i+2],16) for i in (0,2,4)) }}",
-        "popup_border": "rgbx{{ tuple(int(f{{theme.vim.bg3}}[1:][i:i+2],16) for i in (0,2,4)) }}",
+        "popup_border": "rgbx{{ tuple(int(f{{theme.vim.grey}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "popup_highlight_text": "rgbx{{ tuple(int(f{{theme.vim.fg0}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "popup_highlight": "rgbx{{ tuple(int(f{{theme.vim.bg2}}[1:][i:i+2],16) for i in (0,2,4)) }}",
         "toolbar_bottom_separator": "rgbx{{ tuple(int(f{{theme.vim.grey}}[1:][i:i+2],16) for i in (0,2,4)) }}",