diff --git a/smiley_pack/icons/ccc/ccc.gif b/smiley_pack/icons/ccc/ccc.gif
new file mode 100644
index 00000000..2a50f84a
Binary files /dev/null and b/smiley_pack/icons/ccc/ccc.gif differ
diff --git a/smiley_pack/icons/commercial/spotify.gif b/smiley_pack/icons/commercial/spotify.gif
new file mode 100644
index 00000000..b5f10b77
Binary files /dev/null and b/smiley_pack/icons/commercial/spotify.gif differ
diff --git a/smiley_pack/icons/commercial/twitch.gif b/smiley_pack/icons/commercial/twitch.gif
new file mode 100644
index 00000000..657a9dea
Binary files /dev/null and b/smiley_pack/icons/commercial/twitch.gif differ
diff --git a/smiley_pack/icons/commercial/twitter.gif b/smiley_pack/icons/commercial/twitter.gif
new file mode 100644
index 00000000..942a0536
Binary files /dev/null and b/smiley_pack/icons/commercial/twitter.gif differ
diff --git a/smiley_pack/icons/commercial/youtube.gif b/smiley_pack/icons/commercial/youtube.gif
new file mode 100644
index 00000000..f4b9b6a3
Binary files /dev/null and b/smiley_pack/icons/commercial/youtube.gif differ
diff --git a/smiley_pack/icons/fediverse/ap.gif b/smiley_pack/icons/fediverse/ap.gif
new file mode 100644
index 00000000..f37cff59
Binary files /dev/null and b/smiley_pack/icons/fediverse/ap.gif differ
diff --git a/smiley_pack/icons/fediverse/diaspora.gif b/smiley_pack/icons/fediverse/diaspora.gif
new file mode 100644
index 00000000..82971986
Binary files /dev/null and b/smiley_pack/icons/fediverse/diaspora.gif differ
diff --git a/smiley_pack/icons/fediverse/friendica.gif b/smiley_pack/icons/fediverse/friendica.gif
new file mode 100644
index 00000000..45c50e87
Binary files /dev/null and b/smiley_pack/icons/fediverse/friendica.gif differ
diff --git a/smiley_pack/icons/fediverse/hubzilla.gif b/smiley_pack/icons/fediverse/hubzilla.gif
new file mode 100644
index 00000000..88a3b7fd
Binary files /dev/null and b/smiley_pack/icons/fediverse/hubzilla.gif differ
diff --git a/smiley_pack/icons/fediverse/mastodon.gif b/smiley_pack/icons/fediverse/mastodon.gif
new file mode 100644
index 00000000..89645037
Binary files /dev/null and b/smiley_pack/icons/fediverse/mastodon.gif differ
diff --git a/smiley_pack/icons/fediverse/misskey.gif b/smiley_pack/icons/fediverse/misskey.gif
new file mode 100644
index 00000000..84982750
Binary files /dev/null and b/smiley_pack/icons/fediverse/misskey.gif differ
diff --git a/smiley_pack/icons/fediverse/nextcloud.gif b/smiley_pack/icons/fediverse/nextcloud.gif
new file mode 100644
index 00000000..fa81b764
Binary files /dev/null and b/smiley_pack/icons/fediverse/nextcloud.gif differ
diff --git a/smiley_pack/icons/fediverse/pixelfed.gif b/smiley_pack/icons/fediverse/pixelfed.gif
new file mode 100644
index 00000000..da5c1e97
Binary files /dev/null and b/smiley_pack/icons/fediverse/pixelfed.gif differ
diff --git a/smiley_pack/icons/fediverse/pleroma.gif b/smiley_pack/icons/fediverse/pleroma.gif
new file mode 100644
index 00000000..7be5eca4
Binary files /dev/null and b/smiley_pack/icons/fediverse/pleroma.gif differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 6562e29b..c8c19b96 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -2,8 +2,9 @@
 /*
  * Name: Smiley Pack
  * Description: Pack of smileys that make master too AOLish.
- * Version: 1.04
- * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
+ * Version: 1.05
+ * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
+ * Author: Matthias Ebers <https://loma.ml/profile/one>
  * All smileys from sites offering them as Public Domain
  */
 
@@ -25,405 +26,405 @@ function smiley_pack_smilies(&$a,&$b) {
 
 #Animal smileys.
 
-	$b['texts'][] = ':bunnyflowers';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
+	$b['texts'][] = ':bunnyflowers:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers:' . '" />';
 
-	$b['texts'][] = ':chick';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
+	$b['texts'][] = ':chick:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick:' . '" />';
 
-	$b['texts'][] = ':bumblebee';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';
+	$b['texts'][] = ':bumblebee:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee:' . '" />';
 
-	$b['texts'][] = ':ladybird';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird' . '" />';
+	$b['texts'][] = ':ladybird:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird:' . '" />';
 
-	$b['texts'][] = ':bigspider';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider' . '" />';
+	$b['texts'][] = ':bigspider:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider:' . '" />';
 
-	$b['texts'][] = ':cat';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat' . '" />';
+	$b['texts'][] = ':cat:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat:' . '" />';
 
-	$b['texts'][] = ':bunny';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny' . '" />';
+	$b['texts'][] = ':bunny:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny:' . '" />';
 
-	$b['texts'][] = ':cow';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow' . '" />';
+	$b['texts'][] = ':cow:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow:' . '" />';
     
-	$b['texts'][] = ':crab';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab' . '" />';
+	$b['texts'][] = ':crab:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab:' . '" />';
 
-	$b['texts'][] = ':dolphin';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin' . '" />';
+	$b['texts'][] = ':dolphin:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin:' . '" />';
 
-	$b['texts'][] = ':dragonfly';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly' . '" />';
+	$b['texts'][] = ':dragonfly:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly:' . '" />';
 
-	$b['texts'][] = ':frog';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog' . '" />';
+	$b['texts'][] = ':frog:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog:' . '" />';
 
-	$b['texts'][] = ':hamster';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
+	$b['texts'][] = ':hamster:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster:' . '" />';
 
-	$b['texts'][] = ':monkey';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey' . '" />';
+	$b['texts'][] = ':monkey:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey:' . '" />';
 
-	$b['texts'][] = ':horse';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse' . '" />';
+	$b['texts'][] = ':horse:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse:' . '" />';
   
-	$b['texts'][] = ':parrot';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot' . '" />';
+	$b['texts'][] = ':parrot:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot:' . '" />';
 
-	$b['texts'][] = ':tux';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
+	$b['texts'][] = ':tux:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux:' . '" />';
 
-	$b['texts'][] = ':snail';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail' . '" />';
+	$b['texts'][] = ':snail:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail:' . '" />';
 
-	$b['texts'][] = ':sheep';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep' . '" />';
+	$b['texts'][] = ':sheep:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep:' . '" />';
 
-	$b['texts'][] = ':dog';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';
+	$b['texts'][] = ':dog:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog:' . '" />';
 
-	$b['texts'][] = ':elephant';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';
+	$b['texts'][] = ':elephant:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant:' . '" />';
 
-	$b['texts'][] = ':fish';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';
+	$b['texts'][] = ':fish:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish:' . '" />';
 
-	$b['texts'][] = ':giraffe';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';
+	$b['texts'][] = ':giraffe:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe:' . '" />';
 
-	$b['texts'][] = ':pig';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';
+	$b['texts'][] = ':pig:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig:' . '" />';
 
 
 
 #Baby Smileys
 
-	$b['texts'][] = ':baby';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';
+	$b['texts'][] = ':baby:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby:' . '" />';
 
-	$b['texts'][] = ':babycot';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot' . '" />';
+	$b['texts'][] = ':babycot:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot:' . '" />';
 	
 
-	$b['texts'][] = ':pregnant';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant' . '" />';
+	$b['texts'][] = ':pregnant:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant:' . '" />';
 
-	$b['texts'][] = ':stork';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />';
+	$b['texts'][] = ':stork:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork:' . '" />';
 
 
 #Confused Smileys	
-	$b['texts'][] = ':confused';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />';
+	$b['texts'][] = ':confused:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused:' . '" />';
     
-	$b['texts'][] = ':shrug';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug' . '" />';
+	$b['texts'][] = ':shrug:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug:' . '" />';
 
-	$b['texts'][] = ':stupid';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';
+	$b['texts'][] = ':stupid:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid:' . '" />';
 
-	$b['texts'][] = ':dazed';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';
+	$b['texts'][] = ':dazed:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed:' . '" />';
 
 
 #Cool Smileys
 
-	$b['texts'][] = ':affro';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';
+	$b['texts'][] = ':affro:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro:' . '" />';
 
 #Devil/Angel Smileys
 
-	$b['texts'][] = ':angel';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';
+	$b['texts'][] = ':angel:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel:' . '" />';
 
-	$b['texts'][] = ':cherub';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub' . '" />';
+	$b['texts'][] = ':cherub:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub:' . '" />';
 
-	$b['texts'][] = ':devilangel';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel' . '" />';
+	$b['texts'][] = ':devilangel:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel:' . '" />';
 
-	$b['texts'][] = ':catdevil';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil' . '" />';
+	$b['texts'][] = ':catdevil:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil:' . '" />';
 
-	$b['texts'][] = ':devillish';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish' . '" />';
+	$b['texts'][] = ':devillish:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish:' . '" />';
 	
-	$b['texts'][] = ':daseesaw';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';
+	$b['texts'][] = ':daseesaw:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw:' . '" />';
 
-	$b['texts'][] = ':turnevil';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';
+	$b['texts'][] = ':turnevil:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil:' . '" />';
 	
-	$b['texts'][] = ':saint';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';
+	$b['texts'][] = ':saint:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint:' . '" />';
 
-	$b['texts'][] = ':graveside';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';
+	$b['texts'][] = ':graveside:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside:' . '" />';
 
 #Unpleasent smileys.
 
-	$b['texts'][] = ':toilet';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';
+	$b['texts'][] = ':toilet:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet:' . '" />';
 
-	$b['texts'][] = ':fartinbed';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
+	$b['texts'][] = ':fartinbed:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed:' . '" />';
 
-	$b['texts'][] = ':fartblush';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
+	$b['texts'][] = ':fartblush:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush:' . '" />';
 
 #Drinks
 
-	$b['texts'][] = ':tea';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
+	$b['texts'][] = ':tea:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea:' . '" />';
 
-	$b['texts'][] = ':drool';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
+	$b['texts'][] = ':drool:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool:' . '" />';
 
 #Sad smileys
 
-	$b['texts'][] = ':crying';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
+	$b['texts'][] = ':crying:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying:' . '" />';
 
-	$b['texts'][] = ':prisoner';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
+	$b['texts'][] = ':prisoner:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner:' . '" />';
 
-	$b['texts'][] = ':sigh';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh' . '" />';
+	$b['texts'][] = ':sigh:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh:' . '" />';
 
 #Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
-	$b['texts'][] = ':smoking';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
+	$b['texts'][] = ':smoking:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking:' . '" />';
 
 #Sport smileys
 
-	$b['texts'][] = ':basketball';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
+	$b['texts'][] = ':basketball:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball:' . '" />';
 
 	$b['texts'][] = '~bowling';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . '~bowling' . '" />';
 
-	$b['texts'][] = ':cycling';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';
+	$b['texts'][] = ':cycling:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling:' . '" />';
 
-	$b['texts'][] = ':darts';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
+	$b['texts'][] = ':darts:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts:' . '" />';
 
-	$b['texts'][] = ':fencing';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
+	$b['texts'][] = ':fencing:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing:' . '" />';
 
-	$b['texts'][] = ':juggling';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
+	$b['texts'][] = ':juggling:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling:' . '" />';
 
-	$b['texts'][] = ':skipping';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
+	$b['texts'][] = ':skipping:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping:' . '" />';
 
-	$b['texts'][] = ':archery';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
+	$b['texts'][] = ':archery:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery:' . '" />';
 
-	$b['texts'][] = ':surfing';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
+	$b['texts'][] = ':surfing:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing:' . '" />';
 
-	$b['texts'][] = ':snooker';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
+	$b['texts'][] = ':snooker:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker:' . '" />';
   
-	$b['texts'][] = ':horseriding';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
+	$b['texts'][] = ':horseriding:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding:' . '" />';
 
 #Love smileys
 
-	$b['texts'][] = ':iloveyou';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
+	$b['texts'][] = ':iloveyou:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou:' . '" />';
 
-	$b['texts'][] = ':inlove';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
+	$b['texts'][] = ':inlove:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove:' . '" />';
 
 	$b['texts'][] = '~love';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
 
-	$b['texts'][] = ':lovebear';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear' . '" />';
+	$b['texts'][] = ':lovebear:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear:' . '" />';
 
-	$b['texts'][] = ':lovebed';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed' . '" />';
+	$b['texts'][] = ':lovebed:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed:' . '" />';
 
-	$b['texts'][] = ':loveheart';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
+	$b['texts'][] = ':loveheart:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart:' . '" />';
 
 #Tired/Sleep smileys
 
 	$b['texts'][] = ':countsheep';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep:' . '" />';
 
-	$b['texts'][] = ':hammock';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
+	$b['texts'][] = ':hammock:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock:' . '" />';
 
-	$b['texts'][] = ':pillow';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
+	$b['texts'][] = ':pillow:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow:' . '" />';
 
-	$b['texts'][] = ':yawn';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn' . '" />';
+	$b['texts'][] = ':yawn:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn:' . '" />';
 
 #Fight/Flame/Violent smileys
 
-	$b['texts'][] = ':2guns';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
+	$b['texts'][] = ':2guns:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns:' . '" />';
 
 	$b['texts'][] = ':alienfight';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
 
-	$b['texts'][] = ':army';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
+	$b['texts'][] = ':army:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army:' . '" />';
 
-	$b['texts'][] = ':arrowhead';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
+	$b['texts'][] = ':arrowhead:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead:' . '" />';
 
-	$b['texts'][] = ':bfg';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+	$b['texts'][] = ':bfg:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg:' . '" />';
 
-	$b['texts'][] = ':bowman';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
+	$b['texts'][] = ':bowman:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman:' . '" />';
 
-	$b['texts'][] = ':chainsaw';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
+	$b['texts'][] = ':chainsaw:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw:' . '" />';
 
-	$b['texts'][] = ':crossbow';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
+	$b['texts'][] = ':crossbow:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow:' . '" />';
 
-	$b['texts'][] = ':crusader';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
+	$b['texts'][] = ':crusader:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader:' . '" />';
 
-	$b['texts'][] = ':dead';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
+	$b['texts'][] = ':dead:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead:' . '" />';
 
-	$b['texts'][] = ':hammersplat';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
+	$b['texts'][] = ':hammersplat:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat:' . '" />';
 
-	$b['texts'][] = ':lasergun';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
+	$b['texts'][] = ':lasergun:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun:' . '" />';
 
-	$b['texts'][] = ':machinegun';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
+	$b['texts'][] = ':machinegun:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun:' . '" />';
 
-	$b['texts'][] = ':acid';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
+	$b['texts'][] = ':acid:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid:' . '" />';
 
 #Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
 
-	$b['texts'][] = ':alienmonster';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
+	$b['texts'][] = ':alienmonster:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster:' . '" />';
 
-	$b['texts'][] = ':barbarian';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
+	$b['texts'][] = ':barbarian:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian:' . '" />';
 
-	$b['texts'][] = ':dinosaur';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
+	$b['texts'][] = ':dinosaur:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur:' . '" />';
 
-	$b['texts'][] = ':dragon';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
+	$b['texts'][] = ':dragon:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon:' . '" />';
 
-	$b['texts'][] = ':draco';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
+	$b['texts'][] = ':draco:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco:' . '" />';
 
-	$b['texts'][] = ':ghost';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
+	$b['texts'][] = ':ghost:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost:' . '" />';
 
-	$b['texts'][] = ':mummy';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
+	$b['texts'][] = ':mummy:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy:' . '" />';
 
 #Food smileys
 
-	$b['texts'][] = ':apple';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
+	$b['texts'][] = ':apple:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple:' . '" />';
 
-	$b['texts'][] = ':broccoli';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
+	$b['texts'][] = ':broccoli:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli:' . '" />';
 
-	$b['texts'][] = ':cake';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
+	$b['texts'][] = ':cake:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake:' . '" />';
 
-	$b['texts'][] = ':carrot';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
+	$b['texts'][] = ':carrot:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot:' . '" />';
 
-	$b['texts'][] = ':popcorn';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
+	$b['texts'][] = ':popcorn:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn:' . '" />';
 
-	$b['texts'][] = ':tomato';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
+	$b['texts'][] = ':tomato:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato:' . '" />';
 
-	$b['texts'][] = ':banana';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
+	$b['texts'][] = ':banana:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana:' . '" />';
 
-	$b['texts'][] = ':cooking';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
+	$b['texts'][] = ':cooking:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking:' . '" />';
 
-	$b['texts'][] = ':fryegg';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
+	$b['texts'][] = ':fryegg:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg:' . '" />';
 
-	$b['texts'][] = ':birthdaycake';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake' . '" />';
+	$b['texts'][] = ':birthdaycake:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake:' . '" />';
 
 #Happy smileys
 
-	$b['texts'][] = ':cloud9';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
+	$b['texts'][] = ':cloud9:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9:' . '" />';
 
-	$b['texts'][] = ':tearsofjoy';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
+	$b['texts'][] = ':tearsofjoy:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy:' . '" />';
 
 #Repsect smileys
 
-	$b['texts'][] = ':bow';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
+	$b['texts'][] = ':bow:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow:' . '" />';
 
-	$b['texts'][] = ':bravo';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+	$b['texts'][] = ':bravo:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo:' . '" />';
 
-	$b['texts'][] = ':hailking';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
+	$b['texts'][] = ':hailking:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking:' . '" />';
 
-	$b['texts'][] = ':number1';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
+	$b['texts'][] = ':number1:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1:' . '" />';
 
 #Laugh smileys
 
-	$b['texts'][] = ':hahaha';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
+	$b['texts'][] = ':hahaha:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha:' . '" />';
 
-	$b['texts'][] = ':loltv';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
+	$b['texts'][] = ':loltv:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv:' . '" />';
 
-	$b['texts'][] = ':rofl';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
+	$b['texts'][] = ':rofl:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl:' . '" />';
 
 #Music smileys
 
-	$b['texts'][] = ':drums';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
+	$b['texts'][] = ':drums:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums:' . '" />';
 
 
-	$b['texts'][] = ':guitar';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
+	$b['texts'][] = ':guitar:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar:' . '" />';
 
-	$b['texts'][] = ':trumpet';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
+	$b['texts'][] = ':trumpet:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet:' . '" />';
 
 #Smileys that used to be in core
 
-	$b['texts'][] = ':headbang';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
+	$b['texts'][] = ':headbang:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang:' . '" />';
 
-		$b['texts'][] = ':beard';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
+		$b['texts'][] = ':beard:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard:' . '" />';
 
-	$b['texts'][] = ':whitebeard';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
+	$b['texts'][] = ':whitebeard:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard:' . '" />';
 
-	$b['texts'][] = ':shaka';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
+	$b['texts'][] = ':shaka:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka:' . '" />';
 
 	$b['texts'][] = ':\\.../';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
@@ -431,8 +432,8 @@ function smiley_pack_smilies(&$a,&$b) {
 	$b['texts'][] = ':\\ooo/';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
-	$b['texts'][] = ':headdesk';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headdesk' . '" />';
+	$b['texts'][] = ':headdesk:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headdesk:' . '" />';
 
 #These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
 
@@ -445,47 +446,97 @@ function smiley_pack_smilies(&$a,&$b) {
 # Regex killers - stick these at the bottom so they appear at the end of the English and 
 # at the start of $OtherLanguage.
 
-	$b['texts'][] = ':cool';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';
+	$b['texts'][] = ':cool:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool:' . '" />';
 
-	$b['texts'][] = ':vomit';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
+	$b['texts'][] = ':vomit:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit:' . '" />';
 
-	$b['texts'][] = ':golf';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
+	$b['texts'][] = ':golf:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf:' . '" />';
 	
-	$b['texts'][] = ':football';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
+	$b['texts'][] = ':football:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football:' . '" />';
 
-	$b['texts'][] = ':tennis';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
+	$b['texts'][] = ':tennis:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis:' . '" />';
 
-	$b['texts'][] = ':alpha';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
+	$b['texts'][] = ':alpha:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha:' . '" />';
 
-	$b['texts'][] = ':marine';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
+	$b['texts'][] = ':marine:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine:' . '" />';
 
-	$b['texts'][] = ':sabre';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
+	$b['texts'][] = ':sabre:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre:' . '" />';
 
-	$b['texts'][] = ':tank';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
+	$b['texts'][] = ':tank:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank:' . '" />';
 
-	$b['texts'][] = ':viking';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
+	$b['texts'][] = ':viking:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking:' . '" />';
 
-	$b['texts'][] = ':gangs';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
+	$b['texts'][] = ':gangs:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs:' . '" />';
 
 
-	$b['texts'][] = ':dj';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
+	$b['texts'][] = ':dj:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj:' . '" />';
 
 
-	$b['texts'][] = ':elvis';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
+	$b['texts'][] = ':elvis:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs:' . '" />';
+
+	$b['texts'][] = ':violin:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin:' . '" />';
+
+# New Gif Emoji (@one@loma.ml)
+# Fediverse
+
+	$b['texts'][] = ':friendica:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/friendica.gif' . '" alt="' . ':friendica:' . '" />';
+	
+	$b['texts'][] = ':mastodon:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/mastodon.gif' . '" alt="' . ':mastodon:' . '" />';
+	
+	$b['texts'][] = ':pleroma:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/pleroma.gif' . '" alt="' . ':pleroma:' . '" />';
+	
+	$b['texts'][] = ':misskey:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/misskey.gif' . '" alt="' . ':misskey:' . '" />';
+	
+	$b['texts'][] = ':diaspora:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/diaspora.gif' . '" alt="' . ':diaspora:' . '" />';
+	
+	$b['texts'][] = ':hubzilla:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/hubzilla.gif' . '" alt="' . ':hubzilla:' . '" />';
+	
+	$b['texts'][] = ':pixelfed:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/pixelfed.gif' . '" alt="' . ':pixelfeed:' . '" />';
+	
+	$b['texts'][] = ':nextcloud:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/nextcloud.gif' . '" alt="' . ':nextcloud:' . '" />';
+	
+	$b['texts'][] = ':activitypub:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fediverse/ap.gif' . '" alt="' . ':activitypub:' . '" />';
+	
+# ccc
+
+	$b['texts'][] = ':ccc event:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/ccc/ccc.gif' . '" alt="' . ':ccc event:' . '" />';
+	
+# Commercial
+
+	$b['texts'][] = ':youtube:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/commercial/youtube.gif' . '" alt="' . ':youtube:' . '" />';
+	
+	$b['texts'][] = ':spotify:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/commercial/spotify.gif' . '" alt="' . ':spotify:' . '" />';
+		
+	$b['texts'][] = ':twitter:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/commercial/twitter.gif' . '" alt="' . ':twitter:' . '" />';
+			
+	$b['texts'][] = ':twitch:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/commercial/twitch.gif' . '" alt="' . ':twitch:' . '" />';
 
-	$b['texts'][] = ':violin';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
 }