diff --git a/README.md b/README.md
index bef649a7..249c6c13 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ includes also emojis from:
 
 #### notice
 
-please consider adding emojis to `emoji.txt`!
+please consider adding emojis alphabetical to `emoji.txt`!
 
 example:
 ```
@@ -20,7 +20,7 @@ foo, /emoji/custom/foo.png, Tag1,Tag2
 bla, /emoji/custom/bla.png
 ```
 
-#### add `emoji.txt` for new pack
+#### add `emoji.txt` to a new pack
 ```
 newpack='MYSTUFF'
 
diff --git a/static/emoji/custom/colt.png b/static/emoji/custom/colt.png
new file mode 100644
index 00000000..b193d137
Binary files /dev/null and b/static/emoji/custom/colt.png differ
diff --git a/static/emoji/custom/crescent_moon.svg b/static/emoji/custom/crescent_moon.svg
deleted file mode 100644
index aba4295f..00000000
--- a/static/emoji/custom/crescent_moon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M30.312.776C32 19 20 32 .776 30.312c8.199 7.717 21.091 7.588 29.107-.429C37.9 21.867 38.03 8.975 30.312.776z"/><path d="M30.705 15.915c-.453.454-.453 1.189 0 1.644.454.453 1.189.453 1.643 0 .454-.455.455-1.19 0-1.644-.453-.454-1.189-.454-1.643 0zm-16.022 14.38c-.682.681-.682 1.783 0 2.465.68.682 1.784.682 2.464 0 .681-.682.681-1.784 0-2.465-.68-.682-1.784-.682-2.464 0zm13.968-2.147c-1.135 1.135-2.974 1.135-4.108 0-1.135-1.135-1.135-2.975 0-4.107 1.135-1.136 2.974-1.136 4.108 0 1.135 1.133 1.135 2.973 0 4.107z" fill="#B8C5CD"/></svg>
\ No newline at end of file
diff --git a/static/emoji/custom/dove_of_peace.svg b/static/emoji/custom/dove_of_peace.svg
deleted file mode 100644
index 613e4956..00000000
--- a/static/emoji/custom/dove_of_peace.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5C913B" d="M.794 16.112c1 0 5.875 1.344 6.5 2.312L6.013 18.3s-3.906-1.25-4.906-1.25c-1.001 0-.313-.938-.313-.938z"/><path fill="#99AAB5" d="M11 2c1 1 3 7 3 10s-2 6 2 8 5.001-1 5.001-5S20 7 19 5s-2 0-2 0-1-4-2-4-1 2-1 2-2-2-3-2 0 1 0 1z"/><path fill="#CCD6DD" d="M10 15c3 0 4 4 6 4s1-3 3-3 10-5 10-11 3-3 3-1c1 0 2 1.586 2 3 0 1 0 2-1 3 1 0 2 2 1 3 1 3-1 6-3 7 0 1-2 3-4 2 0 0-1 3-3 2 0 0 3.052 1.684 4 2 3 1 7 1 7 1s0 1-2 2c0 0 1 1 0 2s-2 1-2 1 1 2-2 1-6-4-6-4-5 1-9-1-6-6-6-8-3-1-4-1 2-2 3-2c0 0 0-2 3-2z"/><path fill="#5C913B" d="M6.95 18.019s5.438 2.625 7.938 6.656c1.9 3.064 2.782 8.656 2.782 8.656s.043.564-.907-2.281c-1-3-2.217-6.288-4.312-8.188-3.344-3.031-4.75-3.5-6.062-4.25-.332-.189.217-.687.561-.593z"/><path fill="#5C913B" d="M16.198 28.54s2.038.103 3.107 2.139c1.068 2.036-.053 4.914-.053 4.914s-2.75-1.268-3.462-2.947c-.712-1.68.408-4.106.408-4.106zm-2.133-4.778s1.274 1.437 3.558 1.705c2.284.269 4.121-1.379 4.121-1.379s-2.144-1.97-3.968-2.033c-1.823-.065-3.711 1.707-3.711 1.707zm-4.047-3.148s-2.015.329-2.85 2.472.425 4.01.425 4.01 2.534-.848 3.055-2.597c.521-1.747-.63-3.885-.63-3.885z"/></svg>
\ No newline at end of file
diff --git a/static/emoji/custom/emoji.txt b/static/emoji/custom/emoji.txt
index 95c44092..a685b0ee 100644
--- a/static/emoji/custom/emoji.txt
+++ b/static/emoji/custom/emoji.txt
@@ -52,6 +52,7 @@ 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
 commodore, /emoji/custom/commodore.png
 construction, /emoji/custom/construction.gif
 cool_beans, /emoji/custom/cool_beans.png
@@ -62,7 +63,6 @@ corndog, /emoji/custom/corndog.png
 cornholio, /emoji/custom/cornholio.png
 crabs_hi, /emoji/custom/crabs_hi.gif
 cranky-kong, /emoji/custom/cranky-kong.gif
-crescent_moon, /emoji/custom/crescent_moon.svg
 cupcake, /emoji/custom/cupcake.png
 cupcake_dessert, /emoji/custom/cupcake_dessert.gif
 dab-squidward, /emoji/custom/dab-squidward.png
@@ -80,7 +80,6 @@ doom_acid_barrel, /emoji/custom/doom_acid_barrel.gif
 doom_flame_barrel, /emoji/custom/doom_flame_barrel.gif
 doom_lost_soul, /emoji/custom/doom_lost_soul.gif
 dorito, /emoji/custom/dorito.png
-dove_of_peace, /emoji/custom/dove_of_peace.svg
 drum, /emoji/custom/drum.png
 dumpsterfire, /emoji/custom/dumpsterfire.gif
 einstein, /emoji/custom/einstein.png
@@ -112,6 +111,7 @@ girl_happy, /emoji/custom/girl_happy.gif
 girl_mad, /emoji/custom/girl_mad.gif
 goldensnitch, /emoji/custom/goldensnitch.gif
 goomba, /emoji/custom/goomba.gif
+gun, /emoji/custom/gun.png
 guy_basketball, /emoji/custom/guy_basketball.gif
 guy_fast, /emoji/custom/guy_fast.gif
 guy_happy, /emoji/custom/guy_happy.gif
@@ -316,7 +316,6 @@ trolldance, /emoji/custom/trolldance.gif
 unibomber, /emoji/custom/unibomber.png
 unicorn, /emoji/custom/unicorn.gif
 unicorn3, /emoji/custom/unicorn3.gif
-unicorn_face, /emoji/custom/unicorn_face.svg
 valid, /emoji/custom/valid.png
 vigeta, /emoji/custom/vigeta.gif
 virgin, /emoji/custom/virgin.png
@@ -337,5 +336,4 @@ yoshi, /emoji/custom/yoshi.gif
 yoshi2, /emoji/custom/yoshi2.gif
 zelda, /emoji/custom/zelda.gif
 zelda_strong, /emoji/custom/zelda_strong.gif
-zoidberg2, /emoji/custom/zoidberg2.gif
 zombie, /emoji/custom/zombie.gif
\ No newline at end of file
diff --git a/static/emoji/custom/gun.png b/static/emoji/custom/gun.png
new file mode 100644
index 00000000..a275bc8c
Binary files /dev/null and b/static/emoji/custom/gun.png differ
diff --git a/static/emoji/custom/unicorn_face.svg b/static/emoji/custom/unicorn_face.svg
deleted file mode 100644
index 81f0633e..00000000
--- a/static/emoji/custom/unicorn_face.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 19.854C33.518 9.923 25.006 1.909 16.031 6.832c0 0-4.521-1.496-5.174-1.948-.635-.44-1.635-.904-.912.436.423.782.875 1.672 2.403 3.317C8 12.958 9.279 18.262 7.743 21.75c-1.304 2.962-2.577 4.733-1.31 6.976 1.317 2.33 4.73 3.462 7.018 1.06 1.244-1.307.471-1.937 3.132-4.202 2.723-.543 4.394-1.791 4.394-4.375 0 0 .795-.382 1.826 6.009.456 2.818-.157 5.632-.039 8.783H36V19.854z"/><path fill="#55ACEE" d="M36 10.956c-.749-1.038-1.281-3.019-4.094-4.894.531 1.312.848 3.71.595 5.318-.15-3.923-3.188-6.581-4.376-7.193-2.202-1.137-4.372-.979-6.799-.772.111.168.403.814.32 1.547-.479-.875-1.604-1.42-2.333-1.271-3.499.713-5.974 2.232-5.091 3.856 8.937-3.477 14.643 2.161 17.736 8.704.769 1.625 2.611 7.132 4.041 10.292V10.956z"/><path fill="#55ACEE" d="M16.897 6.731c-2.12.564-5.26 2.509-6.537 4.573 0 0-2.589.655-3.631-1.845 2.563.827 4.826-2.339 6.737-3.511 4.028-2.468 3.314-.186 3.314-.186l.117.969z"/><path fill="#F4900C" d="M13.848 8.122l-.005-.007C13.127 7.406.948-.51.219.219s10.224 9.523 10.93 10.061l.011.006c.738-.806 1.69-1.551 2.688-2.164z"/><path fill="#9266CC" d="M13.789 3.662c.573.788 3.236.794 4.596 3.82 1.359 3.026-1.943 2.63-3.14 1.23-1.334-1.561-1.931-2.863-2.165-3.992-.124-.596-.451-2.649.709-1.058z"/><path fill="#744EAA" d="M14.209 4.962c.956.573 2.164 1.515 2.517 2.596.352 1.081-.707.891-1.349-.042-.641-.934-.939-1.975-1.285-2.263-.346-.289.117-.291.117-.291z"/><path fill="#292F33" d="M16.185 14.396c.093.514-.248 1.006-.762 1.099-.514.093-1.006-.248-1.099-.761-.093-.513.248-1.006.762-1.099.515-.093 1.006.248 1.099.761z"/><path fill="#744EAA" d="M8.63 26.877c.119.658-.181 1.263-.67 1.351-.49.089-.984-.372-1.104-1.03-.119-.659.182-1.265.671-1.354.49-.088.984.373 1.103 1.033z"/></svg>
\ No newline at end of file
diff --git a/static/emoji/futurama/emoji.txt b/static/emoji/futurama/emoji.txt
index 185b6c48..17f323fe 100644
--- a/static/emoji/futurama/emoji.txt
+++ b/static/emoji/futurama/emoji.txt
@@ -18,4 +18,5 @@ nixonhead, /emoji/futurama/nixonhead.png
 notsureif, /emoji/futurama/notsureif.png
 pxlogo, /emoji/futurama/pxlogo.png
 slurmsmckenzie, /emoji/futurama/slurmsmckenzie.png
-zoidberg, /emoji/futurama/zoidberg.gif
\ No newline at end of file
+zoidberg, /emoji/futurama/zoidberg.gif
+zoidberg2, /emoji/custom/zoidberg2.gif
\ No newline at end of file
diff --git a/static/emoji/custom/zoidberg2.gif b/static/emoji/futurama/zoidberg2.gif
similarity index 100%
rename from static/emoji/custom/zoidberg2.gif
rename to static/emoji/futurama/zoidberg2.gif
diff --git a/static/emoji/logos/emoji.txt b/static/emoji/logos/emoji.txt
index 8ec42375..f02ce385 100644
--- a/static/emoji/logos/emoji.txt
+++ b/static/emoji/logos/emoji.txt
@@ -31,6 +31,7 @@ python, /emoji/logos/python.png
 react, /emoji/logos/react.png
 reddit, /emoji/logos/reddit.png
 ruby, /emoji/logos/ruby.png
+sega, /emoji/logos/sega.png
 stackoverflow, /emoji/logos/stackoverflow.png
 sublime, /emoji/logos/sublime.png
 tor, /emoji/logos/tor.png
diff --git a/static/emoji/logos/sega.png b/static/emoji/logos/sega.png
new file mode 100644
index 00000000..328cb4fb
Binary files /dev/null and b/static/emoji/logos/sega.png differ