Merge branch 'master' of https://github.com/n0shake/Clocker

Clocker/AppDelegate.swift

@@ -163,6 +163,7 @@ open class AppDelegate: NSObject, NSApplicationDelegate {
         var activationPolicy: NSApplication.ActivationPolicy = defaults.integer(forKey: CLAppDislayOptions) == 0 ? .accessory : .regular
 
         #if DEBUG
+            UserDefaults.standard.set(1, forKey: CLAppDislayOptions)
             activationPolicy = .regular
         #endif
 

Clocker/Clocker.xcodeproj/project.pbxproj

@@ -1454,7 +1454,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 79;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1939,7 +1939,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 79;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -2002,7 +2002,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 77;
+				CURRENT_PROJECT_VERSION = 79;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (

Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Bucket
+   uuid = "F515D608-9FB6-4230-BDAA-714D2FAB3B77"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            uuid = "0963511F-240E-487A-8C30-82699394C21B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            breakpointStackSelectionBehavior = "1"
+            scope = "1"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
+         <BreakpointContent
+            uuid = "4624F314-95A9-4ACC-A82C-CB1A1481BAA4"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

Clocker/Clocker/ca.lproj/Localizable.strings

@@ -112,6 +112,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";

Clocker/Clocker/de.lproj/Localizable.strings

@@ -327,3 +327,6 @@
 /* Errors */
 "You're offline, maybe?" = "You're offline, maybe?";
 
+"Preview" = "Preview";
+
+"Miscellaneous" = "Miscellaneous";

Clocker/Clocker/en.lproj/Localizable.strings

@@ -112,6 +112,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";

Clocker/Clocker/en.lproj/Panel.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -461,16 +461,16 @@
                                         </buttonCell>
                                         <accessibility identifier="Close"/>
                                         <connections>
-                                            <action selector="terminate:" target="-1" id="ZY8-sG-rkC"/>
+                                            <action selector="showMoreOptions:" target="-2" id="xl5-rm-4JK"/>
                                         </connections>
                                     </button>
                                     <button toolTip="Switch between Menubar/Floating mode." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YXE-4J-5cn">
-                                        <rect key="frame" x="278" y="10" width="29" height="19"/>
+                                        <rect key="frame" x="275" y="10" width="29" height="19"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="29" id="fWo-31-i3M"/>
                                             <constraint firstAttribute="height" constant="18" id="v7I-PR-eTK"/>
                                         </constraints>
-                                        <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="Float" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iwC-c9-CBS">
+                                        <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="Float-White" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iwC-c9-CBS">
                                             <behavior key="behavior" lightByContents="YES"/>
                                             <font key="font" metaFont="systemBold" size="12"/>
                                         </buttonCell>
@@ -480,12 +480,12 @@
                                         </connections>
                                     </button>
                                     <button toolTip="Share Clocker!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Hc7-fH-V7i">
-                                        <rect key="frame" x="248" y="7" width="30" height="26"/>
+                                        <rect key="frame" x="240" y="10" width="30" height="21"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="25" id="Bnf-E1-uaE"/>
+                                            <constraint firstAttribute="height" constant="20" id="Bnf-E1-uaE"/>
                                             <constraint firstAttribute="width" constant="30" id="pke-4M-ob5"/>
                                         </constraints>
-                                        <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="NSShareTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jZm-RN-msv">
+                                        <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="SharingDarkIcon" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jZm-RN-msv">
                                             <behavior key="behavior" lightByContents="YES"/>
                                             <font key="font" metaFont="systemBold" size="12"/>
                                         </buttonCell>
@@ -514,13 +514,13 @@
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="Ctq-BV-GPN" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" id="6Q7-jc-cTL"/>
-                                    <constraint firstItem="YXE-4J-5cn" firstAttribute="leading" secondItem="Hc7-fH-V7i" secondAttribute="trailing" id="GF2-UV-dDg"/>
+                                    <constraint firstItem="YXE-4J-5cn" firstAttribute="leading" secondItem="Hc7-fH-V7i" secondAttribute="trailing" constant="5" id="GF2-UV-dDg"/>
                                     <constraint firstItem="YXE-4J-5cn" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" id="OHe-Tc-b0V"/>
                                     <constraint firstAttribute="height" constant="40" id="iYW-fj-EE2"/>
                                     <constraint firstItem="1cR-pI-osG" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" id="oVJ-Xa-cTw"/>
                                     <constraint firstAttribute="trailing" secondItem="1cR-pI-osG" secondAttribute="trailing" constant="11" id="rb9-gW-QZS"/>
-                                    <constraint firstItem="1cR-pI-osG" firstAttribute="leading" secondItem="YXE-4J-5cn" secondAttribute="trailing" constant="2" id="tCt-DB-tt2"/>
+                                    <constraint firstItem="1cR-pI-osG" firstAttribute="leading" secondItem="YXE-4J-5cn" secondAttribute="trailing" constant="5" id="tCt-DB-tt2"/>
-                                    <constraint firstItem="Hc7-fH-V7i" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" id="vPp-mQ-wgE"/>
+                                    <constraint firstItem="Hc7-fH-V7i" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" constant="-1" id="vPp-mQ-wgE"/>
                                     <constraint firstItem="Ctq-BV-GPN" firstAttribute="leading" secondItem="B8X-sx-cjT" secondAttribute="leading" constant="8" id="ydm-oF-sVc"/>
                                 </constraints>
                             </customView>
@@ -570,10 +570,10 @@
         <image name="Add Icon" width="700" height="700"/>
         <image name="CurrentLocation" width="350" height="350"/>
         <image name="Extra" width="700" height="700"/>
-        <image name="Float" width="700" height="700"/>
+        <image name="Float-White" width="15" height="13"/>
         <image name="NSActionTemplate" width="14" height="14"/>
-        <image name="NSShareTemplate" width="11" height="16"/>
         <image name="PowerIcon" width="270" height="270"/>
         <image name="Remove" width="700" height="700"/>
+        <image name="SharingDarkIcon" width="19" height="22"/>
     </resources>
 </document>

Clocker/Clocker/es.lproj/Localizable.strings

@@ -112,6 +112,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";

Clocker/Clocker/fr.lproj/Localizable.strings

@@ -112,6 +112,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";

Clocker/Clocker/hi.lproj/Localizable.strings

@@ -108,6 +108,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";

Clocker/Clocker/it.lproj/Localizable.strings

@@ -113,6 +113,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";

Clocker/Clocker/ja.lproj/Localizable.strings

@@ -111,6 +111,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";
@@ -153,3 +155,4 @@
 "New Zealand" = "New Zealand";
 "Florida" = "Florida";
 "San Francisco" = "San Francisco";
+

Clocker/Clocker/ko.lproj/Localizable.strings

@@ -111,6 +111,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";

Clocker/Clocker/nl.lproj/Localizable.strings

@@ -112,6 +112,8 @@
 "Include Place Name" = "Include Place Name";
 "Menubar Display Options" = "Menubar Display Options";
 "Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
 
 // Empty View
 "No places added" = "No places added";

Clocker/Clocker/ru.lproj/Localizable.strings

@@ -327,3 +327,6 @@
 /* Errors */
 "You're offline, maybe?" = "You're offline, maybe?";
 
+"Preview" = "Preview";
+
+"Miscellaneous" = "Miscellaneous";

Clocker/Clocker/zh-Hans.lproj/Localizable.strings

@@ -327,3 +327,6 @@
 /* Errors */
 "You're offline, maybe?" = "You're offline, maybe?";
 
+"Preview" = "Preview";
+
+"Miscellaneous" = "Miscellaneous";

Clocker/Events and Reminders/CalendarHandler.swift

@@ -53,6 +53,68 @@ extension EventCenter {
         return sourcesAndCalendars
     }
 
+    func isThereAnUpcomingCalendarEvent() -> Bool {
+        if DataStore.shared().shouldDisplay(.showMeetingInMenubar) {
+            let filteredDates = EventCenter.sharedCenter().eventsForDate
+            let autoupdatingCal = EventCenter.sharedCenter().autoupdatingCalendar
+            guard let events = filteredDates[autoupdatingCal.startOfDay(for: Date())] else {
+                return false
+            }
+
+            for event in events {
+                if event.event.startDate.timeIntervalSinceNow > 0, !event.isAllDay {
+                    let timeForEventToStart = event.event.startDate.timeIntervalSinceNow / 60
+
+                    if timeForEventToStart > 30 {
+                        print("Our next event: \(event.event.title ?? "Error") starts in \(timeForEventToStart) mins")
+                        continue
+                    }
+
+                    return true
+                }
+            }
+        }
+
+        return false
+    }
+
+    /* Used for the compact menubar mode.
+     Returns a tuple with 0 as the header string and 1 as the subtitle string
+     */
+    func separateFormat(event: EKEvent) -> (String, String)? {
+        guard let truncateLength = DataStore.shared().retrieve(key: CLTruncateTextLength) as? NSNumber, let eventTitle = event.title else {
+            return nil
+        }
+
+        let seconds = event.startDate.timeIntervalSinceNow
+        var formattedTitle: String = CLEmptyString
+
+        if eventTitle.count > truncateLength.intValue {
+            let truncateIndex = eventTitle.index(eventTitle.startIndex, offsetBy: truncateLength.intValue)
+            let truncatedTitle = String(eventTitle[..<truncateIndex])
+
+            formattedTitle.append(truncatedTitle)
+            formattedTitle.append("...")
+        } else {
+            formattedTitle.append(eventTitle)
+        }
+
+        var menubarText: String = CLEmptyString
+        let minutes = seconds / 60
+
+        if minutes > 2 {
+            let suffix = String(format: " in %0.f mins", minutes)
+            menubarText.append(suffix)
+        } else if minutes == 1 {
+            let suffix = String(format: " in %0.f min", minutes)
+            menubarText.append(suffix)
+        } else {
+            menubarText.append(" starts now.")
+        }
+
+        return (formattedTitle, menubarText)
+    }
+
     func format(event: EKEvent) -> String {
         guard let truncateLength = DataStore.shared().retrieve(key: CLTruncateTextLength) as? NSNumber, let eventTitle = event.title else {
             return CLEmptyString

Clocker/Media.xcassets/Pin/Float-White.imageset/Contents.json

@@ -1,11 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Pin_1x.png",
       "idiom" : "universal",
-      "filename" : "PinIconWhite.png",
       "scale" : "1x"
     },
     {
+      "filename" : "info panel detach button_Normal@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -15,7 +16,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Clocker/Media.xcassets/Pin/Float.imageset/Contents.json

@@ -1,11 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Pin_Light_1x.png",
       "idiom" : "universal",
-      "filename" : "PinIcon.png",
       "scale" : "1x"
     },
     {
+      "filename" : "light-mode.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -15,7 +16,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Clocker/Media.xcassets/Pin/Pin.imageset/Contents.json

@@ -5,29 +5,30 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "1x",
       "appearances" : [
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
-      ]
+      ],
+      "filename" : "Pin_1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
     },
     {
+      "filename" : "light-mode.png",
       "idiom" : "universal",
-      "filename" : "PinIcon.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "PinIconWhite.png",
       "appearances" : [
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ],
+      "filename" : "info panel detach button_Normal@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
@@ -35,18 +36,18 @@
       "scale" : "3x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x",
       "appearances" : [
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
-      ]
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Clocker/Media.xcassets/Power Icon/Power.imageset/Contents.json

@@ -5,29 +5,29 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "1x",
       "appearances" : [
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
-      ]
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
     },
     {
+      "filename" : "More.png",
       "idiom" : "universal",
-      "filename" : "PowerIcon.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "PowerIcon 2.png",
       "appearances" : [
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ],
+      "filename" : "More-Dark.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
@@ -35,18 +35,18 @@
       "scale" : "3x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x",
       "appearances" : [
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
-      ]
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Clocker/Media.xcassets/Power Icon/PowerIcon-White.imageset/Contents.json

@@ -2,10 +2,10 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "PowerIcon 2.png",
       "scale" : "1x"
     },
     {
+      "filename" : "More-Dark.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Clocker/Media.xcassets/Power Icon/PowerIcon.imageset/Contents.json

@@ -2,10 +2,10 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "PowerIcon.png",
       "scale" : "1x"
     },
     {
+      "filename" : "More.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Clocker/Media.xcassets/Sharing/Sharing Dynamic.imageset/Contents.json

@@ -0,0 +1,54 @@
+{
+  "images" : [
+    {
+      "filename" : "share1x_light.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "share1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "share2x_light.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "share2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Clocker/Media.xcassets/Sharing/Sharing.imageset/Contents.json

@@ -1,12 +1,13 @@
 {
   "images" : [
     {
+      "filename" : "share1x_light.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "share2x_light.png",
       "idiom" : "universal",
-      "filename" : "noun_1020875_cc.png",
       "scale" : "2x"
     },
     {
@@ -15,7 +16,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Clocker/Media.xcassets/Sharing/SharingDarkIcon.imageset/Contents.json

@@ -1,12 +1,13 @@
 {
   "images" : [
     {
+      "filename" : "share1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "share2x.png",
       "idiom" : "universal",
-      "filename" : "Sharing_Dark.png",
       "scale" : "2x"
     },
     {
@@ -15,7 +16,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Clocker/Menu Bar/StatusContainerView.swift

@@ -77,8 +77,9 @@ class StatusContainerView: NSView {
                 if let timezoneObject = TimezoneData.customObject(from: timezone) {
                     let precalculatedWidth = Double(compactWidth(for: timezoneObject))
                     let operationObject = TimezoneDataOperations(with: timezoneObject)
-                    let calculatedSize = compactModeTimeFont.size(operationObject.compactMenuHeader(), precalculatedWidth, attributes: timeAttributes)
+                    let calculatedSubtitleSize = compactModeTimeFont.size(operationObject.compactMenuSubtitle(), precalculatedWidth, attributes: timeAttributes)
-                    return result + calculatedSize.width + bufferWidth
+                    let calculatedTitleSize = compactModeTimeFont.size(operationObject.compactMenuTitle(), precalculatedWidth, attributes: timeAttributes)
+                    return result + max(calculatedTitleSize.width, calculatedSubtitleSize.width) + bufferWidth
                 }
 
                 return result + CGFloat(bufferCalculatedWidth())
@@ -114,10 +115,11 @@ class StatusContainerView: NSView {
 
     private func bestWidth(for timezone: TimezoneData) -> Int {
         let operation = TimezoneDataOperations(with: timezone)
+        let bestSize = compactModeTimeFont.size(operation.compactMenuSubtitle(),
+                                                Double(compactWidth(for: timezone)), attributes: timeAttributes)
+        let bestTitleSize = compactModeTimeFont.size(operation.compactMenuTitle(), Double(compactWidth(for: timezone)), attributes: timeAttributes)
 
-        let bestSize = compactModeTimeFont.size(operation.compactMenuHeader(), Double(compactWidth(for: timezone)), attributes: timeAttributes)
+        return Int(max(bestSize.width, bestTitleSize.width) + bufferWidth)
-
-        return Int(bestSize.width + bufferWidth)
     }
 
     func updateTime() {
@@ -126,16 +128,25 @@ class StatusContainerView: NSView {
         }
 
         // See if frame's width needs any adjustment
+        adjustWidthIfNeccessary()
+    }
+
+    private func adjustWidthIfNeccessary() {
         var newWidth: CGFloat = 0
 
         subviews.forEach {
-            if let statusItem = $0 as? StatusItemView {
+            if let statusItem = $0 as? StatusItemView, statusItem.isHidden == false {
                 // Determine what's the best width required to display the current string.
                 let newBestWidth = CGFloat(bestWidth(for: statusItem.dataObject))
 
                 // Let's note if the current width is too small/correct
                 newWidth += statusItem.frame.size.width != newBestWidth ? newBestWidth : statusItem.frame.size.width
 
+                statusItem.frame = CGRect(x: statusItem.frame.origin.x,
+                                          y: statusItem.frame.origin.y,
+                                          width: newBestWidth,
+                                          height: statusItem.frame.size.height)
+
                 statusItem.updateTimeInMenubar()
             }
         }

Clocker/Menu Bar/StatusItemView.swift

@@ -90,13 +90,13 @@ class StatusItemView: NSView {
     }
 
     func updateTimeInMenubar() {
-        locationView.attributedStringValue = NSAttributedString(string: dataObject.formattedTimezoneLabel(), attributes: textFontAttributes)
+        locationView.attributedStringValue = NSAttributedString(string: operationsObject.compactMenuTitle(), attributes: textFontAttributes)
-        timeView.attributedStringValue = NSAttributedString(string: operationsObject.compactMenuHeader(), attributes: timeAttributes)
+        timeView.attributedStringValue = NSAttributedString(string: operationsObject.compactMenuSubtitle(), attributes: timeAttributes)
     }
 
     private func initialSetup() {
-        locationView.attributedStringValue = NSAttributedString(string: dataObject.formattedTimezoneLabel(), attributes: textFontAttributes)
+        locationView.attributedStringValue = NSAttributedString(string: operationsObject.compactMenuTitle(), attributes: textFontAttributes)
-        timeView.attributedStringValue = NSAttributedString(string: operationsObject.compactMenuHeader(), attributes: timeAttributes)
+        timeView.attributedStringValue = NSAttributedString(string: operationsObject.compactMenuSubtitle(), attributes: timeAttributes)
     }
 
     required init?(coder _: NSCoder) {

Clocker/Overall App/Themer.swift

@@ -306,7 +306,7 @@ extension Themer {
             case .dark:
                 return NSImage(named: NSImage.Name("SharingDarkIcon"))!
             case .system:
-                return NSImage(named: NSImage.shareTemplateName)!
+                return NSImage(named: NSImage.Name("Sharing Dynamic"))!
             }
         }
 

Clocker/Panel/Data Layer/TimezoneDataOperations.swift

@@ -33,24 +33,75 @@ extension TimezoneDataOperations {
         return dateFormatter.string(from: newDate)
     }
 
-    func compactMenuHeader() -> String {
+    private func checkForUpcomingEvents() -> (String, String)? {
+        if DataStore.shared().shouldDisplay(.showMeetingInMenubar) {
+            let filteredDates = EventCenter.sharedCenter().eventsForDate
+            let autoupdatingCal = EventCenter.sharedCenter().autoupdatingCalendar
+            guard let events = filteredDates[autoupdatingCal.startOfDay(for: Date())] else {
+                return nil
+            }
+
+            for event in events {
+                if event.event.startDate.timeIntervalSinceNow > 0, !event.isAllDay {
+                    let timeForEventToStart = event.event.startDate.timeIntervalSinceNow / 60
+
+                    if timeForEventToStart > 30 {
+                        print("Our next event: \(event.event.title ?? "Error") starts in \(timeForEventToStart) mins")
+
+                        continue
+                    }
+
+                    return EventCenter.sharedCenter().separateFormat(event: event.event)
+                }
+            }
+        }
+
+        return nil
+    }
+
+    func compactMenuTitle() -> String {
+        if let upcomingEvent = checkForUpcomingEvents() {
+            return upcomingEvent.0
+        }
+
         var subtitle = CLEmptyString
 
         let shouldDayBeShown = DataStore.shared().shouldShowDayInMenubar()
+        let shouldLabelBeShownAlongWithTime = !DataStore.shared().shouldDisplay(.placeInMenubar)
 
-        if shouldDayBeShown {
+        if shouldDayBeShown, shouldLabelBeShownAlongWithTime {
             let substring = date(with: 0, displayType: CLDateDisplayType.menuDisplay)
             subtitle.append(substring)
         }
 
         let shouldDateBeShown = DataStore.shared().shouldShowDateInMenubar()
-        if shouldDateBeShown {
+        if shouldDateBeShown, shouldLabelBeShownAlongWithTime {
             let date = Date().formatter(with: "MMM d", timeZone: dataObject.timezone())
-            if subtitle.isEmpty == false {
+            subtitle.isEmpty ? subtitle.append("\(date)") : subtitle.append(" \(date)")
-                subtitle.append(" \(date)")
+        }
-            } else {
+
-                subtitle.append("\(date)")
+        return subtitle.isEmpty ? dataObject.formattedTimezoneLabel() : subtitle
-            }
+    }
+
+    func compactMenuSubtitle() -> String {
+        if let upcomingEvent = checkForUpcomingEvents() {
+            return upcomingEvent.1
+        }
+
+        var subtitle = CLEmptyString
+
+        let shouldDayBeShown = DataStore.shared().shouldShowDayInMenubar()
+        let shouldLabelsNotBeShownAlongWithTime = DataStore.shared().shouldDisplay(.placeInMenubar)
+
+        if shouldDayBeShown, shouldLabelsNotBeShownAlongWithTime {
+            let substring = date(with: 0, displayType: CLDateDisplayType.menuDisplay)
+            subtitle.append(substring)
+        }
+
+        let shouldDateBeShown = DataStore.shared().shouldShowDateInMenubar()
+        if shouldDateBeShown, shouldLabelsNotBeShownAlongWithTime {
+            let date = Date().formatter(with: "MMM d", timeZone: dataObject.timezone())
+            subtitle.isEmpty ? subtitle.append("\(date)") : subtitle.append(" \(date)")
         }
 
         subtitle.isEmpty ? subtitle.append(time(with: 0)) : subtitle.append(" \(time(with: 0))")

Clocker/Panel/PanelController.swift

@@ -66,7 +66,6 @@ class PanelController: ParentPanelController {
         }
 
         window?.setFrameTopLeftPoint(NSPoint(x: xPoint, y: yPoint))
-
         window?.invalidateShadow()
     }
 

Clocker/Panel/ParentPanelController.swift

@@ -359,6 +359,7 @@ class ParentPanelController: NSWindowController {
 
     private func getAdjustedRowHeight(for object: TimezoneData?, _ currentHeight: CGFloat) -> CGFloat {
         let userFontSize: NSNumber = DataStore.shared().retrieve(key: CLUserFontSizePreference) as? NSNumber ?? 4
+        let shouldShowSunrise = DataStore.shared().shouldDisplay(.sunrise)
 
         var newHeight = currentHeight
 
@@ -382,6 +383,10 @@ class ParentPanelController: NSWindowController {
             }
         }
 
+        if shouldShowSunrise, object?.selectionType == .city {
+            newHeight += 8.0
+        }
+
         newHeight += mainTableView.intercellSpacing.height
 
         return newHeight
@@ -541,6 +546,12 @@ class ParentPanelController: NSWindowController {
                 cellView.sunriseImage.image = model.isSunriseOrSunset ? Themer.shared().sunriseImage() : Themer.shared().sunsetImage()
                 cellView.layout(with: model)
                 updateDatePicker()
+
+                #if DEBUG
+                    if $0 == 0 {
+                        cellView.currentLocationIndicator.isHidden = false
+                    }
+                #endif
             }
         }
     }
@@ -917,6 +928,69 @@ class ParentPanelController: NSWindowController {
         sliderDatePicker.dateValue = Date()
         setTimezoneDatasourceSlider(sliderValue: 0)
     }
+
+    @objc func terminateClocker() {
+        NSApplication.shared.terminate(nil)
+    }
+
+    @objc func reportIssue() {
+        feedbackWindow.showWindow(nil)
+        NSApp.activate(ignoringOtherApps: true)
+        window?.orderOut(nil)
+
+        if let countryCode = Locale.autoupdatingCurrent.regionCode {
+            let custom: [String: Any] = ["Country": countryCode]
+            Logger.log(object: custom, for: "Report Issue Opened")
+        }
+    }
+
+    @objc func openCrowdin() {
+        guard let localizationURL = URL(string: AboutUsConstants.CrowdInLocalizationLink),
+            let languageCode = Locale.preferredLanguages.first else { return }
+
+        NSWorkspace.shared.open(localizationURL)
+
+        // Log this
+        let custom: [String: Any] = ["Language": languageCode]
+        Logger.log(object: custom, for: "Opened Localization Link")
+    }
+
+    @objc func rate() {
+        guard let sourceURL = URL(string: AboutUsConstants.AppStoreLink) else { return }
+
+        NSWorkspace.shared.open(sourceURL)
+    }
+
+    @IBAction func showMoreOptions(_ sender: NSButton) {
+        let menuItem = NSMenu(title: "More Options")
+        let terminateOption = NSMenuItem(title: "Quit Clocker",
+                                         action: #selector(terminateClocker), keyEquivalent: "")
+        let rateClocker = NSMenuItem(title: "Support Clocker...",
+                                     action: #selector(rate), keyEquivalent: "")
+        let sendFeedback = NSMenuItem(title: "Send Feedback...",
+                                      action: #selector(reportIssue), keyEquivalent: "")
+        let localizeClocker = NSMenuItem(title: "Localize Clocker...",
+                                         action: #selector(openCrowdin), keyEquivalent: "")
+
+        let appDisplayName = Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") ?? "Clocker"
+        let shortVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") ?? "N/A"
+        let longVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") ?? "N/A"
+
+        let versionInfo = "\(appDisplayName) \(shortVersion) (\(longVersion))"
+        let clockerVersionInfo = NSMenuItem(title: versionInfo, action: nil, keyEquivalent: "")
+        clockerVersionInfo.isEnabled = false
+        menuItem.addItem(rateClocker)
+        menuItem.addItem(sendFeedback)
+        menuItem.addItem(localizeClocker)
+        menuItem.addItem(NSMenuItem.separator())
+        menuItem.addItem(clockerVersionInfo)
+
+        menuItem.addItem(NSMenuItem.separator())
+        menuItem.addItem(terminateOption)
+        NSMenu.popUpContextMenu(menuItem,
+                                with: NSApp.currentEvent!,
+                                for: sender)
+    }
 }
 
 extension ParentPanelController: NSPopoverDelegate {

Clocker/Panel/UI/TimezoneCellView.swift

@@ -64,7 +64,6 @@ class TimezoneCellView: NSTableCellView {
             }
 
             // If sunrise/sunset times are shown, adjust the time's top space to be closer to cell's top
-
             if !sunriseSetTime.isHidden, relativeDate.isHidden {
                 for constraint in constraints where constraint.identifier == "time-top-space" {
                     if constraint.constant == -5.0 {
@@ -89,7 +88,7 @@ class TimezoneCellView: NSTableCellView {
             if !sunriseSetTime.isHidden {
                 for constraint in constraints where constraint.identifier == "time-top-space" {
                     if constraint.constant == -5.0 {
-                        constraint.constant -= 10.0
+                        constraint.constant -= 15.0
                     }
                 }
             } else {

Clocker/Panel/UI/TimezoneDataSource.swift

@@ -67,6 +67,12 @@ extension TimezoneDataSource: NSTableViewDataSource, NSTableViewDelegate {
         cellView.setAccessibilityIdentifier(currentModel.formattedTimezoneLabel())
         cellView.setAccessibilityLabel(currentModel.formattedTimezoneLabel())
 
+        #if DEBUG
+            if row == 0 {
+                cellView.currentLocationIndicator.isHidden = false
+            }
+        #endif
+
         return cellView
     }
 
@@ -77,6 +83,7 @@ extension TimezoneDataSource: NSTableViewDataSource, NSTableViewDelegate {
 
         if let userFontSize = DataStore.shared().retrieve(key: CLUserFontSizePreference) as? NSNumber, timezones.count > row, let relativeDisplay = DataStore.shared().retrieve(key: CLRelativeDateKey) as? NSNumber {
             let model = timezones[row]
+            let shouldShowSunrise = DataStore.shared().shouldDisplay(.sunrise)
 
             var rowHeight: Int = userFontSize == 4 ? 60 : 65
 
@@ -84,11 +91,16 @@ extension TimezoneDataSource: NSTableViewDataSource, NSTableViewDelegate {
                 rowHeight -= 5
             }
 
+            if shouldShowSunrise, model.selectionType == .city {
+                rowHeight += 8
+            }
+
             if let note = model.note, !note.isEmpty {
-                return CGFloat(rowHeight + userFontSize.intValue + 25)
+                rowHeight += userFontSize.intValue + 25
             }
 
-            return CGFloat(rowHeight + (userFontSize.intValue * 2))
+            rowHeight += (userFontSize.intValue * 2)
+            return CGFloat(rowHeight)
         }
 
         return 0

Clocker/Preferences/About/AboutViewController.swift

@@ -6,7 +6,7 @@ struct AboutUsConstants {
     static let AboutUsNibIdentifier = "CLAboutWindows"
     static let GitHubURL = "https://github.com/abhishekbanthia/Clocker/?ref=ClockerApp"
     static let PayPalURL = "https://paypal.me/abhishekbanthia1712"
-    static let TwitterLink = "https://twitter.com/n0shake/?ref=ClockerApp"
+    static let TwitterLink = "https://twitter.com/clocker_support/?ref=ClockerApp"
     static let PersonalWebsite = "http://abhishekbanthia.com/?ref=ClockerApp"
     static let AppStoreLink = "macappstore://itunes.apple.com/us/app/clocker/id1056643111?action=write-review"
     static let CrowdInLocalizationLink = "https://crwd.in/clocker"

Clocker/Preferences/App Feedback/AppFeedbackWindow.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -12,10 +12,10 @@
                 <outlet property="contactBox" destination="JzF-Oq-qhW" id="CUI-1V-SfW"/>
                 <outlet property="emailField" destination="zlM-Cf-OxV" id="uRw-dZ-JGR"/>
                 <outlet property="feedbackTextView" destination="sCg-gV-TTr" id="Evh-WS-epn"/>
-                <outlet property="headerLabel" destination="gej-YH-9dt" id="mgE-2k-ioK"/>
                 <outlet property="informativeText" destination="W3a-Hi-ryk" id="qhv-iC-svS"/>
                 <outlet property="nameField" destination="Qzm-kE-Igl" id="miJ-7A-VPC"/>
                 <outlet property="progressIndicator" destination="h17-og-9PU" id="AE2-Gh-DpO"/>
+                <outlet property="quickCommentsLabel" destination="j4P-EU-Uso" id="TSm-DN-QeM"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
@@ -23,24 +23,24 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Clocker Feedback" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
-            <rect key="contentRect" x="437" y="172" width="319" height="392"/>
+            <rect key="contentRect" x="437" y="172" width="319" height="440"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="319" height="392"/>
+                <rect key="frame" x="0.0" y="0.0" width="319" height="440"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oNX-kV-RGt">
-                        <rect key="frame" x="12" y="205" width="295" height="145"/>
+                        <rect key="frame" x="12" y="230" width="295" height="122"/>
                         <clipView key="contentView" drawsBackground="NO" id="NNn-eZ-8Je">
-                            <rect key="frame" x="1" y="1" width="293" height="143"/>
+                            <rect key="frame" x="1" y="1" width="293" height="120"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <textView importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="sCg-gV-TTr">
-                                    <rect key="frame" x="0.0" y="0.0" width="293" height="143"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="293" height="120"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                    <size key="minSize" width="293" height="143"/>
+                                    <size key="minSize" width="293" height="120"/>
                                     <size key="maxSize" width="463" height="10000000"/>
                                     <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                 </textView>
@@ -55,14 +55,14 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
-                    <box boxType="custom" borderType="line" title="Box Title" translatesAutoresizingMaskIntoConstraints="NO" id="JzF-Oq-qhW">
+                    <box translatesAutoresizingMaskIntoConstraints="NO" id="JzF-Oq-qhW">
-                        <rect key="frame" x="12" y="67" width="295" height="125"/>
+                        <rect key="frame" x="9" y="63" width="301" height="154"/>
                         <view key="contentView" id="moX-Vc-vMc">
-                            <rect key="frame" x="1" y="1" width="293" height="123"/>
+                            <rect key="frame" x="3" y="3" width="295" height="135"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="Qzm-kE-Igl">
-                                    <rect key="frame" x="10" y="88" width="273" height="24"/>
+                                    <rect key="frame" x="10" y="100" width="275" height="24"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="24" id="6DY-uj-pMG"/>
                                     </constraints>
@@ -73,7 +73,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="zlM-Cf-OxV">
-                                    <rect key="frame" x="10" y="54" width="266" height="24"/>
+                                    <rect key="frame" x="10" y="66" width="267" height="24"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="24" id="b3M-Sc-y8S"/>
                                     </constraints>
@@ -84,7 +84,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="LVY-Qw-MYC">
-                                    <rect key="frame" x="6" y="0.0" width="281" height="44"/>
+                                    <rect key="frame" x="6" y="0.0" width="283" height="56"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" placeholderString="Accessory Info" id="yEq-6I-HBq">
                                         <font key="font" size="10" name="Avenir-Book"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -98,6 +98,7 @@
                                 <constraint firstItem="Qzm-kE-Igl" firstAttribute="top" secondItem="moX-Vc-vMc" secondAttribute="top" constant="11" id="Dpz-4F-hN7"/>
                                 <constraint firstItem="Qzm-kE-Igl" firstAttribute="leading" secondItem="moX-Vc-vMc" secondAttribute="leading" constant="10" id="GKZ-24-t7t"/>
                                 <constraint firstItem="LVY-Qw-MYC" firstAttribute="top" secondItem="zlM-Cf-OxV" secondAttribute="bottom" constant="10" id="Xck-iy-cZk"/>
+                                <constraint firstAttribute="trailing" secondItem="LVY-Qw-MYC" secondAttribute="trailing" constant="8" id="b5X-pR-y2N"/>
                                 <constraint firstItem="LVY-Qw-MYC" firstAttribute="leading" secondItem="moX-Vc-vMc" secondAttribute="leading" constant="8" id="iLs-Ob-MZC"/>
                                 <constraint firstItem="LVY-Qw-MYC" firstAttribute="centerX" secondItem="moX-Vc-vMc" secondAttribute="centerX" id="k3n-00-eiV"/>
                                 <constraint firstAttribute="bottom" secondItem="LVY-Qw-MYC" secondAttribute="bottom" id="p1w-eh-TeV"/>
@@ -105,7 +106,7 @@
                             </constraints>
                         </view>
                         <constraints>
-                            <constraint firstAttribute="height" constant="125" id="lwa-Yt-uxh"/>
+                            <constraint firstAttribute="height" constant="150" id="lwa-Yt-uxh"/>
                         </constraints>
                         <font key="titleFont" size="11" name="Avenir-Book"/>
                     </box>
@@ -143,17 +144,6 @@ DQ
                             <action selector="sendFeedback:" target="-2" id="lrL-0l-Jbd"/>
                         </connections>
                     </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gej-YH-9dt">
-                        <rect key="frame" x="10" y="358" width="299" height="20"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="20" id="a7O-DC-irX"/>
-                        </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="Header Text" id="oHe-hu-bQn">
-                            <font key="font" size="13" name="Avenir-Book"/>
-                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                        </textFieldCell>
-                    </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W3a-Hi-ryk">
                         <rect key="frame" x="10" y="47" width="289" height="22"/>
                         <constraints>
@@ -168,6 +158,36 @@ DQ
                     <progressIndicator wantsLayer="YES" maxValue="100" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="h17-og-9PU">
                         <rect key="frame" x="12" y="19" width="79" height="20"/>
                     </progressIndicator>
+                    <box translatesAutoresizingMaskIntoConstraints="NO" id="bGc-DH-2iw">
+                        <rect key="frame" x="9" y="356" width="301" height="84"/>
+                        <view key="contentView" id="6oZ-b5-xPJ">
+                            <rect key="frame" x="3" y="3" width="295" height="65"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="j4P-EU-Uso" customClass="UnderlinedButton" customModule="Clocker" customModuleProvider="target">
+                                    <rect key="frame" x="5" y="25" width="285" height="15"/>
+                                    <buttonCell key="cell" type="bevel" title="Quick Comments Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="FQy-Mb-DcS">
+                                        <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
+                                        <font key="font" size="11" name="Avenir-Light"/>
+                                    </buttonCell>
+                                    <accessibility identifier="ClockerOpenSourceText"/>
+                                    <connections>
+                                        <action selector="navigateToSupportTwitter:" target="-2" id="kr0-Ks-qua"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <constraints>
+                                <constraint firstItem="j4P-EU-Uso" firstAttribute="centerX" secondItem="6oZ-b5-xPJ" secondAttribute="centerX" id="Lzk-D8-sUJ"/>
+                                <constraint firstItem="j4P-EU-Uso" firstAttribute="centerY" secondItem="6oZ-b5-xPJ" secondAttribute="centerY" id="Zio-We-YXV"/>
+                                <constraint firstAttribute="trailing" secondItem="j4P-EU-Uso" secondAttribute="trailing" constant="5" id="geY-fl-hwn"/>
+                                <constraint firstItem="j4P-EU-Uso" firstAttribute="leading" secondItem="6oZ-b5-xPJ" secondAttribute="leading" constant="5" id="ilm-9x-zlx"/>
+                            </constraints>
+                        </view>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="80" id="9IW-uw-ubx"/>
+                        </constraints>
+                        <font key="titleFont" size="11" name="Avenir-Light"/>
+                    </box>
                 </subviews>
                 <constraints>
                     <constraint firstItem="JzF-Oq-qhW" firstAttribute="trailing" secondItem="oNX-kV-RGt" secondAttribute="trailing" id="4Vq-PW-upG"/>
@@ -175,22 +195,22 @@ DQ
                     <constraint firstAttribute="trailing" secondItem="zlM-Cf-OxV" secondAttribute="trailing" constant="30" id="Arj-b2-oje"/>
                     <constraint firstItem="sJq-1o-Bft" firstAttribute="top" secondItem="JzF-Oq-qhW" secondAttribute="bottom" constant="26" id="Epm-On-lNy"/>
                     <constraint firstAttribute="trailing" secondItem="oNX-kV-RGt" secondAttribute="trailing" constant="12" id="IqR-EG-ga3"/>
+                    <constraint firstItem="bGc-DH-2iw" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="12" id="JMO-BF-p3W"/>
                     <constraint firstItem="sJq-1o-Bft" firstAttribute="leading" secondItem="szs-8j-SMN" secondAttribute="trailing" constant="8" id="JSB-K6-cbX"/>
                     <constraint firstAttribute="trailing" secondItem="sJq-1o-Bft" secondAttribute="trailing" constant="20" id="KuW-ez-Od9"/>
                     <constraint firstItem="JzF-Oq-qhW" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="12" id="NCF-RW-EvZ"/>
                     <constraint firstAttribute="bottom" secondItem="h17-og-9PU" secondAttribute="bottom" constant="20" id="OLS-kL-muQ"/>
                     <constraint firstItem="oNX-kV-RGt" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="12" id="P0X-Hb-ZtS"/>
                     <constraint firstItem="szs-8j-SMN" firstAttribute="leading" secondItem="h17-og-9PU" secondAttribute="trailing" constant="8" id="S7a-To-K83"/>
+                    <constraint firstAttribute="trailing" secondItem="bGc-DH-2iw" secondAttribute="trailing" constant="12" id="Swh-0I-anu"/>
                     <constraint firstAttribute="bottom" secondItem="sJq-1o-Bft" secondAttribute="bottom" constant="20" id="cft-qs-VMz"/>
+                    <constraint firstItem="oNX-kV-RGt" firstAttribute="top" secondItem="6oZ-b5-xPJ" secondAttribute="bottom" constant="7" id="dlq-R6-ar3"/>
                     <constraint firstItem="h17-og-9PU" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="12" id="iIH-oN-lBO"/>
                     <constraint firstAttribute="trailing" secondItem="W3a-Hi-ryk" secondAttribute="trailing" constant="22" id="j6H-0M-Cux"/>
-                    <constraint firstAttribute="trailing" secondItem="gej-YH-9dt" secondAttribute="trailing" constant="12" id="qjH-ND-NKx"/>
+                    <constraint firstItem="bGc-DH-2iw" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="o8t-tV-qS6"/>
-                    <constraint firstItem="gej-YH-9dt" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="12" id="tlA-wq-Gts"/>
                     <constraint firstItem="JzF-Oq-qhW" firstAttribute="top" secondItem="oNX-kV-RGt" secondAttribute="bottom" constant="13" id="v2l-OZ-epC"/>
                     <constraint firstItem="szs-8j-SMN" firstAttribute="top" secondItem="W3a-Hi-ryk" secondAttribute="bottom" constant="6" id="vlm-Yj-d84"/>
                     <constraint firstAttribute="bottom" secondItem="szs-8j-SMN" secondAttribute="bottom" constant="20" id="xos-N8-d1k"/>
-                    <constraint firstItem="gej-YH-9dt" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="14" id="yZE-PY-8EZ"/>
-                    <constraint firstItem="oNX-kV-RGt" firstAttribute="top" secondItem="gej-YH-9dt" secondAttribute="bottom" constant="8" id="yec-Eo-Jb9"/>
                 </constraints>
             </view>
             <connections>

Clocker/Preferences/App Feedback/AppFeedbackWindowController.swift

@@ -33,6 +33,7 @@ class AppFeedbackWindowController: NSWindowController {
     @IBOutlet var informativeText: NSTextField!
     @IBOutlet var progressIndicator: NSProgressIndicator!
 
+    @IBOutlet var quickCommentsLabel: UnderlinedButton!
     private var themeDidChangeNotification: NSObjectProtocol?
     private var serialNumber: String? {
         let platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"))
@@ -72,6 +73,7 @@ class AppFeedbackWindowController: NSWindowController {
         nameField.setAccessibilityIdentifier("NameField")
         emailField.setAccessibilityIdentifier("EmailField")
         progressIndicator.setAccessibilityIdentifier("ProgressIndicator")
+        quickCommentsLabel.setAccessibility("QuickCommentLabel")
 
         setup()
 
@@ -204,19 +206,54 @@ class AppFeedbackWindowController: NSWindowController {
         informativeText.stringValue = CLEmptyString
     }
 
-    @IBOutlet var headerLabel: NSTextField!
     @IBOutlet var contactBox: NSBox!
     @IBOutlet var accessoryInfo: NSTextField!
 
     private func setup() {
-        headerLabel.stringValue = "Tell us what you think!".localized()
         contactBox.title = "Contact Information (Optional)".localized()
         accessoryInfo.stringValue = "Contact fields are optional! Your contact information will let us contact you in case we need more information or can help!".localized()
 
-        [headerLabel, accessoryInfo].forEach { $0?.textColor = Themer.shared().mainTextColor() }
+        let range = NSRange(location: 9, length: 15)
+        quickCommentsLabel.title = "Tweet to @ClockerSupport if you have a quick comment!"
+        setUnderline(for: quickCommentsLabel, range: range)
+
+        [accessoryInfo].forEach { $0?.textColor = Themer.shared().mainTextColor() }
 
         contactBox.borderColor = Themer.shared().mainTextColor()
     }
+
+    private func setUnderline(for button: UnderlinedButton?, range: NSRange) {
+        guard let underlinedButton = button else { return }
+
+        let mutableParaghStyle = NSMutableParagraphStyle()
+        mutableParaghStyle.alignment = .center
+
+        let originalText = NSMutableAttributedString(string: underlinedButton.title)
+        originalText.addAttribute(NSAttributedString.Key.underlineStyle,
+                                  value: NSNumber(value: Int8(NSUnderlineStyle.single.rawValue)),
+                                  range: range)
+        originalText.addAttribute(NSAttributedString.Key.foregroundColor,
+                                  value: Themer.shared().mainTextColor(),
+                                  range: NSRange(location: 0, length: underlinedButton.attributedTitle.string.count))
+        originalText.addAttribute(NSAttributedString.Key.font,
+                                  value: (button?.font)!,
+                                  range: NSRange(location: 0, length: underlinedButton.attributedTitle.string.count))
+        originalText.addAttribute(NSAttributedString.Key.paragraphStyle,
+                                  value: mutableParaghStyle,
+                                  range: NSRange(location: 0, length: underlinedButton.attributedTitle.string.count))
+        underlinedButton.attributedTitle = originalText
+    }
+
+    @IBAction func navigateToSupportTwitter(_: Any) {
+        guard let twitterURL = URL(string: AboutUsConstants.TwitterLink),
+            let countryCode = Locale.autoupdatingCurrent.regionCode else { return }
+
+        NSWorkspace.shared.open(twitterURL)
+
+        // Log this
+        let custom: [String: Any] = ["Country": countryCode]
+        Logger.log(object: custom, for: "Opened Twitter")
+    }
 }
 
 extension AppFeedbackWindowController: NSWindowDelegate {

Clocker/Preferences/Appearance/AppearanceViewController.swift

@@ -12,6 +12,7 @@ class AppearanceViewController: ParentViewController {
     @IBOutlet var includeDayInMenubarControl: NSSegmentedControl!
     @IBOutlet var includeDateInMenubarControl: NSSegmentedControl!
     @IBOutlet var includePlaceNameControl: NSSegmentedControl!
+    @IBOutlet var appearanceTab: NSTabView!
 
     private var themeDidChangeNotification: NSObjectProtocol?
 
@@ -50,16 +51,21 @@ class AppearanceViewController: ParentViewController {
                                                 "place_id": "TestIdentifier",
                                                 "timezoneID": "America/Los_Angeles",
                                                 "nextUpdate": "",
-                                                "note": "Remember to finish setting up Clocker!",
+                                                "note": "Your individual note about this location goes here!",
                                                 "latitude": "37.7749295",
                                                 "longitude": "-122.4194155"])]
 
+        // Ensure the more beautiful tab is selected
+        appearanceTab.selectTabViewItem(at: 0)
+
         // Setup Preview Pane
         previewPanelTableView.dataSource = self
         previewPanelTableView.delegate = self
         previewPanelTableView.reloadData()
         previewPanelTableView.selectionHighlightStyle = .none
         previewPanelTableView.enclosingScrollView?.hasVerticalScroller = false
+        previewPanelTableView.enclosingScrollView?.wantsLayer = true
+        previewPanelTableView.enclosingScrollView?.layer?.cornerRadius = 12
     }
 
     deinit {
@@ -96,7 +102,6 @@ class AppearanceViewController: ParentViewController {
 
         let shouldDisplayCompact = DataStore.shared().shouldDisplay(.menubarCompactMode)
         menubarMode.setSelected(true, forSegment: shouldDisplayCompact ? 0 : 1)
-        updateMenubarControls(!shouldDisplayCompact)
     }
 
     @IBOutlet var timeFormatLabel: NSTextField!
@@ -110,12 +115,12 @@ class AppearanceViewController: ParentViewController {
     @IBOutlet var includeDateLabel: NSTextField!
     @IBOutlet var includeDayLabel: NSTextField!
     @IBOutlet var includePlaceLabel: NSTextField!
-    @IBOutlet var menubarDisplayOptionsLabel: NSTextField!
     @IBOutlet var appDisplayLabel: NSTextField!
     @IBOutlet var menubarModeLabel: NSTextField!
+    @IBOutlet var previewLabel: NSTextField!
+    @IBOutlet var miscelleaneousLabel: NSTextField!
 
     // Panel Preview
-
     @IBOutlet var previewPanelTableView: NSTableView!
 
     private func setup() {
@@ -131,12 +136,14 @@ class AppearanceViewController: ParentViewController {
         includeDayLabel.stringValue = "Include Day".localized()
         includePlaceLabel.stringValue = "Include Place Name".localized()
         menubarModeLabel.stringValue = "Menubar Mode".localized()
+        previewLabel.stringValue = "Preview".localized()
+        miscelleaneousLabel.stringValue = "Miscellaneous".localized()
 
         [timeFormatLabel, panelTheme,
          dayDisplayOptionsLabel, showSliderLabel, showSecondsLabel,
          showSunriseLabel, largerTextLabel, futureSliderRangeLabel,
-         includeDayLabel, includeDateLabel, includePlaceLabel,
+         includeDayLabel, includeDateLabel, includePlaceLabel, appDisplayLabel, menubarModeLabel,
-         menubarDisplayOptionsLabel, appDisplayLabel, menubarModeLabel].forEach {
+         previewLabel, miscelleaneousLabel].forEach {
             $0?.textColor = Themer.shared().mainTextColor()
         }
     }
@@ -194,17 +201,23 @@ class AppearanceViewController: ParentViewController {
         }
     }
 
-    @IBAction func changeRelativeDayDisplay(_ sender: NSSegmentedControl) {
+    private func loggingStringForRelativeDisplaySelection(_ selection: Int) -> String {
-        let selectedIndex = NSNumber(value: sender.selectedSegment)
+        switch selection {
-        var selection = "Relative Day"
+        case 0:
-
+            return "Relative Day"
-        if selectedIndex == 1 {
+        case 1:
-            selection = "Actual Day"
+            return "Actual Day"
-        } else if selectedIndex == 2 {
+        case 2:
-            selection = "Actual Date Day"
+            return "Actual Date Day"
+        case 3:
+            return "Hide"
+        default:
+            return "Unexpected Selection"
         }
+    }
 
-        Logger.log(object: ["dayPreference": selection], for: "RelativeDate")
+    @IBAction func changeRelativeDayDisplay(_ sender: NSSegmentedControl) {
+        Logger.log(object: ["dayPreference": loggingStringForRelativeDisplaySelection(sender.selectedSegment)], for: "RelativeDate")
 
         refresh(panel: true, floating: true)
 
@@ -297,8 +310,6 @@ class AppearanceViewController: ParentViewController {
     }
 
     @IBAction func menubarModeChanged(_ sender: NSSegmentedControl) {
-        updateMenubarControls(sender.selectedSegment == 1)
-
         guard let statusItem = (NSApplication.shared.delegate as? AppDelegate)?.statusItemForPanel() else {
             return
         }
@@ -312,12 +323,6 @@ class AppearanceViewController: ParentViewController {
         }
     }
 
-    // We don't support showing day or date in the menubar for compact mode yet.
-    // Disable those options to let the user know.
-    private func updateMenubarControls(_ isEnabled: Bool) {
-        [includePlaceNameControl].forEach { $0?.isEnabled = isEnabled }
-    }
-
     @IBAction func fontSliderChanged(_: Any) {
         previewPanelTableView.reloadData()
     }

Clocker/Preferences/Calendar/CalendarViewController.swift

@@ -87,9 +87,6 @@ class CalendarViewController: ParentViewController {
         } else {
             showSegmentedControl.selectedSegment = 1
         }
-
-        // If the menubar mode is compact, we can't show meetings in the menubar. So disable toggling that option.
-        showNextMeetingInMenubarControl.isEnabled = !DataStore.shared().shouldDisplay(.menubarCompactMode)
     }
 
     private func verifyCalendarAccess() {

Clocker/Preferences/General/PreferencesViewController.swift

@@ -443,8 +443,8 @@ extension PreferencesViewController {
                                                         let searchResults = self.decode(from: data)
 
                                                         if searchResults?.status == "ZERO_RESULTS" {
-                                                            self.placeholderLabel.placeholderString = "No results! 😔 Try entering the exact name."
                                                             self.findLocalSearchResultsForTimezones()
+                                                            self.placeholderLabel.placeholderString = self.searchResultsDataSource.timezoneFilteredArray.isEmpty ? "No results! 😔 Try entering the exact name." : CLEmptyString
                                                             self.reloadSearchResults()
                                                             self.isActivityInProgress = false
                                                             return

Clocker/Preferences/OneWindowController.swift

@@ -3,21 +3,6 @@
 import Cocoa
 
 class CenteredTabViewController: NSTabViewController {
-    override func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
-        super.toolbarDefaultItemIdentifiers(toolbar)
-
-        var toolbarItems: [NSToolbarItem.Identifier] = [NSToolbarItem.Identifier.flexibleSpace]
-
-        tabViewItems.forEach { item in
-            if let identifier = item.identifier as? String {
-                toolbarItems.append(NSToolbarItem.Identifier(identifier))
-            }
-        }
-
-        toolbarItems.append(NSToolbarItem.Identifier.flexibleSpace)
-        return toolbarItems
-    }
-
     override func viewDidLoad() {
         super.viewDidLoad()
 

Clocker/Preferences/Preferences.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="RHq-9Z-auA">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="RHq-9Z-auA">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -768,20 +768,20 @@
             <objects>
                 <viewController title=" Appearance " id="1aL-zR-8L4" userLabel="Appearance" customClass="AppearanceViewController" customModule="Clocker" customModuleProvider="target" sceneMemberID="viewController">
                     <customView key="view" wantsLayer="YES" id="7EQ-1G-xRP" customClass="ParentView" customModule="Clocker" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="624" height="652"/>
+                        <rect key="frame" x="0.0" y="0.0" width="654" height="502"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <subviews>
-                            <tabView translatesAutoresizingMaskIntoConstraints="NO" id="SGu-yd-JQh">
+                            <tabView initialItem="ztQ-ui-wYI" translatesAutoresizingMaskIntoConstraints="NO" id="SGu-yd-JQh">
-                                <rect key="frame" x="13" y="23" width="606" height="615"/>
+                                <rect key="frame" x="13" y="10" width="628" height="478"/>
                                 <font key="font" metaFont="system"/>
                                 <tabViewItems>
                                     <tabViewItem label="Panel" identifier="" id="vnW-vq-Ote">
                                         <view key="view" id="zFb-Gb-3dB">
-                                            <rect key="frame" x="10" y="33" width="603" height="569"/>
+                                            <rect key="frame" x="10" y="33" width="608" height="432"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9WW-jp-NeO">
-                                                    <rect key="frame" x="203" y="366" width="138" height="24"/>
+                                                    <rect key="frame" x="203" y="267" width="143" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="CcB-5w-IoG">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -795,7 +795,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gEH-vT-EqV">
-                                                    <rect key="frame" x="203" y="328" width="155" height="24"/>
+                                                    <rect key="frame" x="203" y="229" width="160" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="5Rz-xo-JB7">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -809,7 +809,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="xwt-pY-1w9">
-                                                    <rect key="frame" x="30" y="293" width="152" height="18"/>
+                                                    <rect key="frame" x="30" y="194" width="152" height="18"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="148" id="7fj-Em-Lyh"/>
                                                     </constraints>
@@ -820,7 +820,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="gFE-hZ-J92">
-                                                    <rect key="frame" x="45" y="445" width="137" height="18"/>
+                                                    <rect key="frame" x="45" y="308" width="137" height="18"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="133" id="SCi-hT-hxG"/>
                                                     </constraints>
@@ -830,19 +830,8 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="cmK-rb-Px7">
-                                                    <rect key="frame" x="69" y="407" width="113" height="18"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="109" id="YJQ-Mw-oTQ"/>
-                                                    </constraints>
-                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Show Future Slider" id="dG1-hI-A31">
-                                                        <font key="font" size="13" name="Avenir-Light"/>
-                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                </textField>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="wtO-uL-QBf">
-                                                    <rect key="frame" x="78" y="521" width="104" height="18"/>
+                                                    <rect key="frame" x="78" y="384" width="104" height="18"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="100" id="WNN-Le-h1b"/>
                                                     </constraints>
@@ -853,7 +842,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="d4S-hM-MSP">
-                                                    <rect key="frame" x="203" y="442" width="287" height="24"/>
+                                                    <rect key="frame" x="203" y="305" width="292" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="564-Re-f1d">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -868,22 +857,8 @@
                                                         <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.relativeDate" id="KQP-ft-dxC"/>
                                                     </connections>
                                                 </segmentedControl>
-                                                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zTJ-p9-7Tx">
-                                                    <rect key="frame" x="203" y="214" width="293" height="24"/>
-                                                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="dxE-KM-01Y">
-                                                        <font key="font" size="12" name="Avenir-Light"/>
-                                                        <segments>
-                                                            <segment label="Menu Bar only"/>
-                                                            <segment label="Dock and Menu Bar" selected="YES" tag="1"/>
-                                                        </segments>
-                                                    </segmentedCell>
-                                                    <connections>
-                                                        <action selector="changeAppDisplayOptions:" target="1aL-zR-8L4" id="rre-rx-3Py"/>
-                                                        <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.com.abhishek.appDisplayOptions" id="cvt-EV-Ncg"/>
-                                                    </connections>
-                                                </segmentedControl>
                                                 <segmentedControl toolTip="Select a time-format!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="699-dn-eyN">
-                                                    <rect key="frame" x="203" y="518" width="236" height="24"/>
+                                                    <rect key="frame" x="203" y="381" width="236" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="R6T-Ym-jpK">
                                                         <font key="font" size="13" name="Avenir-Light"/>
                                                         <segments>
@@ -896,53 +871,16 @@
                                                         <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.is24HourFormatSelected" id="SlE-o5-83r"/>
                                                     </connections>
                                                 </segmentedControl>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="saM-0J-1YU">
-                                                    <rect key="frame" x="64" y="255" width="118" height="18"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="114" id="l24-oY-7d0"/>
-                                                    </constraints>
-                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Future Slider Range" id="TFk-yf-oBS">
-                                                        <font key="font" size="13" name="Avenir-Light"/>
-                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                </textField>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="Gia-TI-eki">
-                                                    <rect key="frame" x="85" y="217" width="97" height="18"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="93" id="y7H-C5-fA6"/>
-                                                    </constraints>
-                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Show Clocker in" id="5K9-XV-kHb">
-                                                        <font key="font" size="13" name="Avenir-Light"/>
-                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                </textField>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="vrm-cg-RMn">
-                                                    <rect key="frame" x="81" y="483" width="101" height="18"/>
+                                                    <rect key="frame" x="81" y="346" width="101" height="18"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Panel Theme" id="ZKN-5V-B4D">
                                                         <font key="font" size="13" name="Avenir-Light"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CYe-co-1Ey">
-                                                    <rect key="frame" x="203" y="404" width="131" height="24"/>
-                                                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="17B-LG-dAa">
-                                                        <font key="font" size="12" name="Avenir-Light"/>
-                                                        <segments>
-                                                            <segment label="Yes" width="36"/>
-                                                            <segment label="No" width="36" selected="YES" tag="1"/>
-                                                        </segments>
-                                                    </segmentedCell>
-                                                    <accessibility identifier="FutureSlider"/>
-                                                    <connections>
-                                                        <action selector="showFutureSlider:" target="1aL-zR-8L4" id="4Qb-fh-feh"/>
-                                                        <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.displayFutureSlider" id="PHz-wd-EDE"/>
-                                                    </connections>
-                                                </segmentedControl>
                                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="8IA-JL-fje">
-                                                    <rect key="frame" x="554" y="276" width="32" height="52"/>
+                                                    <rect key="frame" x="559" y="177" width="32" height="52"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="32" id="GZK-Zb-UYb"/>
                                                         <constraint firstAttribute="height" constant="52" id="SSv-hh-RFa"/>
@@ -950,7 +888,7 @@
                                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSFontPanel" id="yoa-s4-khY"/>
                                                 </imageView>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="w0y-UQ-RC0">
-                                                    <rect key="frame" x="19" y="331" width="163" height="18"/>
+                                                    <rect key="frame" x="19" y="232" width="163" height="18"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="159" id="mNx-18-sdT"/>
                                                     </constraints>
@@ -961,7 +899,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <segmentedControl toolTip="Choose a theme for the main panel!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FZb-fP-hMJ">
-                                                    <rect key="frame" x="203" y="480" width="260" height="24"/>
+                                                    <rect key="frame" x="203" y="343" width="265" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="hcQ-xa-e2V">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -975,19 +913,8 @@
                                                         <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.defaultTheme" id="gVc-Yf-3h5"/>
                                                     </connections>
                                                 </segmentedControl>
-                                                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IW2-Bb-lEZ">
-                                                    <rect key="frame" x="203" y="251" width="219" height="25"/>
-                                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="noArrow" preferredEdge="maxX" id="5oE-dn-DjN">
-                                                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                        <font key="font" size="12" name="Avenir-Light"/>
-                                                        <menu key="menu" id="7qp-wG-Emb"/>
-                                                    </popUpButtonCell>
-                                                    <connections>
-                                                        <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.sliderDayRange" id="HGl-TA-fRj"/>
-                                                    </connections>
-                                                </popUpButton>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="4lt-X6-3uU">
-                                                    <rect key="frame" x="38" y="369" width="144" height="18"/>
+                                                    <rect key="frame" x="38" y="270" width="144" height="18"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="140" id="hAp-By-Lzj"/>
                                                     </constraints>
@@ -998,7 +925,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider verticalHuggingPriority="750" alphaValue="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="3cU-IS-3Qu">
-                                                    <rect key="frame" x="203" y="289" width="345" height="24"/>
+                                                    <rect key="frame" x="203" y="190" width="350" height="24"/>
                                                     <sliderCell key="cell" state="on" alignment="left" minValue="4" maxValue="7" doubleValue="4" tickMarkPosition="above" numberOfTickMarks="4" allowsTickMarkValuesOnly="YES" sliderType="linear" id="eAh-k3-cof"/>
                                                     <connections>
                                                         <action selector="fontSliderChanged:" target="1aL-zR-8L4" id="YAW-aA-5aR"/>
@@ -1006,12 +933,12 @@
                                                     </connections>
                                                 </slider>
                                                 <scrollView borderType="line" autohidesScrollers="YES" horizontalLineScroll="113" horizontalPageScroll="10" verticalLineScroll="113" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ytg-0u-Mtu">
-                                                    <rect key="frame" x="102" y="67" width="400" height="100"/>
+                                                    <rect key="frame" x="104" y="40" width="400" height="100"/>
-                                                    <clipView key="contentView" ambiguous="YES" id="gnX-f5-31D">
+                                                    <clipView key="contentView" id="gnX-f5-31D">
                                                         <rect key="frame" x="1" y="1" width="398" height="98"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="111" rowSizeStyle="automatic" viewBased="YES" id="KbJ-p4-i6E">
+                                                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="111" rowSizeStyle="automatic" viewBased="YES" id="KbJ-p4-i6E">
                                                                 <rect key="frame" x="0.0" y="0.0" width="398" height="113"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                 <size key="intercellSpacing" width="3" height="2"/>
@@ -1182,78 +1109,78 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZNm-TN-RRJ">
+                                                    <rect key="frame" x="248" y="150" width="112" height="22"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="108" id="KwL-So-Ymu"/>
+                                                        <constraint firstAttribute="height" constant="22" id="bBD-fJ-Xm7"/>
+                                                    </constraints>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Preview" id="knp-DB-v8Y">
+                                                        <font key="font" size="13" name="Avenir-Heavy"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="trailing" secondItem="IW2-Bb-lEZ" secondAttribute="trailing" constant="184" id="36q-fn-4Zm"/>
+                                                <constraint firstItem="4lt-X6-3uU" firstAttribute="trailing" secondItem="gFE-hZ-J92" secondAttribute="trailing" id="0LC-R1-cwL"/>
-                                                <constraint firstItem="4lt-X6-3uU" firstAttribute="trailing" secondItem="cmK-rb-Px7" secondAttribute="trailing" id="5yS-5r-a6b"/>
+                                                <constraint firstItem="4lt-X6-3uU" firstAttribute="top" secondItem="gFE-hZ-J92" secondAttribute="bottom" constant="20" id="0zz-yr-dkd"/>
                                                 <constraint firstAttribute="trailing" secondItem="d4S-hM-MSP" secondAttribute="trailing" constant="115" id="6EI-oM-u6q"/>
                                                 <constraint firstItem="d4S-hM-MSP" firstAttribute="leading" secondItem="FZb-fP-hMJ" secondAttribute="leading" id="6GY-mg-50H"/>
-                                                <constraint firstItem="9WW-jp-NeO" firstAttribute="leading" secondItem="CYe-co-1Ey" secondAttribute="leading" id="7lw-aQ-Mfo"/>
-                                                <constraint firstItem="saM-0J-1YU" firstAttribute="trailing" secondItem="xwt-pY-1w9" secondAttribute="trailing" id="Bjj-Ny-CrI"/>
                                                 <constraint firstAttribute="trailing" secondItem="FZb-fP-hMJ" secondAttribute="trailing" constant="142" id="Dfr-Sc-kQB"/>
                                                 <constraint firstItem="vrm-cg-RMn" firstAttribute="trailing" secondItem="wtO-uL-QBf" secondAttribute="trailing" id="Dz6-2y-0Kj"/>
                                                 <constraint firstItem="vrm-cg-RMn" firstAttribute="top" secondItem="wtO-uL-QBf" secondAttribute="bottom" constant="20" id="E8U-ve-Yq8"/>
                                                 <constraint firstItem="Ytg-0u-Mtu" firstAttribute="centerX" secondItem="zFb-Gb-3dB" secondAttribute="centerX" id="EHm-Kq-6Nq"/>
                                                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="699-dn-eyN" secondAttribute="trailing" constant="10" id="EdO-mM-G6w"/>
-                                                <constraint firstItem="cmK-rb-Px7" firstAttribute="trailing" secondItem="gFE-hZ-J92" secondAttribute="trailing" id="J2Z-aK-Xee"/>
+                                                <constraint firstItem="ZNm-TN-RRJ" firstAttribute="top" secondItem="3cU-IS-3Qu" secondAttribute="bottom" constant="20" id="KJj-ji-SG9"/>
                                                 <constraint firstItem="wtO-uL-QBf" firstAttribute="leading" secondItem="zFb-Gb-3dB" secondAttribute="leading" constant="80" id="KPc-a4-RWW"/>
-                                                <constraint firstItem="zTJ-p9-7Tx" firstAttribute="centerY" secondItem="Gia-TI-eki" secondAttribute="centerY" id="Lmw-yp-Yzd"/>
                                                 <constraint firstItem="d4S-hM-MSP" firstAttribute="centerY" secondItem="gFE-hZ-J92" secondAttribute="centerY" id="MB4-vU-XFQ"/>
                                                 <constraint firstItem="gEH-vT-EqV" firstAttribute="leading" secondItem="9WW-jp-NeO" secondAttribute="leading" id="NBM-n8-g9p"/>
-                                                <constraint firstItem="IW2-Bb-lEZ" firstAttribute="centerY" secondItem="saM-0J-1YU" secondAttribute="centerY" id="NO9-Yo-OjC"/>
+                                                <constraint firstItem="9WW-jp-NeO" firstAttribute="leading" secondItem="d4S-hM-MSP" secondAttribute="leading" id="Nfi-6H-7VR"/>
-                                                <constraint firstItem="saM-0J-1YU" firstAttribute="top" secondItem="xwt-pY-1w9" secondAttribute="bottom" constant="20" id="NcM-Mc-WZC"/>
-                                                <constraint firstItem="Gia-TI-eki" firstAttribute="top" secondItem="saM-0J-1YU" secondAttribute="bottom" constant="20" id="Pwo-Eu-BEI"/>
                                                 <constraint firstItem="8IA-JL-fje" firstAttribute="centerY" secondItem="3cU-IS-3Qu" secondAttribute="centerY" id="QZn-RJ-b2s"/>
                                                 <constraint firstItem="wtO-uL-QBf" firstAttribute="top" secondItem="zFb-Gb-3dB" secondAttribute="top" constant="30" id="TUd-Wc-XZL"/>
                                                 <constraint firstItem="w0y-UQ-RC0" firstAttribute="top" secondItem="4lt-X6-3uU" secondAttribute="bottom" constant="20" id="ULM-L5-4EP"/>
-                                                <constraint firstItem="Ytg-0u-Mtu" firstAttribute="top" secondItem="zTJ-p9-7Tx" secondAttribute="bottom" constant="49" id="VSd-Gm-eIq"/>
-                                                <constraint firstItem="CYe-co-1Ey" firstAttribute="leading" secondItem="d4S-hM-MSP" secondAttribute="leading" id="ViU-LF-3Re"/>
                                                 <constraint firstItem="vrm-cg-RMn" firstAttribute="width" secondItem="wtO-uL-QBf" secondAttribute="width" multiplier="0.97" id="W8Z-wH-RJT"/>
                                                 <constraint firstAttribute="trailing" secondItem="8IA-JL-fje" secondAttribute="trailing" constant="17" id="XEc-lD-5Pt"/>
-                                                <constraint firstAttribute="trailing" secondItem="CYe-co-1Ey" secondAttribute="trailing" constant="271" id="a8e-U0-Mcv"/>
+                                                <constraint firstItem="ZNm-TN-RRJ" firstAttribute="centerX" secondItem="zFb-Gb-3dB" secondAttribute="centerX" id="bWQ-fX-DZe"/>
-                                                <constraint firstItem="4lt-X6-3uU" firstAttribute="top" secondItem="cmK-rb-Px7" secondAttribute="bottom" constant="20" id="ajL-PS-c6Q"/>
                                                 <constraint firstItem="699-dn-eyN" firstAttribute="centerY" secondItem="wtO-uL-QBf" secondAttribute="centerY" id="bfw-Ln-spi"/>
                                                 <constraint firstItem="3cU-IS-3Qu" firstAttribute="leading" secondItem="gEH-vT-EqV" secondAttribute="leading" id="dwP-Gf-Jak"/>
-                                                <constraint firstItem="cmK-rb-Px7" firstAttribute="top" secondItem="gFE-hZ-J92" secondAttribute="bottom" constant="20" id="eft-8t-T27"/>
                                                 <constraint firstItem="8IA-JL-fje" firstAttribute="leading" secondItem="3cU-IS-3Qu" secondAttribute="trailing" constant="8" id="fCD-kc-Rzh"/>
-                                                <constraint firstItem="IW2-Bb-lEZ" firstAttribute="leading" secondItem="3cU-IS-3Qu" secondAttribute="leading" id="gN7-HX-hXW"/>
                                                 <constraint firstItem="xwt-pY-1w9" firstAttribute="trailing" secondItem="w0y-UQ-RC0" secondAttribute="trailing" id="hi7-BQ-ZDh"/>
                                                 <constraint firstItem="gFE-hZ-J92" firstAttribute="top" secondItem="vrm-cg-RMn" secondAttribute="bottom" constant="20" id="ijE-Xu-svg"/>
-                                                <constraint firstAttribute="trailing" secondItem="zTJ-p9-7Tx" secondAttribute="trailing" constant="109" id="j2l-3z-W3I"/>
                                                 <constraint firstAttribute="trailing" secondItem="gEH-vT-EqV" secondAttribute="trailing" constant="247" id="jQj-Gf-XPT"/>
                                                 <constraint firstItem="xwt-pY-1w9" firstAttribute="top" secondItem="w0y-UQ-RC0" secondAttribute="bottom" constant="20" id="krm-S3-2y5"/>
                                                 <constraint firstItem="699-dn-eyN" firstAttribute="leading" secondItem="wtO-uL-QBf" secondAttribute="trailing" constant="25" id="nM0-Kn-lTZ"/>
                                                 <constraint firstItem="3cU-IS-3Qu" firstAttribute="centerY" secondItem="xwt-pY-1w9" secondAttribute="centerY" id="oM8-iJ-okk"/>
                                                 <constraint firstItem="9WW-jp-NeO" firstAttribute="centerY" secondItem="4lt-X6-3uU" secondAttribute="centerY" id="oPk-1s-bdu"/>
+                                                <constraint firstItem="Ytg-0u-Mtu" firstAttribute="top" secondItem="ZNm-TN-RRJ" secondAttribute="bottom" constant="10" id="ouW-SE-Jmn"/>
                                                 <constraint firstItem="FZb-fP-hMJ" firstAttribute="leading" secondItem="699-dn-eyN" secondAttribute="leading" id="rCV-e3-pae"/>
-                                                <constraint firstItem="CYe-co-1Ey" firstAttribute="centerY" secondItem="cmK-rb-Px7" secondAttribute="centerY" id="s1f-0L-lUl"/>
                                                 <constraint firstAttribute="trailing" secondItem="9WW-jp-NeO" secondAttribute="trailing" constant="264" id="s9R-1X-ZOO"/>
-                                                <constraint firstItem="Gia-TI-eki" firstAttribute="trailing" secondItem="saM-0J-1YU" secondAttribute="trailing" id="tFi-8L-tCR"/>
                                                 <constraint firstItem="w0y-UQ-RC0" firstAttribute="trailing" secondItem="4lt-X6-3uU" secondAttribute="trailing" id="ubu-xP-pha"/>
                                                 <constraint firstItem="FZb-fP-hMJ" firstAttribute="centerY" secondItem="vrm-cg-RMn" secondAttribute="centerY" id="vtc-Ea-gV5"/>
                                                 <constraint firstItem="gFE-hZ-J92" firstAttribute="trailing" secondItem="vrm-cg-RMn" secondAttribute="trailing" id="xAU-f3-yVy"/>
                                                 <constraint firstItem="gEH-vT-EqV" firstAttribute="centerY" secondItem="w0y-UQ-RC0" secondAttribute="centerY" id="xC0-2B-rEr"/>
-                                                <constraint firstItem="zTJ-p9-7Tx" firstAttribute="leading" secondItem="IW2-Bb-lEZ" secondAttribute="leading" id="ygH-sX-B63"/>
                                             </constraints>
                                         </view>
                                     </tabViewItem>
-                                    <tabViewItem label="Menubar" identifier="" id="ztQ-ui-wYI">
+                                    <tabViewItem label="Misc" identifier="" id="ztQ-ui-wYI">
                                         <view key="view" id="mF4-bp-EID">
-                                            <rect key="frame" x="10" y="33" width="586" height="569"/>
+                                            <rect key="frame" x="10" y="33" width="608" height="432"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="fTA-lS-4wJ">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="fTA-lS-4wJ">
-                                                    <rect key="frame" x="-21" y="496" width="179" height="22"/>
+                                                    <rect key="frame" x="78" y="364" width="143" height="18"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="139" id="w0W-x9-xCJ"/>
+                                                    </constraints>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Include Date" id="CTM-FL-m3p">
                                                         <font key="font" size="13" name="Avenir-Light"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Axn-Tb-Cdx">
+                                                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Axn-Tb-Cdx">
-                                                    <rect key="frame" x="199" y="503" width="84" height="24"/>
+                                                    <rect key="frame" x="242" y="361" width="83" height="24"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="04s-TY-ltB">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -1266,18 +1193,16 @@
                                                         <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.showDate" id="NI6-wf-sMv"/>
                                                     </connections>
                                                 </segmentedControl>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="pZd-Wg-YPL">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="pZd-Wg-YPL">
-                                                    <rect key="frame" x="-21" y="447" width="179" height="22"/>
+                                                    <rect key="frame" x="148" y="326" width="73" height="18"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Include Day" id="dBJ-Pj-utm">
                                                         <font key="font" size="13" name="Avenir-Light"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KeW-e2-uQE">
+                                                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KeW-e2-uQE">
-                                                    <rect key="frame" x="199" y="405" width="84" height="24"/>
+                                                    <rect key="frame" x="242" y="285" width="83" height="24"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="n7R-Fj-KSe">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -1290,9 +1215,8 @@
                                                         <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.showPlaceName" id="a2r-XT-uf5"/>
                                                     </connections>
                                                 </segmentedControl>
-                                                <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AxB-VD-lXm">
+                                                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AxB-VD-lXm">
-                                                    <rect key="frame" x="199" y="448" width="84" height="24"/>
+                                                    <rect key="frame" x="242" y="323" width="83" height="24"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="0UT-Io-qfp">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -1308,27 +1232,24 @@
                                                         <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.showDay" id="94x-Xq-60W"/>
                                                     </connections>
                                                 </segmentedControl>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="bhJ-MT-NBP">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="bhJ-MT-NBP">
-                                                    <rect key="frame" x="-21" y="402" width="179" height="24"/>
+                                                    <rect key="frame" x="101" y="288" width="120" height="18"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Include Place Name" id="YQC-xV-1Ig">
                                                         <font key="font" size="13" name="Avenir-Light"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="Utg-yF-Rso" userLabel="Menubar Mode">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="Utg-yF-Rso" userLabel="Menubar Mode">
-                                                    <rect key="frame" x="-24" y="359" width="182" height="18"/>
+                                                    <rect key="frame" x="126" y="250" width="95" height="18"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Menubar Mode" id="6xJ-Vn-e39">
                                                         <font key="font" size="13" name="Avenir-Light"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mai-SZ-AEi">
+                                                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mai-SZ-AEi">
-                                                    <rect key="frame" x="201" y="355" width="146" height="24"/>
+                                                    <rect key="frame" x="242" y="247" width="146" height="24"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="tbg-LS-tZH">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -1341,64 +1262,220 @@
                                                         <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.com.abhishek.menubarCompactMode" id="zuN-fl-ZH2"/>
                                                     </connections>
                                                 </segmentedControl>
-                                                <visualEffectView hidden="YES" focusRingType="none" fixedFrame="YES" blendingMode="withinWindow" material="light" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="D6P-38-4c5">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Q3M-Kz-XV3">
-                                                    <rect key="frame" x="-19" y="54" width="563" height="253"/>
+                                                    <rect key="frame" x="248" y="403" width="112" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="22" id="eJS-Lu-Avz"/>
+                                                        <constraint firstAttribute="width" constant="108" id="y01-ys-4L6"/>
+                                                    </constraints>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Menubar Options" id="Gjt-mt-SQR">
+                                                        <font key="font" size="13" name="Avenir-Heavy"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="XeT-rJ-1io">
+                                                    <rect key="frame" x="-3" y="226" width="614" height="5"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="1" id="SdH-Fo-qYn"/>
+                                                    </constraints>
+                                                </box>
+                                                <visualEffectView hidden="YES" focusRingType="none" blendingMode="withinWindow" material="light" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="Wj2-aw-ZDm">
+                                                    <rect key="frame" x="0.0" y="228" width="608" height="204"/>
                                                     <subviews>
-                                                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2gG-g8-lbC">
+                                                        <textField hidden="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="dtb-8u-6gN">
-                                                            <rect key="frame" x="203" y="80" width="126" height="80"/>
+                                                            <rect key="frame" x="52" y="82" width="504" height="40"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                            <constraints>
-                                                            <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Multiline Label" id="qqG-OR-J7w">
+                                                                <constraint firstAttribute="height" constant="40" id="7tY-09-nYM"/>
+                                                                <constraint firstAttribute="width" constant="500" id="Taz-W1-qVP"/>
+                                                            </constraints>
+                                                            <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Multiline Label" id="WYa-RV-fDa">
                                                                 <font key="font" size="18" name="Avenir-Book"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
                                                     </subviews>
+                                                    <constraints>
+                                                        <constraint firstItem="dtb-8u-6gN" firstAttribute="centerX" secondItem="Wj2-aw-ZDm" secondAttribute="centerX" id="J3T-cO-qq1"/>
+                                                        <constraint firstItem="dtb-8u-6gN" firstAttribute="centerY" secondItem="Wj2-aw-ZDm" secondAttribute="centerY" id="VPn-r5-viR"/>
+                                                    </constraints>
                                                 </visualEffectView>
+                                                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DjV-qq-hr9">
+                                                    <rect key="frame" x="242" y="144" width="230" height="24"/>
+                                                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="kvB-5f-IK4">
+                                                        <font key="font" size="12" name="Avenir-Light"/>
+                                                        <segments>
+                                                            <segment label="Menu Bar only"/>
+                                                            <segment label="Dock and Menu Bar" selected="YES" tag="1"/>
+                                                        </segments>
+                                                    </segmentedCell>
+                                                    <connections>
+                                                        <action selector="changeAppDisplayOptions:" target="1aL-zR-8L4" id="ipf-3c-Bsn"/>
+                                                        <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.com.abhishek.appDisplayOptions" id="4Ix-iO-C4I"/>
+                                                    </connections>
+                                                </segmentedControl>
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="GaR-Qm-7u4">
+                                                    <rect key="frame" x="103" y="110" width="118" height="18"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="114" id="lod-PT-AI5"/>
+                                                    </constraints>
+                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Future Slider Range" id="BYJ-7P-E0I">
+                                                        <font key="font" size="13" name="Avenir-Light"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="HNj-dh-8gr">
+                                                    <rect key="frame" x="124" y="148" width="97" height="18"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="93" id="7zy-Fe-aNw"/>
+                                                    </constraints>
+                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Show Clocker in" id="Ujt-R0-aDS">
+                                                        <font key="font" size="13" name="Avenir-Light"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pk6-co-N73">
+                                                    <rect key="frame" x="242" y="68" width="79" height="24"/>
+                                                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="jUA-fY-nhn">
+                                                        <font key="font" size="12" name="Avenir-Light"/>
+                                                        <segments>
+                                                            <segment label="Yes" width="36"/>
+                                                            <segment label="No" width="36" selected="YES" tag="1"/>
+                                                        </segments>
+                                                    </segmentedCell>
+                                                    <accessibility identifier="FutureSlider"/>
+                                                    <connections>
+                                                        <action selector="showFutureSlider:" target="1aL-zR-8L4" id="c1a-KS-oo3"/>
+                                                        <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.displayFutureSlider" id="ha9-nW-Rv2"/>
+                                                    </connections>
+                                                </segmentedControl>
+                                                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Nx-Xq-XDU">
+                                                    <rect key="frame" x="240" y="105" width="223" height="25"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="218" id="0qW-So-4cc"/>
+                                                    </constraints>
+                                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="noArrow" preferredEdge="maxX" id="mqv-tQ-0rf">
+                                                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                        <font key="font" size="12" name="Avenir-Light"/>
+                                                        <menu key="menu" id="9lV-R9-bzr"/>
+                                                    </popUpButtonCell>
+                                                    <connections>
+                                                        <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.sliderDayRange" id="pnp-PO-t4w"/>
+                                                    </connections>
+                                                </popUpButton>
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="8Jv-Cf-blJ">
+                                                    <rect key="frame" x="108" y="72" width="113" height="18"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="109" id="DXS-zG-LoB"/>
+                                                    </constraints>
+                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Show Future Slider" id="pfG-By-On0">
+                                                        <font key="font" size="13" name="Avenir-Light"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ffU-Ce-sfU">
+                                                    <rect key="frame" x="248" y="186" width="112" height="22"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="108" id="3Ch-Kc-bLG"/>
+                                                        <constraint firstAttribute="height" constant="22" id="tHL-bd-6Pl"/>
+                                                    </constraints>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Miscelleaneous" id="bgq-pM-LNm">
+                                                        <font key="font" size="13" name="Avenir-Heavy"/>
+                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                    </textFieldCell>
+                                                </textField>
                                             </subviews>
+                                            <constraints>
+                                                <constraint firstItem="AxB-VD-lXm" firstAttribute="centerY" secondItem="pZd-Wg-YPL" secondAttribute="centerY" id="5wa-d2-jaz"/>
+                                                <constraint firstItem="fTA-lS-4wJ" firstAttribute="top" secondItem="mF4-bp-EID" secondAttribute="top" constant="50" id="7tO-Cp-OiK"/>
+                                                <constraint firstItem="Axn-Tb-Cdx" firstAttribute="centerY" secondItem="fTA-lS-4wJ" secondAttribute="centerY" id="A5h-9Z-lkQ"/>
+                                                <constraint firstItem="KeW-e2-uQE" firstAttribute="centerY" secondItem="bhJ-MT-NBP" secondAttribute="centerY" id="B1W-4F-zAU"/>
+                                                <constraint firstItem="KeW-e2-uQE" firstAttribute="leading" secondItem="AxB-VD-lXm" secondAttribute="leading" id="DYk-jT-Swc"/>
+                                                <constraint firstItem="Q3M-Kz-XV3" firstAttribute="top" secondItem="mF4-bp-EID" secondAttribute="top" constant="7" id="Gaf-bX-kgP"/>
+                                                <constraint firstItem="bhJ-MT-NBP" firstAttribute="top" secondItem="pZd-Wg-YPL" secondAttribute="bottom" constant="20" id="IoV-WF-2Ka"/>
+                                                <constraint firstItem="8Jv-Cf-blJ" firstAttribute="top" secondItem="GaR-Qm-7u4" secondAttribute="bottom" constant="20" id="JEu-wF-GfU"/>
+                                                <constraint firstItem="fTA-lS-4wJ" firstAttribute="leading" secondItem="mF4-bp-EID" secondAttribute="leading" constant="80" id="MkT-cl-OdZ"/>
+                                                <constraint firstItem="8Jv-Cf-blJ" firstAttribute="trailing" secondItem="GaR-Qm-7u4" secondAttribute="trailing" id="NUW-UR-fQ1"/>
+                                                <constraint firstItem="ffU-Ce-sfU" firstAttribute="centerX" secondItem="mF4-bp-EID" secondAttribute="centerX" id="NtD-tv-DLi"/>
+                                                <constraint firstAttribute="trailing" secondItem="XeT-rJ-1io" secondAttribute="trailing" constant="-3" id="PrP-aA-Zhl"/>
+                                                <constraint firstItem="Utg-yF-Rso" firstAttribute="trailing" secondItem="bhJ-MT-NBP" secondAttribute="trailing" id="RVT-XO-vH3"/>
+                                                <constraint firstItem="pk6-co-N73" firstAttribute="centerY" secondItem="8Jv-Cf-blJ" secondAttribute="centerY" id="XeK-R2-Z7W"/>
+                                                <constraint firstItem="pZd-Wg-YPL" firstAttribute="trailing" secondItem="fTA-lS-4wJ" secondAttribute="trailing" id="ZcE-Iu-M9g"/>
+                                                <constraint firstItem="XeT-rJ-1io" firstAttribute="leading" secondItem="mF4-bp-EID" secondAttribute="leading" constant="-3" id="afb-db-nsk"/>
+                                                <constraint firstItem="Mai-SZ-AEi" firstAttribute="leading" secondItem="KeW-e2-uQE" secondAttribute="leading" id="bhh-nt-9cb"/>
+                                                <constraint firstAttribute="trailing" secondItem="Wj2-aw-ZDm" secondAttribute="trailing" id="c7U-11-oja"/>
+                                                <constraint firstItem="Axn-Tb-Cdx" firstAttribute="leading" secondItem="fTA-lS-4wJ" secondAttribute="trailing" constant="25" id="cpc-PS-JXb"/>
+                                                <constraint firstItem="Wj2-aw-ZDm" firstAttribute="bottom" secondItem="XeT-rJ-1io" secondAttribute="bottom" id="d1X-nE-5Z1"/>
+                                                <constraint firstItem="XeT-rJ-1io" firstAttribute="top" secondItem="Mai-SZ-AEi" secondAttribute="bottom" constant="20" id="dK0-pf-XzU"/>
+                                                <constraint firstItem="HNj-dh-8gr" firstAttribute="top" secondItem="ffU-Ce-sfU" secondAttribute="bottom" constant="20" id="e9q-JE-9cD"/>
+                                                <constraint firstItem="ffU-Ce-sfU" firstAttribute="top" secondItem="XeT-rJ-1io" secondAttribute="bottom" constant="20" id="ed3-Oa-Uso"/>
+                                                <constraint firstItem="DjV-qq-hr9" firstAttribute="centerY" secondItem="HNj-dh-8gr" secondAttribute="centerY" id="ezB-Gf-m1M"/>
+                                                <constraint firstItem="Wj2-aw-ZDm" firstAttribute="top" secondItem="mF4-bp-EID" secondAttribute="top" id="g9Z-bG-q6C"/>
+                                                <constraint firstItem="Mai-SZ-AEi" firstAttribute="centerY" secondItem="Utg-yF-Rso" secondAttribute="centerY" id="gaG-hL-cPZ"/>
+                                                <constraint firstItem="bhJ-MT-NBP" firstAttribute="trailing" secondItem="pZd-Wg-YPL" secondAttribute="trailing" id="glb-jO-783"/>
+                                                <constraint firstItem="Utg-yF-Rso" firstAttribute="top" secondItem="bhJ-MT-NBP" secondAttribute="bottom" constant="20" id="i0V-V6-4Ry"/>
+                                                <constraint firstItem="8Nx-Xq-XDU" firstAttribute="leading" secondItem="DjV-qq-hr9" secondAttribute="leading" constant="-2" id="n70-Hh-rVD"/>
+                                                <constraint firstItem="GaR-Qm-7u4" firstAttribute="trailing" secondItem="HNj-dh-8gr" secondAttribute="trailing" id="rdt-gt-K0k"/>
+                                                <constraint firstItem="8Nx-Xq-XDU" firstAttribute="centerY" secondItem="GaR-Qm-7u4" secondAttribute="centerY" id="s0m-wC-dVO"/>
+                                                <constraint firstItem="Wj2-aw-ZDm" firstAttribute="leading" secondItem="mF4-bp-EID" secondAttribute="leading" id="wTr-VP-p2w"/>
+                                                <constraint firstItem="pZd-Wg-YPL" firstAttribute="top" secondItem="fTA-lS-4wJ" secondAttribute="bottom" constant="20" id="whe-Ex-bIB"/>
+                                                <constraint firstItem="AxB-VD-lXm" firstAttribute="leading" secondItem="Axn-Tb-Cdx" secondAttribute="leading" id="x1o-YB-Aes"/>
+                                                <constraint firstItem="pk6-co-N73" firstAttribute="leading" secondItem="DjV-qq-hr9" secondAttribute="leading" id="y9n-Tk-GUK"/>
+                                                <constraint firstItem="Q3M-Kz-XV3" firstAttribute="centerX" secondItem="mF4-bp-EID" secondAttribute="centerX" id="yKZ-7i-UKv"/>
+                                                <constraint firstItem="HNj-dh-8gr" firstAttribute="trailing" secondItem="Utg-yF-Rso" secondAttribute="trailing" id="yPE-hM-Mbb"/>
+                                                <constraint firstItem="DjV-qq-hr9" firstAttribute="leading" secondItem="Mai-SZ-AEi" secondAttribute="leading" id="ykI-Ig-kwf"/>
+                                                <constraint firstItem="GaR-Qm-7u4" firstAttribute="top" secondItem="HNj-dh-8gr" secondAttribute="bottom" constant="20" id="z8z-AY-l8y"/>
+                                            </constraints>
                                         </view>
                                     </tabViewItem>
                                 </tabViewItems>
                             </tabView>
                         </subviews>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="SGu-yd-JQh" secondAttribute="trailing" constant="12" id="0To-sH-uEy"/>
+                            <constraint firstAttribute="trailing" secondItem="SGu-yd-JQh" secondAttribute="trailing" constant="20" id="0To-sH-uEy"/>
                             <constraint firstItem="SGu-yd-JQh" firstAttribute="top" secondItem="7EQ-1G-xRP" secondAttribute="top" constant="20" id="BVY-gd-4Je"/>
-                            <constraint firstAttribute="bottom" secondItem="SGu-yd-JQh" secondAttribute="bottom" constant="33" id="WCa-7K-01j"/>
+                            <constraint firstAttribute="bottom" secondItem="SGu-yd-JQh" secondAttribute="bottom" constant="20" id="WCa-7K-01j"/>
                             <constraint firstItem="SGu-yd-JQh" firstAttribute="leading" secondItem="7EQ-1G-xRP" secondAttribute="leading" constant="20" id="Yei-Ge-6Ol"/>
                         </constraints>
                     </customView>
                     <connections>
-                        <outlet property="appDisplayLabel" destination="Gia-TI-eki" id="nIg-Vf-Ens"/>
+                        <outlet property="appDisplayLabel" destination="HNj-dh-8gr" id="A6U-gp-sje"/>
+                        <outlet property="appearanceTab" destination="SGu-yd-JQh" id="CJn-3E-Ujd"/>
                         <outlet property="dayDisplayOptionsLabel" destination="gFE-hZ-J92" id="tVv-pC-MSW"/>
-                        <outlet property="futureSliderRangeLabel" destination="saM-0J-1YU" id="1Qo-vC-6ML"/>
+                        <outlet property="futureSliderRangeLabel" destination="GaR-Qm-7u4" id="0aB-BK-7fN"/>
                         <outlet property="includeDateInMenubarControl" destination="Axn-Tb-Cdx" id="M5x-Qt-zvs"/>
                         <outlet property="includeDateLabel" destination="fTA-lS-4wJ" id="J1i-yl-JmT"/>
                         <outlet property="includeDayInMenubarControl" destination="AxB-VD-lXm" id="IEy-hk-yMN"/>
                         <outlet property="includeDayLabel" destination="pZd-Wg-YPL" id="JtJ-MQ-bRG"/>
                         <outlet property="includePlaceLabel" destination="bhJ-MT-NBP" id="Gyi-t8-NpL"/>
                         <outlet property="includePlaceNameControl" destination="KeW-e2-uQE" id="SeV-uy-oKg"/>
-                        <outlet property="informationLabel" destination="2gG-g8-lbC" id="pfN-uc-PIv"/>
+                        <outlet property="informationLabel" destination="dtb-8u-6gN" id="1Mo-hH-VNA"/>
                         <outlet property="largerTextLabel" destination="xwt-pY-1w9" id="XbF-MZ-dMx"/>
                         <outlet property="menubarMode" destination="Mai-SZ-AEi" id="PPv-1D-lnt"/>
                         <outlet property="menubarModeLabel" destination="Utg-yF-Rso" id="Pda-Aj-81M"/>
+                        <outlet property="miscelleaneousLabel" destination="ffU-Ce-sfU" id="JbJ-IR-3IL"/>
                         <outlet property="panelTheme" destination="vrm-cg-RMn" id="yPO-LZ-Egp"/>
+                        <outlet property="previewLabel" destination="ZNm-TN-RRJ" id="63F-Zc-KV3"/>
                         <outlet property="previewPanelTableView" destination="KbJ-p4-i6E" id="coQ-qV-XTs"/>
                         <outlet property="showSecondsLabel" destination="w0y-UQ-RC0" id="wGv-J3-mea"/>
-                        <outlet property="showSliderLabel" destination="cmK-rb-Px7" id="Iul-pr-8y4"/>
+                        <outlet property="showSliderLabel" destination="8Jv-Cf-blJ" id="UHb-hK-VVl"/>
                         <outlet property="showSunriseLabel" destination="4lt-X6-3uU" id="tez-s5-RzL"/>
-                        <outlet property="sliderDayRangePopup" destination="IW2-Bb-lEZ" id="VEi-7o-H4P"/>
+                        <outlet property="sliderDayRangePopup" destination="8Nx-Xq-XDU" id="PBM-yB-Yo1"/>
                         <outlet property="theme" destination="FZb-fP-hMJ" id="MuM-9G-MfG"/>
                         <outlet property="timeFormat" destination="699-dn-eyN" id="eAC-GR-28E"/>
                         <outlet property="timeFormatLabel" destination="wtO-uL-QBf" id="udS-d6-Tep"/>
-                        <outlet property="visualEffectView" destination="D6P-38-4c5" id="wZV-B0-T1s"/>
+                        <outlet property="visualEffectView" destination="Wj2-aw-ZDm" id="TZy-V2-JFS"/>
                     </connections>
                 </viewController>
                 <customObject id="u7K-hb-gdM" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <userDefaultsController representsSharedInstance="YES" id="Gpv-Gr-MxZ"/>
             </objects>
-            <point key="canvasLocation" x="-367" y="-755"/>
+            <point key="canvasLocation" x="-419" y="-830"/>
         </scene>
         <!-- Preferences -->
         <scene sceneID="udr-95-hTV">
@@ -1415,7 +1492,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <searchField toolTip="Search a timezone" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dha-h9-Nd0" customClass="ClockerSearchField" customModule="Clocker" customModuleProvider="target">
-                                <rect key="frame" x="8" y="217" width="329" height="23"/>
+                                <rect key="frame" x="8" y="169" width="329" height="23"/>
                                 <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" focusRingType="none" placeholderString="Enter a city, state, country name" usesSingleLineMode="YES" maximumRecents="5" id="ikU-Tm-0WZ">
                                     <font key="font" size="13" name="Avenir-Light"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1472,13 +1549,13 @@ DQ
                                 </connections>
                             </button>
                             <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="32" horizontalPageScroll="10" verticalLineScroll="32" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0wY-ff-FLW">
-                                <rect key="frame" x="8" y="30" width="329" height="177"/>
+                                <rect key="frame" x="8" y="30" width="329" height="129"/>
                                 <clipView key="contentView" drawsBackground="NO" id="rGc-3M-cCq">
-                                    <rect key="frame" x="0.0" y="0.0" width="329" height="177"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="329" height="129"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="30" rowSizeStyle="automatic" viewBased="YES" id="xkl-2X-ZCb">
-                                            <rect key="frame" x="0.0" y="0.0" width="329" height="177"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="329" height="129"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1568,14 +1645,14 @@ DQ
                                 </scroller>
                             </scrollView>
                             <progressIndicator wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="0A5-gp-lay">
-                                <rect key="frame" x="165" y="138" width="16" height="16"/>
+                                <rect key="frame" x="165" y="114" width="16" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="fgE-77-Vda"/>
                                     <constraint firstAttribute="width" constant="16" id="pwe-em-e0a"/>
                                 </constraints>
                             </progressIndicator>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xgb-wU-8RU">
-                                <rect key="frame" x="18" y="108" width="309" height="22"/>
+                                <rect key="frame" x="18" y="84" width="309" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="zqt-d8-yas"/>
                                 </constraints>
@@ -1613,14 +1690,14 @@ DQ
                 <customObject id="Udi-3T-gMi" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <viewController title=" Preferences " id="ZT5-cA-xLj" customClass="PreferencesViewController" customModule="Clocker" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" wantsLayer="YES" id="DlQ-34-TgP" customClass="ParentView" customModule="Clocker" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="633" height="506"/>
+                        <rect key="frame" x="0.0" y="0.0" width="633" height="514"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <stackView wantsLayer="YES" distribution="fill" orientation="vertical" alignment="centerX" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1sT-pO-jK4">
+                            <stackView wantsLayer="YES" distribution="fill" orientation="vertical" alignment="centerX" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1sT-pO-jK4">
-                                <rect key="frame" x="7" y="0.0" width="618" height="506"/>
+                                <rect key="frame" x="7" y="0.0" width="618" height="514"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="J2K-hR-0jv">
-                                        <rect key="frame" x="0.0" y="476" width="613" height="30"/>
+                                        <rect key="frame" x="0.0" y="484" width="613" height="30"/>
                                         <subviews>
                                             <button toolTip="Sorts by time difference from your current timezone" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P6d-qq-ycq">
                                                 <rect key="frame" x="277" y="3" width="13" height="25"/>
@@ -1679,7 +1756,7 @@ DQ
                                         </constraints>
                                     </customView>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="eI7-Vb-R7J">
-                                        <rect key="frame" x="0.0" y="58" width="618" height="412"/>
+                                        <rect key="frame" x="0.0" y="62" width="618" height="412"/>
                                         <subviews>
                                             <scrollView wantsLayer="YES" focusRingType="none" borderType="none" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zpF-gE-u0C">
                                                 <rect key="frame" x="0.0" y="0.0" width="618" height="412"/>
@@ -1688,7 +1765,7 @@ DQ
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" autosaveColumns="NO" rowHeight="60" headerView="1hb-YT-szP" id="p9D-mN-dTa">
-                                                            <rect key="frame" x="0.0" y="0.0" width="618" height="387"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="624" height="387"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <size key="intercellSpacing" width="3" height="2"/>
                                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1705,7 +1782,7 @@ DQ
                                                                     </buttonCell>
                                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                                 </tableColumn>
-                                                                <tableColumn identifier="formattedAddress" editable="NO" width="260" minWidth="260" maxWidth="260" id="Kib-up-9ur">
+                                                                <tableColumn identifier="formattedAddress" editable="NO" width="280" minWidth="280" maxWidth="280" id="Kib-up-9ur">
                                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Name">
                                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -1717,7 +1794,7 @@ DQ
                                                                     </textFieldCell>
                                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                                 </tableColumn>
-                                                                <tableColumn identifier="label" width="240" minWidth="240" maxWidth="240" id="Fbd-Q4-EZ0">
+                                                                <tableColumn identifier="label" width="280" minWidth="280" maxWidth="280" id="Fbd-Q4-EZ0">
                                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Label">
                                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -1746,7 +1823,7 @@ DQ
                                                     <autoresizingMask key="autoresizingMask"/>
                                                 </scroller>
                                                 <tableHeaderView key="headerView" focusRingType="none" id="1hb-YT-szP">
-                                                    <rect key="frame" x="0.0" y="0.0" width="618" height="25"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="624" height="25"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                 </tableHeaderView>
                                             </scrollView>