diff --git a/static/emoji/custom/antifa.png b/static/emoji/custom/antifa.png
new file mode 100644
index 00000000..9d441cf9
Binary files /dev/null and b/static/emoji/custom/antifa.png differ
diff --git a/static/emoji/custom/crt_w_test_pattern.png b/static/emoji/custom/crt_w_test_pattern.png
new file mode 100644
index 00000000..047b0e6b
Binary files /dev/null and b/static/emoji/custom/crt_w_test_pattern.png differ
diff --git a/static/emoji/custom/emoji.txt b/static/emoji/custom/emoji.txt
index 47b9bb16..8b2ac339 100644
--- a/static/emoji/custom/emoji.txt
+++ b/static/emoji/custom/emoji.txt
@@ -3,6 +3,7 @@ adf, /emoji/custom/adf.png
 all_the_things, /emoji/custom/all_the_things.jpg
 amomiji, /emoji/custom/amomiji.png
 anarchy, /emoji/custom/anarchy.png
+antifa, /emoji/custom/antifa.png
 archer, /emoji/custom/archer.png
 autism, /emoji/custom/autism.png
 avocado, /emoji/custom/avocado.png
@@ -52,8 +53,8 @@ classy_pbj_time, /emoji/custom/classy_pbj_time.gif
 cloud_rosa, /emoji/custom/cloud_rosa.gif
 clouds, /emoji/custom/clouds.gif
 cocktail, /emoji/custom/cocktail.png
-coffee, /emoji/custom/coffee.gif
-colt, /emoji/custom/colt.png
+coffee, /emoji/custom/coffee.gif, cofe,hot
+colt, /emoji/custom/colt.png, revolver,gun
 commodore, /emoji/custom/commodore.png
 construction, /emoji/custom/construction.gif
 cool_beans, /emoji/custom/cool_beans.png
@@ -64,6 +65,7 @@ corndog, /emoji/custom/corndog.png
 cornholio, /emoji/custom/cornholio.png
 crabs_hi, /emoji/custom/crabs_hi.gif
 cranky-kong, /emoji/custom/cranky-kong.gif
+crt_w_test_pattern, /emoji/custom/crt_w_test_pattern.png
 cupcake, /emoji/custom/cupcake.png
 cupcake_dessert, /emoji/custom/cupcake_dessert.gif
 dab-squidward, /emoji/custom/dab-squidward.png
@@ -322,7 +324,7 @@ valid, /emoji/custom/valid.png
 vigeta, /emoji/custom/vigeta.gif
 virgin, /emoji/custom/virgin.png
 waving, /emoji/custom/waving.gif
-weed, /emoji/custom/weed.png
+weed, /emoji/custom/weed.png, 420
 wgpcgr, /emoji/custom/wgpcgr.png
 whale_pink, /emoji/custom/whale_pink.svg
 what_is_life, /emoji/custom/what_is_life.gif
diff --git a/static/emoji/futurama/emoji.txt b/static/emoji/futurama/emoji.txt
index 17f323fe..74dfc7fa 100644
--- a/static/emoji/futurama/emoji.txt
+++ b/static/emoji/futurama/emoji.txt
@@ -1,6 +1,6 @@
 amywong, /emoji/futurama/amywong.png
 bender, /emoji/futurama/bender.png
-bender_dance, /emoji/futurama/bender_dance.gif
+bender_dance, /emoji/futurama/bender_dance.gif, yeah,happy,whoop
 brannigan, /emoji/futurama/brannigan.png
 bubblegumtate, /emoji/futurama/bubblegumtate.png
 calculon, /emoji/futurama/calculon.png
diff --git a/static/instance/panel.html b/static/instance/panel.html
index cba52787..94ccf0e0 100644
--- a/static/instance/panel.html
+++ b/static/instance/panel.html
@@ -1,7 +1,7 @@
 <div style="margin-left:12px; margin-right:12px">
 
 <p>Welcome to <a href="https://pleroma.social" target="_blank">Pleroma</a> on <a href="https://envs.net" target="_blank">envs.net</a>.</p>
-<p><a href="https://pleroma.envs.net">Pleroma FE</a> | <a href="/web">Mastodon FE</a> | <a href="https://halcyon.envs.net/" target="_blank">halcyon</a></p>
+<p><a href="https://pleroma.envs.net">Pleroma FE</a> | <a href="/web">Mastodon FE</a><!-- | <a href="https://halcyon.envs.net/" target="_blank">halcyon</a>--></p>
 
 <p>also available over <a href="gopher://pleroma.envs.net:7070" target="_blank">Gopher</a> (<a href="https://gopher.envs.net/pleroma.envs.net:7070" target="_blank">http proxy</a>).</p>