diff --git a/templates/index.html b/templates/index.html
index 4879c03..496d539 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1227,6 +1227,7 @@
                 <li>Movies</li>
                 <li>IPO Calendar</li>
                 <li>Economic Calendar</li>
+                <li>Jokes</li>
 
               {%endif%}
                 
@@ -1338,6 +1339,7 @@
               <option value="16">Movies</option>
               <option value="17">IPO Calendar</option>
               <option value="18">Economic Calendar</option>
+              <option value="19">Jokes</option>
             </select>
           </div> 
 
@@ -6962,7 +6964,174 @@
 
           </div>
       
-      
+
+
+    <!-- Jokes -->
+
+          <div class="page" id="Page19" style="display: none">
+            <div class="row">
+
+              <div class="col-lg-6 col-md-6 col-sm-12">
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputScrollSpeedZ222" class="col-form-label">Scroll Speed:</label>
+                  </div>
+                  <div class="col-auto">
+                    <select
+                      id="inputScrollSpeed19"
+                      class="form-select speed-select">
+                      <option {%if jokes_settings.speed == 'medium' %} selected {% endif %}>Medium</option>
+                      <option {%if jokes_settings.speed == 'slow' %} selected {% endif %}>Slow</option>
+                      <option {%if jokes_settings.speed == 'fast' %} selected {% endif %}>Fast</option>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3 left-div">
+                  <div class="col-auto">
+                    <label for="inputScrollSpeedRowZ222" class="col-form-label">Scroll Speed (Row 2):</label>
+                  </div>
+                  <div class="col-auto">
+                    <select
+                      id="inputScrollSpeedRow19"
+                      class="form-select speed-select">
+                      <option {%if jokes_settings.speed2 == 'medium' %} selected {% endif %}>Medium</option>
+                      <option {%if jokes_settings.speed2 == 'slow' %} selected {% endif %}>Slow</option>
+                      <option {%if jokes_settings.speed2 == 'fast' %} selected {% endif %}>Fast</option>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">Intro Transition:
+                    </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="inputTransition19" class="form-select animation-select">
+                      <option {%if jokes_settings.animation == 'down' %} selected {% endif %}>Down</option>
+                      <option {%if jokes_settings.animation == 'up' %} selected {% endif %}>Up</option>
+                      <option {%if jokes_settings.animation == 'continuous' %} selected {% endif %}>Continuous</option>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center left-div" style="padding-top: 25px;">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">
+                      Display Feature Title
+                    </label>
+                  </div>
+                  <div class="col-auto">
+                    <input
+                      class="form-check-input title-select"
+                      type="checkbox"
+                      value=""
+                      id="jokes_settings_title"
+                      {% if jokes_settings.title%}
+                      checked
+                      {%endif%}/>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="jokes-categories" class="col-form-label">Categories: </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="jokes-categories" class="form-select jokes-categories-select">
+                      <option>Any</option><option>Programming</option><option>Misc</option><option>Dark</option><option>Pun</option>
+                      <option>Spooky</option><option>Christmas</option>
+                    </select>
+                  </div>
+                  <div class="col-auto">
+                    <button id="jokes-categories-btn" class="btn set-btn">Add</button>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputText" class="col-form-label">Blacklist: </label>
+                  </div>
+                  <div class="col-auto">
+                      <input type="checkbox" id="nsfw-jokes" value="nsfw">
+                      <label for="nsfw-jokes">NSFW</label>
+                      <input type="checkbox" id="religious-jokes" value="religious">
+                      <label for="religious-jokes">Religious</label>
+                      <input type="checkbox" id="political-jokes" value="political">
+                      <label for="political-jokes">Political</label><br>
+                      <input type="checkbox" id="racist-jokes" value="racist">
+                      <label for="racist-jokes">Racist</label>
+                      <input type="checkbox" id="sexist-jokes" value="sexist">
+                      <label for="sexist-jokes">Sexist</label>
+                      <input type="checkbox" id="explicit-jokes" value="explicit">
+                      <label for="explicit-jokes">Explicit</label>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="jokes-amount" class="col-form-label">Amount: </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="jokes-amount" class="form-select jokes-amount-select">
+                      <option>1</option><option>2</option><option>3</option><option>4</option><option>5</option>
+                      <option>6</option><option>7</option><option>8</option><option>9</option><option>10</option>
+                    </select>
+                  </div>
+                </div>
+
+              </div>
+
+
+              <div class="col-lg-4 col-md-4 col-sm-12">
+                <h6 class="mt-3">List:</h6>
+                <div class="features-div-two">
+                  <ul
+                    id="jokes-list"
+                    class="display-features-list text-white symbol-list">
+                  </ul>
+                </div>
+              </div>
+
+              <div class="col-lg-2 col-md-2 col-sm-12">
+                <div class="icons-list">
+                  <i
+                    id="jokes-increase-btn"
+                    class="upbutton fa fa-chevron-up"
+                    aria-hidden="true"
+                  ></i>
+                  <br />
+                  <br />
+                  <i
+                    id="jokes-decrease-btn"
+                    class="downbutton fa fa-chevron-down"
+                    aria-hidden="true"
+                  ></i>
+                  <a style="position: relative; bottom: 30px; left: 10px">Sort Order</a>
+                  <br />
+                  <br />
+                  <i
+                    id="jokes-remove-btn"
+                    class="fa fa-minus"
+                    aria-hidden="true"
+                  ></i>
+                  <span style="position: relative; bottom: 0; left: 10px">Remove</span>
+
+                </div>
+              </div>
+            </div>
+
+            <div class="save-btn-div">
+              <a href="#" class="btn save-btn">Save</a>
+            </div>
+
+          </div> 
+
+            
+
+            
           <!-- Custom Images -->
 
           <div class="page" id="Page11" style="display: none">