diff --git a/UI/.idea/inspectionProfiles/Project_Default.xml b/UI/.idea/inspectionProfiles/Project_Default.xml
index cff2d2d6c..9d0540909 100644
--- a/UI/.idea/inspectionProfiles/Project_Default.xml
+++ b/UI/.idea/inspectionProfiles/Project_Default.xml
@@ -4,7 +4,7 @@
     <option name="myLocal" value="false" />
     <inspection_tool class="AssignmentResultUsedJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="AssignmentToForLoopParameterJS" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="AssignmentToFunctionParameterJS" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="AssignmentToFunctionParameterJS" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="BadExpressionStatementJS" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="BreakStatementJS" enabled="true" level="SERVER PROBLEM" enabled_by_default="true" />
     <inspection_tool class="BreakStatementWithLabelJS" enabled="true" level="ERROR" enabled_by_default="true" />
@@ -67,7 +67,6 @@
       <option name="m_limit" value="3" />
     </inspection_tool>
     <inspection_tool class="JSDuplicatedDeclaration" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="JSHint" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="JSLastCommaInArrayLiteral" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="JSPotentiallyInvalidUsageOfThis" enabled="true" level="SERVER PROBLEM" enabled_by_default="true" />
     <inspection_tool class="JSUndeclaredVariable" enabled="true" level="ERROR" enabled_by_default="true" />
diff --git a/UI/.idea/scopes/NzbDrone.xml b/UI/.idea/scopes/NzbDrone.xml
new file mode 100644
index 000000000..17c1c9c5e
--- /dev/null
+++ b/UI/.idea/scopes/NzbDrone.xml
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="NzbDrone" pattern="!file:JsLibraries//*" />
+</component>
\ No newline at end of file
diff --git a/UI/Calendar/UpcomingItemTemplate.html b/UI/Calendar/UpcomingItemTemplate.html
index 75f9a48b0..d92aa0ee3 100644
--- a/UI/Calendar/UpcomingItemTemplate.html
+++ b/UI/Calendar/UpcomingItemTemplate.html
@@ -6,5 +6,5 @@
     <a href="{{series.route}}">
         <h4>{{series.title}}</h4>
     </a>
-    <p>{{startTime}} {{date airDate}}<span class="pull-right">{{seasonNumber}}x{{paddedEpisodeNumber}}</span><br>{{episodeTitle}}</p>
+    <p>{{startTime}} {{ShortDate airDate}}<span class="pull-right">{{seasonNumber}}x{{paddedEpisodeNumber}}</span><br>{{episodeTitle}}</p>
 </div>
diff --git a/UI/Cells/FileSizeCell.js b/UI/Cells/FileSizeCell.js
index 3606379b6..58e58bae6 100644
--- a/UI/Cells/FileSizeCell.js
+++ b/UI/Cells/FileSizeCell.js
@@ -11,7 +11,7 @@ define(
 
             render: function () {
                 var size = this.model.get(this.column.get('name'));
-                this.$el.html(FormatHelpers.FileSizeHelper(size));
+                this.$el.html(FormatHelpers.Bytes(size));
                 this.delegateEvents();
                 return this;
             }
diff --git a/UI/Episode/Summary/ViewTemplate.html b/UI/Episode/Summary/ViewTemplate.html
index 54edd8eb9..992793110 100644
--- a/UI/Episode/Summary/ViewTemplate.html
+++ b/UI/Episode/Summary/ViewTemplate.html
@@ -15,7 +15,7 @@
             <tbody>
             <tr>
                 <td>{{path}}</td>
-                <td>{{fileSize size}}</td>
+                <td>{{Byte size}}</td>
                 <td>{{quality.quality.name}}</td>
             </tr>
             </tbody>
diff --git a/UI/Handlebars/Helpers/DateTime.js b/UI/Handlebars/Helpers/DateTime.js
index 466fac7e1..fb1e972e0 100644
--- a/UI/Handlebars/Helpers/DateTime.js
+++ b/UI/Handlebars/Helpers/DateTime.js
@@ -1,18 +1,17 @@
 'use strict';
 define(
     [
+        'handlebars',
         'sugar'
-    ], {
-        register: function (handlebars) {
-            handlebars.registerHelper('ShortDate', function (input) {
-                if (!input) {
-                    return '';
-                }
+    ], function (Handlebars) {
+        Handlebars.registerHelper('ShortDate', function (input) {
+            if (!input) {
+                return '';
+            }
 
-                var date = Date.create(input);
-                var result = '<span title="' + date.full() + '">' + date.short() + '</span>';
+            var date = Date.create(input);
+            var result = '<span title="' + date.full() + '">' + date.short() + '</span>';
 
-                return new handlebars.SafeString(result);
-            });
-        }
+            return new Handlebars.SafeString(result);
+        });
     });
diff --git a/UI/Handlebars/Helpers/Html.js b/UI/Handlebars/Helpers/Html.js
new file mode 100644
index 000000000..9265515ad
--- /dev/null
+++ b/UI/Handlebars/Helpers/Html.js
@@ -0,0 +1,10 @@
+'use strict';
+
+define(
+    [
+        'handlebars'
+    ], function (Handlebars) {
+        Handlebars.registerHelper('defaultImg', function () {
+            return new Handlebars.SafeString('onerror="this.src="/content/images/poster-dark.jpg";"');
+        });
+    });
diff --git a/UI/Handlebars/Helpers/Numbers.js b/UI/Handlebars/Helpers/Numbers.js
new file mode 100644
index 000000000..60cd2382e
--- /dev/null
+++ b/UI/Handlebars/Helpers/Numbers.js
@@ -0,0 +1,10 @@
+'use strict';
+define(
+    [
+        'handlebars',
+        'Shared/FormatHelpers'
+    ], function (Handlebars, FormatHelpers) {
+        Handlebars.registerHelper('Bytes', function (size) {
+            return new Handlebars.SafeString(FormatHelpers.Bytes(size));
+        });
+    });
diff --git a/UI/Handlebars/backbone.marionette.templates.js b/UI/Handlebars/backbone.marionette.templates.js
index 73a72794a..acf74916c 100644
--- a/UI/Handlebars/backbone.marionette.templates.js
+++ b/UI/Handlebars/backbone.marionette.templates.js
@@ -1,8 +1,11 @@
-'use strict';
-
+'use strict';
 define(
     [
-        'templates'
+        'templates',
+        'Handlebars/Helpers/DateTime',
+        'Handlebars/Helpers/Html',
+        'Handlebars/Helpers/Numbers',
+        'Handlebars/Debug'
     ], function (Templates) {
         return function () {
             this.get = function (templateId) {
diff --git a/UI/Handlebars/debug.js b/UI/Handlebars/debug.js
new file mode 100644
index 000000000..4d052a1a9
--- /dev/null
+++ b/UI/Handlebars/debug.js
@@ -0,0 +1,18 @@
+'use strict';
+define({
+    register: function (Handlebars) {
+        Handlebars.registerHelper("debug", function (optionalValue) {
+
+            console.group('Handlebar context');
+
+            console.log(this);
+            if (optionalValue) {
+
+                console.group('optional values');
+                console.log('optinal values');
+                console.groupEnd();
+            }
+            console.groupEnd();
+        });
+    }
+});
diff --git a/UI/Series/Details/SeasonLayout.js b/UI/Series/Details/SeasonLayout.js
index 6f3f3722d..8a67a1b41 100644
--- a/UI/Series/Details/SeasonLayout.js
+++ b/UI/Series/Details/SeasonLayout.js
@@ -1,5 +1,4 @@
-
-'use strict';
+'use strict';
 define(
     [
         'marionette',
diff --git a/UI/Series/Index/List/ItemTemplate.html b/UI/Series/Index/List/ItemTemplate.html
index a0d064731..ec1f981ea 100644
--- a/UI/Series/Index/List/ItemTemplate.html
+++ b/UI/Series/Index/List/ItemTemplate.html
@@ -31,7 +31,7 @@
                 <div class="span8">
                     {{#if isContinuing}}
                         {{#if nextAiring}}
-                            <span class="label">{{date nextAiring}}</span>
+                            <span class="label">{{ShortDate nextAiring}}</span>
                         {{/if}}
                         <span class="label label-info">Season {{seasonCount}}</span>
                     {{else}}
diff --git a/UI/Series/Index/Posters/ItemTemplate.html b/UI/Series/Index/Posters/ItemTemplate.html
index 76155782a..df56bab8e 100644
--- a/UI/Series/Index/Posters/ItemTemplate.html
+++ b/UI/Series/Index/Posters/ItemTemplate.html
@@ -22,7 +22,7 @@
                 <div class="labels">
                     {{#if isContinuing}}
                         {{#if nextAiring}}
-                            <span class="label label-inverse">{{date nextAiring}}</span>
+                            <span class="label label-inverse">{{ShortDate nextAiring}}</span>
                         {{/if}}
                         <span class="label label-info">Season {{seasonCount}}</span>
                     {{else}}
diff --git a/UI/Settings/Quality/Profile/QualityProfileView.js b/UI/Settings/Quality/Profile/QualityProfileView.js
index bd4d79db6..77cbe2d94 100644
--- a/UI/Settings/Quality/Profile/QualityProfileView.js
+++ b/UI/Settings/Quality/Profile/QualityProfileView.js
@@ -1,5 +1,4 @@
-
-'use strict';
+'use strict';
 
 define(
     [
diff --git a/UI/Shared/FormatHelpers.js b/UI/Shared/FormatHelpers.js
index 1c14f8e87..9f67ecd7f 100644
--- a/UI/Shared/FormatHelpers.js
+++ b/UI/Shared/FormatHelpers.js
@@ -4,7 +4,7 @@ define(
     [
         'sugar'
     ], {
-        FileSizeHelper: function (sourceSize) {
+        Bytes: function (sourceSize) {
             var size = Number(sourceSize);
             return size.bytes(1);
         },
diff --git a/UI/Shared/TemplateHelpers.js b/UI/Shared/TemplateHelpers.js
deleted file mode 100644
index c32297e2f..000000000
--- a/UI/Shared/TemplateHelpers.js
+++ /dev/null
@@ -1,47 +0,0 @@
-'use strict';
-
-define(
-    [
-        'handlebars',
-        'Shared/FormatHelpers'
-    ], function (Handlebars, FormatHelpers) {
-        Handlebars.registerHelper('partial', function (templateName) {
-            //TODO: We should be able to pass in the context, either an object or a property
-
-            var templateFunction = Marionette.TemplateCache.get(templateName);
-            return new Handlebars.SafeString(templateFunction(this));
-        });
-
-        Handlebars.registerHelper('debug', function (optionalValue) {
-            console.log('Current Context');
-            console.log('====================');
-            console.log(this);
-
-            if (optionalValue) {
-                console.log('Value');
-                console.log('====================');
-                console.log(optionalValue);
-            }
-        });
-
-        Handlebars.registerHelper('fileSize', function (size) {
-            return new Handlebars.SafeString(FormatHelpers.FileSizeHelper(size));
-        });
-
-        Handlebars.registerHelper('date', function (date) {
-            //TODO: show actual date in tooltip
-            if (!date) {
-                return '';
-            }
-
-            var shortDate = Date.create(date).short();
-            var formattedDate = FormatHelpers.DateHelper(date);
-            var result = '<span title="' + shortDate + '">' + formattedDate + '</span>';
-
-            return new Handlebars.SafeString(result);
-        });
-
-        Handlebars.registerHelper('defaultImg', function () {
-            return new Handlebars.SafeString('onerror="this.src="/content/images/poster-dark.jpg";"');
-        });
-    });
diff --git a/UI/app.js b/UI/app.js
index c20f10551..6ae34756c 100644
--- a/UI/app.js
+++ b/UI/app.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict';
 require.config({
 
     urlArgs: 'v=' + window.ServerStatus.version,
@@ -36,6 +36,14 @@ require.config({
             }
         },
 
+
+        signalR: {
+            deps:
+                [
+                    '$'
+                ]
+        },
+
         bootstrap: {
             deps:
                 [
@@ -57,7 +65,7 @@ require.config({
                 ]
         },
 
-        'underscore': {
+        underscore: {
             deps   :
                 [
                     '$'
@@ -90,30 +98,19 @@ require.config({
             deps:
                 [
                     'backbone',
-                    'handlebars',
                     'Handlebars/backbone.marionette.templates',
-                    'mixins/AsNamedView',
-
-                    'Handlebars/Helpers/DateTime'
+                    'mixins/AsNamedView'
                 ],
 
             exports: 'Marionette',
-            init   : function (Backbone, Handlebars, TemplateMixin, AsNamedView, DateTimeHelpers) {
+            init   : function (Backbone, TemplateMixin, AsNamedView) {
                 TemplateMixin.call(Marionette.TemplateCache);
                 AsNamedView.call(Marionette.ItemView.prototype);
-                DateTimeHelpers.register(Handlebars);
 
             }
         },
 
 
-        signalR: {
-            deps:
-                [
-                    '$'
-                ]
-        },
-
         'backbone.pageable': {
             deps:
                 [