diff --git a/gc-btt-settings.html b/gc-btt-settings.html
index f414e72..990ec7d 100644
--- a/gc-btt-settings.html
+++ b/gc-btt-settings.html
@@ -5,11 +5,11 @@
 <style>
     body {
         color: #fff;
-        font-family: -apple-system, "SF Pro", Helvetica, sans-serif;
+        font-family: -apple-system, "SF Pro", Helvetica Neue, sans-serif;
         font-size: 14px;
         margin: 24px 48px 64px 48px;
         padding: 0;
-        height: 688px;
+        height: 692px;
         width: 980px;
         background: transparent;
         -webkit-transform: translate3d(0, 0, 0);
@@ -34,23 +34,15 @@
     }
     
     h1 {
-        font-family: -apple-system, "SF Pro Display", Helvetica, sans-serif;
+        font-family: -apple-system, "SF Pro Display", Helvetica Neue, sans-serif;
         font-weight: 600;
         margin: 0;
         padding: 47px 16px 16px 16px;
         font-size: 24px;
     }
     
-    h2 {
-        font-family: -apple-system, "SF Pro Display", Helvetica, sans-serif;
-        font-size: 16px;
-        text-align: center;
-        font-weight: 500;
-        margin: 12px 0;
-    }
-    
     h3 {
-        font-family: -apple-system, "SF Pro Display", Helvetica, sans-serif;
+        font-family: -apple-system, "SF Pro Display", Helvetica Neue, sans-serif;
         text-transform: uppercase;
         font-size: 13px;
         font-weight: 500;
@@ -60,7 +52,7 @@
     }
     
     section:first-of-type h3 {
-        margin-top: -3px;
+        margin-top: -2px;
     }
     
     span {
@@ -100,9 +92,8 @@
         border: 1px solid rgba(255, 255, 255, .2);
         border-right: none;
         -webkit-transform: translate3d(0, 0, 0);
-        background: rgba(56, 56, 56, 0.75);
+        background: rgba(47, 44, 40, 0.75);
         position: relative;
-        box-shadow: inset rgba(255,255,255,.5) 0 0 0;
     }
     
     .traffic-lights { position: absolute; top: 20px; left: 20px; } .focus .traffic-lights > .traffic-light-close, .traffic-lights:hover > .traffic-light-close, .traffic-lights:active > .traffic-light-close { background-color: #ff6159; } .focus .traffic-lights > .traffic-light-close:active:hover, .traffic-lights:hover > .traffic-light-close:active:hover, .traffic-lights:active > .traffic-light-close:active:hover { background-color: #ff8d85; } .focus .traffic-lights > .traffic-light-minimize, .traffic-lights:hover > .traffic-light-minimize, .traffic-lights:active > .traffic-light-minimize { background-color: #ffbd2e; } .focus .traffic-lights > .traffic-light-minimize:active:hover, .traffic-lights:hover > .traffic-light-minimize:active:hover, .traffic-lights:active > .traffic-light-minimize:active:hover { background-color: #bf8e22; } .focus .traffic-lights > .traffic-light-maximize, .traffic-lights:hover > .traffic-light-maximize, .traffic-lights:active > .traffic-light-maximize { background-color: #28c941; } .focus .traffic-lights > .traffic-light-maximize:active:hover, .traffic-lights:hover > .traffic-light-maximize:active:hover, .traffic-lights:active > .traffic-light-maximize:active:hover { background-color: #1d9730; } .traffic-lights > .traffic-light:before, .traffic-lights > .traffic-light:after { visibility: hidden; } .traffic-lights:hover > .traffic-light:before, .traffic-lights:hover > .traffic-light:after, .traffic-lights:active > .traffic-light:before, .traffic-lights:active > .traffic-light:after { visibility: visible; }
@@ -137,7 +128,7 @@
     }
     
     .tablink::after {
-        content: " ";
+        content: "";
         display: block;
         width: calc(100% - 48px);
         height: 1px;
@@ -184,7 +175,7 @@
     
     /* Content Area Styles */
     .content {
-        background: rgba(70, 68, 67, 1);
+        background: #1e1e1e;
         border-top-right-radius: 10px;
         border-bottom-right-radius: 10px;
         border: 1px solid rgba(255, 255, 255, .2);
@@ -197,7 +188,7 @@
     }
     
     .tabcontent {
-        padding-top: 66px;
+        padding-top: calc(51px + 20px);
         display: none;
         position: relative;
     }
@@ -212,12 +203,21 @@
         top: 1px;
         left: 266px;
         right: 1px;
+        height: 51px;
+        line-height: 51px;
         background: rgba(83, 81, 79, .8);
         -webkit-backdrop-filter: blur(16px) saturate(400%) contrast(150%);
         -webkit-transform: translate3d(0, 0, 0);
         border-bottom: 1px solid rgba(0,0,0,1);
-        box-shadow: inset rgba(255,255,255,.4) 0 0 0;
+        box-shadow: rgba(255,255,255,.2) 1px -1px;
         border-top-right-radius: 10px;
+        font-size: 15px;
+        text-align: center;
+        font-weight: 600;
+    }
+    
+    header + small {
+        margin-top: 0px;
     }
     
     section {
@@ -228,8 +228,13 @@
         margin-bottom: 16px;
     }
     
-    label small {
-        margin-bottom: 0;
+    
+    section h3 + small {
+        margin-bottom: 6px;
+    }
+    
+    ul + small {
+        margin-top: -10px;
     }
     
     .tabcontent ul {
@@ -237,14 +242,14 @@
         padding: 0;
         margin: 0 16px 16px 16px;
         -webkit-transform: translate3d(0, 0, 0);
-        background: rgba(85, 84, 83, 1);
+        background: rgba(255,255,255,.12);
         border-radius: 8px;
     }
     
     .tabcontent ul li {
         padding: 8px 8px 8px 0;
         margin: 0 0 0 16px;
-        border-bottom: 1px solid rgba(255,255,255,.1);
+        border-bottom: 1px solid rgba(255,255,255,.12);
     }
     
     .tabcontent ul li:last-of-type {
@@ -316,51 +321,38 @@
     }
     
     .button {
-        background: #1485FF;
-        display: block;
-        text-align: center;
-        border-radius: 4px;
-        margin: 32px 16px;
-        padding: 8px;
-        color: #fff;
-        text-decoration: none;
-        font-weight: 500;
-    }
-    
-    .button:active,
-    .token.selected:active {
-        opacity: .8;
-    }
-    
-    .token {
+        height: 26px;
+        line-height: 26px;
         color: #1485FF;
-        border: 1px solid #1485FF;
         color: #fff;
-        padding: 6px 8px;
+        padding: 0 8px;
         margin: 8px;
-        border-radius: 4px;
+        border-radius: 6px;
     }
     
-    .token.selected {
+    .button.selected {
         background: #1485FF;
         color: #fff;
     }
     
-    .token:active,
-    .segmented-control span:active {
-        background: rgba(128, 125, 124, .2);
+    .button.selected:active {
+        opacity: .8 !important;
     }
     
-    .token.selected:active {
+    .segmented-control span:active {
         background: #1485FF;
     }
     
+    
     .segmented-control {
         position: absolute;
         right: 5px;
         top: 5px;
         display: flex;
         min-width: 300px;
+        box-shadow: inset #1485FF 0 0 0 1px;
+        border-radius: 6px;
+        height: 26px;
     }
     
     .segmented-control span {
@@ -369,25 +361,36 @@
         text-decoration: none;
         background: none;
         font-size: 15px;
-        margin: 0 0 0 -1px;
+        margin: 0 0 0 1px;
         padding: 0 8px;
         box-sizing: border-box;
-        border: 1px solid #1485FF;
-        height: 26px;
         line-height: 26px;
         white-space: nowrap;
         width: 100%;
         min-width: 100px;
+        border-radius: 6px;
+        position: relative;
     }
     
-    .segmented-control span:first-of-type {
-        border-top-left-radius: 4px;
-        border-bottom-left-radius: 4px;
+    .segmented-control span:after,
+    .segmented-control span:before {
+        content: "";
+        width: 1px;
+        height: calc(100% - 12px);
+        margin: 6px 0;
+        background: rgba(255,255,255,.2);
+        position: absolute;
+        right: -1px;
     }
     
-    .segmented-control span:last-of-type {
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
+    .segmented-control span:before {
+        display: none;
+    }
+    
+    .segmented-control span:first-of-type:active:before,
+    .segmented-control span:last-of-type:after,
+    .segmented-control span:active:after {
+        display: none;
     }
     
     .calendar .calendar,
@@ -403,11 +406,46 @@
     .large .large,
     .medium .medium,
     .small .small,
-    label[class="12Hour"] button[class="12Hour"],
-    label[class="24Hour"] button[class="24Hour"] {
+    .twelveHour .twelveHour,
+    .twentyFourHour .twentyFourHour {
         background: #1485FF;
     }
+        
+    .calendar .calendar:after,
+    .fantastical .fantastical:after,
+    .busycal .busycal:after,
+    .dynamic .dynamic:after,
+    .always .always:after,
+    .never .never:after,
+    .full .full:after,
+    .icon .icon:after,
+    .off .off:after,
+    .hide .hide:after,
+    .large .large:after,
+    .medium .medium:after,
+    .small .small:after,
+    .twelveHour .twelveHour:after,
+    .twentyFourHour .twentyFourHour:after {
+        display: none;
+    }
     
+    .segmented-control span:active:before,
+    .fantastical .fantastical:before,
+    .busycal .busycal:before,
+    .always .always:before,
+    .never .never:before,
+    .icon .icon:before,
+    .off .off:before,
+    .hide .hide:before,
+    .large .large:before,
+    .medium .medium:before,
+    .small .small:before,
+    .twentyFourHour .twentyFourHour:before {
+        display: block;
+        right: auto;
+        background: #3c3c3c;
+        left: -1px;
+    }
     
     /* Toggle Switch Styles */
     label, .form-switch {
@@ -535,17 +573,26 @@
         opacity: 0;
     }
     
-    .radio-switch input[type="radio"]:checked + .radio {
+    .radio-switch .custom input[type="radio"] + .radio.custom,
+    .radio-switch .default input[type="radio"] + .radio.default,
+    .radio-switch .minimalist input[type="radio"] + .radio.minimalist,
+    .radio-switch .gcs-daily-driver input[type="radio"] + .radio.gcs-daily-driver {
         background-color: #767272;
         background-image: linear-gradient(#1669e4,#135fce);
     }
     
-    .radio-switch:active input[type="radio"]:checked + .radio {
+    .radio-switch:active .custom input[type="radio"] + .radio.custom,
+    .radio-switch:active .default input[type="radio"] + .radio.default,
+    .radio-switch:active .minimalist input[type="radio"] + .radio.minimalist,
+    .radio-switch:active .gcs-daily-driver input[type="radio"] + .radio.gcs-daily-driver {
         background-color: #767272;
         background-image: linear-gradient(#1d71e6,#2379f2);
     }
     
-    .radio-switch input[type="radio"]:checked + .radio:after {
+    .radio-switch .custom input[type="radio"] + .radio.custom:after,
+    .radio-switch .default input[type="radio"] + .radio.default:after,
+    .radio-switch .minimalist input[type="radio"] + .radio.minimalist:after,
+    .radio-switch .gcs-daily-driver input[type="radio"] + .radio.gcs-daily-driver:after {
           opacity: 1;
           transform: scale(1);
           transition: all .15s ease;
@@ -555,38 +602,47 @@
     /* Active preset display box */
     ul.active-preset-display {
         border: none;
-        border-radius: 8px;
-        background: #5f5d5c;
+        background: rgba(255,255,255,.15);
     }
     
     .active-preset-display .form-switch label {
         display: flex;
         flex-direction: row;
-        padding: 4px 0;
+        padding: 6px 0;
+        height: 100%;
     }
     
     .active-preset-display .form-switch label .description {
         flex-grow: 1;
+        margin: 0;
+        padding: 0;
+        top: 0;
+        line-height: normal;
     }
     
-    .active-preset-display .form-switch label .action .token {
-        margin-top: 13px;
-        line-height: normal;
+    .active-preset-display .form-switch label .action .button {
+        position: absolute;
+        top: 50%;
+        right: 0;
+        margin-top: -13px;
     }
     
     .active-preset-display .form-switch .description span,
     .active-preset-display .form-switch .description small,
-    .active-preset-display .form-switch .token {
+    .active-preset-display .form-switch .button {
         display: none;
     }
     
+    .active-preset-display .form-switch .description span {
+        font-weight: 600;
+    }
+    
     .active-preset-display .form-switch .description small {
-        margin: 0;
-        margin-top: -4px;
+        margin: 6px 0 0 0;
         color: #eee;
     }
     
-    .active-preset-display .form-switch .description small a {
+    .active-preset-display .form-switch .description a {
         position: relative;
         top: 0;
         bottom: 0;
@@ -594,37 +650,59 @@
         right: 0;
         width: auto;
         line-height: 16px;
-        text-align: left;
-        margin-top: 4px;
-        color: #007aff;
+        font-size: 13px;
+        display: inline-block;
+        background: rgba(255,255,255,.15);
+        border-radius: 10px;
+        padding: 2px 5px;
+        margin-left: 2px;
+        color: #ccc;
     }
-        
+    
+    .active-preset-display .form-switch .description a:active {
+        background: rgba(255,255,255,.2);
+    }
+     
     .active-preset-display .form-switch .loading .loading,
     .active-preset-display .form-switch .custom .custom,
     .active-preset-display .form-switch .default .default,
     .active-preset-display .form-switch .minimalist .minimalist,
     .active-preset-display .form-switch .gcs-daily-driver .gcs-daily-driver {
-        display: block;
+        display: inline-block;
     }
     
+    #general .active-preset-display .description {
+        height: 58px;
+    }
+    
+    #general .active-preset-display .description span.loading,
+    #general .active-preset-display .description span.default,
+    #general .active-preset-display .description span.minimalist,
+    #general .active-preset-display .description span.gcs-daily-driver {
+        margin-top: 9px;
+    }
+       
+    
     #general .active-preset-display #activePreset.loading:before,
     #general .active-preset-display #activePreset.custom:before,
     #general .active-preset-display #activePreset.default:before,
     #general .active-preset-display #activePreset.minimalist:before,
     #general .active-preset-display #activePreset.gcs-daily-driver:before {
-        content: " ";
+        content: "";
         position: absolute;
-        top: -9px;
-        bottom: -9px;
-        left: -17px;
-        right: -9px;
-        border: 1px solid #1384fe;
-        border-radius: 4px;
-        display: none;
+        top: -8px;
+        bottom: -8px;
+        left: -16px;
+        right: -8px;
+        border: 1px solid #1485FF;
+        border-radius: 8px;
+        box-shadow: 0 2px 24px rgba(0, 122, 255,.2);
+        
     }
     
     #general .active-preset-display #activePreset.custom:before {
         border-color: #fe9e0b;
+        box-shadow: 0 2px 24px rgba(255, 159, 11,.2);
     }
 </style>
 <script>
@@ -680,7 +758,7 @@
     
     function triggerNamedActionAndRefreshSettingsWindow(actionName, affectsPreset) {
         if(affectsPreset === true) {
-            setVariable('activePreset','custom',event);
+            setVariable('modifiedPreset','true',event);
         }
         triggerNamedActionWithoutResponse(actionName);
         event.preventDefault();
@@ -700,12 +778,20 @@
     }
     
     function checkAndApplyPreset(presetName, actionName) {
-        triggerNamedActionWithoutResponse(actionName);
+        window.BTT.callHandler('get_string_variable', {variableName: 'activePreset'},
+            function callback(currentVariableValue) {
+                if(currentVariableValue === presetName) {
+                    
+                } else {
+                    triggerNamedActionWithoutResponse(actionName);
+                    setTimeout(function () {
+                        getAllVariablesAndUpdateClasses();
+                    }, 3000);
+                }
+            }
+        );
         event.preventDefault();
         event.stopPropagation();
-        setTimeout(function () {
-            getAllVariablesAndUpdateClasses();
-        }, 3000);
     }
     
     function toggleVariable(variable, actionName, event, affectsPreset) {
@@ -732,6 +818,11 @@
         document.getElementById(id).click();
     }
     
+    function showFactoryResetConfirmation() {
+        document.getElementById("factory-reset").style.display = "none";
+        document.getElementById("factory-reset-dialog").style.display = "block";
+    }
+    
     function checkVersion() {
         window.BTT.callHandler('get_string_variable', {variableName: 'gc_version'}, function callback(currentVariableValue) {
             if(currentVariableValue === '3.560') {
@@ -799,17 +890,15 @@ <h1 class="BTTDraggable">GC-BTT Settings</h1>
 <div class="content">
     <div class="content-inner">
             <div id="general" class="tabcontent">
-                <header class="BTTDraggable">
-                    <h2 class="BTTDraggable">General</h2>
-                </header>
+                <header class="BTTDraggable">General</header>
                 <section>
-                    <h3>Current Preset</h3>
+                    <h3>Active Preset</h3>
                     <ul class="active-preset-display">
                         <li class="form-switch">
                             <label id="activePreset" class="loading">
                                 <span class="description">
                                     <span class="loading">
-                                        &nbsp;
+                                        Loading...
                                     </span>
                                     <span class="custom">
                                         Custom Settings
@@ -823,24 +912,24 @@ <h3>Current Preset</h3>
                                     <span class="gcs-daily-driver">
                                         GC's Daily Driver
                                     </span>
+                                    <a onClick="clickElement('presets-tab');">Change &rsaquo;</a><br>
                                     <small class="custom">You're using your own custom settings for GC-BTT.<br>Run "Reapply Settings" if your settings didn't reapply correctly after upgrading.</small>
                                     <small class="loading default minimalist gcs-daily-driver">Run "Reapply Preset" if this preset didn't apply correctly.</small>
-                                    <small class="loading default minimalist gcs-daily-driver"><a onClick="clickElement('presets-tab');">More Presets &rsaquo;</a></small>
                                 </span>
                                 <span class="action">
-                                    <span class="token selected loading" onClick="applyPreset('Check All Settings')">
+                                    <span class="button selected loading" onClick="applyPreset('Check All Settings')">
                                         Reapply Preset
                                     </span>
-                                    <span class="token selected custom" onClick="applyPreset('Restore Custom Settings')">
+                                    <span class="button selected custom" onClick="applyPreset('Restore Custom Settings')">
                                         Reapply Settings
                                     </span>
-                                    <span class="token selected default" onClick="applyPreset('Default Settings')">
+                                    <span class="button selected default" onClick="applyPreset('Default Settings')">
                                         Reapply Preset
                                     </span>
-                                    <span class="token selected minimalist" onClick="applyPreset('Minimalist')">
+                                    <span class="button selected minimalist" onClick="applyPreset('Minimalist')">
                                         Reapply Preset
                                     </span>
-                                    <span class="token selected gcs-daily-driver" onClick="applyPreset('GC\'s Daily Driver')">
+                                    <span class="button selected gcs-daily-driver" onClick="applyPreset('GC\'s Daily Driver')">
                                         Reapply Preset
                                     </span>
                                 </span>
@@ -886,7 +975,7 @@ <h3>Escape Key Style</h3>
                     <h3>Modifier Strips</h3>
                     <ul>
                         <li class="form-switch">
-                            <label id="showControlMenu" onClick="toggleVariable(this.id,'Refresh Control Menu',event)">
+                            <label id="showControlMenu" onClick="toggleVariable(this.id,'Refresh Control Menu',event,true)">
                                 <span class="tbicon">
                                     <img class="invert" src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/touchbar-icons/control.png" alt="">
                                 </span>
@@ -941,10 +1030,105 @@ <h3>Extras</h3>
                     </ul>
                 </section>
             </div>
+            <div id="presets" class="tabcontent">
+                <header class="BTTDraggable">Presets</header>
+                <small>Quickly change your entire Touch Bar. Unless specified, these don't affect Dock Badge settings.</small>
+                <section>
+                    <ul>
+                        <li class="form-switch radio-switch">
+                            <label id="activePreset">
+                                <span class="description">
+                                    Custom Settings
+                                    <small style="display:block;">Restores the settings you had before applying your current preset.</small>
+                                </span>
+                                <input type="radio" name="preset" onClick="checkAndApplyPreset('custom','Restore Custom Settings')">
+                                <span class="radio custom"></span>
+                            </label>
+                        </li>
+                    </ul>
+                </section>
+                <section>
+                    <h3>Standard Presets</h3>
+                    <ul>
+                        <li class="form-switch radio-switch">
+                            <label id="activePreset">
+                                <span class="description">
+                                    Default Settings
+                                    <small>The stock configuration of GoldenChaos-BTT.</small>
+                                    <span class="tbscreenshot">
+                                        <img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/presets/default.png" alt="">
+                                    </span>
+                                </span>
+                                <input type="radio" name="preset" onClick="checkAndApplyPreset('default','Default Settings')">
+                                <span class="radio default"></span>
+                            </label>
+                        </li>
+                        <li class="form-switch radio-switch">
+                            <label id="activePreset">
+                                <span class="description">
+                                    Minimalist
+                                    <small>Just two menu bar sizes - expand for weather and battery info.<br>Home Strip only shows Now Playing controls.</small>
+                                    <span class="tbscreenshot">
+                                        <img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/presets/minimalist.png" alt="">
+                                    </span>
+                                </span>
+                                <input type="radio" name="preset" onClick="checkAndApplyPreset('minimalist','Minimalist')">
+                                <span class="radio minimalist"></span>
+                            </label>
+                        </li>
+                    </ul>
+                </section>
+                <section>
+                    <h3>Community Presets</h3>
+                    <ul>
+                        <li class="form-switch radio-switch">
+                            <label id="activePreset">
+                                <span class="description">
+                                    GC's Daily Driver
+                                    <small>GC's personal configuration with custom medium date size. &bull; <em>By GoldenChaos</em></small>
+                                    <span class="tbscreenshot">
+                                        <img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/presets/gcs-daily-driver.png" alt="">
+                                    </span>
+                                </span>
+                                <input type="radio" name="preset" onClick="checkAndApplyPreset('gcs-daily-driver','GC\'s Daily Driver')">
+                                <span class="radio gcs-daily-driver"></span>
+                            </label>
+                        </li>
+                    </ul>
+                </section>
+                <section>
+                    <h3>Reset</h3>
+                    <ul style="border:1px solid #ff3a30;background:rgba(255,255,255,.12);" class="active-preset-display">
+                        <li class="form-switch">
+                            <label id="activePreset">
+                                <span id="factory-reset" style="display:flex;width:100%;">
+                                    <span class="description">
+                                        <span style="display:block;margin-top:2px;">Factory Reset</span>
+                                        <small style="display:block;">Restores <em>all</em> settings to their defaults, including Dock Badges.<br>Does not erase stored Custom Settings.</small>
+                                    </span>
+                                    <span style="display:block;background:#ff3a30;border-color:#ff3a30;" class="button selected" onClick="showFactoryResetConfirmation()">
+                                        Factory Reset
+                                    </span>
+                                </span>
+                                <span id="factory-reset-dialog" style="display:none;">
+                                    <span class="description">
+                                        <span style="display:block;margin-top:2px;">Are you sure?</span>
+                                        <small style="display:block;"></small>
+                                    </span>
+                                    <span style="display:block;background:#ff3a30;border-color:#ff3a30;" class="button selected" onClick="applyPreset('Factory Reset')">
+                                        Factory Reset
+                                    </span>
+                                    <span style="display:block;" class="button selected" onClick="showFactoryResetConfirmation()">
+                                        Cancel
+                                    </span>
+                                </span>
+                            </label>
+                        </li>
+                    </ul>
+                </section>
+            </div>
             <div id="home-strip" class="tabcontent">
-                <header class="BTTDraggable">
-                    <h2>Home Strip</h2>
-                </header>
+                <header class="BTTDraggable">Home Strip</header>
                 <section>
                     <h3>Controls</h3>
                     <ul>
@@ -1119,9 +1303,7 @@ <h3>Widgets</h3>
                 </section>
             </div>
             <div id="menu-bar" class="tabcontent">
-                <header class="BTTDraggable">
-                    <h2>Menu Bar</h2>
-                </header>
+                <header class="BTTDraggable">Menu Bar</header>
                 <section>
                     <h3>Dynamic Menu Bar</h3>
                     <ul>
@@ -1255,8 +1437,8 @@ <h3>Date and Time</h3>
                                 </span>
                                 Time Format
                                 <span class="segmented-control">
-                                    <span class="12Hour" onClick="triggerNamedActionAndRefreshSettingsWindow('Use 12-Hour Time',true)">12-Hour</span>
-                                    <span class="24Hour" onClick="triggerNamedActionAndRefreshSettingsWindow('Use 24-Hour Time',true)">24-Hour</span>
+                                    <span class="twelveHour" onClick="triggerNamedActionAndRefreshSettingsWindow('Use 12-Hour Time',true)">12-Hour</span>
+                                    <span class="twentyFourHour" onClick="triggerNamedActionAndRefreshSettingsWindow('Use 24-Hour Time',true)">24-Hour</span>
                                 </span>
                             </label>
                         </li>
@@ -1580,11 +1762,10 @@ <h3>GC-BTT Controls</h3>
                 </section>
             </div>
             <div id="dock-badges" class="tabcontent">
-                <header class="BTTDraggable">
-                    <h2>Dock Badges</h2>
-                </header>
+                <header class="BTTDraggable">Dock Badges</header>
                 <section>
-                    <small>Dock Badges allow you to see notification badges from apps in your dock, including from Handoff devices.</small>
+                    <img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/screenshots/dock-badges.png" alt="">
+                    <small>Notification badges on your Touch Bar for apps running in your dock, including from Handoff.</small>
                     <h3>Apple Apps</h3>
                     <ul>
                         <li class="form-switch">
@@ -1952,94 +2133,10 @@ <h3>Third-Party Apps</h3>
                     </ul>
                 </section>
             </div>
-            <div id="presets" class="tabcontent">
-                <header class="BTTDraggable">
-                    <h2>Presets</h2>
-                </header>
-                <small>Quickly change your entire Touch Bar. These don't affect Dock Badge selections.</small>
-                <section>
-                    <ul>
-                        <li class="form-switch radio-switch">
-                            <label id="activePreset" for="radio_custom">
-                                <span class="description">
-                                    Custom Settings
-                                    <small style="display:block;">Restores the settings you had before applying your current preset.</small>
-                                </span>
-                                <input type="radio" name="preset" id="radio_custom">
-                                <span class="radio"></span>
-                            </label>
-                        </li>
-                    </ul>
-                </section>
-                <section>
-                    <h3>Standard Presets</h3>
-                    <ul>
-                        <li class="form-switch radio-switch">
-                            <label id="activePreset" for="radio_default">
-                                <span class="description">
-                                    Default Settings
-                                    <small>The stock configuration of GoldenChaos-BTT.</small>
-                                    <span class="tbscreenshot">
-                                        <img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/presets/default.png" alt="">
-                                    </span>
-                                </span>
-                                <input type="radio" name="preset" id="radio_default" onClick="applyPreset('Default Settings')">
-                                <span class="radio default"></span>
-                            </label>
-                        </li>
-                        <li class="form-switch radio-switch">
-                            <label id="activePreset" for="radio_minimalist">
-                                <span class="description">
-                                    Minimalist
-                                    <small>Just two menu bar sizes - expand for weather and battery info.<br>Home Strip only shows Now Playing controls.</small>
-                                    <span class="tbscreenshot">
-                                        <img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/presets/minimalist.png" alt="">
-                                    </span>
-                                </span>
-                                <input type="radio" name="preset" id="radio_minimalist" onClick="applyPreset('Minimalist')">
-                                <span class="radio minimalist"></label>
-                            </label>
-                        </li>
-                    </ul>
-                </section>
-                <section>
-                    <h3>Community Presets</h3>
-                    <ul>
-                        <li class="form-switch radio-switch">
-                            <label id="activePreset" for="radio_gcs-daily-driver">
-                                <span class="description">
-                                    GC's Daily Driver
-                                    <small>GC's personal configuration with custom medium date size. &bull; <em>By GoldenChaos</em></small>
-                                    <span class="tbscreenshot">
-                                        <img src="https://raw.githubusercontent.com/GoldenChaos/GoldenChaos-BTT/master/presets/gcs-daily-driver.png" alt="">
-                                    </span>
-                                </span>
-                                <input type="radio" name="preset" id="radio_gcs-daily-driver" onClick="applyPreset('GC\'s Daily Driver')">
-                                <span class="radio gcs-daily-driver"></span>
-                            </label>
-                        </li>
-                    </ul>
-                </section>
-                <section>
-                    <h3>Reset</h3>
-                    <ul style="border-color:#ff3a30;" class="active-preset-display">
-                        <li class="form-switch">
-                            <label id="activePreset">
-                                <span class="description" style="top:-5px;">
-                                    Factory Reset
-                                    <small style="display:block;">Applies the Default preset and restores the default set of dock badges.</small>
-                                </span>
-                                <span style="display:block;line-height:normal;background:#ff3a30;border-color:#ff3a30;" class="token selected" onClick="applyPreset('Factory Reset')">
-                                    Factory Reset
-                                </span>
-                            </label>
-                        </li>
-                    </ul>
-                </section>
-            </div>
         </div>
     </div>
     <script>
+        // Make the tabs work
         function openTab(evt, tabName) {
             // Declare all variables
             var i, tabcontent, tablinks;
diff --git a/presets/default.png b/screenshots/default.png
similarity index 100%
rename from presets/default.png
rename to screenshots/default.png
diff --git a/screenshots/dock-badges.png b/screenshots/dock-badges.png
new file mode 100644
index 0000000..1c6a5b1
Binary files /dev/null and b/screenshots/dock-badges.png differ
diff --git a/presets/gcs-daily-driver.png b/screenshots/gcs-daily-driver.png
similarity index 100%
rename from presets/gcs-daily-driver.png
rename to screenshots/gcs-daily-driver.png
diff --git a/presets/minimalist.png b/screenshots/minimalist.png
similarity index 100%
rename from presets/minimalist.png
rename to screenshots/minimalist.png