From 21d9f83d91c5fcd77cfce94128ab8d66f5eb15b9 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Sat, 3 Aug 2024 19:23:13 -0700
Subject: [PATCH 1/3] shorten a bunch of template lines

---
 pkg/bindata/templates/downloaders/deluge.html | 58 +++++++++----
 pkg/bindata/templates/downloaders/nzbget.html | 63 ++++++++++----
 pkg/bindata/templates/downloaders/qbit.html   | 62 ++++++++++----
 .../templates/downloaders/rtorrent.html       | 61 +++++++++----
 .../templates/downloaders/sabnzbd.html        | 58 +++++++++----
 .../templates/downloaders/transmission.html   | 60 +++++++++----
 pkg/bindata/templates/filewatcher.html        | 57 ++++++++++---
 .../templates/includes/filetablelist.html     |  3 +-
 pkg/bindata/templates/index.html              |  3 +-
 pkg/bindata/templates/logfiles.html           |  4 +-
 pkg/bindata/templates/media/plex.html         | 25 ++++--
 pkg/bindata/templates/profile.html            | 15 +++-
 pkg/bindata/templates/services.html           | 64 ++++++++++----
 pkg/bindata/templates/snapshot/nvidia.html    |  9 +-
 pkg/bindata/templates/starr/lidarr.html       | 77 ++++++++++++-----
 pkg/bindata/templates/starr/prowlarr.html     | 74 +++++++++++-----
 pkg/bindata/templates/starr/radarr.html       | 70 +++++++++++----
 pkg/bindata/templates/starr/readarr.html      | 70 +++++++++++----
 pkg/bindata/templates/starr/sonarr.html       | 70 +++++++++++----
 pkg/bindata/templates/triggers.html           | 85 ++++++++-----------
 20 files changed, 704 insertions(+), 284 deletions(-)

diff --git a/pkg/bindata/templates/downloaders/deluge.html b/pkg/bindata/templates/downloaders/deluge.html
index fd531e871..fa1ef1df2 100644
--- a/pkg/bindata/templates/downloaders/deluge.html
+++ b/pkg/bindata/templates/downloaders/deluge.html
@@ -4,11 +4,16 @@
             <div style="float: left;"><img src="{{files}}/images/logo/deluge.png" style="height:50px;">
             </div><h2 class="mb-3" style="margin-bottom:-45px">Deluge</h2>
             <div style="float: right;">
-                <button id="download-Deluge-addbutton" onclick="addInstance('download', 'Deluge')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","","Config.URL","Config.Password","Interval","Timeout"]' type="button" title="Add another instance of Deluge." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="download-Deluge-addbutton" onclick="addInstance('download', 'Deluge')" data-prefix="Apps" data-sslname="ValidSSL" type="button"
+                    data-names='["Name","","Config.URL","Config.Password","Interval","Timeout"]' title="Add another instance of Deluge." class="add-new-item-button btn btn-primary">
+                    <i class="fa fa-plus"></i>
+            </button>
             </div>
         </td>
         <td colspan="7" class="tablet-hide desktop-hide">
-            <button onclick="addInstance('download', 'Deluge')" data-prefix="Apps" type="button" title="Add another instance of Deluge." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+            <button onclick="addInstance('download', 'Deluge')" data-prefix="Apps" type="button" title="Add another instance of Deluge." class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
             <div style="float:right;"><img src="{{files}}/images/logo/deluge.png" style="height:50px;"></div>
         </td>
@@ -24,13 +29,16 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">
+                Name is optional, but required to be unique if you wish to enable service checks on the instance.
+                Otherwise, it's used to identify the instance easier.
+            </div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
         <td colspan="2">
             <div style="display:none;" class="dialogText">
-                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox. 
+                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox.
                 Checking this box enables SSL certificate validation; invalid certificates generate an error.
             </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
@@ -43,7 +51,10 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">
+                This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
+            </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -51,13 +62,18 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
 </thead>
 <tbody id="download-Deluge-container">
 {{- range $index, $app := .Config.Apps.Deluge}}
-    <input disabled style="display: none;" class="client-parameter download-Deluge{{$index}}-deleted" data-group="download" data-label="Deluge {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter download-Deluge{{$index}}-deleted" data-group="download"
+        data-label="Deluge {{instance $index}} Deleted" data-original="false" value="false">
     <tr class="download-Deluge {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="download-Deluge-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('download-Deluge', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('download-Deluge', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="DelugeIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Deluge', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Deluge', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -73,7 +89,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_DELUGE_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Deluge.{{$index}}.Name" name="Apps.Deluge.{{$index}}.Name" data-index="{{$index}}" data-app="Deluge" class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Deluge.{{$index}}.Name" name="Apps.Deluge.{{$index}}.Name" data-index="{{$index}}" data-app="Deluge"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </form>
@@ -91,9 +109,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_DELUGE_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Deluge.{{$index}}.Config.URL" onChange="showhttps($(this).val(), '#Deluge{{$index}}SSL');" name="Apps.Deluge.{{$index}}.Config.URL" data-index="{{$index}}" data-app="Deluge" class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.Deluge.{{$index}}.Config.URL" onChange="showhttps($(this).val(), '#Deluge{{$index}}SSL');" name="Apps.Deluge.{{$index}}.Config.URL"
+                            data-index="{{$index}}" data-app="Deluge" class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Deluge{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Deluge.{{$index}}.ValidSSL" name="Apps.Deluge.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Deluge" class="client-parameter" data-group="download" data-label="Deluge {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Deluge.{{$index}}.ValidSSL" name="Apps.Deluge.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Deluge" class="client-parameter"
+                                data-group="download" data-label="Deluge {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -112,8 +133,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_DELUGE_%d_PASSWORD" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="off" id="Apps.Deluge.{{$index}}.Config.Password" name="Apps.Deluge.{{$index}}.Config.Password" data-index="{{$index}}" data-app="Deluge" class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} Password" data-original="{{$app.Password}}" value="{{$app.Password}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Deluge.{{$index}}.Config.Password', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="off" id="Apps.Deluge.{{$index}}.Config.Password" name="Apps.Deluge.{{$index}}.Config.Password"
+                            data-index="{{$index}}" data-app="Deluge" class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} Password"
+                            data-original="{{$app.Password}}" value="{{$app.Password}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Deluge.{{$index}}.Config.Password', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -131,7 +156,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_DELUGE_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Deluge.{{$index}}.Interval" name="Apps.Deluge.{{$index}}.Interval" data-index="{{$index}}" data-app="Deluge" class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Deluge.{{$index}}.Interval" name="Apps.Deluge.{{$index}}.Interval" data-index="{{$index}}"
+                            data-app="Deluge" class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -151,7 +178,8 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Deluge</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_DELUGE_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Deluge.{{$index}}.Timeout" name="Apps.Deluge.{{$index}}.Timeout" data-index="{{$index}}" data-app="Deluge" class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Deluge.{{$index}}.Timeout" name="Apps.Deluge.{{$index}}.Timeout" data-index="{{$index}}" data-app="Deluge"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Deluge {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
diff --git a/pkg/bindata/templates/downloaders/nzbget.html b/pkg/bindata/templates/downloaders/nzbget.html
index 67e5d64cf..639c82d3c 100644
--- a/pkg/bindata/templates/downloaders/nzbget.html
+++ b/pkg/bindata/templates/downloaders/nzbget.html
@@ -4,11 +4,17 @@
             <div style="float: left;"><img src="{{files}}/images/logo/nzbget.png" style="height:50px;"></div>
             <h2 class="mb-3" style="margin-bottom:-45px">NZBGet</h2>
             <div style="float: right;">
-                <button id="download-NZBGet-addbutton" onclick="addInstance('download', 'NZBGet')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","Config.URL","Config.User","Config.Pass","Interval","Timeout"]' type="button" title="Add another instance of NZBGet." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="download-NZBGet-addbutton" onclick="addInstance('download', 'NZBGet')" data-prefix="Apps" data-sslname="ValidSSL" type="button"
+                    data-names='["Name","Config.URL","Config.User","Config.Pass","Interval","Timeout"]' title="Add another instance of NZBGet." class="add-new-item-button btn btn-primary">
+                    <i class="fa fa-plus"></i>
+                </button>
             </div>
         </td>
         <td colspan="7" class="tablet-hide desktop-hide">
-            <button id="download-NZBGet-addbutton" onclick="addInstance('download', 'NZBGet')" data-prefix="Apps" data-names='["Name","Config.URL","Config.User","Config.Pass","Interval","Timeout"]' type="button" title="Add another instance of NZBGet." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+            <button id="download-NZBGet-addbutton" onclick="addInstance('download', 'NZBGet')" data-prefix="Apps" type="button"
+                data-names='["Name","Config.URL","Config.User","Config.Pass","Interval","Timeout"]' title="Add another instance of NZBGet." class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
             <div style="float:right;"><img src="{{files}}/images/logo/nzbget.png" style="height:50px;"></div>
         </td>
@@ -24,13 +30,15 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td style="min-width:130px;">
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">
+                Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.
+            </div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
         <td style="min-width:190px;">
             <div style="display:none;" class="dialogText">
-                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox. 
+                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox.
                 Checking this box enables SSL certificate validation; invalid certificates generate an error.
             </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
@@ -44,7 +52,10 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td style="min-width:120px;width:120px">
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">
+                This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
+            </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -52,13 +63,18 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
 </thead>
 <tbody id="download-NZBGet-container">
 {{- range $index, $app := .Config.Apps.NZBGet}}
-    <input disabled style="display: none;" class="client-parameter download-NZBGet{{$index}}-deleted" data-group="download" data-label="NZBGet {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter download-NZBGet{{$index}}-deleted" data-group="download"
+        data-label="NZBGet {{instance $index}} Deleted" data-original="false" value="false">
     <tr class="download-NZBGet {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="download-NZBGet-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('download-NZBGet', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('download-NZBGet', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="NZBGetIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'NZBGet', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'NZBGet', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -74,7 +90,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_NZBGET_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.NZBGet.{{$index}}.Name" name="Apps.NZBGet.{{$index}}.Name" data-index="{{$index}}" data-app="NZBGet" class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.NZBGet.{{$index}}.Name" name="Apps.NZBGet.{{$index}}.Name" data-index="{{$index}}" data-app="NZBGet"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </form>
@@ -92,9 +110,13 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_NZBGET_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.NZBGet.{{$index}}.Config.URL" onChange="showhttps($(this).val(), '#NZBGet{{$index}}SSL');" name="Apps.NZBGet.{{$index}}.Config.URL" data-index="{{$index}}" data-app="NZBGet" class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.NZBGet.{{$index}}.Config.URL" onChange="showhttps($(this).val(), '#NZBGet{{$index}}SSL');" name="Apps.NZBGet.{{$index}}.Config.URL"
+                            data-index="{{$index}}" data-app="NZBGet" class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="NZBGet{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.NZBGet.{{$index}}.ValidSSL" name="Apps.NZBGet.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="NZBGet" class="client-parameter" data-group="download" data-label="NZBGet {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.NZBGet.{{$index}}.ValidSSL" name="Apps.NZBGet.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="NZBGet"
+                                class="client-parameter" data-group="download" data-label="NZBGet {{instance $index}} SSL"
+                                data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -113,7 +135,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_NZBGET_%d_USER" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.NZBGet.{{$index}}.Config.User" name="Apps.NZBGet.{{$index}}.Config.User" data-index="{{$index}}" data-app="NZBGet" class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} User" data-original="{{$app.User}}" value="{{$app.User}}">
+                        <input type="text" id="Apps.NZBGet.{{$index}}.Config.User" name="Apps.NZBGet.{{$index}}.Config.User" data-index="{{$index}}" data-app="NZBGet"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} User"
+                            data-original="{{$app.User}}" value="{{$app.User}}">
                     </div>
                 </div>
             </form>
@@ -131,8 +155,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_NZBGET_%d_PASS" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="off" id="Apps.NZBGet.{{$index}}.Config.Pass" name="Apps.NZBGet.{{$index}}.Config.Pass" data-index="{{$index}}" data-app="NZBGet" class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} Pass" data-original="{{$app.Pass}}" value="{{$app.Pass}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.NZBGet.{{$index}}.Config.Pass', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="off" id="Apps.NZBGet.{{$index}}.Config.Pass" name="Apps.NZBGet.{{$index}}.Config.Pass" data-index="{{$index}}"
+                            data-app="NZBGet" class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} Pass"
+                            data-original="{{$app.Pass}}" value="{{$app.Pass}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.NZBGet.{{$index}}.Config.Pass', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -150,7 +178,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_NZBGET_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.NZBGet.{{$index}}.Interval" name="Apps.NZBGet.{{$index}}.Interval" data-index="{{$index}}" data-app="NZBGet" class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.NZBGet.{{$index}}.Interval" name="Apps.NZBGet.{{$index}}.Interval" data-index="{{$index}}" data-app="NZBGet"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -170,7 +200,8 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">NZBGet</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_NZBGET_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.NZBGet.{{$index}}.Timeout" name="Apps.NZBGet.{{$index}}.Timeout" data-index="{{$index}}" data-app="NZBGet" class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.NZBGet.{{$index}}.Timeout" name="Apps.NZBGet.{{$index}}.Timeout" data-index="{{$index}}" data-app="NZBGet"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="NZBGet {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
diff --git a/pkg/bindata/templates/downloaders/qbit.html b/pkg/bindata/templates/downloaders/qbit.html
index 0a81443e1..450eee228 100644
--- a/pkg/bindata/templates/downloaders/qbit.html
+++ b/pkg/bindata/templates/downloaders/qbit.html
@@ -4,11 +4,16 @@
             <div style="float: left;"><img src="{{files}}/images/logo/qbittorrent.png" style="height:50px;"></div>
             <h2 class="mb-3" style="margin-bottom:-45px">qBittorrent</h2>
             <div style="float: right;">
-                <button id="download-Qbit-addbutton" onclick="addInstance('download', 'Qbit')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","URL","User","Pass","Interval","Timeout"]' type="button" title="Add another instance of Qbittorrent." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="download-Qbit-addbutton" onclick="addInstance('download', 'Qbit')" data-prefix="Apps" data-sslname="ValidSSL"  type="button"
+                data-names='["Name","URL","User","Pass","Interval","Timeout"]' title="Add another instance of Qbittorrent." class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             </div>
         </td>
         <td colspan="7" class="tablet-hide desktop-hide">
-            <button onclick="addInstance('download', 'Qbit')" data-prefix="Apps" type="button" title="Add another instance of Qbittorrent." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+            <button onclick="addInstance('download', 'Qbit')" data-prefix="Apps" type="button" title="Add another instance of Qbittorrent." class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
             <div style="float:right;"><img src="{{files}}/images/logo/qbittorrent.png" style="height:50px;"></div>
         </td>
@@ -24,13 +29,15 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td style="min-width:130px;">
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">
+                Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.
+            </div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
         <td>
             <div style="display:none;" class="dialogText">
-                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox. 
+                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox.
                 Checking this box enables SSL certificate validation; invalid certificates generate an error.
             </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
@@ -44,7 +51,10 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td style="min-width:120px;width:120px">
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">
+                This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
+            </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -52,13 +62,18 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
 </thead>
 <tbody id="download-Qbit-container">
 {{- range $index, $app := .Config.Apps.Qbit}}
-    <input disabled style="display: none;" class="client-parameter download-Qbit{{$index}}-deleted" data-group="download" data-label="Qbit {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter download-Qbit{{$index}}-deleted" data-group="download"
+        data-label="Qbit {{instance $index}} Deleted" data-original="false" value="false">
     <tr class="download-Qbit {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="download-Qbit-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('download-Qbit', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('download-Qbit', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="QbitIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Qbit', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Qbit', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -74,7 +89,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_QBIT_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Qbit.{{$index}}.Name" name="Apps.Qbit.{{$index}}.Name" data-index="{{$index}}" data-app="Qbit" class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Qbit.{{$index}}.Name" name="Apps.Qbit.{{$index}}.Name" data-index="{{$index}}" data-app="Qbit"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </form>
@@ -92,9 +109,13 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_QBIT_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Qbit.{{$index}}.URL" onChange="showhttps($(this).val(), '#Qbit{{$index}}SSL');" name="Apps.Qbit.{{$index}}.URL" data-index="{{$index}}" data-app="Qbit" class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.Qbit.{{$index}}.URL" onChange="showhttps($(this).val(), '#Qbit{{$index}}SSL');" name="Apps.Qbit.{{$index}}.URL" data-index="{{$index}}"
+                            data-app="Qbit" class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Qbit{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Qbit.{{$index}}.ValidSSL" name="Apps.Qbit.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Qbit" class="client-parameter" data-group="download" data-label="Qbit {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Qbit.{{$index}}.ValidSSL" name="Apps.Qbit.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Qbit"
+                                class="client-parameter" data-group="download" data-label="Qbit {{instance $index}} SSL"
+                                data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -113,7 +134,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_QBIT_%d_USER" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Qbit.{{$index}}.User" name="Apps.Qbit.{{$index}}.User" data-index="{{$index}}" data-app="Qbit" class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} User" data-original="{{$app.User}}" value="{{$app.User}}">
+                        <input type="text" id="Apps.Qbit.{{$index}}.User" name="Apps.Qbit.{{$index}}.User" data-index="{{$index}}" data-app="Qbit"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} User"
+                            data-original="{{$app.User}}" value="{{$app.User}}">
                     </div>
                 </div>
             </form>
@@ -131,8 +154,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_QBIT_%d_PASS" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="off" id="Apps.Qbit.{{$index}}.Pass" name="Apps.Qbit.{{$index}}.Pass" data-index="{{$index}}" data-app="Qbit" class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} Pass" data-original="{{$app.Pass}}" value="{{$app.Pass}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Qbit.{{$index}}.Pass', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="off" id="Apps.Qbit.{{$index}}.Pass" name="Apps.Qbit.{{$index}}.Pass" data-index="{{$index}}" data-app="Qbit"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} Pass"
+                            data-original="{{$app.Pass}}" value="{{$app.Pass}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Qbit.{{$index}}.Pass', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -150,7 +177,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_QBIT_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Qbit.{{$index}}.Interval" name="Apps.Qbit.{{$index}}.Interval" data-index="{{$index}}" data-app="Qbit" class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Qbit.{{$index}}.Interval" name="Apps.Qbit.{{$index}}.Interval" data-index="{{$index}}" data-app="Qbit"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -170,7 +199,8 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">qBittorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_QBIT_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Qbit.{{$index}}.Timeout" name="Apps.Qbit.{{$index}}.Timeout" data-index="{{$index}}" data-app="Qbit" class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Qbit.{{$index}}.Timeout" name="Apps.Qbit.{{$index}}.Timeout" data-index="{{$index}}" data-app="Qbit"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Qbit {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
diff --git a/pkg/bindata/templates/downloaders/rtorrent.html b/pkg/bindata/templates/downloaders/rtorrent.html
index b1d72e002..21ee592d3 100644
--- a/pkg/bindata/templates/downloaders/rtorrent.html
+++ b/pkg/bindata/templates/downloaders/rtorrent.html
@@ -4,11 +4,16 @@
             <div style="float: left;"><img src="{{files}}/images/logo/rtorrent.png" style="height:50px;"></div>
             <h2 class="mb-3" style="margin-bottom:-45px">rTorrent</h2>
             <div style="float: right;">
-                <button id="download-Rtorrent-addbutton" onclick="addInstance('download', 'Rtorrent')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","URL","User","Pass","Interval","Timeout"]' type="button" title="Add another instance of rTorrent." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="download-Rtorrent-addbutton" onclick="addInstance('download', 'Rtorrent')" data-prefix="Apps" data-sslname="ValidSSL" type="button"
+                    data-names='["Name","URL","User","Pass","Interval","Timeout"]' title="Add another instance of rTorrent." class="add-new-item-button btn btn-primary">
+                    <i class="fa fa-plus"></i>
+                </button>
             </div>
         </td>
         <td colspan="7" class="tablet-hide desktop-hide">
-            <button onclick="addInstance('download', 'Rtorrent')" data-prefix="Apps" type="button" title="Add another instance of rTorrent." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+            <button onclick="addInstance('download', 'Rtorrent')" data-prefix="Apps" type="button" title="Add another instance of rTorrent." class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
             <div style="float:right;"><img src="{{files}}/images/logo/rtorrent.png" style="height:50px;"></div>
         </td>
@@ -24,13 +29,15 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td style="min-width:130px;">
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">
+                Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.
+            </div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
         <td>
             <div style="display:none;" class="dialogText">
-                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox. 
+                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox.
                 Checking this box enables SSL certificate validation; invalid certificates generate an error.
             </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
@@ -44,7 +51,10 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td style="min-width:120px;width:120px">
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">
+                This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance
+            </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -52,13 +62,18 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
 </thead>
 <tbody id="download-Rtorrent-container">
 {{- range $index, $app := .Config.Apps.Rtorrent}}
-    <input disabled style="display: none;" class="client-parameter download-Rtorrent{{$index}}-deleted" data-group="download" data-label="rTorrent {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter download-Rtorrent{{$index}}-deleted" data-group="download"
+        data-label="rTorrent {{instance $index}} Deleted" data-original="false" value="false">
     <tr class="download-Rtorrent {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="download-Rtorrent-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('download-Rtorrent', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('download-Rtorrent', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="RtorrentIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Rtorrent', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Rtorrent', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -74,7 +89,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RTORRENT_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Rtorrent.{{$index}}.Name" name="Apps.Rtorrent.{{$index}}.Name" data-index="{{$index}}" data-app="Rtorrent" class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Rtorrent.{{$index}}.Name" name="Apps.Rtorrent.{{$index}}.Name" data-index="{{$index}}" data-app="Rtorrent"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </form>
@@ -92,9 +109,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RTORRENT_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Rtorrent.{{$index}}.URL" onChange="showhttps($(this).val(), '#Rtorrent{{$index}}SSL');" name="Apps.Rtorrent.{{$index}}.URL" data-index="{{$index}}" data-app="Rtorrent" class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.Rtorrent.{{$index}}.URL" onChange="showhttps($(this).val(), '#Rtorrent{{$index}}SSL');" name="Apps.Rtorrent.{{$index}}.URL"
+                            data-index="{{$index}}" data-app="Rtorrent" class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Rtorrent{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Rtorrent.{{$index}}.ValidSSL" name="Apps.Rtorrent.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Rtorrent" class="client-parameter" data-group="download" data-label="Rtorrent {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Rtorrent.{{$index}}.ValidSSL" name="Apps.Rtorrent.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Rtorrent" class="client-parameter"
+                                data-group="download" data-label="Rtorrent {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -113,7 +133,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RTORRENT_%d_USER" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Rtorrent.{{$index}}.User" name="Apps.Rtorrent.{{$index}}.User" data-index="{{$index}}" data-app="Rtorrent" class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} User" data-original="{{$app.User}}" value="{{$app.User}}">
+                        <input type="text" id="Apps.Rtorrent.{{$index}}.User" name="Apps.Rtorrent.{{$index}}.User" data-index="{{$index}}" data-app="Rtorrent"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} User"
+                            data-original="{{$app.User}}" value="{{$app.User}}">
                     </div>
                 </div>
             </form>
@@ -131,8 +153,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RTORRENT_%d_PASS" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="off" id="Apps.Rtorrent.{{$index}}.Pass" name="Apps.Rtorrent.{{$index}}.Pass" data-index="{{$index}}" data-app="Rtorrent" class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} Pass" data-original="{{$app.Pass}}" value="{{$app.Pass}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Rtorrent.{{$index}}.Pass', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="off" id="Apps.Rtorrent.{{$index}}.Pass" name="Apps.Rtorrent.{{$index}}.Pass" data-index="{{$index}}"
+                            data-app="Rtorrent" class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} Pass"
+                            data-original="{{$app.Pass}}" value="{{$app.Pass}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Rtorrent.{{$index}}.Pass', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -150,7 +176,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RTORRENT_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Rtorrent.{{$index}}.Interval" name="Apps.Rtorrent.{{$index}}.Interval" data-index="{{$index}}" data-app="Rtorrent" class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Rtorrent.{{$index}}.Interval" name="Apps.Rtorrent.{{$index}}.Interval" data-index="{{$index}}" data-app="Rtorrent"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -170,7 +198,8 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">rTorrent</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RTORRENT_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Rtorrent.{{$index}}.Timeout" name="Apps.Rtorrent.{{$index}}.Timeout" data-index="{{$index}}" data-app="Rtorrent" class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Rtorrent.{{$index}}.Timeout" name="Apps.Rtorrent.{{$index}}.Timeout" data-index="{{$index}}" data-app="Rtorrent"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="rTorrent {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
diff --git a/pkg/bindata/templates/downloaders/sabnzbd.html b/pkg/bindata/templates/downloaders/sabnzbd.html
index 23e2fa8a5..9f92f9281 100644
--- a/pkg/bindata/templates/downloaders/sabnzbd.html
+++ b/pkg/bindata/templates/downloaders/sabnzbd.html
@@ -4,11 +4,16 @@
             <div style="float: left;"><img src="{{files}}/images/logo/sabnzbd.png" style="height:50px;"></div>
             <h2 class="mb-3" style="margin-bottom:-45px">SabNZB</h2>
             <div style="float: right;">
-                <button id="download-SabNZB-addbutton" onclick="addInstance('download','SabNZB')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","", "URL","APIKey","Interval","extraConfig.Timeout"]' type="button" title="Add another instance of SabNZB." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="download-SabNZB-addbutton" onclick="addInstance('download','SabNZB')" data-prefix="Apps" data-sslname="ValidSSL" type="button"
+                    data-names='["Name","", "URL","APIKey","Interval","extraConfig.Timeout"]' title="Add another instance of SabNZB." class="add-new-item-button btn btn-primary">
+                    <i class="fa fa-plus"></i>
+                </button>
             </div>
         </td>
         <td colspan="7" class="tablet-hide desktop-hide">
-            <button onclick="addInstance('download','SabNZB')" data-prefix="Apps" type="button" title="Add another instance of SabNZB." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+            <button onclick="addInstance('download','SabNZB')" data-prefix="Apps" type="button" title="Add another instance of SabNZB." class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
             <div style="float:right;"><img src="{{files}}/images/logo/sabnzbd.png" style="height:50px;"></div>
         </td>
@@ -24,13 +29,16 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">
+                Name is optional, but required to be unique if you wish to enable service checks on the instance.
+                Otherwise, it's used to identify the instance easier.
+            </div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
         <td colspan="2">
             <div style="display:none;" class="dialogText">
-                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox. 
+                http:// or https:// URL for the application instance. Providing an https:// URL reveals a checkbox.
                 Checking this box enables SSL certificate validation; invalid certificates generate an error.
             </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
@@ -43,7 +51,10 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">
+                This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
+            </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -51,13 +62,18 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
 </thead>
 <tbody id="download-SabNZB-container">
 {{- range $index, $app := .Config.Apps.SabNZB}}
-    <input disabled style="display: none;" class="client-parameter download-SabNZB{{$index}}-deleted" data-group="download" data-label="SabNZB {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter download-SabNZB{{$index}}-deleted" data-group="download"
+        data-label="SabNZB {{instance $index}} Deleted" data-original="false" value="false">
     <tr class="download-SabNZB {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="download-SabNZB-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('download-SabNZB', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('download-SabNZB', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="SabNZBIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'SabNZB', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'SabNZB', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -73,7 +89,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SABNZBD_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.SabNZB.{{$index}}.Name" name="Apps.SabNZB.{{$index}}.Name" data-index="{{$index}}" data-app="SabNZB" class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.SabNZB.{{$index}}.Name" name="Apps.SabNZB.{{$index}}.Name" data-index="{{$index}}" data-app="SabNZB"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} Name"
+                            data-original="{{$appName}}" value="{{$app.Name}}">.
                     </div>
                 </div>
             </form>
@@ -91,9 +109,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SABNZBD_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.SabNZB.{{$index}}.URL" onChange="showhttps($(this).val(), '#SabNZB{{$index}}SSL');" name="Apps.SabNZB.{{$index}}.URL" data-index="{{$index}}" data-app="SabNZB" class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.SabNZB.{{$index}}.URL" onChange="showhttps($(this).val(), '#SabNZB{{$index}}SSL');" name="Apps.SabNZB.{{$index}}.URL" data-index="{{$index}}"
+                            data-app="SabNZB" class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="SabNZB{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.SabNZB.{{$index}}.ValidSSL" name="Apps.SabNZB.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="SabNZB" class="client-parameter" data-group="download" data-label="SabNZB {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.SabNZB.{{$index}}.ValidSSL" name="Apps.SabNZB.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="SabNZB" class="client-parameter"
+                                data-group="download" data-label="SabNZB {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -112,8 +133,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SABNZBD_%d_API_KEY" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="off" id="Apps.SabNZB.{{$index}}.APIKey" name="Apps.SabNZB.{{$index}}.APIKey" data-index="{{$index}}" data-app="SabNZB" class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} APIKey" data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.SabNZB.{{$index}}.APIKey', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="off" id="Apps.SabNZB.{{$index}}.APIKey" name="Apps.SabNZB.{{$index}}.APIKey" data-index="{{$index}}" data-app="SabNZB"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} APIKey"
+                            data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.SabNZB.{{$index}}.APIKey', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -131,7 +156,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SABNZBD_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.SabNZB.{{$index}}.Interval" name="Apps.SabNZB.{{$index}}.Interval" data-index="{{$index}}" data-app="SabNZB" class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.SabNZB.{{$index}}.Interval" name="Apps.SabNZB.{{$index}}.Interval" data-index="{{$index}}" data-app="SabNZB"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -151,7 +178,8 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SABNZBD_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.SabNZB.{{$index}}.extraConfig.Timeout" name="Apps.SabNZB.{{$index}}.extraConfig.Timeout" data-index="{{$index}}" data-app="SabNZB" class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.SabNZB.{{$index}}.extraConfig.Timeout" name="Apps.SabNZB.{{$index}}.extraConfig.Timeout" data-index="{{$index}}" data-app="SabNZB"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
diff --git a/pkg/bindata/templates/downloaders/transmission.html b/pkg/bindata/templates/downloaders/transmission.html
index 183a8fac9..381e5c048 100644
--- a/pkg/bindata/templates/downloaders/transmission.html
+++ b/pkg/bindata/templates/downloaders/transmission.html
@@ -4,11 +4,16 @@
             <div style="float: left;"><img src="{{files}}/images/logo/transmission.png" style="height:50px;"></div>
             <h2 class="mb-3" style="margin-bottom:-45px">Transmission</h2>
             <div style="float: right;">
-                <button id="download-Transmission-addbutton" onclick="addInstance('download', 'Transmission')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","URL","User","Pass","Interval","Timeout"]' type="button" title="Add another instance of Transmission." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="download-Transmission-addbutton" onclick="addInstance('download', 'Transmission')" data-prefix="Apps" data-sslname="ValidSSL"
+                    data-names='["Name","URL","User","Pass","Interval","Timeout"]' type="button" title="Add another instance of Transmission." class="add-new-item-button btn btn-primary">
+                    <i class="fa fa-plus"></i>
+                </button>
             </div>
         </td>
         <td colspan="7" class="tablet-hide desktop-hide">
-            <button onclick="addInstance('download', 'Transmission')" data-prefix="Apps" type="button" title="Add another instance of Transmission." class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+            <button onclick="addInstance('download', 'Transmission')" data-prefix="Apps" type="button" title="Add another instance of Transmission." class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
             <div style="float:right;"><img src="{{files}}/images/logo/transmission.png" style="height:50px;"></div>
         </td>
@@ -24,7 +29,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td style="min-width:130px;">
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">
+                Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.
+            </div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
@@ -45,7 +52,10 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td style="min-width:120px;width:120px">
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">
+                This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
+            </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -53,13 +63,18 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
 </thead>
 <tbody id="download-Transmission-container">
 {{- range $index, $app := .Config.Apps.Transmission}}
-    <input disabled style="display: none;" class="client-parameter download-Transmission{{$index}}-deleted" data-group="download" data-label="Transmission {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter download-Transmission{{$index}}-deleted" data-group="download"
+        data-label="Transmission {{instance $index}} Deleted" data-original="false" value="false">
     <tr class="download-Transmission {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="download-Transmission-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('download-Transmission', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('download-Transmission', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="TransmissionIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Transmission', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Transmission', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -75,7 +90,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TRANSMISSION_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Transmission.{{$index}}.Name" name="Apps.Transmission.{{$index}}.Name" data-index="{{$index}}" data-app="Transmission" class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Transmission.{{$index}}.Name" name="Apps.Transmission.{{$index}}.Name" data-index="{{$index}}" data-app="Transmission"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </form>
@@ -93,9 +110,13 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TRANSMISSION_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Transmission.{{$index}}.URL" onChange="showhttps($(this).val(), '#Transmission{{$index}}SSL');" name="Apps.Transmission.{{$index}}.URL" data-index="{{$index}}" data-app="Transmission" class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}" placeholder="http://127.0.0.1:9091/transmission/rpc">
+                        <input type="text" id="Apps.Transmission.{{$index}}.URL" onChange="showhttps($(this).val(), '#Transmission{{$index}}SSL');" name="Apps.Transmission.{{$index}}.URL"
+                            data-index="{{$index}}" data-app="Transmission" class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}" placeholder="http://127.0.0.1:9091/transmission/rpc">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Transmission{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Transmission.{{$index}}.ValidSSL" name="Apps.Transmission.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Transmission" class="client-parameter" data-group="download" data-label="Transmission {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Transmission.{{$index}}.ValidSSL" name="Apps.Transmission.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Transmission"
+                                class="client-parameter" data-group="download" data-label="Transmission {{instance $index}} SSL"
+                                data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -114,7 +135,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TRANSMISSION_%d_USER" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Transmission.{{$index}}.User" name="Apps.Transmission.{{$index}}.User" data-index="{{$index}}" data-app="Transmission" class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} User" data-original="{{$app.User}}" value="{{$app.User}}">
+                        <input type="text" id="Apps.Transmission.{{$index}}.User" name="Apps.Transmission.{{$index}}.User" data-index="{{$index}}" data-app="Transmission"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} User"
+                            data-original="{{$app.User}}" value="{{$app.User}}">
                     </div>
                 </div>
             </form>
@@ -132,8 +155,12 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TRANSMISSION_%d_PASS" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="off" id="Apps.Transmission.{{$index}}.Pass" name="Apps.Transmission.{{$index}}.Pass" data-index="{{$index}}" data-app="Transmission" class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} Pass" data-original="{{$app.Pass}}" value="{{$app.Pass}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Transmission.{{$index}}.Pass', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="off" id="Apps.Transmission.{{$index}}.Pass" name="Apps.Transmission.{{$index}}.Pass" data-index="{{$index}}"
+                            data-app="Transmission" class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} Pass"
+                            data-original="{{$app.Pass}}" value="{{$app.Pass}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Transmission.{{$index}}.Pass', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -151,7 +178,9 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TRANSMISSION_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Transmission.{{$index}}.Interval" name="Apps.Transmission.{{$index}}.Interval" data-index="{{$index}}" data-app="Transmission" class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Transmission.{{$index}}.Interval" name="Apps.Transmission.{{$index}}.Interval" data-index="{{$index}}" data-app="Transmission"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -171,7 +200,8 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">Transmission</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TRANSMISSION_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Transmission.{{$index}}.Timeout" name="Apps.Transmission.{{$index}}.Timeout" data-index="{{$index}}" data-app="Transmission" class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Transmission.{{$index}}.Timeout" name="Apps.Transmission.{{$index}}.Timeout" data-index="{{$index}}" data-app="Transmission"
+                            class="client-parameter form-control input-sm" data-group="download" data-label="Transmission {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
diff --git a/pkg/bindata/templates/filewatcher.html b/pkg/bindata/templates/filewatcher.html
index 3cfd6386e..82a577651 100644
--- a/pkg/bindata/templates/filewatcher.html
+++ b/pkg/bindata/templates/filewatcher.html
@@ -67,7 +67,10 @@ <h2 style="margin-left:5px;display:inline;">WatchFiles</h2>
                     <span class="dialogTitle">FIFO Pipe</span>
                 </td>
                 <td style="min-width:110px;width:110px;">
-                    <div style="display:none;" class="dialogText">Enabling this will skip watching the file if it does not exist when the application starts. <b>Watching files that do not exist is still buggy and may not work at all.</b></div>
+                    <div style="display:none;" class="dialogText">
+                        Enabling this will skip watching the file if it does not exist when the application starts.
+                         <b>Watching files that do not exist is still buggy and may not work at all.</b>
+                    </div>
                     <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
                     <span class="dialogTitle">Must Exist</span>
                 </td>
@@ -80,14 +83,21 @@ <h2 style="margin-left:5px;display:inline;">WatchFiles</h2>
         </thead>
         <tbody id="files-WatchFiles-container">
         {{- range $index, $app := .Config.WatchFiles}}
-            <input disabled style="display: none;" class="client-parameter files-WatchFiles{{$index}}-deleted" data-group="files" data-label="Files {{instance $index}} Deleted" data-original="false" value="false">
+            <input disabled style="display: none;" class="client-parameter files-WatchFiles{{$index}}-deleted" data-group="files"
+                data-label="Files {{instance $index}} Deleted" data-original="false" value="false">
             <tr class="files-WatchFiles" id="files-WatchFiles-{{$index}}">
                 <td style="white-space:nowrap;" id="activeFileCell{{$index}}" class="{{if $app.Active}}bk-brand{{else}}bk-danger{{end}}">
                     <div class="btn-group" role="group" style="display:flex;font-size:18px;">
-                        <button onclick="removeInstance('files-WatchFiles', '{{$index}}')" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:16px;width:35px;"><i class="fa fa-trash-alt"></i></button>
+                        <button onclick="removeInstance('files-WatchFiles', '{{$index}}')" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:16px;width:35px;">
+                            <i class="fa fa-trash-alt"></i>
+                        </button>
                         <button id="WatchFilesIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                        <button onClick="stopFileWatch($(this), '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;{{if not $app.Active}}display:none;{{end}}"><i class="fas fa-stop-circle text-danger"></i></button>
-                        <button onClick="startFileWatch($(this), '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;{{if $app.Active}}display:none;{{end}}"><i class="fas fa-play-circle text-primary"></i></button>
+                        <button onClick="stopFileWatch($(this), '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;{{if not $app.Active}}display:none;{{end}}">
+                            <i class="fas fa-stop-circle text-danger"></i>
+                        </button>
+                        <button onClick="startFileWatch($(this), '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;{{if $app.Active}}display:none;{{end}}">
+                            <i class="fas fa-play-circle text-primary"></i>
+                        </button>
                     </div>
                 </td>
                 <td>
@@ -103,10 +113,12 @@ <h2 style="margin-left:5px;display:inline;">WatchFiles</h2>
                                     <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_WATCH_FILES_%d_PATH" $.Flags.EnvPrefix $index}}</span>
                                 </div>
                                 {{- end}}
-                                <input type="text" id="WatchFiles.{{$index}}.Path" name="WatchFiles.{{$index}}.Path" data-index="{{$index}}" 
+                                <input type="text" id="WatchFiles.{{$index}}.Path" name="WatchFiles.{{$index}}.Path" data-index="{{$index}}"
                                     data-app="WatchFiles" class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} Name"
                                     data-original="{{(index $.Input.WatchFiles $index).Path}}" value="{{(index $.Input.WatchFiles $index).Path}}">
-                                <div onClick="browseFiles('#WatchFiles\\.{{$index}}\\.Path');" style="max-width:35px;width:35px;cursor:pointer;font-size:16px;" class="input-group-addon input-sm"><a class="help-icon fas fa-folder-open"></a></div>
+                                <div onClick="browseFiles('#WatchFiles\\.{{$index}}\\.Path');" style="max-width:35px;width:35px;cursor:pointer;font-size:16px;" class="input-group-addon input-sm">
+                                    <a class="help-icon fas fa-folder-open"></a>
+                                </div>
                             </div>
                         </div>
                     </form>
@@ -164,7 +176,9 @@ <h2 style="margin-left:5px;display:inline;">WatchFiles</h2>
                                     <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_WATCH_FILES_%d_POLL" $.Flags.EnvPrefix $index}}</span>
                                 </div>
                                 {{- end}}
-                                <select autocomplete="off" id="WatchFiles.{{$index}}.Poll" name="WatchFiles.{{$index}}.Poll" data-index="{{$index}}" data-app="WatchFiles" class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} Poll" data-original="{{$app.Poll}}" value="{{$app.Poll}}">
+                                <select autocomplete="off" id="WatchFiles.{{$index}}.Poll" name="WatchFiles.{{$index}}.Poll" data-index="{{$index}}" data-app="WatchFiles"
+                                    class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} Poll"
+                                    data-original="{{$app.Poll}}" value="{{$app.Poll}}">
                                     <option {{if $app.Poll}}selected {{end}}value="true">Enabled</option>
                                     <option {{if not $app.Poll}}selected {{end}}value="false">Disabled</option>
                                 </select>
@@ -185,7 +199,9 @@ <h2 style="margin-left:5px;display:inline;">WatchFiles</h2>
                                     <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_WATCH_FILES_%d_PIPE" $.Flags.EnvPrefix $index}}</span>
                                 </div>
                                 {{- end}}
-                                <select autocomplete="off" id="WatchFiles.{{$index}}.Pipe" name="WatchFiles.{{$index}}.Pipe" data-index="{{$index}}" data-app="WatchFiles" class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} Pipe" data-original="{{$app.Pipe}}" value="{{$app.Pipe}}">
+                                <select autocomplete="off" id="WatchFiles.{{$index}}.Pipe" name="WatchFiles.{{$index}}.Pipe" data-index="{{$index}}" data-app="WatchFiles"
+                                    class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} Pipe"
+                                    data-original="{{$app.Pipe}}" value="{{$app.Pipe}}">
                                     <option {{if $app.Pipe}}selected {{end}}value="true">Enabled</option>
                                     <option {{if not $app.Pipe}}selected {{end}}value="false">Disabled</option>
                                 </select>
@@ -206,7 +222,9 @@ <h2 style="margin-left:5px;display:inline;">WatchFiles</h2>
                                     <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_WATCH_FILES_%d_MUST_EXIST" $.Flags.EnvPrefix $index}}</span>
                                 </div>
                                 {{- end}}
-                                <select autocomplete="off" id="WatchFiles.{{$index}}.MustExist" name="WatchFiles.{{$index}}.MustExist" data-index="{{$index}}" data-app="WatchFiles" class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} MustExist" data-original="{{$app.MustExist}}" value="{{$app.MustExist}}">
+                                <select autocomplete="off" id="WatchFiles.{{$index}}.MustExist" name="WatchFiles.{{$index}}.MustExist" data-index="{{$index}}"
+                                    data-app="WatchFiles" class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} MustExist"
+                                    data-original="{{$app.MustExist}}" value="{{$app.MustExist}}">
                                     <option {{if $app.MustExist}}selected {{end}}value="true">Enabled</option>
                                     <option {{if not $app.MustExist}}selected {{end}}value="false">Disabled</option>
                                 </select>
@@ -227,7 +245,9 @@ <h2 style="margin-left:5px;display:inline;">WatchFiles</h2>
                                     <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_WATCH_FILES_%d_LOG_MATCH" $.Flags.EnvPrefix $index}}</span>
                                 </div>
                                 {{- end}}
-                                <select autocomplete="off" id="WatchFiles.{{$index}}.LogMatch" name="WatchFiles.{{$index}}.LogMatch" data-index="{{$index}}" data-app="WatchFiles" class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} LogMatch" data-original="{{$app.LogMatch}}" value="{{$app.LogMatch}}">
+                                <select autocomplete="off" id="WatchFiles.{{$index}}.LogMatch" name="WatchFiles.{{$index}}.LogMatch" data-index="{{$index}}"
+                                    data-app="WatchFiles" class="client-parameter form-control input-sm" data-group="files" data-label="Files {{instance $index}} LogMatch"
+                                    data-original="{{$app.LogMatch}}" value="{{$app.LogMatch}}">
                                     <option {{if $app.LogMatch}}selected {{end}}value="true">Enabled</option>
                                     <option {{if not $app.LogMatch}}selected {{end}}value="false">Disabled</option>
                                 </select>
@@ -244,9 +264,18 @@ <h2 style="margin-left:5px;display:inline;">WatchFiles</h2>
 <h3><i class="fas fa-vial"></i> Regular Expression Tester</h3>
 <div class="table-responsive">
     <table class="table bk-dark">
-        <tr><td style="width:110px;vertical-align:middle;font-size:16px;" class="text-center">Expression</td><td><input class="form-control input-sm regex-parameter" type="text" id="regexTestRegex" name="regexTestRegex" placeholder="(?i)(error|warning|panic)"></td></tr>
-        <tr><td style="width:110px;vertical-align:middle;font-size:16px;" class="text-center">Test String</td><td><input class="form-control input-sm regex-parameter" type="text" id="regexTestLine" name="regexTestLine" placeholder="2059/01/23 16:20:32 [INFO] Log Line goes here"></td></tr>
-        <tr><td><button onClick="testRegex();" class="btn btn-sm btn-success" style="width:100%;font-size:14px;"><i class="fas fa-check-double"></i> Test Regex</button></td><td></td></tr>
+        <tr>
+            <td style="width:110px;vertical-align:middle;font-size:16px;" class="text-center">Expression</td>
+            <td><input class="form-control input-sm regex-parameter" type="text" id="regexTestRegex" name="regexTestRegex" placeholder="(?i)(error|warning|panic)"></td>
+        </tr>
+        <tr>
+            <td style="width:110px;vertical-align:middle;font-size:16px;" class="text-center">Test String</td>
+            <td><input class="form-control input-sm regex-parameter" type="text" id="regexTestLine" name="regexTestLine" placeholder="2059/01/23 16:20:32 [INFO] Log Line goes here"></td>
+        </tr>
+        <tr>
+            <td><button onClick="testRegex();" class="btn btn-sm btn-success" style="width:100%;font-size:14px;"><i class="fas fa-check-double"></i> Test Regex</button></td>
+            <td></td>
+        </tr>
     </table>
 </div>
 {{- /* end of filewatcher (leave this comment) */ -}}
diff --git a/pkg/bindata/templates/includes/filetablelist.html b/pkg/bindata/templates/includes/filetablelist.html
index 19dcadbbb..9c9d82912 100644
--- a/pkg/bindata/templates/includes/filetablelist.html
+++ b/pkg/bindata/templates/includes/filetablelist.html
@@ -1,6 +1,7 @@
 {{- /* This is imported by configfiles and logfiles. */}}
 {{- range $file := . }}
-<table class="table table-bordered fileinfo-table" style="display:none;table-layout:fixed;" id="fileinfo-{{$file.ID}}" data-url="{{base}}ws" data-name="{{$file.Name}}" data-id="{{$file.ID}}" data-used="{{$file.Used}}" data-filename="{{$file.Path}}">
+<table class="table table-bordered fileinfo-table" style="display:none;table-layout:fixed;" id="fileinfo-{{$file.ID}}" data-url="{{base}}ws"
+    data-name="{{$file.Name}}" data-id="{{$file.ID}}" data-used="{{$file.Used}}" data-filename="{{$file.Path}}">
     <tr>
         <th style="width:15%;">Path</th>
         <td style="word-wrap:break-word;">{{$file.Path}}</td>
diff --git a/pkg/bindata/templates/index.html b/pkg/bindata/templates/index.html
index 3e2ed9111..03b2cb43f 100644
--- a/pkg/bindata/templates/index.html
+++ b/pkg/bindata/templates/index.html
@@ -42,7 +42,8 @@ <h4 class="text-uppercase text-white" style="margin:10px 0px 0px 10px">
                                 <div class="btn-default btn-sm disabled" style="margin-top:4px;padding-left:0px;width:100%;text-align:center;font-size:10px">
                                     {{.HostInfo.Hostname}}
                                 </div>
-                                <button class="btn btn-default btn-sm dropdown-toggle" style="margin-top:0px;padding-left:0px;width:100%;text-align:left;font-size:14px" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                <button class="btn btn-default btn-sm dropdown-toggle" style="margin-top:0px;padding-left:0px;width:100%;text-align:left;font-size:14px"
+                                    type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                                     <span style="text-align:left;"><i class="nav-icon fas fa-user-astronaut"></i> &nbsp;&nbsp;&nbsp;&nbsp; {{.Username}} &nbsp;<span class="caret"></span></span>
                                 </button>
                                 <ul style="width:92%;" class="dropdown-menu bk-brown" aria-labelledby="user menu">
diff --git a/pkg/bindata/templates/logfiles.html b/pkg/bindata/templates/logfiles.html
index 8c33dd2b1..08570627a 100644
--- a/pkg/bindata/templates/logfiles.html
+++ b/pkg/bindata/templates/logfiles.html
@@ -35,7 +35,9 @@ <h1><i class="fas fa-file-medical-alt"></i> Log Files</h1>
                             <a href="ui/downloadFile/logs/{{ $file.ID }}" class="fas fa-cloud-download-alt" style="margin-right: 5px;" title="Download log file."></a>
                             <i class="fas fa-cloud-upload-alt" onClick="triggerFileAction($(this), 'upload', 'logs', {{$file.ID}})" style="cursor: pointer; margin-right: 5px;" title="Upload log file."></i>
                             <i class="fas fa-stream socketLink" onClick="openWebsocket($(this), '{{$file.ID}}')" style="cursor: pointer; color: green; margin-right: 5px;" title="Tail log file."></i>
-                            {{if not $file.Used}}<i class="fas fa-trash-alt" onClick="triggerFileAction($(this), 'delete', 'logs', {{$file.ID}})" style="cursor: pointer; color: rgb(169, 9, 9);" title="Delete log file."></i>{{end}}
+                            {{- if not $file.Used}}
+                            <i class="fas fa-trash-alt" onClick="triggerFileAction($(this), 'delete', 'logs', {{$file.ID}})" style="cursor: pointer; color: rgb(169, 9, 9);" title="Delete log file."></i>
+                            {{- end}}
                         </td>
                     </tr>
                     {{- end }}
diff --git a/pkg/bindata/templates/media/plex.html b/pkg/bindata/templates/media/plex.html
index 2e3e8195d..dc905d43d 100644
--- a/pkg/bindata/templates/media/plex.html
+++ b/pkg/bindata/templates/media/plex.html
@@ -24,7 +24,8 @@ <h2 class="mb-3" style="margin-bottom:-45px">Plex</h2>
         </td>
         <td>
             <div style="display:none;" class="dialogText">
-                You may find directions for locating your Plex token at this <a target="_new" href="https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/">Plex Article</a>.
+                You may find directions for locating your Plex token at this
+                <a target="_new" href="https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/">Plex Article</a>.
             </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Plex Token</span>
@@ -35,7 +36,10 @@ <h2 class="mb-3" style="margin-bottom:-45px">Plex</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">
+                This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
+            </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -45,7 +49,9 @@ <h2 class="mb-3" style="margin-bottom:-45px">Plex</h2>
     <tr{{if (lt .Config.Apps.Plex.Timeout.Seconds (add 0 0))}} class="bk-danger"{{end}}>
         <td>
             <div class="btn-group" role="group" style="display:flex;font-size:18px;">
-                <button onClick="testInstance($(this), 'Plex', '1')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Plex', '1')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -68,7 +74,8 @@ <h2 class="mb-3" style="margin-bottom:-45px">Plex</h2>
                             class="client-parameter form-control input-sm" data-group="media" data-label="Plex URL"
                             data-original="{{.Input.Apps.Plex.URL}}" value="{{.Input.Apps.Plex.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains .Config.Apps.Plex.URL "https://")}}display:none;{{end}}" id="PlexSSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Plex.ValidSSL" name="Apps.Plex.ValidSSL" data-app="Plex" class="client-parameter" data-group="media" data-label="Plex SSL" data-original="{{.Config.Apps.Plex.ValidSSL}}" {{if .Config.Apps.Plex.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Plex.ValidSSL" name="Apps.Plex.ValidSSL" data-app="Plex" class="client-parameter" data-group="media"
+                                data-label="Plex SSL" data-original="{{.Config.Apps.Plex.ValidSSL}}" {{if .Config.Apps.Plex.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -90,7 +97,9 @@ <h2 class="mb-3" style="margin-bottom:-45px">Plex</h2>
                         <input type="password" autocomplete="off" id="Apps.Plex.Token" name="Apps.Plex.Token" data-app="Plex"
                             class="client-parameter form-control input-sm" data-group="media" data-label="Plex Token"
                             data-original="{{.Input.Apps.Plex.Token}}" value="{{.Input.Apps.Plex.Token}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Plex.Token', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Plex.Token', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -108,7 +117,8 @@ <h2 class="mb-3" style="margin-bottom:-45px">Plex</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PLEX_INTERVAL" .Flags.EnvPrefix}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Plex.Interval" name="Apps.Plex.Interval" class="client-parameter form-control input-sm"data-group="media" data-label="Plex Interval" data-original="{{.Config.Apps.Plex.Interval}}">
+                        <select type="select" id="Apps.Plex.Interval" name="Apps.Plex.Interval" class="client-parameter form-control input-sm"
+                            data-group="media" data-label="Plex Interval" data-original="{{.Config.Apps.Plex.Interval}}">
 {{template "includes/intervaloptions.html" $.Config.Apps.Plex.Interval}}
                         </select>
                     </div>
@@ -128,7 +138,8 @@ <h2 class="mb-3" style="margin-bottom:-45px">Plex</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PLEX_TIMEOUT" .Flags.EnvPrefix}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Plex.Timeout" name="Plex.Timeout" class="client-parameter form-control input-sm" data-group="media" data-label="Plex Timeout" data-original="{{.Config.Apps.Plex.Timeout}}">
+                        <select type="select" id="Plex.Timeout" name="Plex.Timeout" class="client-parameter form-control input-sm"
+                            data-group="media" data-label="Plex Timeout" data-original="{{.Config.Apps.Plex.Timeout}}">
                             <option value="-1s" {{if eq $.Config.Apps.Plex.Timeout.Seconds (add -1 0)}}selected {{end}}>Disabled</option>
                             {{- range $i := one259 }}
                             <option {{if eq $.Config.Apps.Plex.Timeout.Seconds $i}}selected {{end}}value="{{$i}}s">{{$i}} second{{if not (eq $i (add 0 1))}}s{{end}}</option>
diff --git a/pkg/bindata/templates/profile.html b/pkg/bindata/templates/profile.html
index 6e5a4baca..bbc7bd283 100644
--- a/pkg/bindata/templates/profile.html
+++ b/pkg/bindata/templates/profile.html
@@ -85,10 +85,14 @@ <h4>No Password</h4>
                             <i onClick="dialog($(this), 'right')" class="text-danger help-icon fas fa-outdent"></i>
                             <span class="dialogTitle" style="display:none;">Env Variable: {{printf "%s_UPSTREAMS_0" .Flags.EnvPrefix}}</span>
                         </div>
-                        <input type="text" id="Upstreams" name="Upstreams" placeholder="127.0.0.1 ::1" class="profile-parameter form-control input-sm" data-group="config" data-label="Upstreams" style="width: 100%;" data-original="{{range $s := .Config.Allow.Input}}{{$s}} {{end}}" value="{{range $s := .Config.Allow.Input}}{{$s}} {{end}}">
+                        <input type="text" id="Upstreams" name="Upstreams" placeholder="127.0.0.1 ::1" class="profile-parameter form-control input-sm"
+                            data-group="config"data-label="Upstreams" style="width: 100%;"
+                            data-original="{{range $s := .Config.Allow.Input}}{{$s}} {{end}}" value="{{range $s := .Config.Allow.Input}}{{$s}} {{end}}">
                     </div>
                 {{- else}}
-                    <input type="text" id="Upstreams" name="Upstreams" placeholder="127.0.0.1 ::1" class="profile-parameter form-control input-sm" data-group="config" data-label="Upstreams" style="width: 100%;" data-original="{{range $s := .Config.Allow.Input}}{{$s}} {{end}}" value="{{range $s := .Config.Allow.Input}}{{$s}} {{end}}">
+                    <input type="text" id="Upstreams" name="Upstreams" placeholder="127.0.0.1 ::1" class="profile-parameter form-control input-sm"
+                        data-group="config" data-label="Upstreams" style="width: 100%;"
+                        data-original="{{range $s := .Config.Allow.Input}}{{$s}} {{end}}" value="{{range $s := .Config.Allow.Input}}{{$s}} {{end}}">
                 {{- end}}
                     </div>
                 </div>
@@ -191,8 +195,11 @@ <h4>No Password</h4>
                                     <span class="dialogTitle" style="display:none;">Env Variable: {{printf "%s_UI_PASSWORD" .Flags.EnvPrefix}}</span>
                                 </div>
                             {{- end}}
-                            <input placeholder="9 character minimum" type="password" autocomplete="new-password" id="NewPassword" name="NewPassword" class="profile-parameter form-control input-sm" style="width: {{if (locked (printf "%s_UI_PASSWORD" .Flags.EnvPrefix))}}calc(100% - 15px){{else}}100%{{end}};">
-                            <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('NewPassword', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                            <input placeholder="9 character minimum" type="password" autocomplete="new-password" class="profile-parameter form-control input-sm"
+                                id="NewPassword" name="NewPassword" style="width: {{if (locked (printf "%s_UI_PASSWORD" .Flags.EnvPrefix))}}calc(100% - 15px){{else}}100%{{end}};">
+                            <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('NewPassword', $(this).find('i'));">
+                                <i class="fas fa-low-vision secret-input"></i>
+                            </div>
                         </div>
                     </div>
                 </form>
diff --git a/pkg/bindata/templates/services.html b/pkg/bindata/templates/services.html
index 9f3d0c7c0..3ccddd9e9 100644
--- a/pkg/bindata/templates/services.html
+++ b/pkg/bindata/templates/services.html
@@ -47,7 +47,10 @@ <h3>UDP and ICMP Ping Check Types</h3>
                     <div style="float: left;font-size:40px;"><i class="fas fa-tasks"></i></div>
                     <h3 style="margin-bottom:-45px">Check Configuration</h3>
                     <div style="float: right;">
-                        <button id="services-Checks-addbutton" onclick="addServiceCheck();" data-prefix="Services" data-names='["Name","Type","Value","Expect","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                        <button id="services-Checks-addbutton" onclick="addServiceCheck();" data-prefix="Services" type="button"
+                            data-names='["Name","Type","Value","Expect","Interval","Timeout"]' class="add-new-item-button btn btn-primary">
+                        <i class="fa fa-plus"></i>
+                    </button>
                     </div>
                 </td>
                 <td class="tablet-hide desktop-hide">
@@ -86,13 +89,18 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                 </thead>
                 <tbody id="services-Checks-container">
                 {{- range $index, $svc := .Config.Service}}
-                    <input disabled style="display: none;" class="client-parameter services-Checks{{$index}}-deleted" data-group="services" data-label="Checks {{instance $index}} Deleted" data-original="false" value="false">
+                    <input disabled style="display: none;" class="client-parameter services-Checks{{$index}}-deleted" data-group="services"
+                        data-label="Checks {{instance $index}} Deleted" data-original="false" value="false">
                     <tr class="services-Checks" id="services-Checks-{{$index}}">
                         <td style="white-space:nowrap;">
                             <div class="btn-group" role="group" style="display:flex;">
-                                <button onclick="removeInstance('services-Checks', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                                <button onclick="removeInstance('services-Checks', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                                    <i class="fa fa-minus"></i>
+                                </button>
                                 <button id="checksIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                                <button onClick="testService($(this), '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                                <button onClick="testService($(this), '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                                    <i class="fas fa-check-double"></i>
+                                </button>
                             </div>
                         </td>
                         <td>
@@ -107,7 +115,9 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                                         <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SERVICE_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                                     </div>
                                     {{- end}}
-                                    <input type="text" id="Service.{{$index}}.Name" name="Service.{{$index}}.Name" data-index="{{$index}}" data-app="checks" class="client-parameter form-control input-sm" data-group="services" data-label="Check {{instance $index}} Name" data-original="{{(index $.Input.Service $index).Name}}" value="{{(index $.Input.Service $index).Name}}">
+                                    <input type="text" id="Service.{{$index}}.Name" name="Service.{{$index}}.Name" data-index="{{$index}}" data-app="checks"
+                                        class="client-parameter form-control input-sm" data-group="services" data-label="Check {{instance $index}} Name"
+                                        data-original="{{(index $.Input.Service $index).Name}}" value="{{(index $.Input.Service $index).Name}}">
                                 </div>
                             </div>
                         </td>
@@ -123,7 +133,9 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                                         <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SERVICE_%d_TYPE" $.Flags.EnvPrefix $index}}</span>
                                     </div>
                                     {{- end}}
-                                    <select id="Service.{{$index}}.Type" name="Service.{{$index}}.Type" data-index="{{$index}}" onChange="checkTypeChange($(this));" data-app="checks" class="client-parameter form-control input-sm serviceTypeSelect" data-group="services" data-label="Check {{instance $index}} Type" data-original="{{$svc.Type}}" value="{{$svc.Type}}">
+                                    <select id="Service.{{$index}}.Type" name="Service.{{$index}}.Type" data-index="{{$index}}" onChange="checkTypeChange($(this));"
+                                        data-app="checks" class="client-parameter form-control input-sm serviceTypeSelect" data-group="services" data-label="Check {{instance $index}} Type"
+                                        data-original="{{$svc.Type}}" value="{{$svc.Type}}">
                                         <option value="process"{{if eq $svc.Type "process"}} selected{{end}}>Process</option>
                                         <option value="http"{{if eq $svc.Type "http"}} selected{{end}}>HTTP</option>
                                         <option value="tcp"{{if eq $svc.Type "tcp"}} selected{{end}}>TCP Port</option>
@@ -145,14 +157,18 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                                         <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SERVICE_%d_CHECK" $.Flags.EnvPrefix $index}}</span>
                                     </div>
                                     {{- end}}
-                                    <input type="text" id="Service.{{$index}}.Value" name="Service.{{$index}}.Value" data-index="{{$index}}" data-app="checks" class="client-parameter form-control input-sm" data-group="services" data-label="Check {{instance $index}} Value" data-original="{{(index $.Input.Service $index).Value}}" value="{{(index $.Input.Service $index).Value}}">
+                                    <input type="text" id="Service.{{$index}}.Value" name="Service.{{$index}}.Value" data-index="{{$index}}" data-app="checks"
+                                        class="client-parameter form-control input-sm" data-group="services" data-label="Check {{instance $index}} Value"
+                                        data-original="{{(index $.Input.Service $index).Value}}" value="{{(index $.Input.Service $index).Value}}">
                                 </div>
                             </div>
                         </td>
                         <td>
                             <div class="form-group" style="width:100%">
                                 <div class="input-group" style="width:100%">
-                                    <input id="Service.{{$index}}.Expect" name="Service.{{$index}}.Expect" data-index="{{$index}}" data-app="checks" class="client-parameter form-control input-sm serviceProcessParamExpect" data-group="services" data-label="Check {{instance $index}} Expect" data-original="{{$svc.Expect}}" value="{{$svc.Expect}}" style="display:none;">
+                                    <input id="Service.{{$index}}.Expect" name="Service.{{$index}}.Expect" data-index="{{$index}}" data-app="checks"
+                                        class="client-parameter form-control input-sm serviceProcessParamExpect" data-group="services" data-label="Check {{instance $index}} Expect"
+                                        data-original="{{$svc.Expect}}" value="{{$svc.Expect}}" style="display:none;">
                                     {{- if (locked (printf "%s_SERVICE_%d_EXPECT" $.Flags.EnvPrefix $index)) }}
                                     <div style="width:30px; max-width:30px;" class="input-group-addon input-sm">
                                         <div style="display:none;" class="dialogText">
@@ -162,7 +178,8 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                                         <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SERVICE_%d_EXPECT" $.Flags.EnvPrefix $index}}</span>
                                     </div>
                                     {{- end}}
-                                    <select multiple id="Service.{{$index}}.Expect.StatusCode" onChange="checkExpectChange($(this));" data-index="{{$index}}" data-app="checks" style="width:100%;{{if ne $svc.Type "http"}}display:none;{{end}}" class="form-control input-sm serviceHTTPParam">
+                                    <select multiple id="Service.{{$index}}.Expect.StatusCode" onChange="checkExpectChange($(this));" data-index="{{$index}}" data-app="checks"
+                                        style="width:100%;{{if ne $svc.Type "http"}}display:none;{{end}}" class="form-control input-sm serviceHTTPParam">
                                         <option value="SSL"{{if and (eq $svc.Type "http") (contains $svc.Expect "SSL")}} selected{{end}}>SSL: Validate Certificate</option>
                                         <option value="100"{{if and (eq $svc.Type "http") (contains $svc.Expect "100")}} selected{{end}}>100: Continue</option>
                                         <option value="101"{{if and (eq $svc.Type "http") (contains $svc.Expect "101")}} selected{{end}}>101: SwitchingProtocols</option>
@@ -227,10 +244,17 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                                         <option value="510"{{if and (eq $svc.Type "http") (contains $svc.Expect "510")}} selected{{end}}>510: NotExtended</option>
                                         <option value="511"{{if and (eq $svc.Type "http") (contains $svc.Expect "511")}} selected{{end}}>511: NetworkAuthenticationRequired</option>
                                     </select>
-                                    <input type="number" min="1" max=50 onChange="checkExpectChange($(this));" title="Count of packets to sent." class="form-control input-sm servicePingParam servicePingParamCount" value="{{cutindex $svc.Expect ":" "3" 0}}" style="width:30%;{{if and (ne $svc.Type "ping") (ne $svc.Type "icmp")}}display:none;{{end}}">
-                                    <input type="number" min="1" max=50 onChange="checkExpectChange($(this));" title="Packets that must be received." class="form-control input-sm servicePingParam servicePingParamMin" value="{{cutindex $svc.Expect ":" "2" 1}}" style="width:30%;{{if and (ne $svc.Type "ping") (ne $svc.Type "icmp")}}display:none;{{end}}">
-                                    <input type="number" min="100" max=10000 onChange="checkExpectChange($(this));" title="Interval in milliseconds between packets." class="form-control input-sm servicePingParam servicePingParamInt" value="{{cutindex $svc.Expect ":" "500" 2}}" style="width:40%;{{if and (ne $svc.Type "ping") (ne $svc.Type "icmp")}}display:none;{{end}}">
-                                    <select onChange="checkExpectChange($(this));" style="width:40%;{{if ne $svc.Type "process"}}display:none;{{end}}" class="form-control input-sm serviceProcessParam serviceProcessParamSelector">
+                                    <input type="number" min="1" max=50 onChange="checkExpectChange($(this));" title="Count of packets to sent."
+                                        class="form-control input-sm servicePingParam servicePingParamCount" value="{{cutindex $svc.Expect ":" "3" 0}}"
+                                        style="width:30%;{{if and (ne $svc.Type "ping") (ne $svc.Type "icmp")}}display:none;{{end}}">
+                                    <input type="number" min="1" max=50 onChange="checkExpectChange($(this));" title="Packets that must be received."
+                                        class="form-control input-sm servicePingParam servicePingParamMin" value="{{cutindex $svc.Expect ":" "2" 1}}"
+                                        style="width:30%;{{if and (ne $svc.Type "ping") (ne $svc.Type "icmp")}}display:none;{{end}}">
+                                    <input type="number" min="100" max=10000 onChange="checkExpectChange($(this));" title="Interval in milliseconds between packets."
+                                        class="form-control input-sm servicePingParam servicePingParamInt" value="{{cutindex $svc.Expect ":" "500" 2}}"
+                                        style="width:40%;{{if and (ne $svc.Type "ping") (ne $svc.Type "icmp")}}display:none;{{end}}">
+                                    <select onChange="checkExpectChange($(this));" style="width:40%;{{if ne $svc.Type "process"}}display:none;{{end}}"
+                                        class="form-control input-sm serviceProcessParam serviceProcessParamSelector">
                                         <option value="">None</option>
                                         <option value="restart"{{if contains $svc.Expect "restart"}} selected{{end}}>
                                             Restarts
@@ -239,8 +263,12 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                                             Running
                                         </option>
                                     </select>
-                                    <input type="number" min="0" onChange="checkExpectChange($(this));" title="Minimum number of processes allowed to run." class="form-control input-sm serviceProcessParam serviceProcessParamMin" value="{{min $svc.Expect}}" style="width:30%;{{if ne $svc.Type "process"}}display:none;{{end}}"{{if contains $svc.Expect "running"}} disabled{{end}}>
-                                    <input type="number" min="0" onChange="checkExpectChange($(this));" title="Maximum number of processes allowed to run." class="form-control input-sm serviceProcessParam serviceProcessParamMax" value="{{max $svc.Expect}}" style="width:30%;{{if ne $svc.Type "process"}}display:none;{{end}}"{{if contains $svc.Expect "running"}} disabled{{end}}>
+                                    <input type="number" min="0" onChange="checkExpectChange($(this));" title="Minimum number of processes allowed to run."
+                                        class="form-control input-sm serviceProcessParam serviceProcessParamMin" value="{{min $svc.Expect}}"
+                                        style="width:30%;{{if ne $svc.Type "process"}}display:none;{{end}}"{{if contains $svc.Expect "running"}} disabled{{end}}>
+                                    <input type="number" min="0" onChange="checkExpectChange($(this));" title="Maximum number of processes allowed to run."
+                                        class="form-control input-sm serviceProcessParam serviceProcessParamMax" value="{{max $svc.Expect}}"
+                                        style="width:30%;{{if ne $svc.Type "process"}}display:none;{{end}}"{{if contains $svc.Expect "running"}} disabled{{end}}>
                                     <input disabled type="text" data-app="checks" value="unused" class="form-control input-sm serviceTCPParam" style="{{if ne $svc.Type "tcp"}}display:none;{{end}}">
                                 </div>
                             </div>
@@ -257,7 +285,8 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                                         <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SERVICE_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                                     </div>
                                     {{- end}}
-                                    <select type="select" id="Service.{{$index}}.Interval" name="Service.{{$index}}.Interval" data-index="{{$index}}" data-app="checks" class="client-parameter form-control input-sm" data-group="services" data-label="Check {{instance $index}} Interval" data-original="{{$svc.Interval}}">
+                                    <select type="select" id="Service.{{$index}}.Interval" name="Service.{{$index}}.Interval" data-index="{{$index}}" data-app="checks" data-group="services"
+                                        class="client-parameter form-control input-sm" data-label="Check {{instance $index}} Interval" data-original="{{$svc.Interval}}">
 {{template "includes/intervaloptions.html" $svc.Interval}}
                                     </select>
                                 </div>
@@ -275,7 +304,8 @@ <h3 style="margin-left:5px;display:inline;">Check Configuration</h3>
                                         <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SERVICE_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                                     </div>
                                     {{- end}}
-                                    <select type="select" id="Service.{{$index}}.Timeout" name="Service.{{$index}}.Timeout" data-index="{{$index}}" data-app="checks" class="client-parameter form-control input-sm" data-group="services" data-label="Check {{instance $index}} Timeout" data-original="{{$svc.Timeout}}">
+                                    <select type="select" id="Service.{{$index}}.Timeout" name="Service.{{$index}}.Timeout" data-index="{{$index}}" data-app="checks" data-group="services"
+                                        class="client-parameter form-control input-sm" data-label="Check {{instance $index}} Timeout" data-original="{{$svc.Timeout}}">
                                         <!-- option value="-1s">Disabled</option -->
                                         <option value="0s">No Timeout</option>
                                         {{- range $i := one259 }}
diff --git a/pkg/bindata/templates/snapshot/nvidia.html b/pkg/bindata/templates/snapshot/nvidia.html
index 8f7ee0f32..1c5ee8a8f 100644
--- a/pkg/bindata/templates/snapshot/nvidia.html
+++ b/pkg/bindata/templates/snapshot/nvidia.html
@@ -45,7 +45,9 @@ <h2 style="margin-bottom:-45px;padding-right:100px;">Nvidia</h2>
             <tr class="snaps-Nvidia" id="snaps-Nvidia">
                 <td class="text-center">
                     <div class="btn-group" role="group" style="font-size:18px;">
-                        <button onClick="testInstance($(this), 'Nvidia', 0)" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                        <button onClick="testInstance($(this), 'Nvidia', 0)" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                            <i class="fas fa-check-double"></i>
+                        </button>
                     </div>
                 </td>
                 <td>
@@ -87,7 +89,10 @@ <h2 style="margin-bottom:-45px;padding-right:100px;">Nvidia</h2>
                                 <input type="text" id="Snapshot.Nvidia.SMIPath" name="Snapshot.Nvidia.SMIPath" data-app="Nvidia"
                                     class="client-parameter form-control input-sm" data-group="snaps" data-label="Nvidia SMI Path"
                                     data-original="{{.Input.Snapshot.Nvidia.SMIPath}}" value="{{.Input.Snapshot.Nvidia.SMIPath}}">
-                                <div onClick="browseFiles('#Snapshot\\.Nvidia\\.SMIPath', 'nvidia-smi{{if eq .Version.os "windows"}}.exe{{end}}');" style="max-width:35px;width:35px;cursor:pointer;font-size:16px;" class="input-group-addon input-sm"><a class="help-icon fas fa-folder-open"></a></div>
+                                <div onClick="browseFiles('#Snapshot\\.Nvidia\\.SMIPath', 'nvidia-smi{{if eq .Version.os "windows"}}.exe{{end}}');"
+                                    style="max-width:35px;width:35px;cursor:pointer;font-size:16px;" class="input-group-addon input-sm">
+                                <a class="help-icon fas fa-folder-open"></a>
+                            </div>
                             </div>
                         </div>
                     </form>
diff --git a/pkg/bindata/templates/starr/lidarr.html b/pkg/bindata/templates/starr/lidarr.html
index 030a73478..af4d2d366 100644
--- a/pkg/bindata/templates/starr/lidarr.html
+++ b/pkg/bindata/templates/starr/lidarr.html
@@ -4,11 +4,16 @@
             <div style="float: left;"><img src="{{files}}/images/logo/lidarr.png" style="height:50px;"></div>
             <h2 style="margin-bottom:-45px">Lidarr</h2>
             <div style="float: right;">
-                <button id="starr-Lidarr-addbutton" onclick="addInstance('starr', 'Lidarr')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout","Deletes"]'  type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="starr-Lidarr-addbutton" onclick="addInstance('starr', 'Lidarr')" data-prefix="Apps" data-sslname="ValidSSL" type="button"
+                    data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout","Deletes"]' class="add-new-item-button btn btn-primary">
+                    <i class="fa fa-plus"></i>
+                </button>
             </div>
         </td>
         <td colspan="9" class="tablet-hide desktop-hide">
-            <button  onclick="addInstance('starr', 'Lidarr')" data-prefix="Apps" type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+            <button  onclick="addInstance('starr', 'Lidarr')" data-prefix="Apps" type="button" class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
             <div style="float:right;"><img src="{{files}}/images/logo/lidarr.png" style="height:50px;"></div>
         </td>
@@ -24,7 +29,8 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td style="min-width:120px;">
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance.
+                Otherwise, it's used to identify the instance easier.</div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
@@ -43,12 +49,16 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
             <span class="dialogTitle">API Key</span>
         </td>
         <td style="min-width:100px;">
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application,
+                AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated.
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Username</span>
         </td>
         <td style="min-width:155px;">
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application,
+                AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated.
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Password</span>
         </td>
@@ -58,7 +68,8 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td style="min-width:120px;width:120px">
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -76,13 +87,18 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
 </thead>
 <tbody id="starr-Lidarr-container">
 {{- range $index, $app := .Config.Apps.Lidarr}}
-    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Lidarr{{$index}}-deleted" data-group="starr" data-label="Lidarr {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Lidarr{{$index}}-deleted" data-group="starr"
+        data-label="Lidarr {{instance $index}} Deleted"data-original="false" value="false">
     <tr class="starr-Lidarr {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="starr-Lidarr-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('starr-Lidarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('starr-Lidarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="LidarrIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Lidarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Lidarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -98,7 +114,9 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_LIDARR_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Lidarr.{{$index}}.Name" name="Apps.Lidarr.{{$index}}.Name" data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Lidarr.{{$index}}.Name" name="Apps.Lidarr.{{$index}}.Name" data-index="{{$index}}" data-app="Lidarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </div>
@@ -116,9 +134,13 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_LIDARR_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Lidarr.{{$index}}.URL" name="Apps.Lidarr.{{$index}}.URL" onChange="showhttps($(this).val(), '#Lidarr{{$index}}SSL');"  data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.Lidarr.{{$index}}.URL" name="Apps.Lidarr.{{$index}}.URL" onChange="showhttps($(this).val(), '#Lidarr{{$index}}SSL');"
+                            data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Lidarr{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Lidarr.{{$index}}.ValidSSL" name="Apps.Lidarr.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Lidarr" class="client-parameter" data-group="starr" data-label="Lidarr {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Lidarr.{{$index}}.ValidSSL" name="Apps.Lidarr.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Lidarr"
+                                class="client-parameter"data-group="starr" data-label="Lidarr {{instance $index}} SSL"
+                                data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -137,8 +159,12 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_LIDARR_%d_API_KEY" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Lidarr.{{$index}}.APIKey" name="Apps.Lidarr.{{$index}}.APIKey" data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} API Key" data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Lidarr.{{$index}}.APIKey', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Lidarr.{{$index}}.APIKey" name="Apps.Lidarr.{{$index}}.APIKey" data-index="{{$index}}"
+                            data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} API Key"
+                            data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Lidarr.{{$index}}.APIKey', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -156,7 +182,9 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_LIDARR_%d_USERNAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Lidarr.{{$index}}.Username" name="Apps.Lidarr.{{$index}}.Username" data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Username" data-original="{{$app.Username}}" value="{{$app.Username}}">
+                        <input type="text" id="Apps.Lidarr.{{$index}}.Username" name="Apps.Lidarr.{{$index}}.Username" data-index="{{$index}}" data-app="Lidarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Username"
+                            data-original="{{$app.Username}}" value="{{$app.Username}}">
                     </div>
                 </div>
             </div>
@@ -174,8 +202,12 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_LIDARR_%d_PASSWORD" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Lidarr.{{$index}}.Password" name="Apps.Lidarr.{{$index}}.Password" data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Password" data-original="{{$app.Password}}" value="{{$app.Password}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Lidarr.{{$index}}.Password', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Lidarr.{{$index}}.Password" name="Apps.Lidarr.{{$index}}.Password" data-index="{{$index}}"
+                            data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Password"
+                            data-original="{{$app.Password}}" value="{{$app.Password}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Lidarr.{{$index}}.Password', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -193,7 +225,9 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_LIDARR_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Lidarr.{{$index}}.Interval" name="Apps.Lidarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Lidarr.{{$index}}.Interval" name="Apps.Lidarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Lidarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -213,7 +247,8 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_LIDARR_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Lidarr.{{$index}}.Timeout" name="Apps.Lidarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Lidarr.{{$index}}.Timeout" name="Apps.Lidarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Lidarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
@@ -241,7 +276,9 @@ <h2 style="margin-left:5px;display:inline;">Lidarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_LIDARR_%d_DELETES" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Lidarr.{{$index}}.Deletes" name="Apps.Lidarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Lidarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Deletes" data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
+                        <select type="select" id="Apps.Lidarr.{{$index}}.Deletes" name="Apps.Lidarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Lidarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Lidarr {{instance $index}} Deletes"
+                            data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
                             <option {{if eq $app.Deletes 0}}selected {{end}}value="0">Disabled</option>
                             {{- range $i := oneto 100 }}
                             <option {{if eq $app.Deletes ($i)}}selected {{end}}value="{{$i}}">{{$i}}</option>
diff --git a/pkg/bindata/templates/starr/prowlarr.html b/pkg/bindata/templates/starr/prowlarr.html
index f7b47942c..3282695ce 100644
--- a/pkg/bindata/templates/starr/prowlarr.html
+++ b/pkg/bindata/templates/starr/prowlarr.html
@@ -4,11 +4,16 @@
             <div style="float: left;"><img src="{{files}}/images/logo/prowlarr.png" style="height:50px;"></div>
             <h2 style="margin-bottom:-45px">Prowlarr</h2>
             <div style="float: right;">
-                <button id="starr-Prowlarr-addbutton" onclick="addInstance('starr', 'Prowlarr')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout"]'  type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="starr-Prowlarr-addbutton" onclick="addInstance('starr', 'Prowlarr')" data-prefix="Apps"
+                    data-sslname="ValidSSL" data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout"]'
+                    type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
             </div>
         </td>
         <td colspan="9" class="tablet-hide desktop-hide">
-            <button id="starr-Prowlarr-addbutton" onclick="addInstance('starr', 'Prowlarr')" data-prefix="Apps" data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout"]'  type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+            <button id="starr-Prowlarr-addbutton" onclick="addInstance('starr', 'Prowlarr')" data-prefix="Apps" type="button"
+                data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout"]' class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
             <div style="float:right;"><img src="{{files}}/images/logo/prowlarr.png" style="height:50px;"></div>
         </td>
@@ -24,7 +29,8 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance.
+                Otherwise, it's used to identify the instance easier.</div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
@@ -43,12 +49,16 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
             <span class="dialogTitle">API Key</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application,
+                AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated.
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Username</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application,
+                AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated.
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Password</span>
         </td>
@@ -71,13 +81,18 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
 </thead>
 <tbody id="starr-Prowlarr-container">
     {{- range $index, $app := .Config.Apps.Prowlarr}}
-    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Prowlarr{{$index}}-deleted" data-group="starr" data-label="Prowlarr {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Prowlarr{{$index}}-deleted" data-group="starr"
+        data-label="Prowlarr {{instance $index}} Deleted" data-original="false" value="false">
     <tr class="starr-Prowlarr {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="starr-Prowlarr-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('starr-Prowlarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('starr-Prowlarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="ProwlarrIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Prowlarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Prowlarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -93,7 +108,9 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PROWLARR_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Prowlarr.{{$index}}.Name" name="Apps.Prowlarr.{{$index}}.Name" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Prowlarr.{{$index}}.Name" name="Apps.Prowlarr.{{$index}}.Name" data-index="{{$index}}" data-app="Prowlarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </div>
@@ -111,9 +128,13 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PROWLARR_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Prowlarr.{{$index}}.URL" name="Apps.Prowlarr.{{$index}}.URL" onChange="showhttps($(this).val(), '#Prowlarr{{$index}}SSL');" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.Prowlarr.{{$index}}.URL" name="Apps.Prowlarr.{{$index}}.URL" onChange="showhttps($(this).val(), '#Prowlarr{{$index}}SSL');"
+                            data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Prowlarr{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Prowlarr.{{$index}}.ValidSSL" name="Apps.Prowlarr.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter" data-group="starr" data-label="Prowlarr {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Prowlarr.{{$index}}.ValidSSL" name="Apps.Prowlarr.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Prowlarr"
+                                class="client-parameter" data-group="starr" data-label="Prowlarr {{instance $index}} SSL"
+                                data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -132,8 +153,12 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PROWLARR_%d_API_KEY" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Prowlarr.{{$index}}.APIKey" name="Apps.Prowlarr.{{$index}}.APIKey" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} API Key" data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Prowlarr.{{$index}}.APIKey', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Prowlarr.{{$index}}.APIKey" name="Apps.Prowlarr.{{$index}}.APIKey" data-index="{{$index}}"
+                            data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} API Key"
+                            data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Prowlarr.{{$index}}.APIKey', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -151,7 +176,9 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PROWLARR_%d_USERNAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Prowlarr.{{$index}}.Username" name="Apps.Prowlarr.{{$index}}.Username" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Username" data-original="{{$app.Username}}" value="{{$app.Username}}">
+                        <input type="text" id="Apps.Prowlarr.{{$index}}.Username" name="Apps.Prowlarr.{{$index}}.Username" data-index="{{$index}}" data-app="Prowlarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Username"
+                            data-original="{{$app.Username}}" value="{{$app.Username}}">
                     </div>
                 </div>
             </div>
@@ -169,8 +196,12 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PROWLARR_%d_PASSWORD" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Prowlarr.{{$index}}.Password" name="Apps.Prowlarr.{{$index}}.Password" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Password" data-original="{{$app.Password}}" value="{{$app.Password}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Prowlarr.{{$index}}.Password', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Prowlarr.{{$index}}.Password" name="Apps.Prowlarr.{{$index}}.Password" data-index="{{$index}}"
+                            data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Password"
+                            data-original="{{$app.Password}}" value="{{$app.Password}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Prowlarr.{{$index}}.Password', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -188,7 +219,9 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PROWLARR_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Prowlarr.{{$index}}.Interval" name="Apps.Prowlarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Prowlarr.{{$index}}.Interval" name="Apps.Prowlarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Prowlarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -208,7 +241,8 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PROWLARR_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Prowlarr.{{$index}}.Timeout" name="Apps.Prowlarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Prowlarr.{{$index}}.Timeout" name="Apps.Prowlarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Prowlarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
@@ -236,7 +270,9 @@ <h2 style="margin-left:5px;display:inline;">Prowlarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_PROWLARR_%d_DELETES" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Prowlarr.{{$index}}.Deletes" name="Apps.Prowlarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Prowlarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Deletes" data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
+                        <select type="select" id="Apps.Prowlarr.{{$index}}.Deletes" name="Apps.Prowlarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Prowlarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Prowlarr {{instance $index}} Deletes"
+                            data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
                             <option {{if eq $app.Deletes 0}}selected {{end}}value="0">Disabled</option>
                             {{- range $i := oneto 100 }}
                             <option {{if eq $app.Deletes $i}}selected {{end}}value="{{$i}}">{{$i}}</option>
diff --git a/pkg/bindata/templates/starr/radarr.html b/pkg/bindata/templates/starr/radarr.html
index 39891a5e6..218e52638 100644
--- a/pkg/bindata/templates/starr/radarr.html
+++ b/pkg/bindata/templates/starr/radarr.html
@@ -4,7 +4,10 @@
             <div style="float: left;"><img src="{{files}}/images/logo/radarr.png" style="height:50px;"></div>
             <h2 style="margin-bottom:-45px">Radarr</h2>
             <div style="float: right;">
-                <button id="starr-Radarr-addbutton" onclick="addInstance('starr', 'Radarr')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout","Deletes"]' type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="starr-Radarr-addbutton" onclick="addInstance('starr', 'Radarr')" data-prefix="Apps" data-sslname="ValidSSL" type="button"
+                    data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout","Deletes"]' class="add-new-item-button btn btn-primary">
+                <i class="fa fa-plus"></i>
+            </button>
             </div>
         </td>
         <td colspan="9" class="tablet-hide desktop-hide">
@@ -24,7 +27,8 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance.
+                Otherwise, it's used to identify the instance easier.</div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
@@ -43,12 +47,16 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
             <span class="dialogTitle">API Key</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application,
+                AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated.
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Username</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application,
+                AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated.
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Password</span>
         </td>
@@ -76,13 +84,18 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
 </thead>
 <tbody id="starr-Radarr-container">
     {{- range $index, $app := .Config.Apps.Radarr}}
-    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Radarr{{$index}}-deleted" data-group="starr" data-label="Radarr {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Radarr{{$index}}-deleted" data-group="starr"
+       data-label="Radarr {{instance $index}} Deleted" data-original="false" value="false">
     <tr class="starr-Radarr {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="starr-Radarr-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('starr-Radarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('starr-Radarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="RadarrIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Radarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Radarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -98,7 +111,9 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RADARR_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Radarr.{{$index}}.Name" name="Apps.Radarr.{{$index}}.Name" data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Radarr.{{$index}}.Name" name="Apps.Radarr.{{$index}}.Name" data-index="{{$index}}" data-app="Radarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </div>
@@ -116,9 +131,13 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RADARR_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Radarr.{{$index}}.URL" name="Apps.Radarr.{{$index}}.URL" onChange="showhttps($(this).val(), '#Radarr{{$index}}SSL');" data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.Radarr.{{$index}}.URL" name="Apps.Radarr.{{$index}}.URL" onChange="showhttps($(this).val(), '#Radarr{{$index}}SSL');"
+                            data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Radarr{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Radarr.{{$index}}.ValidSSL" name="Apps.Radarr.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Radarr" class="client-parameter" data-group="starr" data-label="Radarr {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Radarr.{{$index}}.ValidSSL" name="Apps.Radarr.{{$index}}.ValidSSL" data-index="{{$index}}"
+                                data-app="Radarr" class="client-parameter"data-group="starr" data-label="Radarr {{instance $index}} SSL"
+                                data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -137,8 +156,12 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RADARR_%d_API_KEY" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Radarr.{{$index}}.APIKey" name="Apps.Radarr.{{$index}}.APIKey" data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} API Key" data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Radarr.{{$index}}.APIKey', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Radarr.{{$index}}.APIKey" name="Apps.Radarr.{{$index}}.APIKey" data-index="{{$index}}"
+                            data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} API Key"
+                            data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Radarr.{{$index}}.APIKey', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -156,7 +179,9 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RADARR_%d_USERNAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Radarr.{{$index}}.Username" name="Apps.Radarr.{{$index}}.Username" data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Username" data-original="{{$app.Username}}" value="{{$app.Username}}">
+                        <input type="text" id="Apps.Radarr.{{$index}}.Username" name="Apps.Radarr.{{$index}}.Username" data-index="{{$index}}" data-app="Radarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Username"
+                            data-original="{{$app.Username}}" value="{{$app.Username}}">
                     </div>
                 </div>
             </div>
@@ -175,8 +200,12 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
                                 <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RADARR_%d_PASSWORD" $.Flags.EnvPrefix $index}}</span>
                             </div>
                             {{- end}}
-                            <input type="password" autocomplete="new-password" id="Apps.Radarr.{{$index}}.Password" name="Apps.Radarr.{{$index}}.Password" data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Password" data-original="{{$app.Password}}" value="{{$app.Password}}">
-                            <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Radarr.{{$index}}.Password', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                            <input type="password" autocomplete="new-password" id="Apps.Radarr.{{$index}}.Password" name="Apps.Radarr.{{$index}}.Password" data-index="{{$index}}"
+                                data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Password"
+                                data-original="{{$app.Password}}" value="{{$app.Password}}">
+                            <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Radarr.{{$index}}.Password', $(this).find('i'));">
+                                <i class="fas fa-low-vision secret-input"></i>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -195,7 +224,9 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RADARR_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Radarr.{{$index}}.Interval" name="Apps.Radarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Radarr.{{$index}}.Interval" name="Apps.Radarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Radarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -215,7 +246,8 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RADARR_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Radarr.{{$index}}.Timeout" name="Apps.Radarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Radarr.{{$index}}.Timeout" name="Apps.Radarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Radarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
@@ -243,7 +275,9 @@ <h2 style="margin-left:5px;display:inline;">Radarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_RADARR_%d_DELETES" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Radarr.{{$index}}.Deletes" name="Apps.Radarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Radarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Deletes" data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
+                        <select type="select" id="Apps.Radarr.{{$index}}.Deletes" name="Apps.Radarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Radarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Radarr {{instance $index}} Deletes"
+                            data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
                             <option {{if eq $app.Deletes 0}}selected {{end}}value="0">Disabled</option>
                             {{- range $i := oneto 100 }}
                             <option {{if eq $app.Deletes $i}}selected {{end}}value="{{$i}}">{{$i}}</option>
diff --git a/pkg/bindata/templates/starr/readarr.html b/pkg/bindata/templates/starr/readarr.html
index 6de17e6d4..dc5e2eaef 100644
--- a/pkg/bindata/templates/starr/readarr.html
+++ b/pkg/bindata/templates/starr/readarr.html
@@ -4,7 +4,10 @@
             <img src="{{files}}/images/logo/readarr.png" style="height:50px;"></div>
             <h2 style="margin-bottom:-45px">Readarr</h2>
             <div style="float: right;">
-                <button id="starr-Readarr-addbutton" onclick="addInstance('starr', 'Readarr')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout","Deletes"]' type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="starr-Readarr-addbutton" onclick="addInstance('starr', 'Readarr')" data-prefix="Apps" data-sslname="ValidSSL" type="button"
+                    data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout","Deletes"]' class="add-new-item-button btn btn-primary">
+                    <i class="fa fa-plus"></i>
+                </button>
             </div>
         </td>
         <td colspan="9" class="tablet-hide desktop-hide">
@@ -24,7 +27,8 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. 
+                Otherwise, it's used to identify the instance easier.</div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
@@ -43,12 +47,16 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
             <span class="dialogTitle">API Key</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, 
+                AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. 
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Username</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, 
+                AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. 
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Password</span>
         </td>
@@ -76,13 +84,18 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
 </thead>
 <tbody id="starr-Readarr-container">
     {{- range $index, $app := .Config.Apps.Readarr}}
-    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Readarr{{$index}}-deleted" data-group="starr" data-label="Readarr {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Readarr{{$index}}-deleted" data-group="starr"
+       data-label="Readarr {{instance $index}} Deleted"data-original="false" value="false">
     <tr class="starr-Readarr {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="starr-Readarr-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('starr-Readarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('starr-Readarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="ReadarrIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Readarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Readarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -98,7 +111,9 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_READARR_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Readarr.{{$index}}.Name" name="Apps.Readarr.{{$index}}.Name" onChange="showhttps($(this).val(), '#Readarr{{$index}}SSL');" data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Readarr.{{$index}}.Name" name="Apps.Readarr.{{$index}}.Name" onChange="showhttps($(this).val(), '#Readarr{{$index}}SSL');"
+                            data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </div>
@@ -116,9 +131,13 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_READARR_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Readarr.{{$index}}.URL" name="Apps.Readarr.{{$index}}.URL" data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.Readarr.{{$index}}.URL" name="Apps.Readarr.{{$index}}.URL" data-index="{{$index}}" data-app="Readarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Readarr{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Readarr.{{$index}}.ValidSSL" name="Apps.Readarr.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Readarr" class="client-parameter" data-group="starr" data-label="Readarr {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Readarr.{{$index}}.ValidSSL" name="Apps.Readarr.{{$index}}.ValidSSL" data-index="{{$index}}"
+                                data-app="Readarr" class="client-parameter" data-group="starr" data-label="Readarr {{instance $index}} SSL"
+                                data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -137,8 +156,12 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_READARR_%d_API_KEY" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Readarr.{{$index}}.APIKey" name="Apps.Readarr.{{$index}}.APIKey" data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} API Key" data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Readarr.{{$index}}.APIKey', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Readarr.{{$index}}.APIKey" name="Apps.Readarr.{{$index}}.APIKey" data-index="{{$index}}"
+                        data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} API Key"
+                        data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Readarr.{{$index}}.APIKey', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -156,7 +179,9 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_READARR_%d_USERNAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Readarr.{{$index}}.Username" name="Apps.Readarr.{{$index}}.Username" data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Username" data-original="{{$app.Username}}" value="{{$app.Username}}">
+                        <input type="text" id="Apps.Readarr.{{$index}}.Username" name="Apps.Readarr.{{$index}}.Username" data-index="{{$index}}" data-app="Readarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Username"
+                            data-original="{{$app.Username}}" value="{{$app.Username}}">
                     </div>
                 </div>
             </div>
@@ -174,8 +199,12 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_READARR_%d_PASSWORD" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Readarr.{{$index}}.Password" name="Apps.Readarr.{{$index}}.Password" data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Password" data-original="{{$app.Password}}" value="{{$app.Password}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Readarr.{{$index}}.Password', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Readarr.{{$index}}.Password" name="Apps.Readarr.{{$index}}.Password"
+                            data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Password"
+                            data-original="{{$app.Password}}" value="{{$app.Password}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Readarr.{{$index}}.Password', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -193,7 +222,9 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_READARR_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Readarr.{{$index}}.Interval" name="Apps.Readarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Readarr.{{$index}}.Interval" name="Apps.Readarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Readarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -213,7 +244,8 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_READARR_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Readarr.{{$index}}.Timeout" name="Apps.Readarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Readarr.{{$index}}.Timeout" name="Apps.Readarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Readarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
@@ -241,7 +273,9 @@ <h2 style="margin-left:5px;display:inline;">Readarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_READARR_%d_DELETES" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Readarr.{{$index}}.Deletes" name="Apps.Readarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Readarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Deletes" data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
+                        <select type="select" id="Apps.Readarr.{{$index}}.Deletes" name="Apps.Readarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Readarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Readarr {{instance $index}} Deletes"
+                            data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
                             <option {{if eq $app.Deletes 0}}selected {{end}}value="0">Disabled</option>
                             {{- range $i := oneto 100 }}
                             <option {{if eq $app.Deletes $i}}selected {{end}}value="{{$i}}">{{$i}}</option>
diff --git a/pkg/bindata/templates/starr/sonarr.html b/pkg/bindata/templates/starr/sonarr.html
index 474a10a48..79ca68085 100644
--- a/pkg/bindata/templates/starr/sonarr.html
+++ b/pkg/bindata/templates/starr/sonarr.html
@@ -5,7 +5,10 @@
             <div style="float: left;"><img src="{{files}}/images/logo/sonarr.png" style="height:50px;"></div>
             <h2 style="margin-bottom:-45px">Sonarr</h2>
             <div style="float: right;">
-                <button id="starr-Sonarr-addbutton" onclick="addInstance('starr', 'Sonarr')" data-prefix="Apps" data-sslname="ValidSSL" data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout","Deletes"]' type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                <button id="starr-Sonarr-addbutton" onclick="addInstance('starr', 'Sonarr')" data-prefix="Apps" data-sslname="ValidSSL" type="button"
+                    data-names='["Name","URL","APIKey","Username","Password","Interval","Timeout","Deletes"]' class="add-new-item-button btn btn-primary">
+                    <i class="fa fa-plus"></i>
+                </button>
             </div>
         </td>
         <td colspan="9" class="tablet-hide desktop-hide">
@@ -25,7 +28,8 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
             <span class="dialogTitle">Actions</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+            <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. 
+                Otherwise, it's used to identify the instance easier.</div>
             <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Name</span>
         </td>
@@ -44,12 +48,16 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
             <span class="dialogTitle">API Key</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. 
+                Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. 
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Username</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated. If you get 401 errors when doing Corruption checks, add your username and password.</div>
+            <div style="display:none;" class="dialogText">Username and password are required when authentication is enabled in the application, AND you enabled corruption checks. 
+                Database backups cannot be download from the API, and they must be downloaded from a non-API path that may be authenticated.
+                If you get 401 errors when doing Corruption checks, add your username and password.</div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Password</span>
         </td>
@@ -77,13 +85,18 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
 </thead>
 <tbody id="starr-Sonarr-container">
     {{- range $index, $app := .Config.Apps.Sonarr}}
-    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Sonarr{{$index}}-deleted" data-group="starr" data-label="Sonarr {{instance $index}} Deleted" data-original="false" value="false">
+    <input disabled style="display: none;" class="client-parameter form-control input-sm starr-Sonarr{{$index}}-deleted" data-group="starr"
+        data-label="Sonarr {{instance $index}} Deleted"data-original="false" value="false">
     <tr class="starr-Sonarr {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="starr-Sonarr-{{$index}}">
         <td style="white-space:nowrap;">
             <div class="btn-group" role="group" style="display:flex;">
-                <button onclick="removeInstance('starr-Sonarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;"><i class="fa fa-minus"></i></button>
+                <button onclick="removeInstance('starr-Sonarr', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:18px;width:35px;">
+                    <i class="fa fa-minus"></i>
+                </button>
                 <button id="SonarrIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                <button onClick="testInstance($(this), 'Sonarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Sonarr', '{{$index}}')" style="font-size:18px;" type="button" class="btn btn-success btn-sm checkInstanceBtn">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -99,7 +112,9 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SONARR_%d_NAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Sonarr.{{$index}}.Name" name="Apps.Sonarr.{{$index}}.Name" data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Name" data-original="{{$app.Name}}" value="{{$app.Name}}">
+                        <input type="text" id="Apps.Sonarr.{{$index}}.Name" name="Apps.Sonarr.{{$index}}.Name" data-index="{{$index}}" data-app="Sonarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Name"
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">
                     </div>
                 </div>
             </div>
@@ -117,9 +132,13 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SONARR_%d_URL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Sonarr.{{$index}}.URL" name="Apps.Sonarr.{{$index}}.URL" onChange="showhttps($(this).val(), '#Sonarr{{$index}}SSL');" data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} URL" data-original="{{$app.URL}}" value="{{$app.URL}}">
+                        <input type="text" id="Apps.Sonarr.{{$index}}.URL" name="Apps.Sonarr.{{$index}}.URL" onChange="showhttps($(this).val(), '#Sonarr{{$index}}SSL');"
+                            data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} URL"
+                            data-original="{{$app.URL}}" value="{{$app.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains $app.URL "https://")}}display:none;{{end}}" id="Sonarr{{$index}}SSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Sonarr.{{$index}}.ValidSSL" name="Apps.Sonarr.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Sonarr" class="client-parameter" data-group="starr" data-label="Sonarr {{instance $index}} SSL" data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Sonarr.{{$index}}.ValidSSL" name="Apps.Sonarr.{{$index}}.ValidSSL" data-index="{{$index}}" data-app="Sonarr"
+                                class="client-parameter" data-group="starr" data-label="Sonarr {{instance $index}} SSL"
+                                data-original="{{$app.ValidSSL}}" {{if $app.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -138,8 +157,12 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SONARR_%d_API_KEY" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Sonarr.{{$index}}.APIKey" name="Apps.Sonarr.{{$index}}.APIKey" data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} API Key" data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Sonarr.{{$index}}.APIKey', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Sonarr.{{$index}}.APIKey" name="Apps.Sonarr.{{$index}}.APIKey" data-index="{{$index}}"
+                            data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} API Key"
+                            data-original="{{$app.APIKey}}" value="{{$app.APIKey}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Sonarr.{{$index}}.APIKey', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -157,7 +180,9 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SONARR_%d_USERNAME" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" id="Apps.Sonarr.{{$index}}.Username" name="Apps.Sonarr.{{$index}}.Username" data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Username" data-original="{{$app.Username}}" value="{{$app.Username}}">
+                        <input type="text" id="Apps.Sonarr.{{$index}}.Username" name="Apps.Sonarr.{{$index}}.Username" data-index="{{$index}}" data-app="Sonarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Username" 
+                            data-original="{{$app.Username}}" value="{{$app.Username}}">
                     </div>
                 </div>
             </div>
@@ -175,8 +200,12 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SONARR_%d_PASSWORD" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <input type="password" autocomplete="new-password" id="Apps.Sonarr.{{$index}}.Password" name="Apps.Sonarr.{{$index}}.Password" data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Password" data-original="{{$app.Password}}" value="{{$app.Password}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Sonarr.{{$index}}.Password', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <input type="password" autocomplete="new-password" id="Apps.Sonarr.{{$index}}.Password" name="Apps.Sonarr.{{$index}}.Password" data-index="{{$index}}"
+                            data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Password"
+                            data-original="{{$app.Password}}" value="{{$app.Password}}">
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Sonarr.{{$index}}.Password', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -194,7 +223,9 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SONARR_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Sonarr.{{$index}}.Interval" name="Apps.Sonarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Interval" data-original="{{$app.Interval}}" value="{{$app.Interval}}">
+                        <select type="select" id="Apps.Sonarr.{{$index}}.Interval" name="Apps.Sonarr.{{$index}}.Interval" data-index="{{$index}}" data-app="Sonarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Interval"
+                            data-original="{{$app.Interval}}" value="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                         </select>
                     </div>
@@ -214,7 +245,8 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SONARR_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Sonarr.{{$index}}.Timeout" name="Apps.Sonarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                        <select type="select" id="Apps.Sonarr.{{$index}}.Timeout" name="Apps.Sonarr.{{$index}}.Timeout" data-index="{{$index}}" data-app="Sonarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                             <option value="-1s" {{if eq $app.Timeout.Seconds (add 0 -1)}}selected {{end}}>Disabled</option>
                             <option value="0s" {{if eq $app.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                             {{- range $i := one259 }}
@@ -242,7 +274,9 @@ <h2 style="margin-left:5px;display:inline;">Sonarr</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SONARR_%d_DELETES" $.Flags.EnvPrefix $index}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Sonarr.{{$index}}.Deletes" name="Apps.Sonarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Sonarr" class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Deletes" data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
+                        <select type="select" id="Apps.Sonarr.{{$index}}.Deletes" name="Apps.Sonarr.{{$index}}.Deletes" data-index="{{$index}}" data-app="Sonarr"
+                            class="client-parameter form-control input-sm" data-group="starr" data-label="Sonarr {{instance $index}} Deletes"
+                            data-original="{{$app.Deletes}}" value="{{$app.Deletes}}">
                             <option {{if eq $app.Deletes 0}}selected {{end}}value="0">Disabled</option>
                             {{- range $i := oneto 100 }}
                             <option {{if eq $app.Deletes $i}}selected {{end}}value="{{$i}}">{{$i}}</option>
diff --git a/pkg/bindata/templates/triggers.html b/pkg/bindata/templates/triggers.html
index 2023b6c52..df5e102b4 100644
--- a/pkg/bindata/templates/triggers.html
+++ b/pkg/bindata/templates/triggers.html
@@ -28,121 +28,104 @@ <h1><i class="fas fa-fire-extinguisher"></i> Triggers</h1>
         <tr>
             <td>{{index .Expvar.TimerCounts "Starting Radarr profile and format sync."}}</td>
             <td>{{.ClientInfo.Actions.Sync.Interval}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('cfsync')">Radarr TRaSH Sync</a></td><td>Sync custom profiles and formats to Radarr.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('cfsync')">Radarr TRaSH Sync</a>
+            </td><td>Sync custom profiles and formats to Radarr.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Starting Sonarr profile and format sync."}}</td>
             <td>{{.ClientInfo.Actions.Sync.Interval}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('rpsync')">Sonarr TRaSH Sync</a></td><td>Sync custom profiles and formats to Sonarr.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('rpsync')">Sonarr TRaSH Sync</a></td>
+            <td>Sync custom profiles and formats to Sonarr.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Gathering and sending System Snapshot."}}</td>
             <td>{{.ClientInfo.Actions.Snapshot.Interval}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('snapshot')">Send System Snapshot</a></td><td>Sends a system snapshot.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('snapshot')">Send System Snapshot</a></td>
+            <td>Sends a system snapshot.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Initiating State Collection for Dashboard."}}</td>
             <td>{{.ClientInfo.Actions.Dashboard.Interval}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('dashboard')">Send Dashboard States</a></td><td>Collects dashboard data from all your apps and sends it.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('dashboard')">Send Dashboard States</a></td>
+            <td>Collects dashboard data from all your apps and sends it.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Gathering and sending Plex Sessions."}}</td>
             <td>{{.ClientInfo.Actions.Plex.Interval}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('sessions')">Send Plex Sessions</a></td><td>Collects active plex sessions and sends them if any exist.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('sessions')">Send Plex Sessions</a></td>
+            <td>Collects active plex sessions and sends them if any exist.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Sending cached stuck items to website."}}</td>
             <td>{{$action := .Actions.Get "Sending cached stuck items to website."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('stuckitems')">Send Stuck Queue Items</a></td><td>Sends cached stuck queue items to website.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('stuckitems')">Send Stuck Queue Items</a></td>
+            <td>Sends cached stuck queue items to website.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Sending Library contents for MDBList."}}</td>
             <td>{{.ClientInfo.Actions.Mdblist.Interval}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('mdblist')">Send MDB List</a></td><td>Sends Sonarr and/or Radarr libraries to <a href="https://mdblist.com">MDB List</a> for processing.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('mdblist')">Send MDB List</a></td>
+            <td>Sends Sonarr and/or Radarr libraries to <a href="https://mdblist.com">MDB List</a> for processing.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Checking Lidarr for database backup corruption."}}</td>
             <td>{{$action := .Actions.Get "Checking Lidarr for database backup corruption."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('corrupt/lidarr')">Check Lidarr for Corruption</a></td><td>Checks all Lidarr instances' database backups for corruption and sends an update.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('corrupt/lidarr')">Check Lidarr for Corruption</a></td>
+            <td>Checks all Lidarr instances' database backups for corruption and sends an update.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Checking Prowlarr for database backup corruption."}}</td>
             <td>{{$action := .Actions.Get "Checking Prowlarr for database backup corruption."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('corrupt/prowlarr')">Check Prowlarr for Corruption</a></td><td>Checks all Prowlarr instances' database backups for corruption and sends an update.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('corrupt/prowlarr')">Check Prowlarr for Corruption</a></td>
+            <td>Checks all Prowlarr instances' database backups for corruption and sends an update.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Checking Radarr for database backup corruption."}}</td>
             <td>{{$action := .Actions.Get "Checking Radarr for database backup corruption."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('corrupt/radarr')">Check Radarr for Corruption</a></td><td>Checks all Radarr instances' database backups for corruption and sends an update.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('corrupt/radarr')">Check Radarr for Corruption</a></td>
+            <td>Checks all Radarr instances' database backups for corruption and sends an update.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Checking Readarr for database backup corruption."}}</td>
             <td>{{$action := .Actions.Get "Checking Readarr for database backup corruption."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('corrupt/readarr')">Check Readarr for Corruption</a></td><td>Checks all Readarr instances' database backups for corruption and sends an update.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('corrupt/readarr')">Check Readarr for Corruption</a></td>
+            <td>Checks all Readarr instances' database backups for corruption and sends an update.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Checking Sonarr for database backup corruption."}}</td>
             <td>{{$action := .Actions.Get "Checking Sonarr for database backup corruption."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('corrupt/sonarr')">Check Sonarr for Corruption</a></td><td>Checks all Sonarr instances' database backups for corruption and sends an update.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('corrupt/sonarr')">Check Sonarr for Corruption</a></td>
+            <td>Checks all Sonarr instances' database backups for corruption and sends an update.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Sending Lidarr Backup File List to Notifiarr."}}</td>
             <td>{{$action := .Actions.Get "Sending Lidarr Backup File List to Notifiarr."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('backup/lidarr')">Check Lidarr Backups</a></td><td>Grabs all Lidarr instances' database backup info and sends an update. If there's a new backup a notification appears.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('backup/lidarr')">Check Lidarr Backups</a></td>
+            <td>Grabs all Lidarr instances' database backup info and sends an update. If there's a new backup a notification appears.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Sending Prowlarr Backup File List to Notifiarr."}}</td>
             <td>{{$action := .Actions.Get "Sending Prowlarr Backup File List to Notifiarr."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('backup/prowlarr')">Check Prowlarr Backups</a></td><td>Grabs all Prowlarr instances' database backup info and sends an update. If there's a new backup a notification appears.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('backup/prowlarr')">Check Prowlarr Backups</a></td>
+            <td>Grabs all Prowlarr instances' database backup info and sends an update. If there's a new backup a notification appears.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Sending Radarr Backup File List to Notifiarr."}}</td>
             <td>{{$action := .Actions.Get "Sending Radarr Backup File List to Notifiarr."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('backup/radarr')">Check Radarr Backups</a></td><td>Grabs all Radarr instances' database backup info and sends an update. If there's a new backup a notification appears.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('backup/radarr')">Check Radarr Backups</a></td>
+            <td>Grabs all Radarr instances' database backup info and sends an update. If there's a new backup a notification appears.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Sending Readarr Backup File List to Notifiarr."}}</td>
             <td>{{$action := .Actions.Get "Sending Readarr Backup File List to Notifiarr."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('backup/readarr')">Check Readarr Backups</a></td><td>Grabs all Readarr instances' database backup info and sends an update. If there's a new backup a notification appears.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('backup/readarr')">Check Readarr Backups</a></td>
+            <td>Grabs all Readarr instances' database backup info and sends an update. If there's a new backup a notification appears.</td>
         </tr>
         <tr>
             <td>{{index .Expvar.TimerCounts "Sending Sonarr Backup File List to Notifiarr."}}</td>
             <td>{{$action := .Actions.Get "Sending Sonarr Backup File List to Notifiarr."}}{{if and $action $action.D.Duration}}{{$action.D}}{{else}}0s{{end}}</td>
-            <td>
-                <a href="#triggers" onClick="triggerAction('backup/sonarr')">Check Sonarr Backups</a></td><td>Grabs all Sonarr instances' database backup info and sends an update. If there's a new backup a notification appears.
-            </td>
+            <td><a href="#triggers" onClick="triggerAction('backup/sonarr')">Check Sonarr Backups</a></td>
+            <td>Grabs all Sonarr instances' database backup info and sends an update. If there's a new backup a notification appears.</td>
         </tr>
     </table>
     {{- if .Actions.CronTimer.List }}

From 30a9bfeea07558f81335ca78f3f36826a7ed5909 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Sat, 3 Aug 2024 19:25:36 -0700
Subject: [PATCH 2/3] fix a couple more

---
 pkg/bindata/templates/media/tautulli.html | 26 ++++++++++----
 pkg/bindata/templates/snapshot/mysql.html | 42 +++++++++++++++++------
 2 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/pkg/bindata/templates/media/tautulli.html b/pkg/bindata/templates/media/tautulli.html
index 0f1bced67..27731530a 100644
--- a/pkg/bindata/templates/media/tautulli.html
+++ b/pkg/bindata/templates/media/tautulli.html
@@ -30,7 +30,10 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
             <span class="dialogTitle">Interval</span>
         </td>
         <td>
-            <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+            <div style="display:none;" class="dialogText">
+                This controls the maximum duration a request to this application may elapse.
+                Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
+            </div>
             <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
             <span class="dialogTitle">Timeout</span>
         </td>
@@ -40,7 +43,9 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
     <tr{{if (lt .Config.Apps.Tautulli.Timeout.Seconds (add 0 0))}} class="bk-danger"{{end}}>
         <td>
             <div class="btn-group" role="group" style="display:flex;font-size:18px;">
-                <button onClick="testInstance($(this), 'Tautulli', '1')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                <button onClick="testInstance($(this), 'Tautulli', '1')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                    <i class="fas fa-check-double"></i>
+                </button>
             </div>
         </td>
         <td>
@@ -76,9 +81,12 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TAUTULLI_URL" .Flags.EnvPrefix}}</span>
                         </div>
                         {{- end}}
-                        <input type="text" onChange="showhttps($(this).val(), '#TautulliSSL');" id="Apps.Tautulli.URL" name="Apps.Tautulli.URL" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli URL" data-original="{{.Config.Apps.Tautulli.URL}}" value="{{.Config.Apps.Tautulli.URL}}">
+                        <input type="text" onChange="showhttps($(this).val(), '#TautulliSSL');" id="Apps.Tautulli.URL" name="Apps.Tautulli.URL"
+                            class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli URL"
+                            data-original="{{.Config.Apps.Tautulli.URL}}" value="{{.Config.Apps.Tautulli.URL}}">
                         <div style="width:30px; max-width:30px;{{if not (contains .Config.Apps.Tautulli.URL "https://")}}display:none;{{end}}" id="TautulliSSL" class="input-group-addon input-sm">
-                            <input type="checkbox" id="Apps.Tautulli.ValidSSL" name="Apps.Tautulli.ValidSSL" data-app="Tautulli" class="client-parameter" data-group="media" data-label="Tautulli SSL" data-original="{{.Config.Apps.Tautulli.ValidSSL}}" {{if .Config.Apps.Tautulli.ValidSSL}}checked {{end}}value="true">
+                            <input type="checkbox" id="Apps.Tautulli.ValidSSL" name="Apps.Tautulli.ValidSSL" data-app="Tautulli" class="client-parameter" data-group="media"
+                                data-label="Tautulli SSL" data-original="{{.Config.Apps.Tautulli.ValidSSL}}" {{if .Config.Apps.Tautulli.ValidSSL}}checked {{end}}value="true">
                         </div>
                     </div>
                 </div>
@@ -100,7 +108,9 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
                         <input type="password" autocomplete="off" id="Apps.Tautulli.APIKey" name="Apps.Tautulli.APIKey"
                             data-app="Tautulli" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli API Key"
                             data-original="{{.Input.Apps.Tautulli.APIKey}}" value="{{.Input.Apps.Tautulli.APIKey}}">
-                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Tautulli.APIKey', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                        <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Tautulli.APIKey', $(this).find('i'));">
+                            <i class="fas fa-low-vision secret-input"></i>
+                        </div>
                     </div>
                 </div>
             </form>
@@ -118,7 +128,8 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TAUTULLI_INTERVAL" .Flags.EnvPrefix}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Tautulli.Interval" name="Apps.Tautulli.Interval" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli Interval" data-original="{{.Config.Apps.Tautulli.Interval}}">
+                        <select type="select" id="Apps.Tautulli.Interval" name="Apps.Tautulli.Interval" class="client-parameter form-control input-sm" data-group="media"
+                            data-label="Tautulli Interval" data-original="{{.Config.Apps.Tautulli.Interval}}">
 {{template "includes/intervaloptions.html" $.Config.Apps.Tautulli.Interval}}
                         </select>
                     </div>
@@ -138,7 +149,8 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
                             <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TAUTULLI_TIMEOUT" .Flags.EnvPrefix}}</span>
                         </div>
                         {{- end}}
-                        <select type="select" id="Apps.Tautulli.extraConfig.Timeout" name="Apps.Tautulli.extraConfig.Timeout" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli Timeout" data-original="{{.Config.Apps.Tautulli.Timeout}}">
+                        <select type="select" id="Apps.Tautulli.extraConfig.Timeout" name="Apps.Tautulli.extraConfig.Timeout" class="client-parameter form-control input-sm"
+                            data-group="media" data-label="Tautulli Timeout" data-original="{{.Config.Apps.Tautulli.Timeout}}">
                             <option value="-1s" {{if eq $.Config.Tautulli.Timeout.Seconds (add -1 0)}}selected {{end}}>Disabled</option>
                             {{- range $i := one259 }}
                             <option {{if eq $.Config.Apps.Tautulli.Timeout.Seconds $i}}selected {{end}}value="{{$i}}s">{{$i}} second{{if not (eq $i (add 0 1))}}s{{end}}</option>
diff --git a/pkg/bindata/templates/snapshot/mysql.html b/pkg/bindata/templates/snapshot/mysql.html
index 4fe43d6d0..e3db270ab 100644
--- a/pkg/bindata/templates/snapshot/mysql.html
+++ b/pkg/bindata/templates/snapshot/mysql.html
@@ -12,11 +12,17 @@ <h3><i class="fas fa-comment text-orange"></i> MySQL Notes</h3>
                     <div style="float: left;"><img src="{{files}}/images/logo/mysql.png" style="height:50px;"></div>
                     <h2 style="margin-bottom:-45px">MySQL</h2>
                     <div style="float: right;">
-                        <button id="snaps-MySQL-addbutton" onclick="addInstance('snaps', 'MySQL')" data-prefix="Snapshot" data-names='["Name","Host","User","Pass","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                        <button id="snaps-MySQL-addbutton" onclick="addInstance('snaps', 'MySQL')" data-prefix="Snapshot"
+                            data-names='["Name","Host","User","Pass","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary">
+                            <i class="fa fa-plus"></i>
+                        </button>
                     </div>
                 </td>
                 <td colspan="7" class="tablet-hide desktop-hide">
-                    <button id="snaps-MySQL-addbutton" onclick="addInstance('snaps', 'MySQL')" data-prefix="Snapshot" data-names='["Name","Host","User","Pass","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
+                    <button id="snaps-MySQL-addbutton" onclick="addInstance('snaps', 'MySQL')" data-prefix="Snapshot"
+                        data-names='["Name","Host","User","Pass","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary">
+                        <i class="fa fa-plus"></i>
+                    </button>
                     <h2 style="margin-left:5px;display:inline;">MySQL</h2>
                     <div style="float:right;"><img src="{{files}}/images/logo/mysql.png" style="height:50px;"></div>
                 </td>
@@ -32,7 +38,9 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
                     <span class="dialogTitle">Actions</span>
                 </td>
                 <td style="min-width:120px;">
-                    <div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
+                    <div style="display:none;" class="dialogText">
+                        Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.
+                    </div>
                     <a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
                     <span class="dialogTitle">Name</span>
                 </td>
@@ -57,7 +65,10 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
                     <span class="dialogTitle">Interval</span>
                 </td>
                 <td style="min-width:120px;width:120px">
-                    <div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
+                    <div style="display:none;" class="dialogText">
+                        This controls the maximum duration a request to this application may elapse.
+                        Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
+                    </div>
                     <a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
                     <span class="dialogTitle">Timeout</span>
                 </td>
@@ -65,13 +76,18 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
         </thead>
         <tbody id="snaps-MySQL-container">
         {{- range $index, $app := .Config.Snapshot.MySQL}}
-            <input disabled style="display: none;" class="client-parameter snaps-MySQL{{$index}}-deleted" data-group="snaps" data-label="MySQL {{instance $index}} Deleted" data-original="false" value="false">
+            <input disabled style="display: none;" class="client-parameter snaps-MySQL{{$index}}-deleted" data-group="snaps"
+                data-label="MySQL {{instance $index}} Deleted" data-original="false" value="false">
             <tr class="snaps-MySQL {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="snaps-MySQL-{{$index}}">
                 <td style="white-space:nowrap;">
                     <div class="btn-group" role="group" style="display:flex;font-size:18px;">
-                        <button onclick="removeInstance('snaps-MySQL', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:16px;width:35px;"><i class="fa fa-minus"></i></button>
+                        <button onclick="removeInstance('snaps-MySQL', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:16px;width:35px;">
+                            <i class="fa fa-minus"></i>
+                        </button>
                         <button id="MySQLIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
-                        <button onClick="testInstance($(this), 'MySQL', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
+                        <button onClick="testInstance($(this), 'MySQL', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
+                            <i class="fas fa-check-double"></i>
+                        </button>
                     </div>
                 </td>
                 <td>
@@ -150,7 +166,9 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
                                 <input type="password" autocomplete="off" id="Snapshot.MySQL.{{$index}}.Pass" name="Snapshot.MySQL.{{$index}}.Pass" data-index="{{$index}}"
                                     data-app="MySQL" class="client-parameter form-control input-sm" data-group="snaps" data-label="MySQL {{instance $index}} Pass"
                                     data-original="{{(index $.Input.Snapshot.MySQL $index).Pass}}" value="{{(index $.Input.Snapshot.MySQL $index).Pass}}">
-                                <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Snapshot.MySQL.{{$index}}.Pass', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
+                                <div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Snapshot.MySQL.{{$index}}.Pass', $(this).find('i'));">
+                                    <i class="fas fa-low-vision secret-input"></i>
+                                </div>
                             </div>
                         </div>
                     </form>
@@ -168,7 +186,9 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
                                     <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SNAPSHOT_MYSQL_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
                                 </div>
                                 {{- end}}
-                                <select type="select" id="Snapshot.MySQL.{{$index}}.Interval" name="Snapshot.MySQL.{{$index}}.Interval" data-index="{{$index}}" data-app="MySQL" class="client-parameter form-control input-sm" data-group="snaps" data-label="MySQL {{instance $index}} Interval" data-original="{{$app.Interval}}">
+                                <select type="select" id="Snapshot.MySQL.{{$index}}.Interval" name="Snapshot.MySQL.{{$index}}.Interval" data-index="{{$index}}"
+                                    class="client-parameter form-control input-sm" data-label="MySQL {{instance $index}} Interval"
+                                    data-app="MySQL" data-group="snaps" data-original="{{$app.Interval}}">
 {{template "includes/intervaloptions.html" $app.Interval}}
                                 </select>
                             </div>
@@ -188,7 +208,9 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
                                     <span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SNAPSHOT_MYSQL_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
                                 </div>
                                 {{- end}}
-                                <select type="text" id="Snapshot.MySQL.{{$index}}.Timeout" name="Snapshot.MySQL.{{$index}}.Timeout" data-index="{{$index}}" data-app="MySQL" class="client-parameter form-control input-sm" data-group="snaps" data-label="MySQL {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
+                                <select type="text" id="Snapshot.MySQL.{{$index}}.Timeout" name="Snapshot.MySQL.{{$index}}.Timeout" data-index="{{$index}}"
+                                    data-app="MySQL" class="client-parameter form-control input-sm" data-group="snaps"
+                                    data-label="MySQL {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
                                     <option value="-1s">Disabled</option>
                                     <option value="0s">No Timeout</option>
                                     {{- range $i := one259 }}

From b027994fa98a1e2dc05cc404209392685e2bcfcd Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Sat, 3 Aug 2024 19:39:44 -0700
Subject: [PATCH 3/3] typo

---
 pkg/bindata/templates/downloaders/sabnzbd.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/bindata/templates/downloaders/sabnzbd.html b/pkg/bindata/templates/downloaders/sabnzbd.html
index 9f92f9281..c060f2d83 100644
--- a/pkg/bindata/templates/downloaders/sabnzbd.html
+++ b/pkg/bindata/templates/downloaders/sabnzbd.html
@@ -91,7 +91,7 @@ <h2 class="mb-3" style="margin-left:5px;display:inline;">SabNZB</h2>
                         {{- end}}
                         <input type="text" id="Apps.SabNZB.{{$index}}.Name" name="Apps.SabNZB.{{$index}}.Name" data-index="{{$index}}" data-app="SabNZB"
                             class="client-parameter form-control input-sm" data-group="download" data-label="SabNZB {{instance $index}} Name"
-                            data-original="{{$appName}}" value="{{$app.Name}}">.
+                            data-original="{{$app.Name}}" value="{{$app.Name}}">.
                     </div>
                 </div>
             </form>