diff --git a/UI/Form/CheckboxTemplate.html b/UI/Form/CheckboxTemplate.html
index 869117ddd0..86794e9653 100644
--- a/UI/Form/CheckboxTemplate.html
+++ b/UI/Form/CheckboxTemplate.html
@@ -5,8 +5,8 @@
         <label class="checkbox toggle well">
             <input type="checkbox" name="fields.{{order}}.value"/>
             <p>
-                <span>On</span>
-                <span>Off</span>
+                <span>Yes</span>
+                <span>No</span>
             </p>
 
             <div class="btn btn-primary slide-button"></div>
diff --git a/UI/Settings/Indexers/ItemTemplate.html b/UI/Settings/Indexers/ItemTemplate.html
index c3461c4f12..41d7af9888 100644
--- a/UI/Settings/Indexers/ItemTemplate.html
+++ b/UI/Settings/Indexers/ItemTemplate.html
@@ -8,8 +8,8 @@
             <label class="checkbox toggle well">
                 <input type="checkbox" name="enable"/>
                 <p>
-                    <span>On</span>
-                    <span>Off</span>
+                    <span>Yes</span>
+                    <span>No</span>
                 </p>
 
                 <div class="btn btn-primary slide-button"></div>
@@ -21,7 +21,5 @@
         </div>
     </div>
 
-    {{#each fields}}
-        {{formField}}
-    {{/each}}
+    {{formBuilder}}
 </fieldset>
diff --git a/UI/Settings/Naming/NamingTemplate.html b/UI/Settings/Naming/NamingTemplate.html
index d3cf734840..f3826e083d 100644
--- a/UI/Settings/Naming/NamingTemplate.html
+++ b/UI/Settings/Naming/NamingTemplate.html
@@ -10,8 +10,8 @@
                     <input type="checkbox" name="useSceneName"/>
 
                     <p>
-                        <span>On</span>
-                        <span>Off</span>
+                        <span>Yes</span>
+                        <span>No</span>
                     </p>
 
                     <div class="btn btn-primary slide-button"></div>
@@ -31,8 +31,8 @@
                     <input type="checkbox" name="includeSeriesTitle"/>
 
                     <p>
-                        <span>On</span>
-                        <span>Off</span>
+                        <span>Yes</span>
+                        <span>No</span>
                     </p>
 
                     <div class="btn btn-primary slide-button"></div>
@@ -52,8 +52,8 @@
                     <input type="checkbox" name="includeEpisodeTitle"/>
 
                     <p>
-                        <span>On</span>
-                        <span>Off</span>
+                        <span>Yes</span>
+                        <span>No</span>
                     </p>
 
                     <div class="btn btn-primary slide-button"></div>
@@ -73,8 +73,8 @@
                     <input type="checkbox" name="includeQuality"/>
 
                     <p>
-                        <span>On</span>
-                        <span>Off</span>
+                        <span>Yes</span>
+                        <span>No</span>
                     </p>
 
                     <div class="btn btn-primary slide-button"></div>
@@ -94,8 +94,8 @@
                     <input type="checkbox" name="replaceSpaces"/>
 
                     <p>
-                        <span>On</span>
-                        <span>Off</span>
+                        <span>Yes</span>
+                        <span>No</span>
                     </p>
 
                     <div class="btn btn-primary slide-button"></div>
diff --git a/UI/Settings/Notifications/EditTemplate.html b/UI/Settings/Notifications/EditTemplate.html
index c2aa4abac7..477acf2077 100644
--- a/UI/Settings/Notifications/EditTemplate.html
+++ b/UI/Settings/Notifications/EditTemplate.html
@@ -19,8 +19,8 @@
                 <label class="checkbox toggle well">
                     <input type="checkbox" name="onGrab"/>
                     <p>
-                        <span>On</span>
-                        <span>Off</span>
+                        <span>Yes</span>
+                        <span>No</span>
                     </p>
 
                     <div class="btn btn-primary slide-button"></div>
@@ -39,8 +39,8 @@
                 <label class="checkbox toggle well">
                     <input type="checkbox" name="onDownload"/>
                     <p>
-                        <span>On</span>
-                        <span>Off</span>
+                        <span>Yes</span>
+                        <span>No</span>
                     </p>
 
                     <div class="btn btn-primary slide-button"></div>