diff --git a/lib/extensions/javascript.el b/lib/extensions/javascript.el
new file mode 100644
index 0000000..5960730
--- /dev/null
+++ b/lib/extensions/javascript.el
@@ -0,0 +1,16 @@
+(require 'fpkg)
+(require 'fg42/extension)
+(require 'extensions/javascript/init)
+
+;; Dependencies ----------------------------------
+(depends-on 'coffee-mode)
+(depends-on 'js2-mode)
+(depends-on 'js2-refactor)
+(depends-on 'tern)
+(depends-on 'company-tern)
+;; Extension -------------------------------------
+(extension javascript
+	   :version "2.31"
+	   :on-initialize extensions/javascript-initialize)
+
+(provide 'extensions/javascript)
diff --git a/lib/extensions/javascript/init.el b/lib/extensions/javascript/init.el
new file mode 100644
index 0000000..fbde01a
--- /dev/null
+++ b/lib/extensions/javascript/init.el
@@ -0,0 +1,27 @@
+;; Functions -------------------------------------------------
+
+;;;###autoload
+(defun extensions/javascript-initialize ()
+  "Javascript development plugin initialization."
+  (message "Initializing 'javascript' extension.")
+
+  (ability javascript-editor ('flycheck)
+           "Gives FG42 the ability to edit javascript."
+
+           (autoload 'js2-mode "js2-mode" "Javascript mode")
+
+           (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+           (add-to-list 'auto-mode-alist '("\\.jsx\\'" . js2-mode))
+           (add-to-list 'auto-mode-alist '("\\.json\\'" . js2-mode))
+
+           (add-hook 'js-mode-hook 'js2-minor-mode)
+
+           (add-to-list 'company-backends 'company-tern)
+           (setq js2-highlight-level 3)
+
+
+           (add-hook 'web-mode-hook 'extensions/web-activate-modes)))
+
+
+
+(provide 'extensions/web/init)
diff --git a/lib/extensions/web.el b/lib/extensions/web.el
index 6368a6e..6db22c7 100644
--- a/lib/extensions/web.el
+++ b/lib/extensions/web.el
@@ -9,10 +9,7 @@
 (depends-on 'sass-mode)
 (depends-on 'scss-mode)
 (depends-on 'less-css-mode)
-(depends-on 'coffee-mode)
 (depends-on 'handlebars-mode)
-(depends-on 'js2-mode)
-(depends-on 'js2-refactor)
 (depends-on 'rainbow-mode)
 (depends-on 'mustache-mode)
 
diff --git a/lib/fpkg.el b/lib/fpkg.el
index f78a8b4..632ba44 100644
--- a/lib/fpkg.el
+++ b/lib/fpkg.el
@@ -67,7 +67,7 @@
     (require 'package)
 
     (add-to-list 'package-archives
-		 '("melpa" . "http://melpa.milkbox.net/packages/") t)
+		 '("melpa" . "http://melpa.org/packages/") t)
     (when (< emacs-major-version 24)
       ;; For important compatibility libraries like cl-lib
       (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))