diff --git a/assets/js/app.jsx b/assets/js/app.jsx
index 96d1503..0797c4d 100644
--- a/assets/js/app.jsx
+++ b/assets/js/app.jsx
@@ -4,11 +4,12 @@ global.jQuery = require('jquery');
 require('bootstrap');
 
 var React = require('react');
+var ReactDOM = require('react-dom');
 
 // React components
 var WakaTime = require('./components/WakaTime.jsx');
 
-React.render(
+ReactDOM.render(
     <WakaTime />,
     document.getElementById('wakatime')
 );
diff --git a/assets/js/components/Options.jsx b/assets/js/components/Options.jsx
index 5753d56..61a0384 100644
--- a/assets/js/components/Options.jsx
+++ b/assets/js/components/Options.jsx
@@ -1,8 +1,7 @@
 /* global chrome */
 
 var React = require('react');
-var ReactAddons = require('react/addons');
-var ReactCSSTransitionGroup = ReactAddons.addons.CSSTransitionGroup;
+var ReactCSSTransitionGroup = require('react-addons-css-transition-group');
 
 var config = require('../config');
 
@@ -212,4 +211,4 @@ var Options = React.createClass({
     }
 });
 
-module.exports = Options;
\ No newline at end of file
+module.exports = Options;
diff --git a/assets/js/components/WakaTime.jsx b/assets/js/components/WakaTime.jsx
index 6fbd742..bea26f9 100644
--- a/assets/js/components/WakaTime.jsx
+++ b/assets/js/components/WakaTime.jsx
@@ -10,7 +10,7 @@ var NavBar = require('./NavBar.jsx');
 var MainList = require('./MainList.jsx');
 
 // Core
-var WakaTimeOriginal = require('../core/WakaTime');
+var WakaTimeCore = require('../core/WakaTimeCore').default;
 
 // Helpers
 var changeExtensionState = require('../helpers/changeExtensionState');
@@ -32,7 +32,7 @@ var Wakatime = React.createClass({
 
     componentDidMount: function() {
 
-        var wakatime = new WakaTimeOriginal();
+        var wakatime = new WakaTimeCore();
 
         var that = this;
 
@@ -170,4 +170,4 @@ var Wakatime = React.createClass({
 
 });
 
-module.exports = Wakatime;
\ No newline at end of file
+module.exports = Wakatime;
diff --git a/assets/js/core/WakaTime.js b/assets/js/core/WakaTimeCore.js
similarity index 99%
rename from assets/js/core/WakaTime.js
rename to assets/js/core/WakaTimeCore.js
index 5b060cf..2c10bc3 100644
--- a/assets/js/core/WakaTime.js
+++ b/assets/js/core/WakaTimeCore.js
@@ -12,7 +12,7 @@ var changeExtensionState = require('../helpers/changeExtensionState');
 var in_array = require('./../helpers/in_array');
 var contains = require('./../helpers/contains');
 
-class WakaTime {
+class WakaTimeCore {
 
     constructor() {
         this.tabsWithDevtoolsOpen = [];
@@ -253,4 +253,4 @@ class WakaTime {
 
 }
 
-export default WakaTime;
+export default WakaTimeCore;
diff --git a/assets/js/events.js b/assets/js/events.js
index aef16d4..144ce83 100644
--- a/assets/js/events.js
+++ b/assets/js/events.js
@@ -1,10 +1,10 @@
 /* global chrome */
 
 // Core
-var WakaTime = require("./core/WakaTime");
+var WakaTimeCore = require("./core/WakaTimeCore").default;
 
 // initialize class
-var wakatime = new WakaTime();
+var wakatime = new WakaTimeCore();
 
 // Holds currently open connections (ports) with devtools
 // Uses tabId as index key.
@@ -97,4 +97,4 @@ chrome.runtime.onConnect.addListener(function (port) {
         });
 
     }
-});
\ No newline at end of file
+});
diff --git a/assets/js/options.jsx b/assets/js/options.jsx
index fcbd0da..e171c53 100644
--- a/assets/js/options.jsx
+++ b/assets/js/options.jsx
@@ -5,11 +5,12 @@ global.jQuery = require('jquery');
 require('bootstrap');
 
 var React = require('react');
+var ReactDOM = require('react-dom');
 
 // React components
 var Options = require('./components/Options.jsx');
 
-React.render(
+ReactDOM.render(
     <Options />,
     document.getElementById('wakatime-options')
-);
\ No newline at end of file
+);
diff --git a/assets/less/bootstrap/.csscomb.json b/assets/less/bootstrap/.csscomb.json
new file mode 100644
index 0000000..40695a4
--- /dev/null
+++ b/assets/less/bootstrap/.csscomb.json
@@ -0,0 +1,304 @@
+{
+  "always-semicolon": true,
+  "block-indent": 2,
+  "color-case": "lower",
+  "color-shorthand": true,
+  "element-case": "lower",
+  "eof-newline": true,
+  "leading-zero": false,
+  "remove-empty-rulesets": true,
+  "space-after-colon": 1,
+  "space-after-combinator": 1,
+  "space-before-selector-delimiter": 0,
+  "space-between-declarations": "\n",
+  "space-after-opening-brace": "\n",
+  "space-before-closing-brace": "\n",
+  "space-before-colon": 0,
+  "space-before-combinator": 1,
+  "space-before-opening-brace": 1,
+  "strip-spaces": true,
+  "unitless-zero": true,
+  "vendor-prefix-align": true,
+  "sort-order": [
+    [
+      "position",
+      "top",
+      "right",
+      "bottom",
+      "left",
+      "z-index",
+      "display",
+      "float",
+      "width",
+      "min-width",
+      "max-width",
+      "height",
+      "min-height",
+      "max-height",
+      "-webkit-box-sizing",
+      "-moz-box-sizing",
+      "box-sizing",
+      "-webkit-appearance",
+      "padding",
+      "padding-top",
+      "padding-right",
+      "padding-bottom",
+      "padding-left",
+      "margin",
+      "margin-top",
+      "margin-right",
+      "margin-bottom",
+      "margin-left",
+      "overflow",
+      "overflow-x",
+      "overflow-y",
+      "-webkit-overflow-scrolling",
+      "-ms-overflow-x",
+      "-ms-overflow-y",
+      "-ms-overflow-style",
+      "clip",
+      "clear",
+      "font",
+      "font-family",
+      "font-size",
+      "font-style",
+      "font-weight",
+      "font-variant",
+      "font-size-adjust",
+      "font-stretch",
+      "font-effect",
+      "font-emphasize",
+      "font-emphasize-position",
+      "font-emphasize-style",
+      "font-smooth",
+      "-webkit-hyphens",
+      "-moz-hyphens",
+      "hyphens",
+      "line-height",
+      "color",
+      "text-align",
+      "-webkit-text-align-last",
+      "-moz-text-align-last",
+      "-ms-text-align-last",
+      "text-align-last",
+      "text-emphasis",
+      "text-emphasis-color",
+      "text-emphasis-style",
+      "text-emphasis-position",
+      "text-decoration",
+      "text-indent",
+      "text-justify",
+      "text-outline",
+      "-ms-text-overflow",
+      "text-overflow",
+      "text-overflow-ellipsis",
+      "text-overflow-mode",
+      "text-shadow",
+      "text-transform",
+      "text-wrap",
+      "-webkit-text-size-adjust",
+      "-ms-text-size-adjust",
+      "letter-spacing",
+      "-ms-word-break",
+      "word-break",
+      "word-spacing",
+      "-ms-word-wrap",
+      "word-wrap",
+      "-moz-tab-size",
+      "-o-tab-size",
+      "tab-size",
+      "white-space",
+      "vertical-align",
+      "list-style",
+      "list-style-position",
+      "list-style-type",
+      "list-style-image",
+      "pointer-events",
+      "-ms-touch-action",
+      "touch-action",
+      "cursor",
+      "visibility",
+      "zoom",
+      "flex-direction",
+      "flex-order",
+      "flex-pack",
+      "flex-align",
+      "table-layout",
+      "empty-cells",
+      "caption-side",
+      "border-spacing",
+      "border-collapse",
+      "content",
+      "quotes",
+      "counter-reset",
+      "counter-increment",
+      "resize",
+      "-webkit-user-select",
+      "-moz-user-select",
+      "-ms-user-select",
+      "-o-user-select",
+      "user-select",
+      "nav-index",
+      "nav-up",
+      "nav-right",
+      "nav-down",
+      "nav-left",
+      "background",
+      "background-color",
+      "background-image",
+      "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
+      "filter:progid:DXImageTransform.Microsoft.gradient",
+      "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
+      "filter",
+      "background-repeat",
+      "background-attachment",
+      "background-position",
+      "background-position-x",
+      "background-position-y",
+      "-webkit-background-clip",
+      "-moz-background-clip",
+      "background-clip",
+      "background-origin",
+      "-webkit-background-size",
+      "-moz-background-size",
+      "-o-background-size",
+      "background-size",
+      "border",
+      "border-color",
+      "border-style",
+      "border-width",
+      "border-top",
+      "border-top-color",
+      "border-top-style",
+      "border-top-width",
+      "border-right",
+      "border-right-color",
+      "border-right-style",
+      "border-right-width",
+      "border-bottom",
+      "border-bottom-color",
+      "border-bottom-style",
+      "border-bottom-width",
+      "border-left",
+      "border-left-color",
+      "border-left-style",
+      "border-left-width",
+      "border-radius",
+      "border-top-left-radius",
+      "border-top-right-radius",
+      "border-bottom-right-radius",
+      "border-bottom-left-radius",
+      "-webkit-border-image",
+      "-moz-border-image",
+      "-o-border-image",
+      "border-image",
+      "-webkit-border-image-source",
+      "-moz-border-image-source",
+      "-o-border-image-source",
+      "border-image-source",
+      "-webkit-border-image-slice",
+      "-moz-border-image-slice",
+      "-o-border-image-slice",
+      "border-image-slice",
+      "-webkit-border-image-width",
+      "-moz-border-image-width",
+      "-o-border-image-width",
+      "border-image-width",
+      "-webkit-border-image-outset",
+      "-moz-border-image-outset",
+      "-o-border-image-outset",
+      "border-image-outset",
+      "-webkit-border-image-repeat",
+      "-moz-border-image-repeat",
+      "-o-border-image-repeat",
+      "border-image-repeat",
+      "outline",
+      "outline-width",
+      "outline-style",
+      "outline-color",
+      "outline-offset",
+      "-webkit-box-shadow",
+      "-moz-box-shadow",
+      "box-shadow",
+      "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
+      "-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha",
+      "opacity",
+      "-ms-interpolation-mode",
+      "-webkit-transition",
+      "-moz-transition",
+      "-ms-transition",
+      "-o-transition",
+      "transition",
+      "-webkit-transition-delay",
+      "-moz-transition-delay",
+      "-ms-transition-delay",
+      "-o-transition-delay",
+      "transition-delay",
+      "-webkit-transition-timing-function",
+      "-moz-transition-timing-function",
+      "-ms-transition-timing-function",
+      "-o-transition-timing-function",
+      "transition-timing-function",
+      "-webkit-transition-duration",
+      "-moz-transition-duration",
+      "-ms-transition-duration",
+      "-o-transition-duration",
+      "transition-duration",
+      "-webkit-transition-property",
+      "-moz-transition-property",
+      "-ms-transition-property",
+      "-o-transition-property",
+      "transition-property",
+      "-webkit-transform",
+      "-moz-transform",
+      "-ms-transform",
+      "-o-transform",
+      "transform",
+      "-webkit-transform-origin",
+      "-moz-transform-origin",
+      "-ms-transform-origin",
+      "-o-transform-origin",
+      "transform-origin",
+      "-webkit-animation",
+      "-moz-animation",
+      "-ms-animation",
+      "-o-animation",
+      "animation",
+      "-webkit-animation-name",
+      "-moz-animation-name",
+      "-ms-animation-name",
+      "-o-animation-name",
+      "animation-name",
+      "-webkit-animation-duration",
+      "-moz-animation-duration",
+      "-ms-animation-duration",
+      "-o-animation-duration",
+      "animation-duration",
+      "-webkit-animation-play-state",
+      "-moz-animation-play-state",
+      "-ms-animation-play-state",
+      "-o-animation-play-state",
+      "animation-play-state",
+      "-webkit-animation-timing-function",
+      "-moz-animation-timing-function",
+      "-ms-animation-timing-function",
+      "-o-animation-timing-function",
+      "animation-timing-function",
+      "-webkit-animation-delay",
+      "-moz-animation-delay",
+      "-ms-animation-delay",
+      "-o-animation-delay",
+      "animation-delay",
+      "-webkit-animation-iteration-count",
+      "-moz-animation-iteration-count",
+      "-ms-animation-iteration-count",
+      "-o-animation-iteration-count",
+      "animation-iteration-count",
+      "-webkit-animation-direction",
+      "-moz-animation-direction",
+      "-ms-animation-direction",
+      "-o-animation-direction",
+      "animation-direction"
+    ]
+  ]
+}
diff --git a/assets/less/bootstrap/.csslintrc b/assets/less/bootstrap/.csslintrc
new file mode 100644
index 0000000..005b862
--- /dev/null
+++ b/assets/less/bootstrap/.csslintrc
@@ -0,0 +1,19 @@
+{
+  "adjoining-classes": false,
+  "box-sizing": false,
+  "box-model": false,
+  "compatible-vendor-prefixes": false,
+  "floats": false,
+  "font-sizes": false,
+  "gradients": false,
+  "important": false,
+  "known-properties": false,
+  "outline-none": false,
+  "qualified-headings": false,
+  "regex-selectors": false,
+  "shorthand": false,
+  "text-indent": false,
+  "unique-headings": false,
+  "universal-selector": false,
+  "unqualified-attributes": false
+}
diff --git a/assets/less/font-awesome/bordered-pulled.less b/assets/less/font-awesome/bordered-pulled.less
index 0c90eb5..f1c8ad7 100644
--- a/assets/less/font-awesome/bordered-pulled.less
+++ b/assets/less/font-awesome/bordered-pulled.less
@@ -7,6 +7,15 @@
   border-radius: .1em;
 }
 
+.@{fa-css-prefix}-pull-left { float: left; }
+.@{fa-css-prefix}-pull-right { float: right; }
+
+.@{fa-css-prefix} {
+  &.@{fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.@{fa-css-prefix}-pull-right { margin-left: .3em; }
+}
+
+/* Deprecated as of 4.4.0 */
 .pull-right { float: right; }
 .pull-left { float: left; }
 
diff --git a/assets/less/font-awesome/core.less b/assets/less/font-awesome/core.less
index f814f1e..c577ac8 100644
--- a/assets/less/font-awesome/core.less
+++ b/assets/less/font-awesome/core.less
@@ -3,11 +3,10 @@
 
 .@{fa-css-prefix} {
   display: inline-block;
-  font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
   font-size: inherit; // can't have font-size inherit on line above, so need to override
   text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  transform: translate(0, 0); // ensures no half-pixel rendering in firefox
 
 }
diff --git a/assets/less/font-awesome/font-awesome.less b/assets/less/font-awesome/font-awesome.less
index 1f45c63..c44e5f4 100644
--- a/assets/less/font-awesome/font-awesome.less
+++ b/assets/less/font-awesome/font-awesome.less
@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.3 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 
@@ -15,3 +15,4 @@
 @import "rotated-flipped.less";
 @import "stacked.less";
 @import "icons.less";
+@import "screen-reader.less";
diff --git a/assets/less/font-awesome/icons.less b/assets/less/font-awesome/icons.less
index c265de5..ba21b22 100644
--- a/assets/less/font-awesome/icons.less
+++ b/assets/less/font-awesome/icons.less
@@ -163,6 +163,7 @@
 .@{fa-css-prefix}-github:before { content: @fa-var-github; }
 .@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; }
 .@{fa-css-prefix}-credit-card:before { content: @fa-var-credit-card; }
+.@{fa-css-prefix}-feed:before,
 .@{fa-css-prefix}-rss:before { content: @fa-var-rss; }
 .@{fa-css-prefix}-hdd-o:before { content: @fa-var-hdd-o; }
 .@{fa-css-prefix}-bullhorn:before { content: @fa-var-bullhorn; }
@@ -437,7 +438,7 @@
 .@{fa-css-prefix}-stumbleupon:before { content: @fa-var-stumbleupon; }
 .@{fa-css-prefix}-delicious:before { content: @fa-var-delicious; }
 .@{fa-css-prefix}-digg:before { content: @fa-var-digg; }
-.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
+.@{fa-css-prefix}-pied-piper-pp:before { content: @fa-var-pied-piper-pp; }
 .@{fa-css-prefix}-pied-piper-alt:before { content: @fa-var-pied-piper-alt; }
 .@{fa-css-prefix}-drupal:before { content: @fa-var-drupal; }
 .@{fa-css-prefix}-joomla:before { content: @fa-var-joomla; }
@@ -487,11 +488,14 @@
 .@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }
 .@{fa-css-prefix}-circle-o-notch:before { content: @fa-var-circle-o-notch; }
 .@{fa-css-prefix}-ra:before,
+.@{fa-css-prefix}-resistance:before,
 .@{fa-css-prefix}-rebel:before { content: @fa-var-rebel; }
 .@{fa-css-prefix}-ge:before,
 .@{fa-css-prefix}-empire:before { content: @fa-var-empire; }
 .@{fa-css-prefix}-git-square:before { content: @fa-var-git-square; }
 .@{fa-css-prefix}-git:before { content: @fa-var-git; }
+.@{fa-css-prefix}-y-combinator-square:before,
+.@{fa-css-prefix}-yc-square:before,
 .@{fa-css-prefix}-hacker-news:before { content: @fa-var-hacker-news; }
 .@{fa-css-prefix}-tencent-weibo:before { content: @fa-var-tencent-weibo; }
 .@{fa-css-prefix}-qq:before { content: @fa-var-qq; }
@@ -502,7 +506,6 @@
 .@{fa-css-prefix}-send-o:before,
 .@{fa-css-prefix}-paper-plane-o:before { content: @fa-var-paper-plane-o; }
 .@{fa-css-prefix}-history:before { content: @fa-var-history; }
-.@{fa-css-prefix}-genderless:before,
 .@{fa-css-prefix}-circle-thin:before { content: @fa-var-circle-thin; }
 .@{fa-css-prefix}-header:before { content: @fa-var-header; }
 .@{fa-css-prefix}-paragraph:before { content: @fa-var-paragraph; }
@@ -573,6 +576,7 @@
 .@{fa-css-prefix}-venus:before { content: @fa-var-venus; }
 .@{fa-css-prefix}-mars:before { content: @fa-var-mars; }
 .@{fa-css-prefix}-mercury:before { content: @fa-var-mercury; }
+.@{fa-css-prefix}-intersex:before,
 .@{fa-css-prefix}-transgender:before { content: @fa-var-transgender; }
 .@{fa-css-prefix}-transgender-alt:before { content: @fa-var-transgender-alt; }
 .@{fa-css-prefix}-venus-double:before { content: @fa-var-venus-double; }
@@ -582,6 +586,7 @@
 .@{fa-css-prefix}-mars-stroke-v:before { content: @fa-var-mars-stroke-v; }
 .@{fa-css-prefix}-mars-stroke-h:before { content: @fa-var-mars-stroke-h; }
 .@{fa-css-prefix}-neuter:before { content: @fa-var-neuter; }
+.@{fa-css-prefix}-genderless:before { content: @fa-var-genderless; }
 .@{fa-css-prefix}-facebook-official:before { content: @fa-var-facebook-official; }
 .@{fa-css-prefix}-pinterest-p:before { content: @fa-var-pinterest-p; }
 .@{fa-css-prefix}-whatsapp:before { content: @fa-var-whatsapp; }
@@ -594,3 +599,135 @@
 .@{fa-css-prefix}-train:before { content: @fa-var-train; }
 .@{fa-css-prefix}-subway:before { content: @fa-var-subway; }
 .@{fa-css-prefix}-medium:before { content: @fa-var-medium; }
+.@{fa-css-prefix}-yc:before,
+.@{fa-css-prefix}-y-combinator:before { content: @fa-var-y-combinator; }
+.@{fa-css-prefix}-optin-monster:before { content: @fa-var-optin-monster; }
+.@{fa-css-prefix}-opencart:before { content: @fa-var-opencart; }
+.@{fa-css-prefix}-expeditedssl:before { content: @fa-var-expeditedssl; }
+.@{fa-css-prefix}-battery-4:before,
+.@{fa-css-prefix}-battery-full:before { content: @fa-var-battery-full; }
+.@{fa-css-prefix}-battery-3:before,
+.@{fa-css-prefix}-battery-three-quarters:before { content: @fa-var-battery-three-quarters; }
+.@{fa-css-prefix}-battery-2:before,
+.@{fa-css-prefix}-battery-half:before { content: @fa-var-battery-half; }
+.@{fa-css-prefix}-battery-1:before,
+.@{fa-css-prefix}-battery-quarter:before { content: @fa-var-battery-quarter; }
+.@{fa-css-prefix}-battery-0:before,
+.@{fa-css-prefix}-battery-empty:before { content: @fa-var-battery-empty; }
+.@{fa-css-prefix}-mouse-pointer:before { content: @fa-var-mouse-pointer; }
+.@{fa-css-prefix}-i-cursor:before { content: @fa-var-i-cursor; }
+.@{fa-css-prefix}-object-group:before { content: @fa-var-object-group; }
+.@{fa-css-prefix}-object-ungroup:before { content: @fa-var-object-ungroup; }
+.@{fa-css-prefix}-sticky-note:before { content: @fa-var-sticky-note; }
+.@{fa-css-prefix}-sticky-note-o:before { content: @fa-var-sticky-note-o; }
+.@{fa-css-prefix}-cc-jcb:before { content: @fa-var-cc-jcb; }
+.@{fa-css-prefix}-cc-diners-club:before { content: @fa-var-cc-diners-club; }
+.@{fa-css-prefix}-clone:before { content: @fa-var-clone; }
+.@{fa-css-prefix}-balance-scale:before { content: @fa-var-balance-scale; }
+.@{fa-css-prefix}-hourglass-o:before { content: @fa-var-hourglass-o; }
+.@{fa-css-prefix}-hourglass-1:before,
+.@{fa-css-prefix}-hourglass-start:before { content: @fa-var-hourglass-start; }
+.@{fa-css-prefix}-hourglass-2:before,
+.@{fa-css-prefix}-hourglass-half:before { content: @fa-var-hourglass-half; }
+.@{fa-css-prefix}-hourglass-3:before,
+.@{fa-css-prefix}-hourglass-end:before { content: @fa-var-hourglass-end; }
+.@{fa-css-prefix}-hourglass:before { content: @fa-var-hourglass; }
+.@{fa-css-prefix}-hand-grab-o:before,
+.@{fa-css-prefix}-hand-rock-o:before { content: @fa-var-hand-rock-o; }
+.@{fa-css-prefix}-hand-stop-o:before,
+.@{fa-css-prefix}-hand-paper-o:before { content: @fa-var-hand-paper-o; }
+.@{fa-css-prefix}-hand-scissors-o:before { content: @fa-var-hand-scissors-o; }
+.@{fa-css-prefix}-hand-lizard-o:before { content: @fa-var-hand-lizard-o; }
+.@{fa-css-prefix}-hand-spock-o:before { content: @fa-var-hand-spock-o; }
+.@{fa-css-prefix}-hand-pointer-o:before { content: @fa-var-hand-pointer-o; }
+.@{fa-css-prefix}-hand-peace-o:before { content: @fa-var-hand-peace-o; }
+.@{fa-css-prefix}-trademark:before { content: @fa-var-trademark; }
+.@{fa-css-prefix}-registered:before { content: @fa-var-registered; }
+.@{fa-css-prefix}-creative-commons:before { content: @fa-var-creative-commons; }
+.@{fa-css-prefix}-gg:before { content: @fa-var-gg; }
+.@{fa-css-prefix}-gg-circle:before { content: @fa-var-gg-circle; }
+.@{fa-css-prefix}-tripadvisor:before { content: @fa-var-tripadvisor; }
+.@{fa-css-prefix}-odnoklassniki:before { content: @fa-var-odnoklassniki; }
+.@{fa-css-prefix}-odnoklassniki-square:before { content: @fa-var-odnoklassniki-square; }
+.@{fa-css-prefix}-get-pocket:before { content: @fa-var-get-pocket; }
+.@{fa-css-prefix}-wikipedia-w:before { content: @fa-var-wikipedia-w; }
+.@{fa-css-prefix}-safari:before { content: @fa-var-safari; }
+.@{fa-css-prefix}-chrome:before { content: @fa-var-chrome; }
+.@{fa-css-prefix}-firefox:before { content: @fa-var-firefox; }
+.@{fa-css-prefix}-opera:before { content: @fa-var-opera; }
+.@{fa-css-prefix}-internet-explorer:before { content: @fa-var-internet-explorer; }
+.@{fa-css-prefix}-tv:before,
+.@{fa-css-prefix}-television:before { content: @fa-var-television; }
+.@{fa-css-prefix}-contao:before { content: @fa-var-contao; }
+.@{fa-css-prefix}-500px:before { content: @fa-var-500px; }
+.@{fa-css-prefix}-amazon:before { content: @fa-var-amazon; }
+.@{fa-css-prefix}-calendar-plus-o:before { content: @fa-var-calendar-plus-o; }
+.@{fa-css-prefix}-calendar-minus-o:before { content: @fa-var-calendar-minus-o; }
+.@{fa-css-prefix}-calendar-times-o:before { content: @fa-var-calendar-times-o; }
+.@{fa-css-prefix}-calendar-check-o:before { content: @fa-var-calendar-check-o; }
+.@{fa-css-prefix}-industry:before { content: @fa-var-industry; }
+.@{fa-css-prefix}-map-pin:before { content: @fa-var-map-pin; }
+.@{fa-css-prefix}-map-signs:before { content: @fa-var-map-signs; }
+.@{fa-css-prefix}-map-o:before { content: @fa-var-map-o; }
+.@{fa-css-prefix}-map:before { content: @fa-var-map; }
+.@{fa-css-prefix}-commenting:before { content: @fa-var-commenting; }
+.@{fa-css-prefix}-commenting-o:before { content: @fa-var-commenting-o; }
+.@{fa-css-prefix}-houzz:before { content: @fa-var-houzz; }
+.@{fa-css-prefix}-vimeo:before { content: @fa-var-vimeo; }
+.@{fa-css-prefix}-black-tie:before { content: @fa-var-black-tie; }
+.@{fa-css-prefix}-fonticons:before { content: @fa-var-fonticons; }
+.@{fa-css-prefix}-reddit-alien:before { content: @fa-var-reddit-alien; }
+.@{fa-css-prefix}-edge:before { content: @fa-var-edge; }
+.@{fa-css-prefix}-credit-card-alt:before { content: @fa-var-credit-card-alt; }
+.@{fa-css-prefix}-codiepie:before { content: @fa-var-codiepie; }
+.@{fa-css-prefix}-modx:before { content: @fa-var-modx; }
+.@{fa-css-prefix}-fort-awesome:before { content: @fa-var-fort-awesome; }
+.@{fa-css-prefix}-usb:before { content: @fa-var-usb; }
+.@{fa-css-prefix}-product-hunt:before { content: @fa-var-product-hunt; }
+.@{fa-css-prefix}-mixcloud:before { content: @fa-var-mixcloud; }
+.@{fa-css-prefix}-scribd:before { content: @fa-var-scribd; }
+.@{fa-css-prefix}-pause-circle:before { content: @fa-var-pause-circle; }
+.@{fa-css-prefix}-pause-circle-o:before { content: @fa-var-pause-circle-o; }
+.@{fa-css-prefix}-stop-circle:before { content: @fa-var-stop-circle; }
+.@{fa-css-prefix}-stop-circle-o:before { content: @fa-var-stop-circle-o; }
+.@{fa-css-prefix}-shopping-bag:before { content: @fa-var-shopping-bag; }
+.@{fa-css-prefix}-shopping-basket:before { content: @fa-var-shopping-basket; }
+.@{fa-css-prefix}-hashtag:before { content: @fa-var-hashtag; }
+.@{fa-css-prefix}-bluetooth:before { content: @fa-var-bluetooth; }
+.@{fa-css-prefix}-bluetooth-b:before { content: @fa-var-bluetooth-b; }
+.@{fa-css-prefix}-percent:before { content: @fa-var-percent; }
+.@{fa-css-prefix}-gitlab:before { content: @fa-var-gitlab; }
+.@{fa-css-prefix}-wpbeginner:before { content: @fa-var-wpbeginner; }
+.@{fa-css-prefix}-wpforms:before { content: @fa-var-wpforms; }
+.@{fa-css-prefix}-envira:before { content: @fa-var-envira; }
+.@{fa-css-prefix}-universal-access:before { content: @fa-var-universal-access; }
+.@{fa-css-prefix}-wheelchair-alt:before { content: @fa-var-wheelchair-alt; }
+.@{fa-css-prefix}-question-circle-o:before { content: @fa-var-question-circle-o; }
+.@{fa-css-prefix}-blind:before { content: @fa-var-blind; }
+.@{fa-css-prefix}-audio-description:before { content: @fa-var-audio-description; }
+.@{fa-css-prefix}-volume-control-phone:before { content: @fa-var-volume-control-phone; }
+.@{fa-css-prefix}-braille:before { content: @fa-var-braille; }
+.@{fa-css-prefix}-assistive-listening-systems:before { content: @fa-var-assistive-listening-systems; }
+.@{fa-css-prefix}-asl-interpreting:before,
+.@{fa-css-prefix}-american-sign-language-interpreting:before { content: @fa-var-american-sign-language-interpreting; }
+.@{fa-css-prefix}-deafness:before,
+.@{fa-css-prefix}-hard-of-hearing:before,
+.@{fa-css-prefix}-deaf:before { content: @fa-var-deaf; }
+.@{fa-css-prefix}-glide:before { content: @fa-var-glide; }
+.@{fa-css-prefix}-glide-g:before { content: @fa-var-glide-g; }
+.@{fa-css-prefix}-signing:before,
+.@{fa-css-prefix}-sign-language:before { content: @fa-var-sign-language; }
+.@{fa-css-prefix}-low-vision:before { content: @fa-var-low-vision; }
+.@{fa-css-prefix}-viadeo:before { content: @fa-var-viadeo; }
+.@{fa-css-prefix}-viadeo-square:before { content: @fa-var-viadeo-square; }
+.@{fa-css-prefix}-snapchat:before { content: @fa-var-snapchat; }
+.@{fa-css-prefix}-snapchat-ghost:before { content: @fa-var-snapchat-ghost; }
+.@{fa-css-prefix}-snapchat-square:before { content: @fa-var-snapchat-square; }
+.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
+.@{fa-css-prefix}-first-order:before { content: @fa-var-first-order; }
+.@{fa-css-prefix}-yoast:before { content: @fa-var-yoast; }
+.@{fa-css-prefix}-themeisle:before { content: @fa-var-themeisle; }
+.@{fa-css-prefix}-google-plus-circle:before,
+.@{fa-css-prefix}-google-plus-official:before { content: @fa-var-google-plus-official; }
+.@{fa-css-prefix}-fa:before,
+.@{fa-css-prefix}-font-awesome:before { content: @fa-var-font-awesome; }
diff --git a/assets/less/font-awesome/mixins.less b/assets/less/font-awesome/mixins.less
index c97f460..beef231 100644
--- a/assets/less/font-awesome/mixins.less
+++ b/assets/less/font-awesome/mixins.less
@@ -3,25 +3,58 @@
 
 .fa-icon() {
   display: inline-block;
-  font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
   font-size: inherit; // can't have font-size inherit on line above, so need to override
   text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  transform: translate(0, 0); // ensures no half-pixel rendering in firefox
 
 }
 
 .fa-icon-rotate(@degrees, @rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})";
   -webkit-transform: rotate(@degrees);
       -ms-transform: rotate(@degrees);
           transform: rotate(@degrees);
 }
 
 .fa-icon-flip(@horiz, @vert, @rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)";
   -webkit-transform: scale(@horiz, @vert);
       -ms-transform: scale(@horiz, @vert);
           transform: scale(@horiz, @vert);
 }
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+.sr-only() {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+.sr-only-focusable() {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+}
diff --git a/assets/less/font-awesome/path.less b/assets/less/font-awesome/path.less
index 9211e66..835be41 100644
--- a/assets/less/font-awesome/path.less
+++ b/assets/less/font-awesome/path.less
@@ -9,7 +9,7 @@
     url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
     url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
     url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
-//  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/assets/less/font-awesome/screen-reader.less b/assets/less/font-awesome/screen-reader.less
new file mode 100644
index 0000000..11c1881
--- /dev/null
+++ b/assets/less/font-awesome/screen-reader.less
@@ -0,0 +1,5 @@
+// Screen Readers
+// -------------------------
+
+.sr-only { .sr-only(); }
+.sr-only-focusable { .sr-only-focusable(); }
diff --git a/assets/less/font-awesome/variables.less b/assets/less/font-awesome/variables.less
index d526064..2b33819 100644
--- a/assets/less/font-awesome/variables.less
+++ b/assets/less/font-awesome/variables.less
@@ -3,20 +3,24 @@
 
 @fa-font-path:        "../fonts";
 @fa-font-size-base:   14px;
-//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts"; // for referencing Bootstrap CDN font files directly
+@fa-line-height-base: 1;
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.6.3/fonts"; // for referencing Bootstrap CDN font files directly
 @fa-css-prefix:       fa;
-@fa-version:          "4.3.0";
+@fa-version:          "4.6.3";
 @fa-border-color:     #eee;
 @fa-inverse:          #fff;
 @fa-li-width:         (30em / 14);
 
+@fa-var-500px: "\f26e";
 @fa-var-adjust: "\f042";
 @fa-var-adn: "\f170";
 @fa-var-align-center: "\f037";
 @fa-var-align-justify: "\f039";
 @fa-var-align-left: "\f036";
 @fa-var-align-right: "\f038";
+@fa-var-amazon: "\f270";
 @fa-var-ambulance: "\f0f9";
+@fa-var-american-sign-language-interpreting: "\f2a3";
 @fa-var-anchor: "\f13d";
 @fa-var-android: "\f17b";
 @fa-var-angellist: "\f209";
@@ -47,16 +51,30 @@
 @fa-var-arrows-alt: "\f0b2";
 @fa-var-arrows-h: "\f07e";
 @fa-var-arrows-v: "\f07d";
+@fa-var-asl-interpreting: "\f2a3";
+@fa-var-assistive-listening-systems: "\f2a2";
 @fa-var-asterisk: "\f069";
 @fa-var-at: "\f1fa";
+@fa-var-audio-description: "\f29e";
 @fa-var-automobile: "\f1b9";
 @fa-var-backward: "\f04a";
+@fa-var-balance-scale: "\f24e";
 @fa-var-ban: "\f05e";
 @fa-var-bank: "\f19c";
 @fa-var-bar-chart: "\f080";
 @fa-var-bar-chart-o: "\f080";
 @fa-var-barcode: "\f02a";
 @fa-var-bars: "\f0c9";
+@fa-var-battery-0: "\f244";
+@fa-var-battery-1: "\f243";
+@fa-var-battery-2: "\f242";
+@fa-var-battery-3: "\f241";
+@fa-var-battery-4: "\f240";
+@fa-var-battery-empty: "\f244";
+@fa-var-battery-full: "\f240";
+@fa-var-battery-half: "\f242";
+@fa-var-battery-quarter: "\f243";
+@fa-var-battery-three-quarters: "\f241";
 @fa-var-bed: "\f236";
 @fa-var-beer: "\f0fc";
 @fa-var-behance: "\f1b4";
@@ -71,12 +89,17 @@
 @fa-var-bitbucket: "\f171";
 @fa-var-bitbucket-square: "\f172";
 @fa-var-bitcoin: "\f15a";
+@fa-var-black-tie: "\f27e";
+@fa-var-blind: "\f29d";
+@fa-var-bluetooth: "\f293";
+@fa-var-bluetooth-b: "\f294";
 @fa-var-bold: "\f032";
 @fa-var-bolt: "\f0e7";
 @fa-var-bomb: "\f1e2";
 @fa-var-book: "\f02d";
 @fa-var-bookmark: "\f02e";
 @fa-var-bookmark-o: "\f097";
+@fa-var-braille: "\f2a1";
 @fa-var-briefcase: "\f0b1";
 @fa-var-btc: "\f15a";
 @fa-var-bug: "\f188";
@@ -89,7 +112,11 @@
 @fa-var-cab: "\f1ba";
 @fa-var-calculator: "\f1ec";
 @fa-var-calendar: "\f073";
+@fa-var-calendar-check-o: "\f274";
+@fa-var-calendar-minus-o: "\f272";
 @fa-var-calendar-o: "\f133";
+@fa-var-calendar-plus-o: "\f271";
+@fa-var-calendar-times-o: "\f273";
 @fa-var-camera: "\f030";
 @fa-var-camera-retro: "\f083";
 @fa-var-car: "\f1b9";
@@ -105,7 +132,9 @@
 @fa-var-cart-plus: "\f217";
 @fa-var-cc: "\f20a";
 @fa-var-cc-amex: "\f1f3";
+@fa-var-cc-diners-club: "\f24c";
 @fa-var-cc-discover: "\f1f2";
+@fa-var-cc-jcb: "\f24b";
 @fa-var-cc-mastercard: "\f1f1";
 @fa-var-cc-paypal: "\f1f4";
 @fa-var-cc-stripe: "\f1f5";
@@ -127,12 +156,14 @@
 @fa-var-chevron-right: "\f054";
 @fa-var-chevron-up: "\f077";
 @fa-var-child: "\f1ae";
+@fa-var-chrome: "\f268";
 @fa-var-circle: "\f111";
 @fa-var-circle-o: "\f10c";
 @fa-var-circle-o-notch: "\f1ce";
 @fa-var-circle-thin: "\f1db";
 @fa-var-clipboard: "\f0ea";
 @fa-var-clock-o: "\f017";
+@fa-var-clone: "\f24d";
 @fa-var-close: "\f00d";
 @fa-var-cloud: "\f0c2";
 @fa-var-cloud-download: "\f0ed";
@@ -141,20 +172,26 @@
 @fa-var-code: "\f121";
 @fa-var-code-fork: "\f126";
 @fa-var-codepen: "\f1cb";
+@fa-var-codiepie: "\f284";
 @fa-var-coffee: "\f0f4";
 @fa-var-cog: "\f013";
 @fa-var-cogs: "\f085";
 @fa-var-columns: "\f0db";
 @fa-var-comment: "\f075";
 @fa-var-comment-o: "\f0e5";
+@fa-var-commenting: "\f27a";
+@fa-var-commenting-o: "\f27b";
 @fa-var-comments: "\f086";
 @fa-var-comments-o: "\f0e6";
 @fa-var-compass: "\f14e";
 @fa-var-compress: "\f066";
 @fa-var-connectdevelop: "\f20e";
+@fa-var-contao: "\f26d";
 @fa-var-copy: "\f0c5";
 @fa-var-copyright: "\f1f9";
+@fa-var-creative-commons: "\f25e";
 @fa-var-credit-card: "\f09d";
+@fa-var-credit-card-alt: "\f283";
 @fa-var-crop: "\f125";
 @fa-var-crosshairs: "\f05b";
 @fa-var-css3: "\f13c";
@@ -165,6 +202,8 @@
 @fa-var-dashboard: "\f0e4";
 @fa-var-dashcube: "\f210";
 @fa-var-database: "\f1c0";
+@fa-var-deaf: "\f2a4";
+@fa-var-deafness: "\f2a4";
 @fa-var-dedent: "\f03b";
 @fa-var-delicious: "\f1a5";
 @fa-var-desktop: "\f108";
@@ -177,6 +216,7 @@
 @fa-var-dribbble: "\f17d";
 @fa-var-dropbox: "\f16b";
 @fa-var-drupal: "\f1a9";
+@fa-var-edge: "\f282";
 @fa-var-edit: "\f044";
 @fa-var-eject: "\f052";
 @fa-var-ellipsis-h: "\f141";
@@ -185,6 +225,7 @@
 @fa-var-envelope: "\f0e0";
 @fa-var-envelope-o: "\f003";
 @fa-var-envelope-square: "\f199";
+@fa-var-envira: "\f299";
 @fa-var-eraser: "\f12d";
 @fa-var-eur: "\f153";
 @fa-var-euro: "\f153";
@@ -193,11 +234,13 @@
 @fa-var-exclamation-circle: "\f06a";
 @fa-var-exclamation-triangle: "\f071";
 @fa-var-expand: "\f065";
+@fa-var-expeditedssl: "\f23e";
 @fa-var-external-link: "\f08e";
 @fa-var-external-link-square: "\f14c";
 @fa-var-eye: "\f06e";
 @fa-var-eye-slash: "\f070";
 @fa-var-eyedropper: "\f1fb";
+@fa-var-fa: "\f2b4";
 @fa-var-facebook: "\f09a";
 @fa-var-facebook-f: "\f09a";
 @fa-var-facebook-official: "\f230";
@@ -205,6 +248,7 @@
 @fa-var-fast-backward: "\f049";
 @fa-var-fast-forward: "\f050";
 @fa-var-fax: "\f1ac";
+@fa-var-feed: "\f09e";
 @fa-var-female: "\f182";
 @fa-var-fighter-jet: "\f0fb";
 @fa-var-file: "\f15b";
@@ -230,6 +274,8 @@
 @fa-var-filter: "\f0b0";
 @fa-var-fire: "\f06d";
 @fa-var-fire-extinguisher: "\f134";
+@fa-var-firefox: "\f269";
+@fa-var-first-order: "\f2b0";
 @fa-var-flag: "\f024";
 @fa-var-flag-checkered: "\f11e";
 @fa-var-flag-o: "\f11d";
@@ -242,6 +288,9 @@
 @fa-var-folder-open: "\f07c";
 @fa-var-folder-open-o: "\f115";
 @fa-var-font: "\f031";
+@fa-var-font-awesome: "\f2b4";
+@fa-var-fonticons: "\f280";
+@fa-var-fort-awesome: "\f286";
 @fa-var-forumbee: "\f211";
 @fa-var-forward: "\f04e";
 @fa-var-foursquare: "\f180";
@@ -253,18 +302,26 @@
 @fa-var-ge: "\f1d1";
 @fa-var-gear: "\f013";
 @fa-var-gears: "\f085";
-@fa-var-genderless: "\f1db";
+@fa-var-genderless: "\f22d";
+@fa-var-get-pocket: "\f265";
+@fa-var-gg: "\f260";
+@fa-var-gg-circle: "\f261";
 @fa-var-gift: "\f06b";
 @fa-var-git: "\f1d3";
 @fa-var-git-square: "\f1d2";
 @fa-var-github: "\f09b";
 @fa-var-github-alt: "\f113";
 @fa-var-github-square: "\f092";
+@fa-var-gitlab: "\f296";
 @fa-var-gittip: "\f184";
 @fa-var-glass: "\f000";
+@fa-var-glide: "\f2a5";
+@fa-var-glide-g: "\f2a6";
 @fa-var-globe: "\f0ac";
 @fa-var-google: "\f1a0";
 @fa-var-google-plus: "\f0d5";
+@fa-var-google-plus-circle: "\f2b3";
+@fa-var-google-plus-official: "\f2b3";
 @fa-var-google-plus-square: "\f0d4";
 @fa-var-google-wallet: "\f1ee";
 @fa-var-graduation-cap: "\f19d";
@@ -272,10 +329,21 @@
 @fa-var-group: "\f0c0";
 @fa-var-h-square: "\f0fd";
 @fa-var-hacker-news: "\f1d4";
+@fa-var-hand-grab-o: "\f255";
+@fa-var-hand-lizard-o: "\f258";
 @fa-var-hand-o-down: "\f0a7";
 @fa-var-hand-o-left: "\f0a5";
 @fa-var-hand-o-right: "\f0a4";
 @fa-var-hand-o-up: "\f0a6";
+@fa-var-hand-paper-o: "\f256";
+@fa-var-hand-peace-o: "\f25b";
+@fa-var-hand-pointer-o: "\f25a";
+@fa-var-hand-rock-o: "\f255";
+@fa-var-hand-scissors-o: "\f257";
+@fa-var-hand-spock-o: "\f259";
+@fa-var-hand-stop-o: "\f256";
+@fa-var-hard-of-hearing: "\f2a4";
+@fa-var-hashtag: "\f292";
 @fa-var-hdd-o: "\f0a0";
 @fa-var-header: "\f1dc";
 @fa-var-headphones: "\f025";
@@ -286,16 +354,29 @@
 @fa-var-home: "\f015";
 @fa-var-hospital-o: "\f0f8";
 @fa-var-hotel: "\f236";
+@fa-var-hourglass: "\f254";
+@fa-var-hourglass-1: "\f251";
+@fa-var-hourglass-2: "\f252";
+@fa-var-hourglass-3: "\f253";
+@fa-var-hourglass-end: "\f253";
+@fa-var-hourglass-half: "\f252";
+@fa-var-hourglass-o: "\f250";
+@fa-var-hourglass-start: "\f251";
+@fa-var-houzz: "\f27c";
 @fa-var-html5: "\f13b";
+@fa-var-i-cursor: "\f246";
 @fa-var-ils: "\f20b";
 @fa-var-image: "\f03e";
 @fa-var-inbox: "\f01c";
 @fa-var-indent: "\f03c";
+@fa-var-industry: "\f275";
 @fa-var-info: "\f129";
 @fa-var-info-circle: "\f05a";
 @fa-var-inr: "\f156";
 @fa-var-instagram: "\f16d";
 @fa-var-institution: "\f19c";
+@fa-var-internet-explorer: "\f26b";
+@fa-var-intersex: "\f224";
 @fa-var-ioxhost: "\f208";
 @fa-var-italic: "\f033";
 @fa-var-joomla: "\f1aa";
@@ -334,13 +415,18 @@
 @fa-var-long-arrow-left: "\f177";
 @fa-var-long-arrow-right: "\f178";
 @fa-var-long-arrow-up: "\f176";
+@fa-var-low-vision: "\f2a8";
 @fa-var-magic: "\f0d0";
 @fa-var-magnet: "\f076";
 @fa-var-mail-forward: "\f064";
 @fa-var-mail-reply: "\f112";
 @fa-var-mail-reply-all: "\f122";
 @fa-var-male: "\f183";
+@fa-var-map: "\f279";
 @fa-var-map-marker: "\f041";
+@fa-var-map-o: "\f278";
+@fa-var-map-pin: "\f276";
+@fa-var-map-signs: "\f277";
 @fa-var-mars: "\f222";
 @fa-var-mars-double: "\f227";
 @fa-var-mars-stroke: "\f229";
@@ -358,17 +444,27 @@
 @fa-var-minus-circle: "\f056";
 @fa-var-minus-square: "\f146";
 @fa-var-minus-square-o: "\f147";
+@fa-var-mixcloud: "\f289";
 @fa-var-mobile: "\f10b";
 @fa-var-mobile-phone: "\f10b";
+@fa-var-modx: "\f285";
 @fa-var-money: "\f0d6";
 @fa-var-moon-o: "\f186";
 @fa-var-mortar-board: "\f19d";
 @fa-var-motorcycle: "\f21c";
+@fa-var-mouse-pointer: "\f245";
 @fa-var-music: "\f001";
 @fa-var-navicon: "\f0c9";
 @fa-var-neuter: "\f22c";
 @fa-var-newspaper-o: "\f1ea";
+@fa-var-object-group: "\f247";
+@fa-var-object-ungroup: "\f248";
+@fa-var-odnoklassniki: "\f263";
+@fa-var-odnoklassniki-square: "\f264";
+@fa-var-opencart: "\f23d";
 @fa-var-openid: "\f19b";
+@fa-var-opera: "\f26a";
+@fa-var-optin-monster: "\f23c";
 @fa-var-outdent: "\f03b";
 @fa-var-pagelines: "\f18c";
 @fa-var-paint-brush: "\f1fc";
@@ -378,18 +474,22 @@
 @fa-var-paragraph: "\f1dd";
 @fa-var-paste: "\f0ea";
 @fa-var-pause: "\f04c";
+@fa-var-pause-circle: "\f28b";
+@fa-var-pause-circle-o: "\f28c";
 @fa-var-paw: "\f1b0";
 @fa-var-paypal: "\f1ed";
 @fa-var-pencil: "\f040";
 @fa-var-pencil-square: "\f14b";
 @fa-var-pencil-square-o: "\f044";
+@fa-var-percent: "\f295";
 @fa-var-phone: "\f095";
 @fa-var-phone-square: "\f098";
 @fa-var-photo: "\f03e";
 @fa-var-picture-o: "\f03e";
 @fa-var-pie-chart: "\f200";
-@fa-var-pied-piper: "\f1a7";
+@fa-var-pied-piper: "\f2ae";
 @fa-var-pied-piper-alt: "\f1a8";
+@fa-var-pied-piper-pp: "\f1a7";
 @fa-var-pinterest: "\f0d2";
 @fa-var-pinterest-p: "\f231";
 @fa-var-pinterest-square: "\f0d3";
@@ -404,11 +504,13 @@
 @fa-var-plus-square-o: "\f196";
 @fa-var-power-off: "\f011";
 @fa-var-print: "\f02f";
+@fa-var-product-hunt: "\f288";
 @fa-var-puzzle-piece: "\f12e";
 @fa-var-qq: "\f1d6";
 @fa-var-qrcode: "\f029";
 @fa-var-question: "\f128";
 @fa-var-question-circle: "\f059";
+@fa-var-question-circle-o: "\f29c";
 @fa-var-quote-left: "\f10d";
 @fa-var-quote-right: "\f10e";
 @fa-var-ra: "\f1d0";
@@ -416,14 +518,17 @@
 @fa-var-rebel: "\f1d0";
 @fa-var-recycle: "\f1b8";
 @fa-var-reddit: "\f1a1";
+@fa-var-reddit-alien: "\f281";
 @fa-var-reddit-square: "\f1a2";
 @fa-var-refresh: "\f021";
+@fa-var-registered: "\f25d";
 @fa-var-remove: "\f00d";
 @fa-var-renren: "\f18b";
 @fa-var-reorder: "\f0c9";
 @fa-var-repeat: "\f01e";
 @fa-var-reply: "\f112";
 @fa-var-reply-all: "\f122";
+@fa-var-resistance: "\f1d0";
 @fa-var-retweet: "\f079";
 @fa-var-rmb: "\f157";
 @fa-var-road: "\f018";
@@ -436,8 +541,10 @@
 @fa-var-rub: "\f158";
 @fa-var-ruble: "\f158";
 @fa-var-rupee: "\f156";
+@fa-var-safari: "\f267";
 @fa-var-save: "\f0c7";
 @fa-var-scissors: "\f0c4";
+@fa-var-scribd: "\f28a";
 @fa-var-search: "\f002";
 @fa-var-search-minus: "\f010";
 @fa-var-search-plus: "\f00e";
@@ -455,10 +562,14 @@
 @fa-var-shield: "\f132";
 @fa-var-ship: "\f21a";
 @fa-var-shirtsinbulk: "\f214";
+@fa-var-shopping-bag: "\f290";
+@fa-var-shopping-basket: "\f291";
 @fa-var-shopping-cart: "\f07a";
 @fa-var-sign-in: "\f090";
+@fa-var-sign-language: "\f2a7";
 @fa-var-sign-out: "\f08b";
 @fa-var-signal: "\f012";
+@fa-var-signing: "\f2a7";
 @fa-var-simplybuilt: "\f215";
 @fa-var-sitemap: "\f0e8";
 @fa-var-skyatlas: "\f216";
@@ -467,6 +578,9 @@
 @fa-var-sliders: "\f1de";
 @fa-var-slideshare: "\f1e7";
 @fa-var-smile-o: "\f118";
+@fa-var-snapchat: "\f2ab";
+@fa-var-snapchat-ghost: "\f2ac";
+@fa-var-snapchat-square: "\f2ad";
 @fa-var-soccer-ball-o: "\f1e3";
 @fa-var-sort: "\f0dc";
 @fa-var-sort-alpha-asc: "\f15d";
@@ -499,7 +613,11 @@
 @fa-var-step-backward: "\f048";
 @fa-var-step-forward: "\f051";
 @fa-var-stethoscope: "\f0f1";
+@fa-var-sticky-note: "\f249";
+@fa-var-sticky-note-o: "\f24a";
 @fa-var-stop: "\f04d";
+@fa-var-stop-circle: "\f28d";
+@fa-var-stop-circle-o: "\f28e";
 @fa-var-street-view: "\f21d";
 @fa-var-strikethrough: "\f0cc";
 @fa-var-stumbleupon: "\f1a4";
@@ -517,6 +635,7 @@
 @fa-var-tags: "\f02c";
 @fa-var-tasks: "\f0ae";
 @fa-var-taxi: "\f1ba";
+@fa-var-television: "\f26c";
 @fa-var-tencent-weibo: "\f1d5";
 @fa-var-terminal: "\f120";
 @fa-var-text-height: "\f034";
@@ -524,6 +643,7 @@
 @fa-var-th: "\f00a";
 @fa-var-th-large: "\f009";
 @fa-var-th-list: "\f00b";
+@fa-var-themeisle: "\f2b2";
 @fa-var-thumb-tack: "\f08d";
 @fa-var-thumbs-down: "\f165";
 @fa-var-thumbs-o-down: "\f088";
@@ -540,6 +660,7 @@
 @fa-var-toggle-on: "\f205";
 @fa-var-toggle-right: "\f152";
 @fa-var-toggle-up: "\f151";
+@fa-var-trademark: "\f25c";
 @fa-var-train: "\f238";
 @fa-var-transgender: "\f224";
 @fa-var-transgender-alt: "\f225";
@@ -547,6 +668,7 @@
 @fa-var-trash-o: "\f014";
 @fa-var-tree: "\f1bb";
 @fa-var-trello: "\f181";
+@fa-var-tripadvisor: "\f262";
 @fa-var-trophy: "\f091";
 @fa-var-truck: "\f0d1";
 @fa-var-try: "\f195";
@@ -554,18 +676,21 @@
 @fa-var-tumblr: "\f173";
 @fa-var-tumblr-square: "\f174";
 @fa-var-turkish-lira: "\f195";
+@fa-var-tv: "\f26c";
 @fa-var-twitch: "\f1e8";
 @fa-var-twitter: "\f099";
 @fa-var-twitter-square: "\f081";
 @fa-var-umbrella: "\f0e9";
 @fa-var-underline: "\f0cd";
 @fa-var-undo: "\f0e2";
+@fa-var-universal-access: "\f29a";
 @fa-var-university: "\f19c";
 @fa-var-unlink: "\f127";
 @fa-var-unlock: "\f09c";
 @fa-var-unlock-alt: "\f13e";
 @fa-var-unsorted: "\f0dc";
 @fa-var-upload: "\f093";
+@fa-var-usb: "\f287";
 @fa-var-usd: "\f155";
 @fa-var-user: "\f007";
 @fa-var-user-md: "\f0f0";
@@ -577,10 +702,14 @@
 @fa-var-venus-double: "\f226";
 @fa-var-venus-mars: "\f228";
 @fa-var-viacoin: "\f237";
+@fa-var-viadeo: "\f2a9";
+@fa-var-viadeo-square: "\f2aa";
 @fa-var-video-camera: "\f03d";
+@fa-var-vimeo: "\f27d";
 @fa-var-vimeo-square: "\f194";
 @fa-var-vine: "\f1ca";
 @fa-var-vk: "\f189";
+@fa-var-volume-control-phone: "\f2a0";
 @fa-var-volume-down: "\f027";
 @fa-var-volume-off: "\f026";
 @fa-var-volume-up: "\f028";
@@ -590,16 +719,25 @@
 @fa-var-weixin: "\f1d7";
 @fa-var-whatsapp: "\f232";
 @fa-var-wheelchair: "\f193";
+@fa-var-wheelchair-alt: "\f29b";
 @fa-var-wifi: "\f1eb";
+@fa-var-wikipedia-w: "\f266";
 @fa-var-windows: "\f17a";
 @fa-var-won: "\f159";
 @fa-var-wordpress: "\f19a";
+@fa-var-wpbeginner: "\f297";
+@fa-var-wpforms: "\f298";
 @fa-var-wrench: "\f0ad";
 @fa-var-xing: "\f168";
 @fa-var-xing-square: "\f169";
+@fa-var-y-combinator: "\f23b";
+@fa-var-y-combinator-square: "\f1d4";
 @fa-var-yahoo: "\f19e";
+@fa-var-yc: "\f23b";
+@fa-var-yc-square: "\f1d4";
 @fa-var-yelp: "\f1e9";
 @fa-var-yen: "\f157";
+@fa-var-yoast: "\f2b1";
 @fa-var-youtube: "\f167";
 @fa-var-youtube-play: "\f16a";
 @fa-var-youtube-square: "\f166";
diff --git a/bower.json b/bower.json
index 38db952..619ca46 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,7 @@
     "tests"
   ],
   "dependencies": {
-    "font-awesome": "~4.3.0",
+    "font-awesome": "~4.6.3",
     "bootstrap": "~3.3.4"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
index 86cca8e..510d4c6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -28,7 +28,7 @@ gulp.task('postinstall', function (cb) {
  |
  */
 
-elixir.config.assetsDir = 'assets/';
+elixir.config.assetsPath = 'assets/';
 
 elixir(function (mix) {
     mix.copy('vendor/bower_components/bootstrap/less', 'assets/less/bootstrap');
diff --git a/package.json b/package.json
index fcd0a7b..73b3c54 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "gulp": "gulp",
     "watch": "gulp watch",
     "lint": "jsxhint --jsx-only .",
-    "postinstall": "gulp postinstall"
+    "postinstall": "gulp postinstall",
+    "validate": "npm ls"
   },
   "pre-commit": [
     "lint"
@@ -24,31 +25,32 @@
   },
   "private": true,
   "devDependencies": {
-    "babel-jest": "^5.3.0",
-    "bower": "^1.4.1",
-    "chai": "^3.0.0",
-    "del": "^1.2.0",
-    "gulp": "^3.8.8",
-    "jest-cli": "github:facebook/jest#0.5.x",
-    "jshint": "^2.8.0",
+    "babel-jest": "^13.0.0",
+    "bower": "^1.7.9",
+    "chai": "^3.5.0",
+    "del": "^2.2.1",
+    "gulp": "^3.9.1",
+    "jest-cli": "^13.0.0",
+    "jshint": "^2.9.2",
     "jsxhint": "^0.15.1",
-    "laravel-elixir": "*",
+    "laravel-elixir": "^5.0.0",
     "mocha": "^2.5.3",
-    "mocha-sinon": "^1.1.4",
+    "mocha-sinon": "^1.1.5",
     "mocha-traceur": "^2.1.0",
-    "precommit-hook": "^2.0.1",
-    "react-tools": "^0.13.3",
-    "sinon": "^1.15.4",
+    "precommit-hook": "^3.0.0",
+    "sinon": "^1.17.4",
     "sinon-chai": "^2.8.0",
-    "sinon-chrome": "^0.2.1",
-    "traceur": "0.0.111"
+    "sinon-chrome": "^1.1.2",
+    "traceur": "^0.0.111"
   },
   "dependencies": {
-    "bootstrap": "^3.3.4",
-    "classnames": "^2.1.2",
-    "jquery": "^2.1.3",
-    "moment": "^2.10.3",
-    "react": "^0.13.3"
+    "bootstrap": "^3.3.6",
+    "classnames": "^2.2.5",
+    "jquery": "^3.0.0",
+    "moment": "^2.13.0",
+    "react": "^15.1.0",
+    "react-addons-css-transition-group": "^15.1.0",
+    "react-dom": "^15.1.0"
   },
   "jshintConfig": {
     "asi": false,