diff --git a/gulp/jshint.js b/gulp/jshint.js
index 98e038b0f..b144335d3 100644
--- a/gulp/jshint.js
+++ b/gulp/jshint.js
@@ -11,8 +11,8 @@ gulp.task('jshint', function () {
         .pipe(jshint({
             '-W030': false,
             '-W064': false,
-            '-W097': false,
-            '-W100': false,
+            '-W097': false, //Use the function form of “use strict”
+            '-W100': false, //Silently deleted characters (in locales)
             'undef': true,
             'globals': {
                 'require': true,
@@ -23,4 +23,4 @@ gulp.task('jshint', function () {
             }
         }))
         .pipe(jshint.reporter(stylish));
-});
\ No newline at end of file
+});
diff --git a/src/UI/Activity/ActivityLayoutTemplate.hbs b/src/UI/Activity/ActivityLayoutTemplate.hbs
index c10fa733c..c9c08ecf7 100644
--- a/src/UI/Activity/ActivityLayoutTemplate.hbs
+++ b/src/UI/Activity/ActivityLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <li><a href="#queue" class="x-queue-tab no-router">Queue</a></li>
     <li><a href="#history" class="x-history-tab no-router">History</a></li>
     <li><a href="#blacklist" class="x-blacklist-tab no-router">Blacklist</a></li>
diff --git a/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs b/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs
index 7f6def076..a3d14fc32 100644
--- a/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs
+++ b/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-toolbar"/>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="col-md-12 table-responsive">
         <div id="x-blacklist"/>
diff --git a/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs b/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs
index 455bcf0c4..6a038fd76 100644
--- a/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs
+++ b/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="history-detail-modal">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/src/UI/Activity/History/HistoryLayoutTemplate.hbs b/src/UI/Activity/History/HistoryLayoutTemplate.hbs
index d9a65aa9e..d5e3d1bce 100644
--- a/src/UI/Activity/History/HistoryLayoutTemplate.hbs
+++ b/src/UI/Activity/History/HistoryLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-history-toolbar"/>
+<div id="x-history-toolbar"/>
 <div class="row">
     <div class="col-md-12 table-responsive">
         <div id="x-history"/>
diff --git a/src/UI/Activity/Queue/QueueLayoutTemplate.hbs b/src/UI/Activity/Queue/QueueLayoutTemplate.hbs
index 4af587514..8b8fd8599 100644
--- a/src/UI/Activity/Queue/QueueLayoutTemplate.hbs
+++ b/src/UI/Activity/Queue/QueueLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12 table-responsive">
         <div id="x-queue"/>
     </div>
diff --git a/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs b/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs
index 9ef1ced00..477fdd028 100644
--- a/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs
+++ b/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs
@@ -1,4 +1,4 @@
-{{#each statusMessages}}
+{{#each statusMessages}}
     {{title}}
     <ul>
         {{#each messages}}
diff --git a/src/UI/AddSeries/AddSeriesLayoutTemplate.hbs b/src/UI/AddSeries/AddSeriesLayoutTemplate.hbs
index 401847f7f..9d68d05ff 100644
--- a/src/UI/AddSeries/AddSeriesLayoutTemplate.hbs
+++ b/src/UI/AddSeries/AddSeriesLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12">
         <div class="btn-group add-series-btn-group btn-group-lg btn-block">
             <button type="button" class="btn btn-default col-md-10 col-xs-8 add-series-import-btn x-import">
diff --git a/src/UI/AddSeries/AddSeriesViewTemplate.hbs b/src/UI/AddSeries/AddSeriesViewTemplate.hbs
index 829527ddc..a7c068a76 100644
--- a/src/UI/AddSeries/AddSeriesViewTemplate.hbs
+++ b/src/UI/AddSeries/AddSeriesViewTemplate.hbs
@@ -1,4 +1,4 @@
-{{#if folder.path}}
+{{#if folder.path}}
 <div class="unmapped-folder-path">
     <div class="col-md-12">
         {{folder.path}}
diff --git a/src/UI/AddSeries/EmptyViewTemplate.hbs b/src/UI/AddSeries/EmptyViewTemplate.hbs
index c6bcb0343..60346f0c0 100644
--- a/src/UI/AddSeries/EmptyViewTemplate.hbs
+++ b/src/UI/AddSeries/EmptyViewTemplate.hbs
@@ -1,3 +1,3 @@
-<div class="text-center hint col-md-12">
+<div class="text-center hint col-md-12">
     <span>You can also search by tvdbid using the tvdb: prefixes.</span>
 </div>
diff --git a/src/UI/AddSeries/ErrorViewTemplate.hbs b/src/UI/AddSeries/ErrorViewTemplate.hbs
index 862d5e058..163779c26 100644
--- a/src/UI/AddSeries/ErrorViewTemplate.hbs
+++ b/src/UI/AddSeries/ErrorViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="text-center col-md-12">
+<div class="text-center col-md-12">
     <h3>
         There was an error searching for '{{term}}'.
     </h3>
diff --git a/src/UI/AddSeries/Existing/AddExistingSeriesCollectionViewTemplate.hbs b/src/UI/AddSeries/Existing/AddExistingSeriesCollectionViewTemplate.hbs
index ca693b1f6..6ac537804 100644
--- a/src/UI/AddSeries/Existing/AddExistingSeriesCollectionViewTemplate.hbs
+++ b/src/UI/AddSeries/Existing/AddExistingSeriesCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="x-existing-folders">
+<div class="x-existing-folders">
     <div class="loading-folders x-loading-folders">
         Loading search results from trakt for your series, this may take a few minutes.
     </div>
diff --git a/src/UI/AddSeries/NotFoundViewTemplate.hbs b/src/UI/AddSeries/NotFoundViewTemplate.hbs
index b4b74f16d..f203260e2 100644
--- a/src/UI/AddSeries/NotFoundViewTemplate.hbs
+++ b/src/UI/AddSeries/NotFoundViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="text-center col-md-12">
+<div class="text-center col-md-12">
     <h3>
         Sorry. We couldn't find any series matching '{{term}}'
     </h3>
diff --git a/src/UI/AddSeries/RootFolders/RootFolderCollectionViewTemplate.hbs b/src/UI/AddSeries/RootFolders/RootFolderCollectionViewTemplate.hbs
index 817e9d3d7..70755bbca 100644
--- a/src/UI/AddSeries/RootFolders/RootFolderCollectionViewTemplate.hbs
+++ b/src/UI/AddSeries/RootFolders/RootFolderCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<table class="table table-hover">
+<table class="table table-hover">
     <thead>
         <tr>
             <th class="col-md-10 ">
diff --git a/src/UI/AddSeries/RootFolders/RootFolderItemViewTemplate.hbs b/src/UI/AddSeries/RootFolders/RootFolderItemViewTemplate.hbs
index a04d9b288..c52109a6d 100644
--- a/src/UI/AddSeries/RootFolders/RootFolderItemViewTemplate.hbs
+++ b/src/UI/AddSeries/RootFolders/RootFolderItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<td class="col-md-10 x-folder folder-path">
+<td class="col-md-10 x-folder folder-path">
    {{path}}
 </td>
 <td class="col-md-3 x-folder folder-free-space">
diff --git a/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.hbs b/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.hbs
index d50f68168..a125e7259 100644
--- a/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.hbs
+++ b/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Select Folder</h3>
diff --git a/src/UI/AddSeries/RootFolders/RootFolderSelectionPartial.hbs b/src/UI/AddSeries/RootFolders/RootFolderSelectionPartial.hbs
index 2f12a3167..56729b0dd 100644
--- a/src/UI/AddSeries/RootFolders/RootFolderSelectionPartial.hbs
+++ b/src/UI/AddSeries/RootFolders/RootFolderSelectionPartial.hbs
@@ -1,4 +1,4 @@
-<select class="col-md-4 form-control x-root-folder" validation-name="RootFolderPath">
+<select class="col-md-4 form-control x-root-folder" validation-name="RootFolderPath">
     {{#if this}}
     {{#each this}}
     <option value="{{id}}">{{path}}</option>
diff --git a/src/UI/AddSeries/SearchResultViewTemplate.hbs b/src/UI/AddSeries/SearchResultViewTemplate.hbs
index d84dabac2..2dd639bfe 100644
--- a/src/UI/AddSeries/SearchResultViewTemplate.hbs
+++ b/src/UI/AddSeries/SearchResultViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="search-item {{#unless isExisting}}search-item-new{{/unless}}">
+<div class="search-item {{#unless isExisting}}search-item-new{{/unless}}">
     <div class="row">
         <div class="col-md-2">
             <a href="{{tvdbUrl}}" target="_blank">
diff --git a/src/UI/AddSeries/SeriesTypeSelectionPartial.hbs b/src/UI/AddSeries/SeriesTypeSelectionPartial.hbs
index 8cfdb7344..ec2990640 100644
--- a/src/UI/AddSeries/SeriesTypeSelectionPartial.hbs
+++ b/src/UI/AddSeries/SeriesTypeSelectionPartial.hbs
@@ -1,4 +1,4 @@
-<select class="form-control col-md-2 x-series-type" name="seriesType">
+<select class="form-control col-md-2 x-series-type" name="seriesType">
     <option value="standard">Standard</option>
     <option value="daily">Daily</option>
     <option value="anime">Anime</option>
diff --git a/src/UI/AddSeries/StartingSeasonSelectionPartial.hbs b/src/UI/AddSeries/StartingSeasonSelectionPartial.hbs
index 4d0b5b608..e5623e33a 100644
--- a/src/UI/AddSeries/StartingSeasonSelectionPartial.hbs
+++ b/src/UI/AddSeries/StartingSeasonSelectionPartial.hbs
@@ -1,4 +1,4 @@
-<select class="form-control col-md-2 starting-season x-starting-season">
+<select class="form-control col-md-2 starting-season x-starting-season">
 
 
     {{#each this}}
diff --git a/src/UI/Calendar/CalendarLayoutTemplate.hbs b/src/UI/Calendar/CalendarLayoutTemplate.hbs
index ef008eee0..b9f3d50a2 100644
--- a/src/UI/Calendar/CalendarLayoutTemplate.hbs
+++ b/src/UI/Calendar/CalendarLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-3 hidden-xs">
         <div class="pull-left">
             <h4>Upcoming</h4>
diff --git a/src/UI/Calendar/UpcomingItemViewTemplate.hbs b/src/UI/Calendar/UpcomingItemViewTemplate.hbs
index dd29530f6..eae2491bd 100644
--- a/src/UI/Calendar/UpcomingItemViewTemplate.hbs
+++ b/src/UI/Calendar/UpcomingItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="event">
+<div class="event">
     <div class="date {{StatusLevel}}">
         <h1>{{Day airDateUtc}}</h1>
         <h4>{{Month airDateUtc}}</h4>
diff --git a/src/UI/Cells/ApprovalStatusCellTemplate.hbs b/src/UI/Cells/ApprovalStatusCellTemplate.hbs
index 80a9ae682..d039a1714 100644
--- a/src/UI/Cells/ApprovalStatusCellTemplate.hbs
+++ b/src/UI/Cells/ApprovalStatusCellTemplate.hbs
@@ -1,4 +1,4 @@
-<ul>
+<ul>
     {{#each this}}
     <li>{{this}}</li>
     {{/each}}
diff --git a/src/UI/Cells/Edit/QualityCellEditorTemplate.hbs b/src/UI/Cells/Edit/QualityCellEditorTemplate.hbs
index 4916cf284..b5fe3afec 100644
--- a/src/UI/Cells/Edit/QualityCellEditorTemplate.hbs
+++ b/src/UI/Cells/Edit/QualityCellEditorTemplate.hbs
@@ -1,4 +1,4 @@
-{{#each items}}
+{{#each items}}
     {{#with quality}}
         {{#if selected}}
             <option value="{{id}}" selected="selected">{{name}}</option>
diff --git a/src/UI/Cells/EpisodeProgressCellTemplate.hbs b/src/UI/Cells/EpisodeProgressCellTemplate.hbs
index 868dc3636..98c06f4c0 100644
--- a/src/UI/Cells/EpisodeProgressCellTemplate.hbs
+++ b/src/UI/Cells/EpisodeProgressCellTemplate.hbs
@@ -1 +1 @@
-{{> EpisodeProgressPartial }}
\ No newline at end of file
+{{> EpisodeProgressPartial }}
\ No newline at end of file
diff --git a/src/UI/Cells/QualityCellTemplate.hbs b/src/UI/Cells/QualityCellTemplate.hbs
index ede7dfe52..6625ade9b 100644
--- a/src/UI/Cells/QualityCellTemplate.hbs
+++ b/src/UI/Cells/QualityCellTemplate.hbs
@@ -1,4 +1,4 @@
-{{#if_gt proper compare="1"}}
+{{#if_gt proper compare="1"}}
     <span class="badge badge-info" title="PROPER">{{quality.name}}</span>
 {{else}}
     <span class="badge">{{quality.name}}</span>
diff --git a/src/UI/Cells/SeriesTitleTemplate.hbs b/src/UI/Cells/SeriesTitleTemplate.hbs
index b4786d5b1..99205b00a 100644
--- a/src/UI/Cells/SeriesTitleTemplate.hbs
+++ b/src/UI/Cells/SeriesTitleTemplate.hbs
@@ -1 +1 @@
-<a href="{{route}}">{{title}}</a>
+<a href="{{route}}">{{title}}</a>
diff --git a/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.hbs b/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.hbs
index 7f2818c53..fc3eb57fb 100644
--- a/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.hbs
+++ b/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.hbs
@@ -1 +1 @@
-<div class="activity-table table-responsive"></div>
\ No newline at end of file
+<div class="activity-table table-responsive"></div>
\ No newline at end of file
diff --git a/src/UI/Episode/Activity/NoActivityViewTemplate.hbs b/src/UI/Episode/Activity/NoActivityViewTemplate.hbs
index ea9d127af..6f3b107be 100644
--- a/src/UI/Episode/Activity/NoActivityViewTemplate.hbs
+++ b/src/UI/Episode/Activity/NoActivityViewTemplate.hbs
@@ -1,3 +1,3 @@
-<p class="text-warning">
+<p class="text-warning">
     No activity for this episode.
 </p>
\ No newline at end of file
diff --git a/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs b/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs
index 2e75d35f2..42b6b31da 100644
--- a/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs
+++ b/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="episode-detail-modal">
         <div class="modal-header">
             <span class="hidden-series-title x-series-title">{{series.title}}</span>
diff --git a/src/UI/Episode/Search/ButtonsViewTemplate.hbs b/src/UI/Episode/Search/ButtonsViewTemplate.hbs
index 698e75430..af2b3b7a6 100644
--- a/src/UI/Episode/Search/ButtonsViewTemplate.hbs
+++ b/src/UI/Episode/Search/ButtonsViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="search-buttons">
+<div class="search-buttons">
     <button class="btn btn-lg btn-block x-search-auto"><i class="icon-rocket"/> Automatic Search</button>
     <button class="btn btn-lg btn-block btn-primary x-search-manual"><i class="icon-user"/> Manual Search</button>
 </div>
\ No newline at end of file
diff --git a/src/UI/Episode/Search/EpisodeSearchLayoutTemplate.hbs b/src/UI/Episode/Search/EpisodeSearchLayoutTemplate.hbs
index a0db76df8..879e0b356 100644
--- a/src/UI/Episode/Search/EpisodeSearchLayoutTemplate.hbs
+++ b/src/UI/Episode/Search/EpisodeSearchLayoutTemplate.hbs
@@ -1 +1 @@
-<div id="episode-search-region"></div>
\ No newline at end of file
+<div id="episode-search-region"></div>
\ No newline at end of file
diff --git a/src/UI/Episode/Search/ManualLayoutTemplate.hbs b/src/UI/Episode/Search/ManualLayoutTemplate.hbs
index 9238c1959..1797eb289 100644
--- a/src/UI/Episode/Search/ManualLayoutTemplate.hbs
+++ b/src/UI/Episode/Search/ManualLayoutTemplate.hbs
@@ -1,2 +1,2 @@
-<div id="episode-release-grid" class="table-responsive"></div>
+<div id="episode-release-grid" class="table-responsive"></div>
 <button class="btn x-search-back">Back</button>
\ No newline at end of file
diff --git a/src/UI/Episode/Search/NoResultsViewTemplate.hbs b/src/UI/Episode/Search/NoResultsViewTemplate.hbs
index 87201af05..7904e5520 100644
--- a/src/UI/Episode/Search/NoResultsViewTemplate.hbs
+++ b/src/UI/Episode/Search/NoResultsViewTemplate.hbs
@@ -1 +1 @@
-<div>No results found</div>
\ No newline at end of file
+<div>No results found</div>
\ No newline at end of file
diff --git a/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.hbs b/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.hbs
index 28367800e..9cfeca2da 100644
--- a/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.hbs
+++ b/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="episode-info">
+<div class="episode-info">
     {{#with series}}
         {{profile profileId}}
         <span class="label label-info">{{network}}</span>
diff --git a/src/UI/Episode/Summary/NoFileViewTemplate.hbs b/src/UI/Episode/Summary/NoFileViewTemplate.hbs
index 62acb5499..0f923737d 100644
--- a/src/UI/Episode/Summary/NoFileViewTemplate.hbs
+++ b/src/UI/Episode/Summary/NoFileViewTemplate.hbs
@@ -1,3 +1,3 @@
-<p class="text-warning">
+<p class="text-warning">
     No file available for this episode.
 </p>
\ No newline at end of file
diff --git a/src/UI/Hotkeys/HotkeysViewTemplate.hbs b/src/UI/Hotkeys/HotkeysViewTemplate.hbs
index 45f4ae1a7..0ae6566e3 100644
--- a/src/UI/Hotkeys/HotkeysViewTemplate.hbs
+++ b/src/UI/Hotkeys/HotkeysViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Keyboard Shortcuts</h3>
diff --git a/src/UI/Navbar/NavbarLayoutTemplate.hbs b/src/UI/Navbar/NavbarLayoutTemplate.hbs
index 7c39aaf5a..14e3df8af 100644
--- a/src/UI/Navbar/NavbarLayoutTemplate.hbs
+++ b/src/UI/Navbar/NavbarLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<!-- Static navbar -->
+<!-- Static navbar -->
 <div class="navbar navbar-nzbdrone" role="navigation">
     <div class="container-fluid">
         <div class="navbar-header">
diff --git a/src/UI/Profile/ProfileSelectionPartial.hbs b/src/UI/Profile/ProfileSelectionPartial.hbs
index 6d979b88a..5526b361d 100644
--- a/src/UI/Profile/ProfileSelectionPartial.hbs
+++ b/src/UI/Profile/ProfileSelectionPartial.hbs
@@ -1,4 +1,4 @@
-<select class="col-md-2 form-control x-profile">
+<select class="col-md-2 form-control x-profile">
     {{#each this}}
     <option value="{{id}}">{{name}}</option>
     {{/each}}
diff --git a/src/UI/Release/ReleaseLayoutTemplate.hbs b/src/UI/Release/ReleaseLayoutTemplate.hbs
index 6df720d21..429260d74 100644
--- a/src/UI/Release/ReleaseLayoutTemplate.hbs
+++ b/src/UI/Release/ReleaseLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-toolbar"/>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="col-md-12">
         <div id="x-grid"/>
diff --git a/src/UI/Rename/RenamePreviewEmptyCollectionViewTemplate.hbs b/src/UI/Rename/RenamePreviewEmptyCollectionViewTemplate.hbs
index 1975f8a6a..eeb0e3d0c 100644
--- a/src/UI/Rename/RenamePreviewEmptyCollectionViewTemplate.hbs
+++ b/src/UI/Rename/RenamePreviewEmptyCollectionViewTemplate.hbs
@@ -1,3 +1,3 @@
-<div class="alert alert-success">
+<div class="alert alert-success">
     Success! My work is done, no files to rename.
 </div>
\ No newline at end of file
diff --git a/src/UI/Rename/RenamePreviewFormatViewTemplate.hbs b/src/UI/Rename/RenamePreviewFormatViewTemplate.hbs
index 560ded964..27340b092 100644
--- a/src/UI/Rename/RenamePreviewFormatViewTemplate.hbs
+++ b/src/UI/Rename/RenamePreviewFormatViewTemplate.hbs
@@ -1,4 +1,4 @@
-<span class="file-name-format">
+<span class="file-name-format">
 {{#if rename}}
     {{format}}
 {{/if}}
diff --git a/src/UI/Rename/RenamePreviewItemViewTemplate.hbs b/src/UI/Rename/RenamePreviewItemViewTemplate.hbs
index f0fe50702..789c839c6 100644
--- a/src/UI/Rename/RenamePreviewItemViewTemplate.hbs
+++ b/src/UI/Rename/RenamePreviewItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="rename-preview-item">
+<div class="rename-preview-item">
     <div class="row">
         <div class="rename-checkbox col-md-1">
             <label class="checkbox-button" title="Rename File">
diff --git a/src/UI/Rename/RenamePreviewLayoutTemplate.hbs b/src/UI/Rename/RenamePreviewLayoutTemplate.hbs
index 066ccce79..63fdbb009 100644
--- a/src/UI/Rename/RenamePreviewLayoutTemplate.hbs
+++ b/src/UI/Rename/RenamePreviewLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="rename-preview-modal">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/src/UI/SeasonPass/SeasonPassLayoutTemplate.hbs b/src/UI/SeasonPass/SeasonPassLayoutTemplate.hbs
index d7a86c6df..3365f018d 100644
--- a/src/UI/SeasonPass/SeasonPassLayoutTemplate.hbs
+++ b/src/UI/SeasonPass/SeasonPassLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-toolbar"></div>
+<div id="x-toolbar"></div>
 
 <div class="row">
     <div class="col-md-12">
diff --git a/src/UI/SeasonPass/SeriesLayoutTemplate.hbs b/src/UI/SeasonPass/SeriesLayoutTemplate.hbs
index 6ccbc1036..1215d36f1 100644
--- a/src/UI/SeasonPass/SeriesLayoutTemplate.hbs
+++ b/src/UI/SeasonPass/SeriesLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="seasonpass-series">
+<div class="seasonpass-series">
     <div class="row">
         <div class="col-md-12">
             <i class="icon-chevron-right x-expander expander pull-left"/>
diff --git a/src/UI/Series/Delete/DeleteSeriesTemplate.hbs b/src/UI/Series/Delete/DeleteSeriesTemplate.hbs
index 50c27bd3e..d856df05b 100644
--- a/src/UI/Series/Delete/DeleteSeriesTemplate.hbs
+++ b/src/UI/Series/Delete/DeleteSeriesTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Delete {{title}}</h3>
diff --git a/src/UI/Series/Details/InfoViewTemplate.hbs b/src/UI/Series/Details/InfoViewTemplate.hbs
index f49e3c7f1..7b37e2a8e 100644
--- a/src/UI/Series/Details/InfoViewTemplate.hbs
+++ b/src/UI/Series/Details/InfoViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-9">
         {{profile profileId}}
         <span class="label label-info">{{network}}</span>
diff --git a/src/UI/Series/Details/SeasonLayoutTemplate.hbs b/src/UI/Series/Details/SeasonLayoutTemplate.hbs
index 69a9f1a9c..10117f0f2 100644
--- a/src/UI/Series/Details/SeasonLayoutTemplate.hbs
+++ b/src/UI/Series/Details/SeasonLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="series-season" id="season-{{seasonNumber}}">
+<div class="series-season" id="season-{{seasonNumber}}">
     <h2>
         <i class="x-season-monitored season-monitored clickable" title="Toggle season monitored status"/>
 
diff --git a/src/UI/Series/Details/SeriesDetailsTemplate.hbs b/src/UI/Series/Details/SeriesDetailsTemplate.hbs
index 72150d89c..1ae5f50a1 100644
--- a/src/UI/Series/Details/SeriesDetailsTemplate.hbs
+++ b/src/UI/Series/Details/SeriesDetailsTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row series-page-header">
+<div class="row series-page-header">
     <div class="col-md-12">
         <div class="row">
             <h1>
diff --git a/src/UI/Series/Edit/EditSeriesViewTemplate.hbs b/src/UI/Series/Edit/EditSeriesViewTemplate.hbs
index a514d1024..c6ed5eeaa 100644
--- a/src/UI/Series/Edit/EditSeriesViewTemplate.hbs
+++ b/src/UI/Series/Edit/EditSeriesViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>{{title}}</h3>
diff --git a/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.hbs b/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.hbs
index 9cdabda51..38f508895 100644
--- a/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.hbs
+++ b/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Organize of Selected Series</h3>
diff --git a/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.hbs b/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.hbs
index 8d30bb969..630ec279f 100644
--- a/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.hbs
+++ b/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="series-editor-footer">
+<div class="series-editor-footer">
     <div class="row">
         <div class="form-group col-md-2">
             <label>Monitored</label>
diff --git a/src/UI/Series/Editor/SeriesEditorLayoutTemplate.hbs b/src/UI/Series/Editor/SeriesEditorLayoutTemplate.hbs
index 8ecc8cf5d..1d0519894 100644
--- a/src/UI/Series/Editor/SeriesEditorLayoutTemplate.hbs
+++ b/src/UI/Series/Editor/SeriesEditorLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-toolbar"></div>
+<div id="x-toolbar"></div>
 
 <div class="row">
     <div class="col-md-12">
diff --git a/src/UI/Series/Index/EmptyTemplate.hbs b/src/UI/Series/Index/EmptyTemplate.hbs
index 7c7849d9c..7b40d50d2 100644
--- a/src/UI/Series/Index/EmptyTemplate.hbs
+++ b/src/UI/Series/Index/EmptyTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="no-series">
+<div class="no-series">
     <div class="row">
         <div class="well col-md-12">
             <i class="icon-comment"/>
diff --git a/src/UI/Series/Index/EpisodeProgressPartial.hbs b/src/UI/Series/Index/EpisodeProgressPartial.hbs
index 3f1072eee..db5c49a2b 100644
--- a/src/UI/Series/Index/EpisodeProgressPartial.hbs
+++ b/src/UI/Series/Index/EpisodeProgressPartial.hbs
@@ -1,4 +1,4 @@
-<div class="progress episode-progress">
+<div class="progress episode-progress">
     <span class="progressbar-back-text">{{episodeFileCount}} / {{episodeCount}}</span>
     <div class="progress-bar {{EpisodeProgressClass}} episode-progress" style="width:{{percentOfEpisodes}}%"><span class="progressbar-front-text">{{episodeFileCount}} / {{episodeCount}}</span></div>
 </div>
\ No newline at end of file
diff --git a/src/UI/Series/Index/FooterViewTemplate.hbs b/src/UI/Series/Index/FooterViewTemplate.hbs
index bcf1ab35c..1b45fa747 100644
--- a/src/UI/Series/Index/FooterViewTemplate.hbs
+++ b/src/UI/Series/Index/FooterViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="series-legend legend col-xs-6 col-sm-4">
         <ul class='legend-labels'>
             <li><span class="progress-bar"></span>Continuing (All episodes downloaded)</li>
diff --git a/src/UI/Series/Index/Overview/SeriesOverviewCollectionViewTemplate.hbs b/src/UI/Series/Index/Overview/SeriesOverviewCollectionViewTemplate.hbs
index 831ad1fea..046bb3348 100644
--- a/src/UI/Series/Index/Overview/SeriesOverviewCollectionViewTemplate.hbs
+++ b/src/UI/Series/Index/Overview/SeriesOverviewCollectionViewTemplate.hbs
@@ -1 +1 @@
-<div id="x-series-list"/>
+<div id="x-series-list"/>
diff --git a/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.hbs b/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.hbs
index 4ed48d45b..8547302e9 100644
--- a/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.hbs
+++ b/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="series-item">
+<div class="series-item">
     <div class="row">
         <div class="col-md-2 col-xs-3">
             <a href="{{route}}">
diff --git a/src/UI/Series/Index/Posters/SeriesPostersCollectionViewTemplate.hbs b/src/UI/Series/Index/Posters/SeriesPostersCollectionViewTemplate.hbs
index 1e2dac8b4..11b8e8ac7 100644
--- a/src/UI/Series/Index/Posters/SeriesPostersCollectionViewTemplate.hbs
+++ b/src/UI/Series/Index/Posters/SeriesPostersCollectionViewTemplate.hbs
@@ -1 +1 @@
-<ul id="x-series-posters" class="series-posters"></ul>
\ No newline at end of file
+<ul id="x-series-posters" class="series-posters"></ul>
\ No newline at end of file
diff --git a/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.hbs b/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.hbs
index 6cff7b9e0..883f26f31 100644
--- a/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.hbs
+++ b/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="series-posters-item">
+<div class="series-posters-item">
     <div class="center">
         <div class="series-poster-container x-series-poster">
             <div class="series-controls x-series-controls">
diff --git a/src/UI/Series/Index/SeriesIndexLayoutTemplate.hbs b/src/UI/Series/Index/SeriesIndexLayoutTemplate.hbs
index 12426b7d1..932413b57 100644
--- a/src/UI/Series/Index/SeriesIndexLayoutTemplate.hbs
+++ b/src/UI/Series/Index/SeriesIndexLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="toolbars">
+<div class="toolbars">
     <div id="x-toolbar"></div>
     <div id="x-toolbar2"></div>
 </div>
diff --git a/src/UI/Settings/DownloadClient/Add/DownloadClientAddCollectionViewTemplate.hbs b/src/UI/Settings/DownloadClient/Add/DownloadClientAddCollectionViewTemplate.hbs
index fb30f0504..16e74dbea 100644
--- a/src/UI/Settings/DownloadClient/Add/DownloadClientAddCollectionViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Add/DownloadClientAddCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Add Download Client</h3>
diff --git a/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs b/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
index a2c0295be..0b50d028e 100644
--- a/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="add-thingy">
+<div class="add-thingy">
     <div>
         {{implementation}}
     </div>
diff --git a/src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate.hbs b/src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate.hbs
index 6493c9b61..b1af0328d 100644
--- a/src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Delete Download Client</h3>
diff --git a/src/UI/Settings/DownloadClient/DownloadClientCollectionViewTemplate.hbs b/src/UI/Settings/DownloadClient/DownloadClientCollectionViewTemplate.hbs
index 18f580141..c298685da 100644
--- a/src/UI/Settings/DownloadClient/DownloadClientCollectionViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/DownloadClientCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Download Clients</legend>
     <div class="row">
         <div class="col-md-12">
diff --git a/src/UI/Settings/DownloadClient/DownloadClientItemViewTemplate.hbs b/src/UI/Settings/DownloadClient/DownloadClientItemViewTemplate.hbs
index 9bd854c95..ca9fb65f9 100644
--- a/src/UI/Settings/DownloadClient/DownloadClientItemViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/DownloadClientItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="download-client-item thingy">
+<div class="download-client-item thingy">
     <div>
         <h3>{{name}}</h3>
     </div>
diff --git a/src/UI/Settings/DownloadClient/DownloadClientLayoutTemplate.hbs b/src/UI/Settings/DownloadClient/DownloadClientLayoutTemplate.hbs
index 7f3d4ffca..ab039d682 100644
--- a/src/UI/Settings/DownloadClient/DownloadClientLayoutTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/DownloadClientLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-download-clients-region"></div>
+<div id="x-download-clients-region"></div>
 <div class="form-horizontal">
     <div id="x-download-handling-region"></div>
     <div id="x-dronefactory-region"></div>
diff --git a/src/UI/Settings/DownloadClient/DownloadHandling/DownloadHandlingViewTemplate.hbs b/src/UI/Settings/DownloadClient/DownloadHandling/DownloadHandlingViewTemplate.hbs
index 62315a562..bf2466d7c 100644
--- a/src/UI/Settings/DownloadClient/DownloadHandling/DownloadHandlingViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/DownloadHandling/DownloadHandlingViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Completed Download Handling</legend>
     <div class="form-group">
         <label class="col-sm-3 control-label">Enable</label>
diff --git a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs
index 236f993bf..59d55f777 100644
--- a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset class="advanced-setting">
+<fieldset class="advanced-setting">
     <legend>Drone Factory Options</legend>
     <div class="form-group">
         <label class="col-sm-3 control-label">Drone Factory</label>
diff --git a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.hbs b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.hbs
index e277c2c4d..3295f4777 100644
--- a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         {{#if id}}
diff --git a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingCollectionViewTemplate.hbs b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingCollectionViewTemplate.hbs
index ec332b59f..2ef5c804b 100644
--- a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingCollectionViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset class="advanced-setting">
+<fieldset class="advanced-setting">
     <legend>Remote Path Mappings</legend>
 
     <div class="col-md-12">
diff --git a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate.hbs b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate.hbs
index ad288fbf6..0a20b26b7 100644
--- a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Delete Mapping</h3>
diff --git a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate.hbs b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate.hbs
index 8b359f88f..a3a6406e6 100644
--- a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         {{#if id}}
diff --git a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingItemViewTemplate.hbs b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingItemViewTemplate.hbs
index 2796de5b1..69508cdec 100644
--- a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingItemViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-    <div class="col-sm-2">
+    <div class="col-sm-2">
         {{host}}
     </div>
     <div class="col-sm-5">
diff --git a/src/UI/Settings/General/GeneralViewTemplate.hbs b/src/UI/Settings/General/GeneralViewTemplate.hbs
index 266de9ce5..3e9a215c0 100644
--- a/src/UI/Settings/General/GeneralViewTemplate.hbs
+++ b/src/UI/Settings/General/GeneralViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="form-horizontal">
+<div class="form-horizontal">
     <fieldset>
         <legend>Start-Up</legend>
 
diff --git a/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs b/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
index ea5a9ccc6..8e51fc94c 100644
--- a/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Add Indexer</h3>
diff --git a/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs b/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
index a2c0295be..0b50d028e 100644
--- a/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="add-thingy">
+<div class="add-thingy">
     <div>
         {{implementation}}
     </div>
diff --git a/src/UI/Settings/Indexers/Delete/IndexerDeleteViewTemplate.hbs b/src/UI/Settings/Indexers/Delete/IndexerDeleteViewTemplate.hbs
index 354d79b25..52ec3589f 100644
--- a/src/UI/Settings/Indexers/Delete/IndexerDeleteViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Delete/IndexerDeleteViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Delete Indexer</h3>
diff --git a/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.hbs b/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.hbs
index c9a84f266..826969973 100644
--- a/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" aria-hidden="true" data-dismiss="modal">&times;</button>
         {{#if id}}
diff --git a/src/UI/Settings/Indexers/IndexerCollectionViewTemplate.hbs b/src/UI/Settings/Indexers/IndexerCollectionViewTemplate.hbs
index cbffbb17d..d50ed6b39 100644
--- a/src/UI/Settings/Indexers/IndexerCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/IndexerCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Indexers</legend>
     <div class="row">
         <div class="col-md-12">
diff --git a/src/UI/Settings/Indexers/IndexerItemViewTemplate.hbs b/src/UI/Settings/Indexers/IndexerItemViewTemplate.hbs
index eb16c04b3..abef39886 100644
--- a/src/UI/Settings/Indexers/IndexerItemViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/IndexerItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="indexer-item thingy">
+<div class="indexer-item thingy">
     <div>
         <h3>{{name}}</h3>
     </div>
diff --git a/src/UI/Settings/Indexers/IndexerLayoutTemplate.hbs b/src/UI/Settings/Indexers/IndexerLayoutTemplate.hbs
index 0e33996c8..b82535642 100644
--- a/src/UI/Settings/Indexers/IndexerLayoutTemplate.hbs
+++ b/src/UI/Settings/Indexers/IndexerLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-indexers-region"></div>
+<div id="x-indexers-region"></div>
 <div class="form-horizontal">
     <div id="x-indexer-options-region"></div>
     <div id="x-restriction-region"></div>
diff --git a/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs b/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs
index 6326cf95d..1b36bf261 100644
--- a/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Options</legend>
 
     <div class="form-group">
diff --git a/src/UI/Settings/Indexers/Restriction/RestrictionCollectionViewTemplate.hbs b/src/UI/Settings/Indexers/Restriction/RestrictionCollectionViewTemplate.hbs
index cdaa4b33a..a1fdebe97 100644
--- a/src/UI/Settings/Indexers/Restriction/RestrictionCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Restriction/RestrictionCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset class="advanced-setting">
+<fieldset class="advanced-setting">
     <legend>Restrictions</legend>
 
     <div class="col-md-12">
diff --git a/src/UI/Settings/Indexers/Restriction/RestrictionDeleteViewTemplate.hbs b/src/UI/Settings/Indexers/Restriction/RestrictionDeleteViewTemplate.hbs
index de51ffb26..6d0d28457 100644
--- a/src/UI/Settings/Indexers/Restriction/RestrictionDeleteViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Restriction/RestrictionDeleteViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Delete Restriction</h3>
diff --git a/src/UI/Settings/Indexers/Restriction/RestrictionEditViewTemplate.hbs b/src/UI/Settings/Indexers/Restriction/RestrictionEditViewTemplate.hbs
index f789d3013..59582953f 100644
--- a/src/UI/Settings/Indexers/Restriction/RestrictionEditViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Restriction/RestrictionEditViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         {{#if id}}
diff --git a/src/UI/Settings/Indexers/Restriction/RestrictionItemViewTemplate.hbs b/src/UI/Settings/Indexers/Restriction/RestrictionItemViewTemplate.hbs
index 0933f49d1..513b78fe8 100644
--- a/src/UI/Settings/Indexers/Restriction/RestrictionItemViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Restriction/RestrictionItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-    <div class="col-sm-4">
+    <div class="col-sm-4">
         {{genericTagDisplay required 'label label-success'}}
     </div>
     <div class="col-sm-4">
diff --git a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs
index b72f35a24..fabb55e5d 100644
--- a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>File Management</legend>
 
     <div class="form-group">
diff --git a/src/UI/Settings/MediaManagement/MediaManagementLayoutTemplate.hbs b/src/UI/Settings/MediaManagement/MediaManagementLayoutTemplate.hbs
index 1126a78f6..44fb14ac3 100644
--- a/src/UI/Settings/MediaManagement/MediaManagementLayoutTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/MediaManagementLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="form-horizontal">
+<div class="form-horizontal">
     <div id="episode-naming"></div>
     <div id="sorting"></div>
     <div id="file-management"></div>
diff --git a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingViewTemplate.hbs
index 793a7a2fe..06429a722 100644
--- a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group">
     <label class="col-sm-3 control-label">Include Series Title</label>
 
     <div class="col-sm-9">
diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
index 6a5403c79..486bf2ae6 100644
--- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Episode Naming</legend>
 
     <div class="form-group">
diff --git a/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.hbs b/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.hbs
index 5d71adce7..00792a1e3 100644
--- a/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset class="advanced-setting">
+<fieldset class="advanced-setting">
     <legend>Permissions</legend>
 
     <div class="form-group">
diff --git a/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs
index 925c29742..dd22ed295 100644
--- a/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset class="advanced-setting">
+<fieldset class="advanced-setting">
     <legend>Folders</legend>
 
     <div class="form-group">
diff --git a/src/UI/Settings/Metadata/MetadataCollectionViewTemplate.hbs b/src/UI/Settings/Metadata/MetadataCollectionViewTemplate.hbs
index 0562678a1..a5c034668 100644
--- a/src/UI/Settings/Metadata/MetadataCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Metadata/MetadataCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Metadata</legend>
     <div class="row">
         <div class="col-md-12">
diff --git a/src/UI/Settings/Metadata/MetadataEditViewTemplate.hbs b/src/UI/Settings/Metadata/MetadataEditViewTemplate.hbs
index d4ce1e08d..974e06a9b 100644
--- a/src/UI/Settings/Metadata/MetadataEditViewTemplate.hbs
+++ b/src/UI/Settings/Metadata/MetadataEditViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Edit</h3>
diff --git a/src/UI/Settings/Metadata/MetadataItemViewTemplate.hbs b/src/UI/Settings/Metadata/MetadataItemViewTemplate.hbs
index 1d228cb85..4faf9b942 100644
--- a/src/UI/Settings/Metadata/MetadataItemViewTemplate.hbs
+++ b/src/UI/Settings/Metadata/MetadataItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="metadata-item">
+<div class="metadata-item">
     <div>
         <h3>{{name}}</h3>
     </div>
diff --git a/src/UI/Settings/Metadata/MetadataLayoutTemplate.hbs b/src/UI/Settings/Metadata/MetadataLayoutTemplate.hbs
index 0d4e79f32..a32fe464e 100644
--- a/src/UI/Settings/Metadata/MetadataLayoutTemplate.hbs
+++ b/src/UI/Settings/Metadata/MetadataLayoutTemplate.hbs
@@ -1,3 +1,3 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12" id="x-metadata-providers"/>
 </div>
diff --git a/src/UI/Settings/Notifications/Add/NotificationAddCollectionViewTemplate.hbs b/src/UI/Settings/Notifications/Add/NotificationAddCollectionViewTemplate.hbs
index 993479aec..791e6ac95 100644
--- a/src/UI/Settings/Notifications/Add/NotificationAddCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Add/NotificationAddCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Add Notification</h3>
diff --git a/src/UI/Settings/Notifications/Add/NotificationAddItemViewTemplate.hbs b/src/UI/Settings/Notifications/Add/NotificationAddItemViewTemplate.hbs
index a2c0295be..0b50d028e 100644
--- a/src/UI/Settings/Notifications/Add/NotificationAddItemViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Add/NotificationAddItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="add-thingy">
+<div class="add-thingy">
     <div>
         {{implementation}}
     </div>
diff --git a/src/UI/Settings/Notifications/Delete/NotificationDeleteViewTemplate.hbs b/src/UI/Settings/Notifications/Delete/NotificationDeleteViewTemplate.hbs
index 017e53d90..304b12767 100644
--- a/src/UI/Settings/Notifications/Delete/NotificationDeleteViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Delete/NotificationDeleteViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Delete Notification</h3>
diff --git a/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs b/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
index 32b5ef59e..6680a33cd 100644
--- a/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         {{#if id}}
diff --git a/src/UI/Settings/Notifications/NotificationCollectionViewTemplate.hbs b/src/UI/Settings/Notifications/NotificationCollectionViewTemplate.hbs
index 11da8dd11..26b29af1a 100644
--- a/src/UI/Settings/Notifications/NotificationCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/NotificationCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Connections</legend>
     <div class="row">
         <div class="col-md-12">
diff --git a/src/UI/Settings/Notifications/NotificationItemViewTemplate.hbs b/src/UI/Settings/Notifications/NotificationItemViewTemplate.hbs
index 259690be5..75417ac85 100644
--- a/src/UI/Settings/Notifications/NotificationItemViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/NotificationItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="notification-item thingy">
+<div class="notification-item thingy">
     <div>
         <h3>{{name}}</h3>
     </div>
diff --git a/src/UI/Settings/Profile/Delay/DelayProfileItemViewTemplate.hbs b/src/UI/Settings/Profile/Delay/DelayProfileItemViewTemplate.hbs
index 4175db917..1036f4564 100644
--- a/src/UI/Settings/Profile/Delay/DelayProfileItemViewTemplate.hbs
+++ b/src/UI/Settings/Profile/Delay/DelayProfileItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-    <div class="col-sm-2">
+    <div class="col-sm-2">
         {{#if enableUsenet}}
             {{#if enableTorrent}}
                 {{#if_eq preferredProtocol compare="usenet"}}
diff --git a/src/UI/Settings/Profile/Delay/DelayProfileLayoutTemplate.hbs b/src/UI/Settings/Profile/Delay/DelayProfileLayoutTemplate.hbs
index 78acf91e9..3287185eb 100644
--- a/src/UI/Settings/Profile/Delay/DelayProfileLayoutTemplate.hbs
+++ b/src/UI/Settings/Profile/Delay/DelayProfileLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset class="advanced-setting">
+<fieldset class="advanced-setting">
     <legend>Delay Profiles</legend>
 
     <div class="col-md-12">
diff --git a/src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate.hbs b/src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate.hbs
index fbd6cad88..924d30d8f 100644
--- a/src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate.hbs
+++ b/src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Delete Delay Profile</h3>
diff --git a/src/UI/Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate.hbs b/src/UI/Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate.hbs
index bc4865edd..5e5de85b9 100644
--- a/src/UI/Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate.hbs
+++ b/src/UI/Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" aria-hidden="true" data-dismiss="modal">&times;</button>
         {{#if id}}
diff --git a/src/UI/Settings/Profile/DeleteProfileViewTemplate.hbs b/src/UI/Settings/Profile/DeleteProfileViewTemplate.hbs
index 3d7eb73db..8212de963 100644
--- a/src/UI/Settings/Profile/DeleteProfileViewTemplate.hbs
+++ b/src/UI/Settings/Profile/DeleteProfileViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3>Delete: {{name}}</h3>
diff --git a/src/UI/Settings/Profile/Edit/EditProfileItemViewTemplate.hbs b/src/UI/Settings/Profile/Edit/EditProfileItemViewTemplate.hbs
index 33cc7d2f5..7c5be0260 100644
--- a/src/UI/Settings/Profile/Edit/EditProfileItemViewTemplate.hbs
+++ b/src/UI/Settings/Profile/Edit/EditProfileItemViewTemplate.hbs
@@ -1,3 +1,3 @@
-<i class="select-handle pull-left x-select" />
+<i class="select-handle pull-left x-select" />
 <span class="quality-label">{{quality.name}}</span>
 <i class="drag-handle pull-right icon-reorder advanced-setting x-drag-handle" />
diff --git a/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.hbs b/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.hbs
index b5efad40c..d64cadd4f 100644
--- a/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.hbs
+++ b/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
     <button type="button" class="close" aria-hidden="true" data-dismiss="modal">&times;</button>
     {{#if id}}
diff --git a/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.hbs b/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.hbs
index 6e2911962..f27349ac2 100644
--- a/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.hbs
+++ b/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group">
     <label class="col-sm-3 control-label">Name</label>
 
     <div class="col-sm-5">
diff --git a/src/UI/Settings/Profile/ProfileCollectionTemplate.hbs b/src/UI/Settings/Profile/ProfileCollectionTemplate.hbs
index 7117cff84..ce58c87af 100644
--- a/src/UI/Settings/Profile/ProfileCollectionTemplate.hbs
+++ b/src/UI/Settings/Profile/ProfileCollectionTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Profiles</legend>
     <div class="row">
         <div class="col-md-12">
diff --git a/src/UI/Settings/Profile/ProfileLayoutTemplate.hbs b/src/UI/Settings/Profile/ProfileLayoutTemplate.hbs
index 65ea7a26f..99adeab97 100644
--- a/src/UI/Settings/Profile/ProfileLayoutTemplate.hbs
+++ b/src/UI/Settings/Profile/ProfileLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12" id="profile"/>
 
     <div class="col-md-12 delay-profile-region" id="delay-profile"/>
diff --git a/src/UI/Settings/Profile/ProfileViewTemplate.hbs b/src/UI/Settings/Profile/ProfileViewTemplate.hbs
index fdb0e0526..4f5b3eef0 100644
--- a/src/UI/Settings/Profile/ProfileViewTemplate.hbs
+++ b/src/UI/Settings/Profile/ProfileViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="profile-item thingy">
+<div class="profile-item thingy">
     <div>
         <h3 name="name"></h3>
     </div>
diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs b/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs
index 8ed291585..c1c556274 100644
--- a/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs
+++ b/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Quality Definitions</legend>
     <div class="col-md-11">
         <div id="quality-definition-list">
diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionItemViewTemplate.hbs b/src/UI/Settings/Quality/Definition/QualityDefinitionItemViewTemplate.hbs
index 315f2bcde..39b94b650 100644
--- a/src/UI/Settings/Quality/Definition/QualityDefinitionItemViewTemplate.hbs
+++ b/src/UI/Settings/Quality/Definition/QualityDefinitionItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-    <span class="col-md-2 col-sm-3">
+    <span class="col-md-2 col-sm-3">
         {{quality.name}}
     </span>
     <span class="col-md-2 col-sm-3">
diff --git a/src/UI/Settings/Quality/QualityLayoutTemplate.hbs b/src/UI/Settings/Quality/QualityLayoutTemplate.hbs
index 8db6f83ee..a12f1926a 100644
--- a/src/UI/Settings/Quality/QualityLayoutTemplate.hbs
+++ b/src/UI/Settings/Quality/QualityLayoutTemplate.hbs
@@ -1,3 +1,3 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12" id="quality-definition"/>
 </div>
diff --git a/src/UI/Settings/SettingsLayoutTemplate.hbs b/src/UI/Settings/SettingsLayoutTemplate.hbs
index 7d37ff78c..c69ba9f16 100644
--- a/src/UI/Settings/SettingsLayoutTemplate.hbs
+++ b/src/UI/Settings/SettingsLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs nav-justified settings-tabs">
+<ul class="nav nav-tabs nav-justified settings-tabs">
     <li><a href="#media-management" class="x-media-management-tab no-router">Media Management</a></li>
     <li><a href="#profiles" class="x-profiles-tab no-router">Profiles</a></li>
     <li><a href="#quality" class="x-quality-tab no-router">Quality</a></li>
diff --git a/src/UI/Settings/ThingyHeaderGroupViewTemplate.hbs b/src/UI/Settings/ThingyHeaderGroupViewTemplate.hbs
index c3c233e52..310a29241 100644
--- a/src/UI/Settings/ThingyHeaderGroupViewTemplate.hbs
+++ b/src/UI/Settings/ThingyHeaderGroupViewTemplate.hbs
@@ -1,2 +1,2 @@
-<legend>{{header}}</legend>
+<legend>{{header}}</legend>
 <ul class="item-list" />
\ No newline at end of file
diff --git a/src/UI/Settings/UI/UiViewTemplate.hbs b/src/UI/Settings/UI/UiViewTemplate.hbs
index 3f1402e86..358a26f38 100644
--- a/src/UI/Settings/UI/UiViewTemplate.hbs
+++ b/src/UI/Settings/UI/UiViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="form-horizontal">
+<div class="form-horizontal">
     <fieldset>
         <legend>Calendar</legend>
 
diff --git a/src/UI/Shared/FileBrowser/EmptyViewTemplate.hbs b/src/UI/Shared/FileBrowser/EmptyViewTemplate.hbs
index cc3053509..53469ac16 100644
--- a/src/UI/Shared/FileBrowser/EmptyViewTemplate.hbs
+++ b/src/UI/Shared/FileBrowser/EmptyViewTemplate.hbs
@@ -1,3 +1,3 @@
-<div class="text-center col-md-12 file-browser-empty">
+<div class="text-center col-md-12 file-browser-empty">
     <span>No files/folders were found, edit the path above, or clear to start again</span>
 </div>
diff --git a/src/UI/Shared/FileBrowser/FileBrowserLayoutTemplate.hbs b/src/UI/Shared/FileBrowser/FileBrowserLayoutTemplate.hbs
index b225d7135..532cee849 100644
--- a/src/UI/Shared/FileBrowser/FileBrowserLayoutTemplate.hbs
+++ b/src/UI/Shared/FileBrowser/FileBrowserLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="modal-header">
     <button type="button" class="close" aria-hidden="true" data-dismiss="modal">&times;</button>
     <h3>File Browser</h3>
diff --git a/src/UI/Shared/Grid/JumpToPageTemplate.hbs b/src/UI/Shared/Grid/JumpToPageTemplate.hbs
index d257ccc6d..9a157ece6 100644
--- a/src/UI/Shared/Grid/JumpToPageTemplate.hbs
+++ b/src/UI/Shared/Grid/JumpToPageTemplate.hbs
@@ -1,4 +1,4 @@
-<select class="x-page-select">
+<select class="x-page-select">
     {{#each pages}}
         {{#if current}}
             <option value="{{page}}" selected="selected">{{page}}</option>
diff --git a/src/UI/Shared/Grid/PagerTemplate.hbs b/src/UI/Shared/Grid/PagerTemplate.hbs
index 2320337ea..795e76e6e 100644
--- a/src/UI/Shared/Grid/PagerTemplate.hbs
+++ b/src/UI/Shared/Grid/PagerTemplate.hbs
@@ -1,4 +1,4 @@
-<ul>
+<ul>
     {{#each handles}}
         <li {{#if className}}class="{{className}}"{{/if}} >
             {{#if pageNumber}}
diff --git a/src/UI/Shared/LoadingViewTemplate.hbs b/src/UI/Shared/LoadingViewTemplate.hbs
index 702dcaf07..139d7cda3 100644
--- a/src/UI/Shared/LoadingViewTemplate.hbs
+++ b/src/UI/Shared/LoadingViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div id="followingBalls">
         <div id="ball-1" class="ball"></div>
         <div id="ball-2" class="ball"></div>
diff --git a/src/UI/Shared/NotFoundViewTemplate.hbs b/src/UI/Shared/NotFoundViewTemplate.hbs
index 0b3aa5778..4073bba9f 100644
--- a/src/UI/Shared/NotFoundViewTemplate.hbs
+++ b/src/UI/Shared/NotFoundViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div>
+<div>
     <img src="{{UrlBase}}/Content/Images/404.png" style="height:400px; margin-top: 50px"/>
 
 </div>
diff --git a/src/UI/Shared/Toolbar/ButtonTemplate.hbs b/src/UI/Shared/Toolbar/ButtonTemplate.hbs
index f664ce3f0..d21cdbc9d 100644
--- a/src/UI/Shared/Toolbar/ButtonTemplate.hbs
+++ b/src/UI/Shared/Toolbar/ButtonTemplate.hbs
@@ -1 +1 @@
-<i class="{{icon}} x-icon"/><span> {{title}}</span>
+<i class="{{icon}} x-icon"/><span> {{title}}</span>
diff --git a/src/UI/Shared/Toolbar/RadioButtonTemplate.hbs b/src/UI/Shared/Toolbar/RadioButtonTemplate.hbs
index 3e75e7332..aaff67405 100644
--- a/src/UI/Shared/Toolbar/RadioButtonTemplate.hbs
+++ b/src/UI/Shared/Toolbar/RadioButtonTemplate.hbs
@@ -1 +1 @@
-<input type="radio"><i class="{{icon}} x-icon"/><span> {{title}}</span>
+<input type="radio"><i class="{{icon}} x-icon"/><span> {{title}}</span>
diff --git a/src/UI/Shared/Toolbar/Sorting/SortingButtonCollectionViewTemplate.hbs b/src/UI/Shared/Toolbar/Sorting/SortingButtonCollectionViewTemplate.hbs
index 7085453c3..80d4888de 100644
--- a/src/UI/Shared/Toolbar/Sorting/SortingButtonCollectionViewTemplate.hbs
+++ b/src/UI/Shared/Toolbar/Sorting/SortingButtonCollectionViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="btn-group sorting-buttons">
+<div class="btn-group sorting-buttons">
     <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
         Sort <span class="caret"></span>
     </a>
diff --git a/src/UI/Shared/Toolbar/Sorting/SortingButtonViewTemplate.hbs b/src/UI/Shared/Toolbar/Sorting/SortingButtonViewTemplate.hbs
index b2663c548..57018028d 100644
--- a/src/UI/Shared/Toolbar/Sorting/SortingButtonViewTemplate.hbs
+++ b/src/UI/Shared/Toolbar/Sorting/SortingButtonViewTemplate.hbs
@@ -1,4 +1,4 @@
-<a href="#">
+<a href="#">
     <span class="sorting-title">{{title}}</span>
     <i class=""></i>
 </a>
\ No newline at end of file
diff --git a/src/UI/Shared/Toolbar/ToolbarLayoutTemplate.hbs b/src/UI/Shared/Toolbar/ToolbarLayoutTemplate.hbs
index 9b676649e..f1e5f3c1a 100644
--- a/src/UI/Shared/Toolbar/ToolbarLayoutTemplate.hbs
+++ b/src/UI/Shared/Toolbar/ToolbarLayoutTemplate.hbs
@@ -1,2 +1,2 @@
-<div class="page-toolbar pull-left pull-none-xs x-toolbar-left" />
+<div class="page-toolbar pull-left pull-none-xs x-toolbar-left" />
 <div class="page-toolbar pull-right pull-none-xs x-toolbar-right" />
diff --git a/src/UI/System/Backup/BackupEmptyViewTemplate.hbs b/src/UI/System/Backup/BackupEmptyViewTemplate.hbs
index 5a480c62a..2e14e7145 100644
--- a/src/UI/System/Backup/BackupEmptyViewTemplate.hbs
+++ b/src/UI/System/Backup/BackupEmptyViewTemplate.hbs
@@ -1 +1 @@
-<div>No backups are available</div>
\ No newline at end of file
+<div>No backups are available</div>
\ No newline at end of file
diff --git a/src/UI/System/Backup/BackupFilenameCellTemplate.hbs b/src/UI/System/Backup/BackupFilenameCellTemplate.hbs
index 23808eafb..e129039c3 100644
--- a/src/UI/System/Backup/BackupFilenameCellTemplate.hbs
+++ b/src/UI/System/Backup/BackupFilenameCellTemplate.hbs
@@ -1 +1 @@
-<a href="{{UrlBase}}/backup/{{type}}/{{name}}" class="no-router">{{name}}</a>
+<a href="{{UrlBase}}/backup/{{type}}/{{name}}" class="no-router">{{name}}</a>
diff --git a/src/UI/System/Backup/BackupLayoutTemplate.hbs b/src/UI/System/Backup/BackupLayoutTemplate.hbs
index b2b9f91f9..b50db1799 100644
--- a/src/UI/System/Backup/BackupLayoutTemplate.hbs
+++ b/src/UI/System/Backup/BackupLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12">
         <div id="x-backup-toolbar"/>
     </div>
diff --git a/src/UI/System/Info/About/AboutViewTemplate.hbs b/src/UI/System/Info/About/AboutViewTemplate.hbs
index d24a5016b..a7fff2483 100644
--- a/src/UI/System/Info/About/AboutViewTemplate.hbs
+++ b/src/UI/System/Info/About/AboutViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>About</legend>
 
     <dl class="dl-horizontal info">
diff --git a/src/UI/System/Info/DiskSpace/DiskSpaceLayoutTemplate.hbs b/src/UI/System/Info/DiskSpace/DiskSpaceLayoutTemplate.hbs
index 6cf4d34e3..99c218b67 100644
--- a/src/UI/System/Info/DiskSpace/DiskSpaceLayoutTemplate.hbs
+++ b/src/UI/System/Info/DiskSpace/DiskSpaceLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>Disk Space</legend>
 
     <div id="x-grid"/>
diff --git a/src/UI/System/Info/Health/HealthLayoutTemplate.hbs b/src/UI/System/Info/Health/HealthLayoutTemplate.hbs
index 911c3fdf5..eda20b205 100644
--- a/src/UI/System/Info/Health/HealthLayoutTemplate.hbs
+++ b/src/UI/System/Info/Health/HealthLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset class="x-health">
+<fieldset class="x-health">
     <legend>Health</legend>
 
     <div id="x-health-grid"/>
diff --git a/src/UI/System/Info/Health/HealthOkViewTemplate.hbs b/src/UI/System/Info/Health/HealthOkViewTemplate.hbs
index 7d13af4ad..b33a62360 100644
--- a/src/UI/System/Info/Health/HealthOkViewTemplate.hbs
+++ b/src/UI/System/Info/Health/HealthOkViewTemplate.hbs
@@ -1,3 +1,3 @@
-<div class="row health-ok">
+<div class="row health-ok">
     <div class="col-md-12">No issues with your configuration</div>
 </div>
\ No newline at end of file
diff --git a/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs b/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs
index 93a48608b..fe97561d3 100644
--- a/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs
+++ b/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset>
     <legend>More Info</legend>
 
     <dl class="dl-horizontal info">
diff --git a/src/UI/System/Info/SystemInfoLayoutTemplate.hbs b/src/UI/System/Info/SystemInfoLayoutTemplate.hbs
index a2b380576..d6eef7abd 100644
--- a/src/UI/System/Info/SystemInfoLayoutTemplate.hbs
+++ b/src/UI/System/Info/SystemInfoLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12" id="health"></div>
 </div>
 
diff --git a/src/UI/System/Logs/Files/ContentsViewTemplate.hbs b/src/UI/System/Logs/Files/ContentsViewTemplate.hbs
index ae6b5d35e..c9a21b736 100644
--- a/src/UI/System/Logs/Files/ContentsViewTemplate.hbs
+++ b/src/UI/System/Logs/Files/ContentsViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12">
         <h3>{{filename}}</h3>
     </div>
diff --git a/src/UI/System/Logs/Files/LogFileLayoutTemplate.hbs b/src/UI/System/Logs/Files/LogFileLayoutTemplate.hbs
index d1ccae5df..0188f1d0e 100644
--- a/src/UI/System/Logs/Files/LogFileLayoutTemplate.hbs
+++ b/src/UI/System/Logs/Files/LogFileLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-toolbar"/>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="col-md-12">
         <div id="x-grid"/>
diff --git a/src/UI/System/Logs/LogsLayoutTemplate.hbs b/src/UI/System/Logs/LogsLayoutTemplate.hbs
index a9832519a..1bf663f29 100644
--- a/src/UI/System/Logs/LogsLayoutTemplate.hbs
+++ b/src/UI/System/Logs/LogsLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-2 col-sm-2">
         <ul class="nav nav-pills nav-stacked">
             <li><a href="#table" class="x-table-tab no-router">Table</a></li>
diff --git a/src/UI/System/Logs/Table/Details/LogDetailsViewTemplate.hbs b/src/UI/System/Logs/Table/Details/LogDetailsViewTemplate.hbs
index 4e902ee86..d511a9517 100644
--- a/src/UI/System/Logs/Table/Details/LogDetailsViewTemplate.hbs
+++ b/src/UI/System/Logs/Table/Details/LogDetailsViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content">
     <div class="log-details-modal">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/src/UI/System/Logs/Table/LogsTableLayoutTemplate.hbs b/src/UI/System/Logs/Table/LogsTableLayoutTemplate.hbs
index f0f162d05..13b178496 100644
--- a/src/UI/System/Logs/Table/LogsTableLayoutTemplate.hbs
+++ b/src/UI/System/Logs/Table/LogsTableLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-toolbar"/>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="col-md-12 table-responsive">
         <div id="x-grid"/>
diff --git a/src/UI/System/SystemLayoutTemplate.hbs b/src/UI/System/SystemLayoutTemplate.hbs
index f0bb81574..a3e24f76b 100644
--- a/src/UI/System/SystemLayoutTemplate.hbs
+++ b/src/UI/System/SystemLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <li><a href="#info" class="x-info-tab no-router">Info</a></li>
     <li><a href="#logs" class="x-logs-tab no-router">Logs</a></li>
     <li><a href="#updates" class="x-updates-tab no-router">Updates</a></li>
diff --git a/src/UI/System/Task/TaskLayoutTemplate.hbs b/src/UI/System/Task/TaskLayoutTemplate.hbs
index 02b971abf..0a3631541 100644
--- a/src/UI/System/Task/TaskLayoutTemplate.hbs
+++ b/src/UI/System/Task/TaskLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12">
         <div id="x-tasks" class="tasks table-responsive"/>
     </div>
diff --git a/src/UI/System/Update/EmptyViewTemplate.hbs b/src/UI/System/Update/EmptyViewTemplate.hbs
index 24248d97b..728e10d93 100644
--- a/src/UI/System/Update/EmptyViewTemplate.hbs
+++ b/src/UI/System/Update/EmptyViewTemplate.hbs
@@ -1 +1 @@
-<div>No updates are available</div>
\ No newline at end of file
+<div>No updates are available</div>
\ No newline at end of file
diff --git a/src/UI/System/Update/UpdateItemViewTemplate.hbs b/src/UI/System/Update/UpdateItemViewTemplate.hbs
index b8c7fddb1..aecefacbd 100644
--- a/src/UI/System/Update/UpdateItemViewTemplate.hbs
+++ b/src/UI/System/Update/UpdateItemViewTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="update">
+<div class="update">
     <fieldset>
         <legend>{{version}}
             <span class="date">
diff --git a/src/UI/System/Update/UpdateLayoutTemplate.hbs b/src/UI/System/Update/UpdateLayoutTemplate.hbs
index b3361c31d..0bd69dc20 100644
--- a/src/UI/System/Update/UpdateLayoutTemplate.hbs
+++ b/src/UI/System/Update/UpdateLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12">
         <div id="x-updates"/>
     </div>
diff --git a/src/UI/Wanted/ControlsColumnTemplate.hbs b/src/UI/Wanted/ControlsColumnTemplate.hbs
index 78292bfca..d7cd59deb 100644
--- a/src/UI/Wanted/ControlsColumnTemplate.hbs
+++ b/src/UI/Wanted/ControlsColumnTemplate.hbs
@@ -1 +1 @@
-<i class="icon-search x-search" title="Search"/>
+<i class="icon-search x-search" title="Search"/>
diff --git a/src/UI/Wanted/Cutoff/CutoffUnmetLayoutTemplate.hbs b/src/UI/Wanted/Cutoff/CutoffUnmetLayoutTemplate.hbs
index 13527bd29..a8641d93c 100644
--- a/src/UI/Wanted/Cutoff/CutoffUnmetLayoutTemplate.hbs
+++ b/src/UI/Wanted/Cutoff/CutoffUnmetLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-toolbar"/>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="col-md-12">
         <div id="x-cutoff-unmet"/>
diff --git a/src/UI/Wanted/Missing/MissingLayoutTemplate.hbs b/src/UI/Wanted/Missing/MissingLayoutTemplate.hbs
index 04c4df110..a9b80d964 100644
--- a/src/UI/Wanted/Missing/MissingLayoutTemplate.hbs
+++ b/src/UI/Wanted/Missing/MissingLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<div id="x-toolbar"/>
+<div id="x-toolbar"/>
 <div class="row">
     <div class="col-md-12 table-responsive">
         <div id="x-missing"/>
diff --git a/src/UI/Wanted/WantedLayoutTemplate.hbs b/src/UI/Wanted/WantedLayoutTemplate.hbs
index 6665fb3d1..973feb838 100644
--- a/src/UI/Wanted/WantedLayoutTemplate.hbs
+++ b/src/UI/Wanted/WantedLayoutTemplate.hbs
@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <li><a href="#missing" class="x-missing-tab no-router">Missing</a></li>
     <li><a href="#cutoff" class="x-cutoff-tab no-router">Cutoff Unmet</a></li>
 </ul>