diff --git a/templates/index.html b/templates/index.html
index cfc58e9..9d67d4b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -393,6 +393,159 @@
     </div><br>
 
 
+
+    <div id="screensaver-div" style="display:none">
+      <div id="screensaver-top">
+        <h3 id="screensaver-p">Screensaver Settings</h3>
+        <button id="screensaver-close-btn" onclick="closeScreensaver()">Close</button>
+        <div id="inside-screensaver-div">
+          <p id="clock1-p">Clock 1 Settings:</p>
+            <div class="col-auto" style="padding-left:5%">
+              Time Color
+              <select class="form-select hour-select" id="shutdown-hour-select">
+                <option {%if clock_screensaver.clock1.time_color == 'White' %} selected {% endif %}>White</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Red' %} selected {% endif %}>Red</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Green' %} selected {% endif %}>Green</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Dark Green' %} selected {% endif %}>Dark Green</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Blue' %} selected {% endif %}>Blue</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Purple' %} selected {% endif %}>Purple</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Pink' %} selected {% endif %}>Pink</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Yellow' %} selected {% endif %}>Yellow</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Orange' %} selected {% endif %}>Orange</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Gold' %} selected {% endif %}>Gold</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Gray' %} selected {% endif %}>Gray</option>
+                <option {%if clock_screensaver.clock1.time_color == 'Cyan' %} selected {% endif %}>Cyan</option>
+              </select><br>
+              Weekday Color
+              <select class="form-select minute-select" id="shutdown-minute-select">
+                <option {%if clock_screensaver.clock1.weekday_color == 'White' %} selected {% endif %}>White</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Red' %} selected {% endif %}>Red</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Green' %} selected {% endif %}>Green</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Dark Green' %} selected {% endif %}>Dark Green</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Blue' %} selected {% endif %}>Blue</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Purple' %} selected {% endif %}>Purple</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Pink' %} selected {% endif %}>Pink</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Yellow' %} selected {% endif %}>Yellow</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Orange' %} selected {% endif %}>Orange</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Gold' %} selected {% endif %}>Gold</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Gray' %} selected {% endif %}>Gray</option>
+                <option {%if clock_screensaver.clock1.weekday_color == 'Cyan' %} selected {% endif %}>Cyan</option>
+              </select><br>
+              Date Color
+              <select class="form-select minute-select" id="shutdown-minute-select">
+                <option {%if clock_screensaver.clock1.date_color == 'White' %} selected {% endif %}>White</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Red' %} selected {% endif %}>Red</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Green' %} selected {% endif %}>Green</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Dark Green' %} selected {% endif %}>Dark Green</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Blue' %} selected {% endif %}>Blue</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Purple' %} selected {% endif %}>Purple</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Pink' %} selected {% endif %}>Pink</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Yellow' %} selected {% endif %}>Yellow</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Orange' %} selected {% endif %}>Orange</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Gold' %} selected {% endif %}>Gold</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Gray' %} selected {% endif %}>Gray</option>
+                <option {%if clock_screensaver.clock1.date_color == 'Cyan' %} selected {% endif %}>Cyan</option>
+              </select><br>
+              Timezone
+              <select class="form-select minute-select" id="shutdown-minute-select">
+                <option {%if clock_screensaver.shutdown.minute == '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%}/>
+              <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%}/>
+              <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%}/>
+
+            </div>
+
+          <p id="clock2-p">Clock 2 Settings:</p>
+            <div class="col-auto" style="padding-left:5%">
+              Time Color
+              <select class="form-select hour-select" id="reboot-hour-select">
+                <option {%if clock_screensaver.clock2.time_color == 'White' %} selected {% endif %}>White</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Red' %} selected {% endif %}>Red</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Green' %} selected {% endif %}>Green</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Dark Green' %} selected {% endif %}>Dark Green</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Blue' %} selected {% endif %}>Blue</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Purple' %} selected {% endif %}>Purple</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Pink' %} selected {% endif %}>Pink</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Yellow' %} selected {% endif %}>Yellow</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Orange' %} selected {% endif %}>Orange</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Gold' %} selected {% endif %}>Gold</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Gray' %} selected {% endif %}>Gray</option>
+                <option {%if clock_screensaver.clock2.time_color == 'Cyan' %} selected {% endif %}>Cyan</option>
+              </select><br>
+              Date Color
+              <select class="form-select minute-select" id="reboot-minute-select">
+                <option {%if clock_screensaver.clock2.date_color == 'White' %} selected {% endif %}>White</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Red' %} selected {% endif %}>Red</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Green' %} selected {% endif %}>Green</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Dark Green' %} selected {% endif %}>Dark Green</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Blue' %} selected {% endif %}>Blue</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Purple' %} selected {% endif %}>Purple</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Pink' %} selected {% endif %}>Pink</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Yellow' %} selected {% endif %}>Yellow</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Orange' %} selected {% endif %}>Orange</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Gold' %} selected {% endif %}>Gold</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Gray' %} selected {% endif %}>Gray</option>
+                <option {%if clock_screensaver.clock2.date_color == 'Cyan' %} selected {% endif %}>Cyan</option>
+              </select><br>
+              Timezone
+              <select class="form-select minute-select" id="reboot-minute-select">
+                <option {%if clock_screensaver.reboot.minute == '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%}/>
+              <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%}/>
+            </div>
+
+
+          <p id="worldclock-p">World Clock Settings:</p>
+            <div class="col-auto" style="padding-left:5%">
+              City Color
+              <select class="form-select b-minute-select" id="brightness1-hour1-select">
+                <option {%if clock_screensaver.world_clock.city_color == 'White' %} selected {% endif %}>White</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Red' %} selected {% endif %}>Red</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Green' %} selected {% endif %}>Green</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Dark Green' %} selected {% endif %}>Dark Green</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Blue' %} selected {% endif %}>Blue</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Purple' %} selected {% endif %}>Purple</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Pink' %} selected {% endif %}>Pink</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Yellow' %} selected {% endif %}>Yellow</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Orange' %} selected {% endif %}>Orange</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Gold' %} selected {% endif %}>Gold</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Gray' %} selected {% endif %}>Gray</option>
+                <option {%if clock_screensaver.world_clock.city_color == 'Cyan' %} selected {% endif %}>Cyan</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.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%}/>
+              <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%}/>
+            </div>
+
+        </div>
+
+        <div class="col-lg-2 col-md-2 col-sm-2" style="display:block;margin: 0 auto;width: 30%;margin-top:8%;">
+          <a id="save-screensaver-btn" class="btn btn-screensaver-settings" onclick="saveScreensaverSettings()">Save Settings</a>
+          <p align="center" style="display:none;color:red;" id="screensaver-saved">Saved!</p>
+        </div>
+      </div>
+    </div>
+
+      
+
     <div id="scheduler-div" style="display:none">
       <div id="scheduler-top">
         <h3 id="scheduler-p">Scheduler Settings</h3>