diff --git a/templates/index.html b/templates/index.html
index 9d67d4b..9e7a1dd 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -448,17 +448,17 @@
               </select><br>
               Timezone
               <select class="form-select minute-select" id="shutdown-minute-select">
-                <option {%if clock_screensaver.shutdown.minute == '00' %} selected {% endif %}>00</option>
+                <option {%if clock_screensaver.clock1.timezone == '00' %} selected {% endif %}>00</option>
               </select><br>
               <label for="inputTransitionZ" class="col-form-label">PM/AM</label>
               <input class="screensaver-hour-select" type="checkbox" value="" id="shutdown-enabled"
-              {% if clock_screensaver.clock1.display_pm %} checked {%endif%}/>
+              {% if clock_screensaver.clock1['display_pm'] %} checked {%endif%}/>
               <label for="inputTransitionZ" class="col-form-label">Seconds</label>
               <input class="screensaver-hour-select" type="checkbox" value="" id="shutdown-enabled"
-              {% if clock_screensaver.clock1.display_seconds %} checked {%endif%}/>
+              {% if clock_screensaver.clock1['display_seconds'] %} checked {%endif%}/>
               <label for="inputTransitionZ" class="col-form-label">12 Hour Format</label>
               <input class="screensaver-hour-select" type="checkbox" value="" id="shutdown-enabled"
-              {% if clock_screensaver.clock1.12hour %} checked {%endif%}/>
+              {% if clock_screensaver.clock1['12hour'] %} checked {%endif%}/>
 
             </div>
 
@@ -496,14 +496,14 @@
               </select><br>
               Timezone
               <select class="form-select minute-select" id="reboot-minute-select">
-                <option {%if clock_screensaver.reboot.minute == '00' %} selected {% endif %}>00</option>
+                <option {%if clock_screensaver.clock2.timezone == '00' %} selected {% endif %}>00</option>
               </select><br>
               <label for="inputTransitionZ" class="col-form-label">PM/AM</label>
               <input class="screensaver-hour-select" type="checkbox" value="" id="reboot-enabled"
-              {% if clock_screensaver.clock2.display_pm %} checked {%endif%}/>
+              {% if clock_screensaver.clock2['display_pm'] %} checked {%endif%}/>
               <label for="inputTransitionZ" class="col-form-label">12 Hour Format</label>
               <input class="screensaver-hour-select" type="checkbox" value="" id="reboot-enabled"
-              {% if clock_screensaver.clock2.12hour %} checked {%endif%}/>
+              {% if clock_screensaver.clock2['12hour'] %} checked {%endif%}/>
             </div>
 
 
@@ -526,13 +526,13 @@
               </select><br>
               <label for="inputTransitionZ" class="col-form-label">PM/AM</label>
               <input class="screensaver-hour-select" type="checkbox" value="" id="shutdown-enabled"
-              {% if clock_screensaver.world_clock.display_pm %} checked {%endif%}/>
+              {% if clock_screensaver.world_clock['display_pm'] %} checked {%endif%}/>
               <label for="inputTransitionZ" class="col-form-label">Seconds</label>
               <input class="screensaver-hour-select" type="checkbox" value="" id="shutdown-enabled"
-              {% if clock_screensaver.world_clock.display_seconds %} checked {%endif%}/>
+              {% if clock_screensaver.world_clock['display_seconds'] %} checked {%endif%}/>
               <label for="inputTransitionZ" class="col-form-label">12 Hour Format</label>
               <input class="screensaver-hour-select" type="checkbox" value="" id="shutdown-enabled"
-              {% if clock_screensaver.world_clock.12hour %} checked {%endif%}/>
+              {% if clock_screensaver.world_clock['12hour'] %} checked {%endif%}/>
             </div>
 
         </div>