diff --git a/src/image-lookup.js b/src/image-lookup.js
index da9e130..7332154 100644
--- a/src/image-lookup.js
+++ b/src/image-lookup.js
@@ -1,6 +1,4 @@
-var image_decoder = { // Image tag : Image URL
+var image_decoder = { // Image tag (no brackets) : Image URL
+    "noot" : ""
 
-
-}
-
-module.exports = image_decoder;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/injections/facebook.js b/src/injections/facebook.js
index c4844f6..80274e6 100644
--- a/src/injections/facebook.js
+++ b/src/injections/facebook.js
@@ -1,17 +1,15 @@
-$('.fbNubFlyout').on('DOMNodeInserted DOMNodeRemoved change load', function(event) {
+function change_chat_tabs() {
     $('._d97').each(function(){
-        $(this).html($(this).html().replace('expected',
-            "<img class='emoticon' style='height: 30px; width: 30px;' src='http://icons.iconarchive.com/icons/hopstarter/sleek-xp-software/256/Yahoo-Messenger-icon.png'/>"
-        ));
-        console.log("Change made!");
+        for (var i = 0; i < image_decoder.length; i++) {
+            $(this).html($(this).html().replace(image_decoder[i][0],
+                "<img class='emoticon' style='height: 30px; width: 30px;' src='" + image_decoder[i][1] + "'/>"
+            ));
+        }
     });
-
-});
+}
 
 
-window.setInterval(function(){ //Force it every now and then
-    elements = $('.fbNubFlyout');
-    if (elements.length != 0) {
-        elements.trigger('change');
-    }
-}, 5000);
\ No newline at end of file
+$('.fbNubFlyout').on(
+    'DOMNodeInserted DOMNodeRemoved change load', function(event) {
+    change_chat_tabs();
+});
\ No newline at end of file
diff --git a/src/site-decoder.js b/src/site-decoder.js
index 3990acf..8fbc855 100644
--- a/src/site-decoder.js
+++ b/src/site-decoder.js
@@ -1,4 +1,4 @@
 var site_decoder = { // Site Identifier : Injection JS
-
+    "*.facebook.com":"facebook.js"
 }
 module.exports = site_decoder;
\ No newline at end of file