diff --git a/assets/build-assets.py b/assets/build-assets.py
index c99fe7a..447816f 100644
--- a/assets/build-assets.py
+++ b/assets/build-assets.py
@@ -28,5 +28,5 @@ with open('src/injector.js', "r") as file:
 
 js_file = js_file.replace("%image_decoder%", image_decoder_json)
 
-with open('build/injector.js', 'w') as file:
+with open('build/global.js', 'w') as file:
     file.write(js_file)
diff --git a/build-js.sh b/build-js.sh
index f756e15..cba64c0 100644
--- a/build-js.sh
+++ b/build-js.sh
@@ -5,8 +5,8 @@ cp -r src/decoder.json build/
 rm -rf build/injections/*
 mkdir -p build/src/injections
 
-uglifyjs build/injector.js --compress --screw-ie8 --define --keep-fnames -o build/injector.js
-for f in src/injections/*; do uglifyjs "build/injector.js" "src/lib/jquery.js" $f --compress --screw-ie8 --define --stats --keep-fnames -o build/$f; done
+uglifyjs "build/global.js" --compress --screw-ie8 --define --keep-fnames -o build/global.js
+for f in src/injections/*; do uglifyjs "build/global.js" "src/lib/jquery.js" $f --compress --screw-ie8 --define --stats --keep-fnames -o build/$f; done
 
 cp -rp build/src/* build/
 rm -rf build/src
\ No newline at end of file
diff --git a/chrome/build-manifest.py b/chrome/build-manifest.py
index ed717dc..4619fc6 100644
--- a/chrome/build-manifest.py
+++ b/chrome/build-manifest.py
@@ -32,7 +32,7 @@ for site in site_decoder:
     site = list(site.items())[0]
     temp = {}
     temp['matches'] = ["*://" + site[0] + '/*']
-    temp['js'] = ['data/lib/jquery.js', 'data/injector.js', 'data/injections/' + site[1]]
+    temp['js'] = ['data/injections/' + site[1]]
     content_scripts.append(temp)
 
 
diff --git a/src/injector.js b/src/global.js
similarity index 86%
rename from src/injector.js
rename to src/global.js
index b60d7d5..2d66ae5 100644
--- a/src/injector.js
+++ b/src/global.js
@@ -1,4 +1,4 @@
-function inject_image(ident, classes) {
+function insert_emoticons(ident, classes) {
   classes = classes || "";
   $(ident).each(function() {
     decoder = image_decoder.images;
@@ -13,7 +13,7 @@ function inject_image(ident, classes) {
   });
 }
 
-function markdown_injector(ident) {
+function markdown_decoder(ident) {
   decoder = image_decoder.images;
   for (var i = 0; i < decoder.length; i++) {
     raw_key = Object.keys(decoder[i]);
diff --git a/src/injections/facebook.js b/src/injections/facebook.js
index cd96cd1..88fe77f 100644
--- a/src/injections/facebook.js
+++ b/src/injections/facebook.js
@@ -1,5 +1,5 @@
 function change_chat_tabs() {
-  inject_image('._d97', 'emoticon');
+  inset_emoticons('._d97', 'emoticon');
 }
 
 $('.fbNubFlyout').on('DOMNodeInserted DOMNodeRemoved change load', change_chat_tabs);
@@ -10,4 +10,6 @@ $('.fbNub').on('click', change_chat_tabs);
 
 $('._55ln').on('click', change_chat_tabs);
 
-change_chat_tabs();
\ No newline at end of file
+$(document).on('ready', function() {
+  change_chat_tabs();
+});
\ No newline at end of file
diff --git a/src/injections/github.js b/src/injections/github.js
index d73e342..9f6ec10 100644
--- a/src/injections/github.js
+++ b/src/injections/github.js
@@ -1,13 +1,13 @@
 function change_comments() {
-  inject_image('.comment-body');
+  insert_emoticons('.comment-body');
 }
 
 function change_readme() {
-  inject_image('#readme');
+  insert_emoticons('#readme');
 }
 
 function change_wiki() {
-    inject_image('#wiki-body');
+  insert_emoticons('#wiki-body');
 }
 
 $('.js-comment-container').on('load change', change_comments);
@@ -15,11 +15,11 @@ $('.js-comment-container').on('load change', change_comments);
 $('#readme').on('load change', change_readme);
 
 $('form .timeline-comment textarea[placeholder="Leave a comment"]').on('change input', function() {
-    markdown_injector('form .timeline-comment textarea[placeholder="Leave a comment"]');
+    markdown_decoder('form .timeline-comment textarea[placeholder="Leave a comment"]');
 });
 
 $(document).on('ready', function() {
-    change_comments();
-    change_readme();
-    change_wiki();
+  change_comments();
+  change_readme();
+  change_wiki();
 });
diff --git a/src/injections/trello.js b/src/injections/trello.js
index 4e6ec3b..402563e 100644
--- a/src/injections/trello.js
+++ b/src/injections/trello.js
@@ -1,15 +1,15 @@
 function change_card_title() {
-    inject_image('.list-card-title');
-    inject_image('.window-title-text');
+    insert_emoticons('.list-card-title');
+    insert_emoticons('.window-title-text');
 }
 
 function change_list_title() {
-    inject_image('.list-header-name');
-    inject_image('.window-header-inline-content');
+    insert_emoticons('.list-header-name');
+    insert_emoticons('.window-header-inline-content');
 }
 
 function change_comment() {
-    inject_image('.action-comment');
+    insert_emoticons('.action-comment');
 }
 
 $('.list-header-name').on('change load', function() {
@@ -23,7 +23,7 @@ $('.active-card').on('click', function() {
 });
 
 $('.card-detail-edit textarea').on('change input', function() {
-    markdown_injector('.card-detail-edit textarea');
+    markdown_decoder('.card-detail-edit textarea');
 });
 
 $('.phenom-action').on('DOMNodeInserted DOMNodeRemoved change load', function() {