diff --git a/Clocker.xcodeproj/project.pbxproj b/Clocker.xcodeproj/project.pbxproj
index 36a53a7..d7b0a00 100755
--- a/Clocker.xcodeproj/project.pbxproj
+++ b/Clocker.xcodeproj/project.pbxproj
@@ -44,6 +44,7 @@
 		9A5E6BA01CAF71C1006E7C5C /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5E6B9F1CAF71C1006E7C5C /* libicucore.tbd */; };
 		9A5E6BAB1CAF8DFA006E7C5C /* iRate.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 9A5E6BAA1CAF8DFA006E7C5C /* iRate.bundle */; };
 		9A63620A1C432F68004AD010 /* CLAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A6362091C432F68004AD010 /* CLAPI.m */; };
+		9A6D93371CF3E82F005A8690 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A6D93361CF3E82F005A8690 /* CoreImage.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		9A79E9901CB34B6800BA7916 /* CLParentPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A79E98F1CB34B6800BA7916 /* CLParentPanelController.m */; };
 		9A82F3441CDFF8F600CC8906 /* pop.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A82F33B1CDFF8CF00CC8906 /* pop.framework */; };
 		9A8605AE1BEC148400A810A4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A8605AD1BEC148400A810A4 /* main.m */; };
@@ -81,7 +82,7 @@
 		9ABA2B031C671D49009DC0EF /* CLMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABA2B021C671D49009DC0EF /* CLMainWindowController.m */; };
 		9ABF58721C29A80600BD0187 /* CLTimezoneData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABF58711C29A80600BD0187 /* CLTimezoneData.m */; };
 		9ABFB3801CA6882000E10745 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ABFB37F1CA6882000E10745 /* ApplicationServices.framework */; };
-		9AC678E41C1ABAB9003B4F6B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC678E31C1ABAB9003B4F6B /* QuartzCore.framework */; };
+		9AC678E41C1ABAB9003B4F6B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC678E31C1ABAB9003B4F6B /* QuartzCore.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		9ACE03EF1CB0ADE00039FC01 /* Firebase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ACE03EE1CB0ADE00039FC01 /* Firebase.framework */; };
 		9AD6DE571CE114DA007A8401 /* CLScaleUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD6DE561CE114DA007A8401 /* CLScaleUpButton.m */; };
 		9AF9A16B1C250AB300EE7C2A /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AF9A16A1C250AB300EE7C2A /* Reachability.m */; };
@@ -265,6 +266,7 @@
 		9A5E6BAA1CAF8DFA006E7C5C /* iRate.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = iRate.bundle; sourceTree = "<group>"; };
 		9A6362081C432F68004AD010 /* CLAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLAPI.h; path = Clocker/API/CLAPI.h; sourceTree = "<group>"; };
 		9A6362091C432F68004AD010 /* CLAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLAPI.m; path = Clocker/API/CLAPI.m; sourceTree = "<group>"; };
+		9A6D93361CF3E82F005A8690 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
 		9A7654341CDC2290000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		9A7654351CDC2290000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		9A7654361CDC2290000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/CLOneWindow.xib"; sourceTree = "<group>"; };
@@ -355,6 +357,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9AC678E41C1ABAB9003B4F6B /* QuartzCore.framework in Frameworks */,
+				9A6D93371CF3E82F005A8690 /* CoreImage.framework in Frameworks */,
 				9A86E2C21CE04F4A00547EE7 /* PTHotKey.framework in Frameworks */,
 				9A86E2C11CE04F4300547EE7 /* ShortcutRecorder.framework in Frameworks */,
 				9A82F3441CDFF8F600CC8906 /* pop.framework in Frameworks */,
@@ -367,7 +371,6 @@
 				9A43792C1BEC231100F4E27F /* libz.tbd in Frameworks */,
 				9A9E876C1C1FEDE700A7A2DF /* libsqlite3.tbd in Frameworks */,
 				9A9E87681C1FEDD300A7A2DF /* Security.framework in Frameworks */,
-				9AC678E41C1ABAB9003B4F6B /* QuartzCore.framework in Frameworks */,
 				9A5951BA1C1D0A22009C17AA /* Crashlytics.framework in Frameworks */,
 				9A43792A1BEC230A00F4E27F /* libc++.tbd in Frameworks */,
 				9A4379251BEC223900F4E27F /* Security.framework in Frameworks */,
@@ -656,6 +659,7 @@
 		DD4F7C0713C30F9F00825C6E /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				9A6D93361CF3E82F005A8690 /* CoreImage.framework */,
 				9A5E6B9F1CAF71C1006E7C5C /* libicucore.tbd */,
 				9ABFB37F1CA6882000E10745 /* ApplicationServices.framework */,
 				9A20A06F1C4E804D00FB45AB /* ServiceManagement.framework */,
diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index de2d882..ab2dec7 100644
Binary files a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate and b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index fe2b454..96c4043 100644
--- a/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,4 +2,22 @@
 <Bucket
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Clocker/Custom Slider/CLCustomSliderCell.m"
+            timestampString = "485926507.475266"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "17"
+            endingLineNumber = "17"
+            landmarkName = "-drawBarInside:flipped:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/Clocker/AboutUsWindow/en.lproj/CLAboutUsView.xib b/Clocker/AboutUsWindow/en.lproj/CLAboutUsView.xib
index 2dc6e13..253cade 100644
--- a/Clocker/AboutUsWindow/en.lproj/CLAboutUsView.xib
+++ b/Clocker/AboutUsWindow/en.lproj/CLAboutUsView.xib
@@ -47,18 +47,18 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5Eo-aJ-L8H">
-                    <rect key="frame" x="153" y="120" width="316" height="20"/>
+                    <rect key="frame" x="153" y="116" width="316" height="24"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="20" id="6fy-MI-uin"/>
+                        <constraint firstAttribute="height" constant="24" id="6fy-MI-uin"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Copyright (2016) Abhishek Banthia" id="4PX-se-5ds">
-                        <font key="font" size="14" name="HelveticaNeue-UltraLight"/>
+                        <font key="font" size="14" name="HelveticaNeue-Thin"/>
                         <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="6Cx-BF-XMU">
-                    <rect key="frame" x="153" y="95" width="316" height="15"/>
+                    <rect key="frame" x="153" y="91" width="316" height="15"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="Oob-bz-4Vp"/>
                     </constraints>
@@ -111,7 +111,7 @@
                     </connections>
                 </button>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IhK-El-tOe">
-                    <rect key="frame" x="153" y="61" width="316" height="15"/>
+                    <rect key="frame" x="153" y="57" width="316" height="15"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="7kh-Ha-LHP"/>
                     </constraints>
@@ -122,7 +122,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rzs-xE-sfs">
-                    <rect key="frame" x="153" y="78" width="316" height="15"/>
+                    <rect key="frame" x="153" y="74" width="316" height="15"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="2sg-Q1-h9h"/>
                     </constraints>
diff --git a/Clocker/AboutUsWindow/ja.lproj/CLAboutUsView.xib b/Clocker/AboutUsWindow/ja.lproj/CLAboutUsView.xib
index e0ad11a..924ce66 100644
--- a/Clocker/AboutUsWindow/ja.lproj/CLAboutUsView.xib
+++ b/Clocker/AboutUsWindow/ja.lproj/CLAboutUsView.xib
@@ -52,7 +52,7 @@
                         <constraint firstAttribute="height" constant="20" id="6fy-MI-uin"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="著作権 (2016) Abhishek Banthia" id="4PX-se-5ds">
-                        <font key="font" size="14" name="HelveticaNeue-UltraLight"/>
+                        <font key="font" size="14" name="HelveticaNeue-Thin"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
diff --git a/Clocker/AboutUsWindow/zh-Hans.lproj/CLAboutUsView.xib b/Clocker/AboutUsWindow/zh-Hans.lproj/CLAboutUsView.xib
index bd447e6..cb92737 100644
--- a/Clocker/AboutUsWindow/zh-Hans.lproj/CLAboutUsView.xib
+++ b/Clocker/AboutUsWindow/zh-Hans.lproj/CLAboutUsView.xib
@@ -47,18 +47,18 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5Eo-aJ-L8H">
-                    <rect key="frame" x="153" y="120" width="316" height="20"/>
+                    <rect key="frame" x="153" y="118" width="316" height="22"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="20" id="6fy-MI-uin"/>
+                        <constraint firstAttribute="height" constant="22" id="6fy-MI-uin"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Copyright (2016) Abhishek Banthia" id="4PX-se-5ds">
-                        <font key="font" size="14" name="HelveticaNeue-UltraLight"/>
+                        <font key="font" size="14" name="HelveticaNeue-Thin"/>
                         <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="6Cx-BF-XMU">
-                    <rect key="frame" x="153" y="95" width="316" height="15"/>
+                    <rect key="frame" x="153" y="93" width="316" height="15"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="Oob-bz-4Vp"/>
                     </constraints>
@@ -111,7 +111,7 @@
                     </connections>
                 </button>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rzs-xE-sfs">
-                    <rect key="frame" x="153" y="75" width="316" height="15"/>
+                    <rect key="frame" x="153" y="73" width="316" height="15"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="2sg-Q1-h9h"/>
                     </constraints>
diff --git a/Clocker/AboutUsWindow/zh-Hant.lproj/CLAboutUsView.xib b/Clocker/AboutUsWindow/zh-Hant.lproj/CLAboutUsView.xib
index d31f186..8a8f891 100644
--- a/Clocker/AboutUsWindow/zh-Hant.lproj/CLAboutUsView.xib
+++ b/Clocker/AboutUsWindow/zh-Hant.lproj/CLAboutUsView.xib
@@ -47,18 +47,18 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5Eo-aJ-L8H">
-                    <rect key="frame" x="153" y="120" width="316" height="20"/>
+                    <rect key="frame" x="153" y="118" width="316" height="22"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="20" id="6fy-MI-uin"/>
+                        <constraint firstAttribute="height" constant="22" id="6fy-MI-uin"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Copyright (2016) Abhishek Banthia" id="4PX-se-5ds">
-                        <font key="font" size="14" name="HelveticaNeue-UltraLight"/>
+                        <font key="font" size="14" name="HelveticaNeue-Thin"/>
                         <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="6Cx-BF-XMU">
-                    <rect key="frame" x="153" y="95" width="316" height="15"/>
+                    <rect key="frame" x="153" y="93" width="316" height="15"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="Oob-bz-4Vp"/>
                     </constraints>
@@ -111,7 +111,7 @@
                     </connections>
                 </button>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IhK-El-tOe">
-                    <rect key="frame" x="153" y="75" width="316" height="15"/>
+                    <rect key="frame" x="153" y="73" width="316" height="15"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="7kh-Ha-LHP"/>
                     </constraints>
diff --git a/Clocker/App Feedback/en.lproj/CLAppFeedbackWindow.xib b/Clocker/App Feedback/en.lproj/CLAppFeedbackWindow.xib
index 4307a96..f494ed9 100644
--- a/Clocker/App Feedback/en.lproj/CLAppFeedbackWindow.xib	
+++ b/Clocker/App Feedback/en.lproj/CLAppFeedbackWindow.xib	
@@ -58,13 +58,13 @@
                     <box title="Contact Information (Optional)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="JzF-Oq-qhW">
                         <rect key="frame" x="9" y="66" width="291" height="129"/>
                         <view key="contentView" id="moX-Vc-vMc">
-                            <rect key="frame" x="1" y="1" width="289" height="110"/>
+                            <rect key="frame" x="1" y="1" width="289" height="112"/>
                             <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="77" width="269" height="22"/>
+                                    <rect key="frame" x="10" y="77" width="269" height="24"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="6DY-uj-pMG"/>
+                                        <constraint firstAttribute="height" constant="24" id="6DY-uj-pMG"/>
                                     </constraints>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Name" drawsBackground="YES" id="9OU-9S-Apl">
                                         <font key="font" size="12" name="SFUIDisplay-Light"/>
@@ -73,23 +73,23 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="zlM-Cf-OxV">
-                                    <rect key="frame" x="10" y="45" width="269" height="22"/>
+                                    <rect key="frame" x="10" y="43" width="269" height="24"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="b3M-Sc-y8S"/>
+                                        <constraint firstAttribute="height" constant="24" id="b3M-Sc-y8S"/>
                                     </constraints>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Email" drawsBackground="YES" id="Z0A-qe-nbc">
-                                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="LVY-Qw-MYC">
-                                    <rect key="frame" x="6" y="8" width="277" height="30"/>
+                                    <rect key="frame" x="6" y="6" width="277" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="30" id="dRi-pM-pWX"/>
                                     </constraints>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Your contact information will let us contact you in case we need more information or can help!" placeholderString="" id="yEq-6I-HBq">
-                                        <font key="font" size="10" name="SFUIDisplay-Regular"/>
+                                        <font key="font" size="10" name="HelveticaNeue"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
@@ -111,7 +111,7 @@
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <font key="titleFont" size="11" name="SFUIDisplay-Regular"/>
+                        <font key="titleFont" size="11" name="HelveticaNeue"/>
                     </box>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="szs-8j-SMN">
                         <rect key="frame" x="93" y="13" width="82" height="32"/>
@@ -153,7 +153,7 @@ DQ
                             <constraint firstAttribute="height" constant="17" id="a7O-DC-irX"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Tell us what you think!" id="oHe-hu-bQn">
-                            <font key="font" size="13" name="SFUIDisplay-Regular"/>
+                            <font key="font" size="13" name="HelveticaNeue"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -164,7 +164,7 @@ DQ
                             <constraint firstAttribute="height" constant="17" id="vCO-Z3-Dfd"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="sSH-y9-tFH">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/App Feedback/ja.lproj/CLAppFeedbackWindow.xib b/Clocker/App Feedback/ja.lproj/CLAppFeedbackWindow.xib
index 436e38d..abb15e2 100644
--- a/Clocker/App Feedback/ja.lproj/CLAppFeedbackWindow.xib	
+++ b/Clocker/App Feedback/ja.lproj/CLAppFeedbackWindow.xib	
@@ -62,34 +62,37 @@
                             <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="77" width="269" height="22"/>
+                                    <rect key="frame" x="10" y="71" width="269" height="28"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="6DY-uj-pMG"/>
+                                        <constraint firstAttribute="height" constant="28" id="6DY-uj-pMG"/>
                                     </constraints>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="名" drawsBackground="YES" id="9OU-9S-Apl">
-                                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString=" 名" drawsBackground="YES" id="9OU-9S-Apl">
+                                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        <allowedInputSourceLocales>
+                                            <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+                                        </allowedInputSourceLocales>
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="zlM-Cf-OxV">
-                                    <rect key="frame" x="10" y="45" width="269" height="22"/>
+                                    <rect key="frame" x="10" y="33" width="269" height="28"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="b3M-Sc-y8S"/>
+                                        <constraint firstAttribute="height" constant="28" id="b3M-Sc-y8S"/>
                                     </constraints>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Eメール" drawsBackground="YES" id="Z0A-qe-nbc">
-                                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString=" Eメール" drawsBackground="YES" id="Z0A-qe-nbc">
+                                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="LVY-Qw-MYC">
-                                    <rect key="frame" x="6" y="8" width="277" height="30"/>
+                                    <rect key="frame" x="6" y="-4" width="277" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="30" id="dRi-pM-pWX"/>
                                     </constraints>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Your contact information will let us contact you in case we need more information or can help!" placeholderString="" id="yEq-6I-HBq">
-                                        <font key="font" size="10" name="SFUIDisplay-Regular"/>
+                                        <font key="font" size="10" name="HelveticaNeue"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
@@ -111,7 +114,7 @@
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <font key="titleFont" size="11" name="SFUIDisplay-Regular"/>
+                        <font key="titleFont" size="11" name="HelveticaNeue-Bold"/>
                     </box>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="szs-8j-SMN">
                         <rect key="frame" x="93" y="13" width="82" height="32"/>
@@ -153,7 +156,7 @@ DQ
                             <constraint firstAttribute="height" constant="17" id="a7O-DC-irX"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Tell us what you think!" id="oHe-hu-bQn">
-                            <font key="font" size="13" name="SFUIDisplay-Regular"/>
+                            <font key="font" size="13" name="HelveticaNeue"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -164,7 +167,7 @@ DQ
                             <constraint firstAttribute="height" constant="17" id="vCO-Z3-Dfd"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="sSH-y9-tFH">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/App Feedback/zh-Hans.lproj/CLAppFeedbackWindow.xib b/Clocker/App Feedback/zh-Hans.lproj/CLAppFeedbackWindow.xib
index ccc190e..2ac8645 100644
--- a/Clocker/App Feedback/zh-Hans.lproj/CLAppFeedbackWindow.xib	
+++ b/Clocker/App Feedback/zh-Hans.lproj/CLAppFeedbackWindow.xib	
@@ -58,38 +58,38 @@
                     <box title="Contact Information (自选)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="JzF-Oq-qhW">
                         <rect key="frame" x="9" y="66" width="291" height="129"/>
                         <view key="contentView" id="moX-Vc-vMc">
-                            <rect key="frame" x="1" y="1" width="289" height="110"/>
+                            <rect key="frame" x="1" y="1" width="289" height="112"/>
                             <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="77" width="269" height="22"/>
+                                    <rect key="frame" x="10" y="77" width="269" height="24"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="6DY-uj-pMG"/>
+                                        <constraint firstAttribute="height" constant="24" id="6DY-uj-pMG"/>
                                     </constraints>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="名称" drawsBackground="YES" id="9OU-9S-Apl">
-                                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="zlM-Cf-OxV">
-                                    <rect key="frame" x="10" y="45" width="269" height="22"/>
+                                    <rect key="frame" x="10" y="43" width="269" height="24"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="b3M-Sc-y8S"/>
+                                        <constraint firstAttribute="height" constant="24" id="b3M-Sc-y8S"/>
                                     </constraints>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="电子邮件" drawsBackground="YES" id="Z0A-qe-nbc">
-                                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="LVY-Qw-MYC">
-                                    <rect key="frame" x="6" y="8" width="277" height="30"/>
+                                    <rect key="frame" x="6" y="6" width="277" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="30" id="dRi-pM-pWX"/>
                                     </constraints>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Your contact information will let us contact you in case we need more information or can help!" placeholderString="" id="yEq-6I-HBq">
-                                        <font key="font" size="10" name="SFUIDisplay-Regular"/>
+                                        <font key="font" size="10" name="HelveticaNeue"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
@@ -111,7 +111,7 @@
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <font key="titleFont" size="11" name="SFUIDisplay-Regular"/>
+                        <font key="titleFont" size="11" name="HelveticaNeue"/>
                     </box>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="szs-8j-SMN">
                         <rect key="frame" x="93" y="13" width="82" height="32"/>
@@ -153,7 +153,7 @@ DQ
                             <constraint firstAttribute="height" constant="17" id="a7O-DC-irX"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Tell us what you think!" id="oHe-hu-bQn">
-                            <font key="font" size="13" name="SFUIDisplay-Regular"/>
+                            <font key="font" size="13" name="HelveticaNeue"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -164,7 +164,7 @@ DQ
                             <constraint firstAttribute="height" constant="17" id="vCO-Z3-Dfd"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="sSH-y9-tFH">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/App Feedback/zh-Hant.lproj/CLAppFeedbackWindow.xib b/Clocker/App Feedback/zh-Hant.lproj/CLAppFeedbackWindow.xib
index ac7f343..17cf5f3 100644
--- a/Clocker/App Feedback/zh-Hant.lproj/CLAppFeedbackWindow.xib	
+++ b/Clocker/App Feedback/zh-Hant.lproj/CLAppFeedbackWindow.xib	
@@ -58,38 +58,38 @@
                     <box title="Contact Information (自选)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="JzF-Oq-qhW">
                         <rect key="frame" x="9" y="66" width="291" height="129"/>
                         <view key="contentView" id="moX-Vc-vMc">
-                            <rect key="frame" x="1" y="1" width="289" height="110"/>
+                            <rect key="frame" x="1" y="1" width="289" height="112"/>
                             <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="77" width="269" height="22"/>
+                                    <rect key="frame" x="10" y="77" width="269" height="24"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="6DY-uj-pMG"/>
+                                        <constraint firstAttribute="height" constant="24" id="6DY-uj-pMG"/>
                                     </constraints>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="名称" drawsBackground="YES" id="9OU-9S-Apl">
-                                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="zlM-Cf-OxV">
-                                    <rect key="frame" x="10" y="45" width="269" height="22"/>
+                                    <rect key="frame" x="10" y="43" width="269" height="24"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="b3M-Sc-y8S"/>
+                                        <constraint firstAttribute="height" constant="24" id="b3M-Sc-y8S"/>
                                     </constraints>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="电子邮件" drawsBackground="YES" id="Z0A-qe-nbc">
-                                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="LVY-Qw-MYC">
-                                    <rect key="frame" x="6" y="8" width="277" height="30"/>
+                                    <rect key="frame" x="6" y="6" width="277" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="30" id="dRi-pM-pWX"/>
                                     </constraints>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Your contact information will let us contact you in case we need more information or can help!" placeholderString="" id="yEq-6I-HBq">
-                                        <font key="font" size="10" name="SFUIDisplay-Regular"/>
+                                        <font key="font" size="10" name="HelveticaNeue"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
@@ -111,7 +111,7 @@
                         </constraints>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <font key="titleFont" size="11" name="SFUIDisplay-Regular"/>
+                        <font key="titleFont" size="11" name="HelveticaNeue"/>
                     </box>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="szs-8j-SMN">
                         <rect key="frame" x="93" y="13" width="82" height="32"/>
@@ -153,7 +153,7 @@ DQ
                             <constraint firstAttribute="height" constant="17" id="a7O-DC-irX"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Tell us what you think!" id="oHe-hu-bQn">
-                            <font key="font" size="13" name="SFUIDisplay-Regular"/>
+                            <font key="font" size="13" name="HelveticaNeue"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -164,7 +164,7 @@ DQ
                             <constraint firstAttribute="height" constant="17" id="vCO-Z3-Dfd"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="sSH-y9-tFH">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/Appearance Tab/CLAppearanceViewController.m b/Clocker/Appearance Tab/CLAppearanceViewController.m
index c3c0a6c..30833a1 100644
--- a/Clocker/Appearance Tab/CLAppearanceViewController.m	
+++ b/Clocker/Appearance Tab/CLAppearanceViewController.m	
@@ -36,40 +36,9 @@
     
     self.enableOptions = [[NSUserDefaults standardUserDefaults] objectForKey:@"favouriteTimezone"] == nil ? NO : YES;
     
-    [self setAppropriateFont];
-    
 }
 
 
-- (void)setAppropriateFont
-{
-    NSOperatingSystemVersion operatingSystemVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
-    
-    if (operatingSystemVersion.minorVersion <= 10)
-    {
-        //Set up Helvetica Neue font
-         [self setFontFamily:@"HelveticaNeue-Light" forView:self.view andSubViews:YES];
-    }
-    
-}
-
--(void)setFontFamily:(NSString*)fontFamily forView:(NSView*)view andSubViews:(BOOL)isSubViews
-{
-    if ([view isKindOfClass:[NSTextField class]])
-    {
-        NSTextField *labels = (NSTextField *)view;
-        
-        [labels setFont:[NSFont fontWithName:fontFamily size:[[labels font] pointSize]]];
-    }
-    
-    if (isSubViews)
-    {
-        for (NSView *sview in view.subviews)
-        {
-            [self setFontFamily:fontFamily forView:sview andSubViews:YES];
-        }
-    }
-}
 
 
 - (IBAction)timeFormatSelectionChanged:(id)sender
@@ -121,7 +90,6 @@
         sharedDelege.floatingWindow = [CLFloatingWindowController sharedFloatingWindow];
         [sharedDelege.floatingWindow showWindow:nil];
         [sharedDelege.floatingWindow updateDefaultPreferences];
-        [sharedDelege.floatingWindow.mainTableview reloadData];
         [sharedDelege.floatingWindow startWindowTimer];
         [NSApp activateIgnoringOtherApps:YES];
     }
diff --git a/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib
index f2250af..d19f843 100644
--- a/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib	
@@ -25,7 +25,7 @@
                         <constraint firstAttribute="width" constant="60" id="KEa-ei-G2i"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Theme" id="hCb-NM-To8">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -37,7 +37,7 @@
                         <constraint firstAttribute="width" constant="100" id="nh0-5K-Aa0"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Time Format" id="Hza-PB-FEf">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -48,7 +48,7 @@
                         <constraint firstAttribute="width" constant="143" id="dW5-vG-EwD"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="3ED-rf-SN8">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Default" width="70"/>
                             <segment label="Black" toolTip="Customize the timezone panel by selecting a theme!" width="70" selected="YES" tag="1"/>
@@ -66,7 +66,7 @@
                         <constraint firstAttribute="width" constant="150" id="n8S-fR-UtY"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Day Display Options" id="KTv-74-itf">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -77,7 +77,7 @@
                         <constraint firstAttribute="width" constant="232" id="uOJ-Mi-Fin"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="s7b-og-KCV">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="12-hour clock" width="115"/>
                             <segment label="24-hour clock" toolTip="Set the time format you want to see in the timezone panel!" width="114" tag="1"/>
@@ -89,24 +89,24 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="3d9-qg-dNb">
-                    <rect key="frame" x="130" y="173" width="179" height="18"/>
+                    <rect key="frame" x="130" y="170" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="MdL-Dh-02n"/>
                         <constraint firstAttribute="width" constant="175" id="hHO-Wa-gmc"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Menubar Display Options" id="ZP5-1i-Bm8">
-                        <font key="font" size="12" name="SFUIDisplay-Bold"/>
+                        <font key="font" size="12" name="HelveticaNeue-Bold"/>
                         <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="175" translatesAutoresizingMaskIntoConstraints="NO" id="pqa-Qg-U8Y">
-                    <rect key="frame" x="130" y="145" width="179" height="19"/>
+                    <rect key="frame" x="130" y="141" width="179" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="B2I-0j-0W0"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Date of Favourite Place" id="IAe-wr-MUG">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -115,13 +115,13 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="atA-2r-FXV">
-                    <rect key="frame" x="179" y="117" width="84" height="24"/>
+                    <rect key="frame" x="179" y="113" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="BqM-4F-6Ta"/>
                         <constraint firstAttribute="width" constant="80" id="ZeK-lO-tUa"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="rIg-AP-wGG">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" width="38" selected="YES"/>
                             <segment label="No" width="38" tag="1"/>
@@ -133,13 +133,13 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="kEn-QZ-niZ">
-                    <rect key="frame" x="130" y="96" width="179" height="18"/>
+                    <rect key="frame" x="130" y="88" width="179" height="22"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="18" id="2fd-f6-8cD"/>
+                        <constraint firstAttribute="height" constant="22" id="2fd-f6-8cD"/>
                         <constraint firstAttribute="width" constant="175" id="D0w-xz-gkw"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Day of Favourite Place" id="I99-Wp-1Iq">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -148,13 +148,13 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XwV-hy-YiP">
-                    <rect key="frame" x="178" y="68" width="84" height="24"/>
+                    <rect key="frame" x="178" y="60" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="80" id="dBz-ZQ-BF1"/>
                         <constraint firstAttribute="height" constant="21" id="y8c-hZ-MtI"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="18N-XQ-ANm">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" width="38"/>
                             <segment label="No" width="38" selected="YES" tag="1"/>
@@ -166,12 +166,12 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="72r-oi-X0f">
-                    <rect key="frame" x="180" y="314" width="79" height="24"/>
+                    <rect key="frame" x="180" y="313" width="79" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="75" id="H8w-wg-vel"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="FMr-PO-czs">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" width="36"/>
                             <segment label="No" width="36" selected="YES" tag="1"/>
@@ -183,12 +183,12 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="14F-6y-MaJ">
-                    <rect key="frame" x="180" y="206" width="79" height="24"/>
+                    <rect key="frame" x="180" y="203" width="79" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="75" id="XbD-oF-Vod"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="d4r-UR-acP">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" width="36"/>
                             <segment label="No" width="36" selected="YES" tag="1"/>
@@ -199,41 +199,41 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="HTZ-1V-qZb">
-                    <rect key="frame" x="158" y="345" width="124" height="19"/>
+                    <rect key="frame" x="158" y="344" width="124" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="1Lv-wC-hEM"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Future Slider" id="PE4-Ua-hkI">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-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="76h-05-go1">
-                    <rect key="frame" x="158" y="289" width="124" height="19"/>
+                    <rect key="frame" x="158" y="287" width="124" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="Odw-mb-nT5"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Clocker should be" id="ahg-YF-MX8">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="MHe-dB-GZr">
-                    <rect key="frame" x="0.0" y="197" width="439" height="5"/>
+                    <rect key="frame" x="0.0" y="194" width="439" height="5"/>
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <font key="titleFont" metaFont="system"/>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="LC1-Sx-uav">
-                    <rect key="frame" x="130" y="44" width="179" height="18"/>
+                    <rect key="frame" x="130" y="36" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="Pdc-78-vzv"/>
                         <constraint firstAttribute="height" constant="18" id="hsh-i8-ULY"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Favourite Place Name" id="nEh-Sa-SDH">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -242,13 +242,13 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JR8-v7-K0w">
-                    <rect key="frame" x="178" y="16" width="84" height="24"/>
+                    <rect key="frame" x="178" y="8" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="Xof-eY-ZUl"/>
                         <constraint firstAttribute="width" constant="80" id="msH-Xd-mrp"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="SLe-HO-6so">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" width="38"/>
                             <segment label="No" width="38" selected="YES" tag="1"/>
@@ -266,7 +266,7 @@
                         <constraint firstAttribute="height" constant="18" id="bTT-ve-oW9"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Main Panel Options" id="skQ-rM-X70">
-                        <font key="font" size="12" name="SFUIDisplay-Bold"/>
+                        <font key="font" size="12" name="HelveticaNeue-Bold"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -277,7 +277,7 @@
                         <constraint firstAttribute="width" constant="125" id="u9T-ks-rqA"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="ZV9-ih-faz">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Relative" width="60"/>
                             <segment label="Actual" width="60" selected="YES" tag="1"/>
@@ -289,16 +289,16 @@
                     </connections>
                 </segmentedControl>
                 <visualEffectView wantsLayer="YES" appearanceType="vibrantLight" alphaValue="0.90000000000000002" blendingMode="withinWindow" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="kHi-mx-HdE">
-                    <rect key="frame" x="0.0" y="0.0" width="439" height="199"/>
+                    <rect key="frame" x="0.0" y="0.0" width="439" height="196"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WDP-d4-eNj">
-                            <rect key="frame" x="57" y="86" width="324" height="39"/>
+                            <rect key="frame" x="57" y="84" width="324" height="39"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="320" id="3wp-Z6-TrB"/>
                                 <constraint firstAttribute="height" constant="39" id="IyN-y5-6JP"/>
                             </constraints>
                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="JHS-Tb-Aq8">
-                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
@@ -319,12 +319,12 @@
                     </connections>
                 </visualEffectView>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SbG-Qh-ziy">
-                    <rect key="frame" x="53" y="258" width="334" height="24"/>
+                    <rect key="frame" x="53" y="256" width="334" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="330" id="T2D-fB-93g"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="zOl-EY-gEX">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Attached to the menu-bar" width="164"/>
                             <segment label="In Floating mode" width="163" selected="YES" tag="1"/>
@@ -336,12 +336,12 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="R46-6I-vYT">
-                    <rect key="frame" x="138" y="233" width="164" height="19"/>
+                    <rect key="frame" x="138" y="230" width="164" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="160" id="3tu-Bf-MZ4"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Sunrise/Sunset" id="dPO-nm-S9e">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
diff --git a/Clocker/Appearance Tab/ja.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/ja.lproj/CLAppearanceView.xib
index 4089208..f25b442 100644
--- a/Clocker/Appearance Tab/ja.lproj/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/ja.lproj/CLAppearanceView.xib	
@@ -25,7 +25,7 @@
                         <constraint firstAttribute="width" constant="60" id="KEa-ei-G2i"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="テーマ" id="hCb-NM-To8">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -37,18 +37,18 @@
                         <constraint firstAttribute="width" constant="100" id="nh0-5K-Aa0"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="時間スタイル" id="Hza-PB-FEf">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <segmentedControl toolTip="Choose a theme for the main panel!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5tI-fU-0lZ">
-                    <rect key="frame" x="167" y="436" width="107" height="24"/>
+                    <rect key="frame" x="166" y="436" width="107" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="103" id="dW5-vG-EwD"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="3ED-rf-SN8">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="白"/>
                             <segment label="ブラック" toolTip="Customize the timezone panel by selecting a theme!" selected="YES" tag="1"/>
@@ -66,7 +66,7 @@
                         <constraint firstAttribute="width" constant="150" id="n8S-fR-UtY"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="日表示オプション" id="KTv-74-itf">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -77,7 +77,7 @@
                         <constraint firstAttribute="width" constant="232" id="uOJ-Mi-Fin"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="s7b-og-KCV">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="12-hour clock" width="115"/>
                             <segment label="24-hour clock" toolTip="Set the time format you want to see in the timezone panel!" width="114" tag="1"/>
@@ -89,24 +89,24 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3d9-qg-dNb">
-                    <rect key="frame" x="130" y="175" width="179" height="18"/>
+                    <rect key="frame" x="130" y="167" width="179" height="24"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="18" id="MdL-Dh-02n"/>
+                        <constraint firstAttribute="height" constant="24" id="MdL-Dh-02n"/>
                         <constraint firstAttribute="width" constant="175" id="hHO-Wa-gmc"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Menubar Display Options" id="ZP5-1i-Bm8">
-                        <font key="font" size="12" name="SFUIDisplay-Bold"/>
+                        <font key="font" size="12" name="HelveticaNeue-Bold"/>
                         <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="pqa-Qg-U8Y">
-                    <rect key="frame" x="130" y="147" width="179" height="19"/>
+                    <rect key="frame" x="130" y="138" width="179" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="B2I-0j-0W0"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="お気に入りの場所の完全な日付を表示" id="IAe-wr-MUG">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -115,13 +115,13 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="atA-2r-FXV">
-                    <rect key="frame" x="179" y="119" width="84" height="24"/>
+                    <rect key="frame" x="178" y="110" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="BqM-4F-6Ta"/>
                         <constraint firstAttribute="width" constant="80" id="ZeK-lO-tUa"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="rIg-AP-wGG">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" selected="YES"/>
                             <segment label="No" tag="1"/>
@@ -133,13 +133,13 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kEn-QZ-niZ">
-                    <rect key="frame" x="130" y="98" width="179" height="18"/>
+                    <rect key="frame" x="130" y="89" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="2fd-f6-8cD"/>
                         <constraint firstAttribute="width" constant="175" id="D0w-xz-gkw"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="お気に入りの場所のショー日" id="I99-Wp-1Iq">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -148,13 +148,13 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XwV-hy-YiP">
-                    <rect key="frame" x="178" y="70" width="84" height="24"/>
+                    <rect key="frame" x="178" y="61" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="80" id="dBz-ZQ-BF1"/>
                         <constraint firstAttribute="height" constant="21" id="y8c-hZ-MtI"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="18N-XQ-ANm">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes"/>
                             <segment label="No" selected="YES" tag="1"/>
@@ -166,12 +166,12 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="72r-oi-X0f">
-                    <rect key="frame" x="184" y="319" width="71" height="24"/>
+                    <rect key="frame" x="184" y="318" width="71" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="67" id="H8w-wg-vel"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="FMr-PO-czs">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" width="32"/>
                             <segment label="No" width="32" selected="YES" tag="1"/>
@@ -183,30 +183,30 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="HTZ-1V-qZb">
-                    <rect key="frame" x="158" y="350" width="124" height="19"/>
+                    <rect key="frame" x="158" y="349" width="124" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="1Lv-wC-hEM"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="ショータイムスライダ" id="PE4-Ua-hkI">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="MHe-dB-GZr">
-                    <rect key="frame" x="0.0" y="195" width="439" height="5"/>
+                    <rect key="frame" x="0.0" y="193" width="439" height="5"/>
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <font key="titleFont" metaFont="system"/>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LC1-Sx-uav">
-                    <rect key="frame" x="130" y="46" width="179" height="18"/>
+                    <rect key="frame" x="130" y="37" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="Pdc-78-vzv"/>
                         <constraint firstAttribute="height" constant="18" id="hsh-i8-ULY"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="お気に入りの地名を表示" id="nEh-Sa-SDH">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -215,13 +215,13 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JR8-v7-K0w">
-                    <rect key="frame" x="178" y="18" width="84" height="24"/>
+                    <rect key="frame" x="178" y="9" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="Xof-eY-ZUl"/>
                         <constraint firstAttribute="width" constant="80" id="msH-Xd-mrp"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="SLe-HO-6so">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes"/>
                             <segment label="No" selected="YES" tag="1"/>
@@ -239,7 +239,7 @@
                         <constraint firstAttribute="height" constant="18" id="bTT-ve-oW9"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Main Panel Options" id="skQ-rM-X70">
-                        <font key="font" size="12" name="SFUIDisplay-Bold"/>
+                        <font key="font" size="12" name="HelveticaNeue-Bold"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -250,7 +250,7 @@
                         <constraint firstAttribute="width" constant="125" id="u9T-ks-rqA"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="ZV9-ih-faz">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Relative"/>
                             <segment label="Actual" selected="YES" tag="1"/>
@@ -262,16 +262,16 @@
                     </connections>
                 </segmentedControl>
                 <visualEffectView wantsLayer="YES" appearanceType="vibrantLight" alphaValue="0.90000000000000002" blendingMode="withinWindow" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="kHi-mx-HdE">
-                    <rect key="frame" x="0.0" y="0.0" width="439" height="197"/>
+                    <rect key="frame" x="0.0" y="0.0" width="439" height="195"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WDP-d4-eNj">
-                            <rect key="frame" x="57" y="79" width="324" height="39"/>
+                            <rect key="frame" x="57" y="78" width="324" height="39"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="320" id="3wp-Z6-TrB"/>
                                 <constraint firstAttribute="height" constant="39" id="IyN-y5-6JP"/>
                             </constraints>
                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="JHS-Tb-Aq8">
-                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
@@ -292,23 +292,23 @@
                     </connections>
                 </visualEffectView>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="4j5-9I-Tnd">
-                    <rect key="frame" x="158" y="288" width="124" height="19"/>
+                    <rect key="frame" x="158" y="286" width="124" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="GzK-ID-ikO"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Clocker should be" id="Nqm-DO-x9o">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-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="haT-zt-gJ4">
-                    <rect key="frame" x="53" y="257" width="334" height="24"/>
+                    <rect key="frame" x="53" y="255" width="334" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="330" id="IeS-OV-AVP"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="kqG-uB-264">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Attached to the menu-bar" width="164"/>
                             <segment label="In Floating mode" width="163" selected="YES" tag="1"/>
@@ -320,13 +320,13 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AYV-9U-UMC">
-                    <rect key="frame" x="180" y="204" width="79" height="24"/>
+                    <rect key="frame" x="180" y="202" width="79" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="75" id="EZM-08-yj4"/>
                         <constraint firstAttribute="height" constant="21" id="Fpv-eR-VDX"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="L8S-Qx-bNb">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" width="36"/>
                             <segment label="No" width="36" selected="YES" tag="1"/>
@@ -337,13 +337,13 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="vSg-CZ-PbR">
-                    <rect key="frame" x="138" y="231" width="164" height="19"/>
+                    <rect key="frame" x="138" y="229" width="164" height="19"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="160" id="g35-pI-NgZ"/>
                         <constraint firstAttribute="height" constant="19" id="ron-iL-V0y"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Sunrise/Sunset" id="uw6-9h-nwE">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -370,13 +370,13 @@
                 <constraint firstItem="pqa-Qg-U8Y" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="PHa-pY-kHG"/>
                 <constraint firstItem="1eh-BT-2fK" firstAttribute="top" secondItem="YQi-x8-6f8" secondAttribute="bottom" constant="8" id="POa-Gi-Prk"/>
                 <constraint firstItem="X5s-Mc-Yfo" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="PRU-TH-852"/>
-                <constraint firstItem="atA-2r-FXV" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" constant="1" id="Pjx-sg-kK0"/>
+                <constraint firstItem="atA-2r-FXV" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Pjx-sg-kK0"/>
                 <constraint firstAttribute="trailing" secondItem="kHi-mx-HdE" secondAttribute="trailing" id="QaQ-6R-Oy9"/>
                 <constraint firstItem="XwV-hy-YiP" firstAttribute="top" secondItem="kEn-QZ-niZ" secondAttribute="bottom" constant="5" id="Qyy-6B-BBN"/>
                 <constraint firstItem="atA-2r-FXV" firstAttribute="top" secondItem="pqa-Qg-U8Y" secondAttribute="bottom" constant="5" id="RdE-wy-6vH"/>
                 <constraint firstItem="MHe-dB-GZr" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="TyR-gg-RLi"/>
                 <constraint firstItem="pqa-Qg-U8Y" firstAttribute="top" secondItem="3d9-qg-dNb" secondAttribute="bottom" constant="9" id="Uc0-mI-ciF"/>
-                <constraint firstItem="5tI-fU-0lZ" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" constant="1" id="Vkb-QV-unN"/>
+                <constraint firstItem="5tI-fU-0lZ" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Vkb-QV-unN"/>
                 <constraint firstItem="HTZ-1V-qZb" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Wet-hO-O6U"/>
                 <constraint firstItem="YQi-x8-6f8" firstAttribute="top" secondItem="5tI-fU-0lZ" secondAttribute="bottom" constant="15" id="WoY-W4-XuS"/>
                 <constraint firstItem="JR8-v7-K0w" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Wye-84-JgC"/>
diff --git a/Clocker/Appearance Tab/zh-Hans.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/zh-Hans.lproj/CLAppearanceView.xib
index 3a7121f..40847e2 100644
--- a/Clocker/Appearance Tab/zh-Hans.lproj/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/zh-Hans.lproj/CLAppearanceView.xib	
@@ -25,7 +25,7 @@
                         <constraint firstAttribute="width" constant="60" id="KEa-ei-G2i"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="主题" id="hCb-NM-To8">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -37,7 +37,7 @@
                         <constraint firstAttribute="width" constant="100" id="nh0-5K-Aa0"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="时间格式" id="Hza-PB-FEf">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -48,7 +48,7 @@
                         <constraint firstAttribute="width" constant="91" id="dW5-vG-EwD"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="3ED-rf-SN8">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="白色"/>
                             <segment label="黑色" toolTip="Customize the timezone panel by selecting a theme!" selected="YES" tag="1"/>
@@ -66,7 +66,7 @@
                         <constraint firstAttribute="width" constant="150" id="n8S-fR-UtY"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="日显示选项" id="KTv-74-itf">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -77,7 +77,7 @@
                         <constraint firstAttribute="width" constant="232" id="uOJ-Mi-Fin"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="s7b-og-KCV">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="12-hour clock" width="115"/>
                             <segment label="24-hour clock" toolTip="Set the time format you want to see in the timezone panel!" width="114" tag="1"/>
@@ -89,7 +89,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3d9-qg-dNb">
-                    <rect key="frame" x="130" y="175" width="179" height="18"/>
+                    <rect key="frame" x="130" y="173" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="MdL-Dh-02n"/>
                         <constraint firstAttribute="width" constant="175" id="hHO-Wa-gmc"/>
@@ -101,7 +101,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pqa-Qg-U8Y">
-                    <rect key="frame" x="130" y="147" width="179" height="19"/>
+                    <rect key="frame" x="130" y="145" width="179" height="19"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="B2I-0j-0W0"/>
                     </constraints>
@@ -115,7 +115,7 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="atA-2r-FXV">
-                    <rect key="frame" x="180" y="119" width="83" height="24"/>
+                    <rect key="frame" x="180" y="117" width="83" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="BqM-4F-6Ta"/>
                         <constraint firstAttribute="width" constant="79" id="ZeK-lO-tUa"/>
@@ -133,7 +133,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kEn-QZ-niZ">
-                    <rect key="frame" x="130" y="98" width="179" height="18"/>
+                    <rect key="frame" x="130" y="96" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="2fd-f6-8cD"/>
                         <constraint firstAttribute="width" constant="175" id="D0w-xz-gkw"/>
@@ -148,7 +148,7 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XwV-hy-YiP">
-                    <rect key="frame" x="179" y="70" width="83" height="24"/>
+                    <rect key="frame" x="179" y="68" width="83" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="79" id="dBz-ZQ-BF1"/>
                         <constraint firstAttribute="height" constant="21" id="y8c-hZ-MtI"/>
@@ -166,7 +166,7 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="72r-oi-X0f">
-                    <rect key="frame" x="184" y="313" width="71" height="24"/>
+                    <rect key="frame" x="184" y="312" width="71" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="67" id="H8w-wg-vel"/>
                     </constraints>
@@ -183,24 +183,24 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="HTZ-1V-qZb">
-                    <rect key="frame" x="158" y="344" width="124" height="19"/>
+                    <rect key="frame" x="158" y="343" width="124" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="1Lv-wC-hEM"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="显示滑块" id="PE4-Ua-hkI">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="MHe-dB-GZr">
-                    <rect key="frame" x="0.0" y="195" width="439" height="5"/>
+                    <rect key="frame" x="0.0" y="193" width="439" height="5"/>
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <font key="titleFont" metaFont="system"/>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LC1-Sx-uav">
-                    <rect key="frame" x="130" y="46" width="179" height="18"/>
+                    <rect key="frame" x="130" y="44" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="Pdc-78-vzv"/>
                         <constraint firstAttribute="height" constant="18" id="hsh-i8-ULY"/>
@@ -215,7 +215,7 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JR8-v7-K0w">
-                    <rect key="frame" x="179" y="18" width="83" height="24"/>
+                    <rect key="frame" x="179" y="16" width="83" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="Xof-eY-ZUl"/>
                         <constraint firstAttribute="width" constant="79" id="msH-Xd-mrp"/>
@@ -239,7 +239,7 @@
                         <constraint firstAttribute="height" constant="18" id="bTT-ve-oW9"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="主面板选项" id="skQ-rM-X70">
-                        <font key="font" size="12" name="SFUIDisplay-Bold"/>
+                        <font key="font" size="12" name="HelveticaNeue-Bold"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -250,7 +250,7 @@
                         <constraint firstAttribute="width" constant="91" id="u9T-ks-rqA"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="ZV9-ih-faz">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="各自"/>
                             <segment label="实际" selected="YES" tag="1"/>
@@ -262,10 +262,10 @@
                     </connections>
                 </segmentedControl>
                 <visualEffectView wantsLayer="YES" appearanceType="vibrantLight" alphaValue="0.90000000000000002" blendingMode="withinWindow" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="kHi-mx-HdE">
-                    <rect key="frame" x="0.0" y="0.0" width="439" height="197"/>
+                    <rect key="frame" x="0.0" y="0.0" width="439" height="195"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WDP-d4-eNj">
-                            <rect key="frame" x="57" y="86" width="324" height="39"/>
+                            <rect key="frame" x="57" y="85" width="324" height="39"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="320" id="3wp-Z6-TrB"/>
                                 <constraint firstAttribute="height" constant="39" id="IyN-y5-6JP"/>
@@ -292,23 +292,23 @@
                     </connections>
                 </visualEffectView>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="j8M-9i-Afg">
-                    <rect key="frame" x="158" y="288" width="124" height="19"/>
+                    <rect key="frame" x="158" y="286" width="124" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="UFT-P2-EEA"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Clocker should be" id="tkn-7l-QwI">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-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="vrS-e1-Q9g">
-                    <rect key="frame" x="53" y="257" width="334" height="24"/>
+                    <rect key="frame" x="53" y="255" width="334" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="330" id="iAh-lK-wMi"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="02s-Ya-jkR">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Attached to the menu-bar" width="164"/>
                             <segment label="In Floating mode" width="163" selected="YES" tag="1"/>
@@ -320,13 +320,13 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ivm-x1-PHI">
-                    <rect key="frame" x="180" y="204" width="79" height="24"/>
+                    <rect key="frame" x="180" y="202" width="79" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="JNS-PR-cif"/>
                         <constraint firstAttribute="width" constant="75" id="grb-53-gua"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="vCE-m1-lfo">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="Yes" width="36"/>
                             <segment label="No" width="36" selected="YES" tag="1"/>
@@ -337,13 +337,13 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="sud-7W-5cY">
-                    <rect key="frame" x="137" y="231" width="164" height="19"/>
+                    <rect key="frame" x="137" y="229" width="164" height="19"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="19" id="M0w-Cz-pmq"/>
                         <constraint firstAttribute="width" constant="160" id="oJs-SU-Q6F"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Sunrise/Sunset" id="mgO-p2-acc">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
diff --git a/Clocker/Appearance Tab/zh-Hant.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/zh-Hant.lproj/CLAppearanceView.xib
index 1a95c30..e592ece 100644
--- a/Clocker/Appearance Tab/zh-Hant.lproj/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/zh-Hant.lproj/CLAppearanceView.xib	
@@ -25,7 +25,7 @@
                         <constraint firstAttribute="width" constant="60" id="KEa-ei-G2i"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="主题" id="hCb-NM-To8">
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
@@ -48,7 +48,7 @@
                         <constraint firstAttribute="width" constant="143" id="dW5-vG-EwD"/>
                     </constraints>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="3ED-rf-SN8">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
                         <segments>
                             <segment label="白色" width="70"/>
                             <segment label="黑色" toolTip="Customize the timezone panel by selecting a theme!" width="70" selected="YES" tag="1"/>
diff --git a/Clocker/ApplicationDelegate.m b/Clocker/ApplicationDelegate.m
index 0af2289..282ed27 100755
--- a/Clocker/ApplicationDelegate.m
+++ b/Clocker/ApplicationDelegate.m
@@ -116,7 +116,7 @@ void *kContextActivePanel = &kContextActivePanel;
 
     NSString *onboarding = [[NSUserDefaults standardUserDefaults] objectForKey:@"initialLaunch"];
     
-    if (onboarding != nil)
+    if (onboarding == nil)
     {
         CLOnboardingWindowController *windowController = [CLOnboardingWindowController sharedWindow];
         [windowController showWindow:nil];
@@ -205,9 +205,6 @@ void *kContextActivePanel = &kContextActivePanel;
         
         [NSApp activateIgnoringOtherApps:YES];
     }
-    
-
-
 }
 
 
diff --git a/Clocker/Clocker-Info.plist b/Clocker/Clocker-Info.plist
index 42f814d..781c8fe 100755
--- a/Clocker/Clocker-Info.plist
+++ b/Clocker/Clocker-Info.plist
@@ -13,12 +13,12 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.4</string>
+	<string>1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>22</string>
-    <key>Fabric</key>
+	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
 		<string>94088f95c41979e8019b67d5795f52bbbe7104d4</string>
diff --git a/Clocker/Custom Table Cell Views/CLTimezoneCellView.h b/Clocker/Custom Table Cell Views/CLTimezoneCellView.h
index 1237652..7a06f79 100644
--- a/Clocker/Custom Table Cell Views/CLTimezoneCellView.h	
+++ b/Clocker/Custom Table Cell Views/CLTimezoneCellView.h	
@@ -20,7 +20,6 @@
 
 - (void)updateTextColorWithColor:(NSColor *)color andCell:(CLTimezoneCellView*)cell;
 - (void)setUpAutoLayoutWithCell;
-- (void)setAppropriateFont;
 
 @end
 
diff --git a/Clocker/Custom Table Cell Views/CLTimezoneCellView.m b/Clocker/Custom Table Cell Views/CLTimezoneCellView.m
index 25c190d..a800e01 100644
--- a/Clocker/Custom Table Cell Views/CLTimezoneCellView.m	
+++ b/Clocker/Custom Table Cell Views/CLTimezoneCellView.m	
@@ -138,24 +138,6 @@
     cell.sunriseSetTime.textColor = color;
 }
 
-- (void)setAppropriateFont
-{
-    NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
-    
-    NSArray *availableFonts = [[NSFontManager sharedFontManager] availableFontFamilies];
-    
-    if(version.minorVersion <= 10)
-    {
-        if ([availableFonts containsObject:@"Helvetica Neue"])
-        {
-            self.relativeDate.font = [NSFont fontWithName:@"HelveticaNeue-Bold" size:0];
-            self.customName.font = [NSFont fontWithName:@"HelveticaNeue-Thin" size:15];
-            self.time.font = [NSFont fontWithName:@"HelveticaNeue-Thin" size:22];
-            self.sunriseSetTime.font = [NSFont fontWithName:@"HelveticaNeue-Light" size:11];
-        }
-    }
-}
-
 - (void)setUpAutoLayoutWithCell
 {
     CGFloat width = [self.relativeDate.stringValue
diff --git a/Clocker/Floating Window/CLFloatingWindowController.m b/Clocker/Floating Window/CLFloatingWindowController.m
index 13f9a2f..5c82ea1 100644
--- a/Clocker/Floating Window/CLFloatingWindowController.m	
+++ b/Clocker/Floating Window/CLFloatingWindowController.m	
@@ -170,8 +170,6 @@ NSString *const CLTimezoneCellIdentifier = @"timeZoneCell";
 
     [cell setUpAutoLayoutWithCell];
     
-    [cell setAppropriateFont];
-    
     return cell;
 }
 
diff --git a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib
index 114abbe..77e74eb 100644
--- a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
@@ -72,7 +72,7 @@
                                                                 <constraint firstAttribute="height" constant="17" id="zYu-u6-R0W"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" placeholderString="" id="ENI-4b-K6F">
-                                                                <font key="font" size="11" name="SFUIDisplay-Ultralight"/>
+                                                                <font key="font" size="11" name="HelveticaNeue-Thin"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -84,7 +84,7 @@
                                                                 <constraint firstAttribute="height" constant="22" id="IPV-7t-wcx"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Timezone Name" id="gVe-So-ccI">
-                                                                <font key="font" size="15" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="15" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -100,7 +100,7 @@
                                                                 <constraint firstAttribute="width" constant="72" id="1lj-e2-EdR"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="Mf8-R9-XbU">
-                                                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -112,7 +112,7 @@
                                                                 <constraint firstAttribute="height" constant="35" id="wBx-lE-7e5"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="XcD-xi-2Mc">
-                                                                <font key="font" size="22" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="22" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -154,7 +154,7 @@
                                                                 <constraint firstAttribute="height" constant="20" id="vbo-OR-VmB"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Enjoy using Clocker?" id="1Rx-kx-Jwl">
-                                                                <font key="font" size="12" name="SFUIDisplay-Regular"/>
+                                                                <font key="font" size="12" name="HelveticaNeue"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -167,7 +167,7 @@
                                                             </constraints>
                                                             <buttonCell key="cell" type="push" title="Not Really" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="SrC-SM-0fO">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                <font key="font" size="13" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                             </buttonCell>
                                                             <connections>
                                                                 <action selector="actionOnNegativeFeedback:" target="G9G-ck-AYH" id="Orf-XY-IB9"/>
@@ -177,7 +177,7 @@
                                                             <rect key="frame" x="130" y="-2" width="108" height="32"/>
                                                             <buttonCell key="cell" type="push" title="Yes!" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cNi-UX-fun">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                <font key="font" size="13" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                             </buttonCell>
                                                             <connections>
                                                                 <action selector="actionOnPositiveFeedback:" target="G9G-ck-AYH" id="17t-0A-6lZ"/>
diff --git a/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib
index fa9310c..2514ca3 100644
--- a/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib	
@@ -72,7 +72,7 @@
                                                                 <constraint firstAttribute="height" constant="17" id="rcL-hY-BVT"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" placeholderString="" id="7Oy-jC-4Ad">
-                                                                <font key="font" size="11" name="SFUIDisplay-Ultralight"/>
+                                                                <font key="font" size="11" name="HelveticaNeue-Thin"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -84,7 +84,7 @@
                                                                 <constraint firstAttribute="height" constant="22" id="IPV-7t-wcx"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Timezone Name" id="gVe-So-ccI">
-                                                                <font key="font" size="15" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="15" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -99,7 +99,7 @@
                                                                 <constraint firstAttribute="width" constant="72" id="1lj-e2-EdR"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="Mf8-R9-XbU">
-                                                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -111,7 +111,7 @@
                                                                 <constraint firstAttribute="height" constant="35" id="wBx-lE-7e5"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="XcD-xi-2Mc">
-                                                                <font key="font" size="22" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="22" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -153,7 +153,7 @@
                                                                 <constraint firstAttribute="height" constant="20" id="vbo-OR-VmB"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Enjoy タイムキーパー?" id="1Rx-kx-Jwl">
-                                                                <font key="font" size="12" name="SFUIDisplay-Regular"/>
+                                                                <font key="font" size="12" name="HelveticaNeue"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -166,7 +166,7 @@
                                                             </constraints>
                                                             <buttonCell key="cell" type="push" title="Not Really" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="SrC-SM-0fO">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                <font key="font" size="13" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                             </buttonCell>
                                                             <connections>
                                                                 <action selector="actionOnNegativeFeedback:" target="G9G-ck-AYH" id="Orf-XY-IB9"/>
@@ -176,7 +176,7 @@
                                                             <rect key="frame" x="130" y="-2" width="108" height="32"/>
                                                             <buttonCell key="cell" type="push" title="Yes!" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cNi-UX-fun">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                <font key="font" size="13" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                             </buttonCell>
                                                             <connections>
                                                                 <action selector="actionOnPositiveFeedback:" target="G9G-ck-AYH" id="17t-0A-6lZ"/>
diff --git a/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib
index b54d176..b6479ef 100644
--- a/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib	
@@ -64,7 +64,7 @@
                                                                 <constraint firstAttribute="height" constant="22" id="IPV-7t-wcx"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Timezone Name" id="gVe-So-ccI">
-                                                                <font key="font" size="15" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="15" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -87,7 +87,7 @@
                                                                 <constraint firstAttribute="height" constant="17" id="wVS-6m-nWK"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" placeholderString="" id="o1Y-yu-qQs">
-                                                                <font key="font" size="11" name="SFUIDisplay-Ultralight"/>
+                                                                <font key="font" size="11" name="HelveticaNeue-Thin"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -99,7 +99,7 @@
                                                                 <constraint firstAttribute="width" constant="72" id="1lj-e2-EdR"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="Mf8-R9-XbU">
-                                                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -111,7 +111,7 @@
                                                                 <constraint firstAttribute="height" constant="35" id="wBx-lE-7e5"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="XcD-xi-2Mc">
-                                                                <font key="font" size="22" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="22" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -153,7 +153,7 @@
                                                                 <constraint firstAttribute="height" constant="20" id="vbo-OR-VmB"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Enjoy using 计时员?" id="1Rx-kx-Jwl">
-                                                                <font key="font" size="12" name="SFUIDisplay-Regular"/>
+                                                                <font key="font" size="12" name="HelveticaNeue"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -166,7 +166,7 @@
                                                             </constraints>
                                                             <buttonCell key="cell" type="push" title="Not Really" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="SrC-SM-0fO">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                <font key="font" size="13" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                             </buttonCell>
                                                             <connections>
                                                                 <action selector="actionOnNegativeFeedback:" target="G9G-ck-AYH" id="Orf-XY-IB9"/>
@@ -176,7 +176,7 @@
                                                             <rect key="frame" x="130" y="-2" width="108" height="32"/>
                                                             <buttonCell key="cell" type="push" title="Yes!" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cNi-UX-fun">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                <font key="font" size="13" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                             </buttonCell>
                                                             <connections>
                                                                 <action selector="actionOnPositiveFeedback:" target="G9G-ck-AYH" id="17t-0A-6lZ"/>
diff --git a/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib
index b846083..790381c 100644
--- a/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib	
@@ -64,7 +64,7 @@
                                                                 <constraint firstAttribute="height" constant="22" id="IPV-7t-wcx"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Timezone Name" id="gVe-So-ccI">
-                                                                <font key="font" size="15" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="15" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -88,7 +88,7 @@
                                                                 <constraint firstAttribute="height" constant="17" id="dVD-Q8-tsO"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" placeholderString="" id="A8n-aG-v8t">
-                                                                <font key="font" size="11" name="SFUIDisplay-Ultralight"/>
+                                                                <font key="font" size="11" name="HelveticaNeue-Thin"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -100,7 +100,7 @@
                                                                 <constraint firstAttribute="width" constant="72" id="1lj-e2-EdR"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="Mf8-R9-XbU">
-                                                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -112,7 +112,7 @@
                                                                 <constraint firstAttribute="height" constant="35" id="wBx-lE-7e5"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="XcD-xi-2Mc">
-                                                                <font key="font" size="22" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="22" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -154,7 +154,7 @@
                                                                 <constraint firstAttribute="height" constant="20" id="vbo-OR-VmB"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Enjoy using 计时员?" id="1Rx-kx-Jwl">
-                                                                <font key="font" size="12" name="SFUIDisplay-Regular"/>
+                                                                <font key="font" size="12" name="HelveticaNeue"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -167,7 +167,7 @@
                                                             </constraints>
                                                             <buttonCell key="cell" type="push" title="Not Really" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="SrC-SM-0fO">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                <font key="font" size="13" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                             </buttonCell>
                                                             <connections>
                                                                 <action selector="actionOnNegativeFeedback:" target="G9G-ck-AYH" id="Orf-XY-IB9"/>
@@ -177,7 +177,7 @@
                                                             <rect key="frame" x="130" y="-2" width="108" height="32"/>
                                                             <buttonCell key="cell" type="push" title="Yes!" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cNi-UX-fun">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                <font key="font" size="13" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                             </buttonCell>
                                                             <connections>
                                                                 <action selector="actionOnPositiveFeedback:" target="G9G-ck-AYH" id="17t-0A-6lZ"/>
diff --git a/Clocker/Model/CLTimezoneData.h b/Clocker/Model/CLTimezoneData.h
index 8186fa8..5a70887 100644
--- a/Clocker/Model/CLTimezoneData.h
+++ b/Clocker/Model/CLTimezoneData.h
@@ -14,6 +14,11 @@ typedef enum : NSUInteger {
     CLMenuDisplay
 } CLDateDisplayType;
 
+typedef enum : NSUInteger {
+    CLCitySelection,
+    CLTimezoneSelection
+} CLSelection;
+
 @interface CLTimezoneData : NSObject<NSCoding>
 
 @property (copy, nonatomic) NSString *customLabel;
@@ -27,6 +32,7 @@ typedef enum : NSUInteger {
 @property (strong, nonatomic) NSDate *sunriseTime;
 @property (strong, nonatomic) NSDate *sunsetTime;
 @property (assign, nonatomic) BOOL sunriseOrSunset; //YES for Sunrise, NO for Sunset
+@property (assign, nonatomic) CLSelection selectionType;
 
 + (instancetype)getCustomObject:(NSData *)encodedData;
 + (void)setInitialTimezoneData;
diff --git a/Clocker/Model/CLTimezoneData.m b/Clocker/Model/CLTimezoneData.m
index 7cb2e04..d77b64c 100644
--- a/Clocker/Model/CLTimezoneData.m
+++ b/Clocker/Model/CLTimezoneData.m
@@ -30,6 +30,7 @@
         self.place_id = dictionary[CLPlaceIdentifier];
         self.formattedAddress = dictionary[CLTimezoneName];
         self.isFavourite = [NSNumber numberWithInt:NSOffState];
+        self.selectionType = CLCitySelection;
     }
     
     return self;
@@ -87,6 +88,7 @@
     [coder encodeObject:self.isFavourite forKey:@"isFavourite"];
     [coder encodeObject:self.sunriseTime forKey:@"sunriseTime"];
     [coder encodeObject:self.sunsetTime forKey:@"sunsetTime"];
+    [coder encodeInteger:self.selectionType forKey:@"selectionType"];
 }
 
 - (instancetype)initWithCoder:(NSCoder *)coder
@@ -105,6 +107,7 @@
         self.isFavourite = [coder decodeObjectForKey:@"isFavourite"];
         self.sunriseTime = [coder decodeObjectForKey:@"sunriseTime"];
         self.sunsetTime = [coder decodeObjectForKey:@"sunsetTime"];
+        self.selectionType = [coder decodeIntegerForKey:@"selectionType"];
     }
     
     return self;
@@ -112,7 +115,7 @@
 
 -(NSString *)description
 {
-    return [NSString stringWithFormat:@"TimezoneID: %@\nFormatted Address: %@\nCustom Label: %@\nLatitude: %@\nLongitude:%@\nPlaceID: %@\nisFavourite: %@\nSunrise Time: %@\nSunset Time: %@", self.timezoneID,
+    return [NSString stringWithFormat:@"TimezoneID: %@\nFormatted Address: %@\nCustom Label: %@\nLatitude: %@\nLongitude:%@\nPlaceID: %@\nisFavourite: %@\nSunrise Time: %@\nSunset Time: %@\nSelection Type: %zd", self.timezoneID,
             self.formattedAddress,
             self.customLabel,
             self.latitude,
@@ -120,7 +123,8 @@
             self.place_id,
             self.isFavourite,
             self.sunriseTime,
-            self.sunsetTime];
+            self.sunsetTime,
+            self.selectionType];
 }
 
 - (NSString *)formatStringShouldContainCity:(BOOL)value
@@ -428,10 +432,20 @@
 
 -(void)initializeSunriseSunsetWithSliderValue:(NSInteger)sliderValue
 {
+    
     if (!self.latitude || !self.longitude)
     {
         //Retrieve the values using Google Places API
         
+        if (self.selectionType == CLTimezoneSelection)
+        {
+            /* A timezone has been selected*/
+            
+            NSLog(@"%@", self);
+            
+            return;
+        }
+        
         [self retrieveLatitudeAndLongitudeWithSearchString:self.formattedAddress];
         
     }
diff --git a/Clocker/Onboarding/CLIntroView.xib b/Clocker/Onboarding/CLIntroView.xib
index 364ae60..d450d2e 100644
--- a/Clocker/Onboarding/CLIntroView.xib
+++ b/Clocker/Onboarding/CLIntroView.xib
@@ -26,7 +26,7 @@
                     </constraints>
                     <buttonCell key="cell" type="push" title="Continue" bezelStyle="rounded" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="FBn-qW-PPa">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" size="13" name="SFUIDisplay-Light"/>
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <string key="keyEquivalent" base64-UTF8="YES">
 DQ
 </string>
diff --git a/Clocker/Onboarding/en.lproj/CLOnboardingWindow.xib b/Clocker/Onboarding/en.lproj/CLOnboardingWindow.xib
index 208fcef..3d5476f 100644
--- a/Clocker/Onboarding/en.lproj/CLOnboardingWindow.xib
+++ b/Clocker/Onboarding/en.lproj/CLOnboardingWindow.xib
@@ -61,7 +61,7 @@
                         </constraints>
                         <buttonCell key="cell" type="push" title="Continue" bezelStyle="rounded" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="TjC-Ot-oen">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <string key="keyEquivalent" base64-UTF8="YES">
 DQ
 </string>
diff --git a/Clocker/Onboarding/ja.lproj/CLOnboardingWindow.xib b/Clocker/Onboarding/ja.lproj/CLOnboardingWindow.xib
index d11f455..d32eb6e 100644
--- a/Clocker/Onboarding/ja.lproj/CLOnboardingWindow.xib
+++ b/Clocker/Onboarding/ja.lproj/CLOnboardingWindow.xib
@@ -46,7 +46,7 @@
                             <constraint firstAttribute="height" constant="17" id="Ttg-Xe-RUI"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Made by Abhishek Banthia" id="cdT-3T-Jmu">
-                            <font key="font" size="11" name="SFUIDisplay-Light"/>
+                            <font key="font" size="11" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/Onboarding/zh-Hans.lproj/CLOnboardingWindow.xib b/Clocker/Onboarding/zh-Hans.lproj/CLOnboardingWindow.xib
index 647144e..97db7c1 100644
--- a/Clocker/Onboarding/zh-Hans.lproj/CLOnboardingWindow.xib
+++ b/Clocker/Onboarding/zh-Hans.lproj/CLOnboardingWindow.xib
@@ -30,9 +30,9 @@
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ClockerIcon-512" id="2t2-AF-Gtf"/>
                     </imageView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oiI-iN-JcW">
-                        <rect key="frame" x="18" y="136" width="404" height="40"/>
+                        <rect key="frame" x="18" y="134" width="404" height="42"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="40" id="C7v-6N-7K9"/>
+                            <constraint firstAttribute="height" constant="42" id="C7v-6N-7K9"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="计时员" id="r8V-tn-VkN">
                             <font key="font" size="35" name="HelveticaNeue-Bold"/>
@@ -46,7 +46,7 @@
                             <constraint firstAttribute="height" constant="17" id="Ttg-Xe-RUI"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Made by Abhishek Banthia" id="cdT-3T-Jmu">
-                            <font key="font" size="11" name="SFUIDisplay-Light"/>
+                            <font key="font" size="11" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -74,7 +74,7 @@ DQ
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wod-xv-dtj">
-                        <rect key="frame" x="18" y="105" width="404" height="23"/>
+                        <rect key="frame" x="18" y="103" width="404" height="23"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Here's what's new in Version 1.3..." id="hQe-Z5-uca">
                             <font key="font" size="16" name="HelveticaNeue-Thin"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
diff --git a/Clocker/Onboarding/zh-Hant.lproj/CLOnboardingWindow.xib b/Clocker/Onboarding/zh-Hant.lproj/CLOnboardingWindow.xib
index f5e88cd..79a6070 100644
--- a/Clocker/Onboarding/zh-Hant.lproj/CLOnboardingWindow.xib
+++ b/Clocker/Onboarding/zh-Hant.lproj/CLOnboardingWindow.xib
@@ -46,7 +46,7 @@
                             <constraint firstAttribute="height" constant="17" id="Ttg-Xe-RUI"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Made by Abhishek Banthia" id="cdT-3T-Jmu">
-                            <font key="font" size="11" name="SFUIDisplay-Light"/>
+                            <font key="font" size="11" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/PanelController.m b/Clocker/PanelController.m
index c0a58d3..3d87e7e 100755
--- a/Clocker/PanelController.m
+++ b/Clocker/PanelController.m
@@ -343,8 +343,6 @@ static PanelController *sharedPanel = nil;
     
     [cell setUpAutoLayoutWithCell];
     
-    [cell setAppropriateFont];
-    
     return cell;
 }
 
diff --git a/Clocker/Preferences/CLPreferencesViewController.m b/Clocker/Preferences/CLPreferencesViewController.m
index 9afe616..bdf9f9b 100644
--- a/Clocker/Preferences/CLPreferencesViewController.m
+++ b/Clocker/Preferences/CLPreferencesViewController.m
@@ -371,6 +371,7 @@ NSString *const CLTryAgainMessage = @"Try again, maybe?";
         [self.selectedTimeZones enumerateObjectsUsingBlock:^(NSData *  _Nonnull encodedData, NSUInteger idx, BOOL * _Nonnull stop) {
             
             CLTimezoneData *timezoneObject = [CLTimezoneData getCustomObject:encodedData];
+            timezoneObject.selectionType = CLCitySelection;
             NSString *name = timezoneObject.place_id;
             NSString *selectedPlaceID = dataObject.place_id;
             
@@ -399,6 +400,7 @@ NSString *const CLTryAgainMessage = @"Try again, maybe?";
     else
     {
         CLTimezoneData *data = [CLTimezoneData new];
+        data.selectionType = CLTimezoneSelection;
         data.isFavourite = [NSNumber numberWithInt:NSOffState];
         data.customLabel = CLEmptyString;
         
diff --git a/Clocker/Preferences/en.lproj/CLPreferencesView.xib b/Clocker/Preferences/en.lproj/CLPreferencesView.xib
index 118ce5c..a1140e6 100644
--- a/Clocker/Preferences/en.lproj/CLPreferencesView.xib
+++ b/Clocker/Preferences/en.lproj/CLPreferencesView.xib
@@ -83,7 +83,7 @@ CA
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="HJL-uw-ZOC">
-                                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -96,7 +96,7 @@ CA
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="xOd-3p-ihC">
-                                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -183,9 +183,9 @@ CA
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <searchField toolTip="Search a timezone" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="biT-6m-ElR">
-                        <rect key="frame" x="8" y="288" width="329" height="24"/>
+                        <rect key="frame" x="8" y="287" width="329" height="25"/>
                         <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="ijc-z6-99E">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </searchFieldCell>
@@ -194,18 +194,18 @@ CA
                         </connections>
                     </searchField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KFC-NV-5A3">
-                        <rect key="frame" x="102" y="4" width="230" height="20"/>
+                        <rect key="frame" x="106" y="4" width="226" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="rr3-gU-VUn"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="COF-wH-VLX">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="ifx-PO-gfq">
-                        <rect key="frame" x="164" y="147" width="16" height="16"/>
+                        <rect key="frame" x="164" y="148" width="16" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="16" id="dUF-zC-zcm"/>
                             <constraint firstAttribute="height" constant="16" id="igc-Hk-413"/>
@@ -220,10 +220,10 @@ CA
                         </connections>
                     </progressIndicator>
                     <button toolTip="Close Panel" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cyZ-cL-S7a">
-                        <rect key="frame" x="44" y="-2" width="62" height="29"/>
+                        <rect key="frame" x="44" y="-2" width="66" height="31"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="18" id="lku-Qx-nX5"/>
-                            <constraint firstAttribute="width" constant="50" id="vqo-37-082"/>
+                            <constraint firstAttribute="height" constant="20" id="lku-Qx-nX5"/>
+                            <constraint firstAttribute="width" constant="54" id="vqo-37-082"/>
                         </constraints>
                         <buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="YjP-c4-vTl">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -237,9 +237,9 @@ Gw
                         </connections>
                     </button>
                     <button toolTip="Add a timezone" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hp6-CH-WJs">
-                        <rect key="frame" x="2" y="-2" width="52" height="29"/>
+                        <rect key="frame" x="2" y="-2" width="52" height="31"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="18" id="r2L-5O-GZy"/>
+                            <constraint firstAttribute="height" constant="20" id="r2L-5O-GZy"/>
                             <constraint firstAttribute="width" constant="40" id="yuH-LM-RAy"/>
                         </constraints>
                         <buttonCell key="cell" type="push" title="Add" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="x6l-8x-qnu">
@@ -259,13 +259,13 @@ DQ
                         </connections>
                     </button>
                     <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MiN-SF-nnU">
-                        <rect key="frame" x="6" y="257" width="294" height="24"/>
+                        <rect key="frame" x="6" y="256" width="294" height="24"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="290" id="bEt-xB-Cf4"/>
                             <constraint firstAttribute="height" constant="21" id="uOZ-MR-dr4"/>
                         </constraints>
                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="P1v-7w-asy">
-                            <font key="font" size="12" name="SFUIDisplay-Regular"/>
+                            <font key="font" size="12" name="HelveticaNeue"/>
                             <segments>
                                 <segment label="Search By City" width="144" selected="YES"/>
                                 <segment label="Search by Timezone(s)" width="143" tag="1"/>
@@ -276,13 +276,13 @@ DQ
                         </connections>
                     </segmentedControl>
                     <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LM9-75-vkc">
-                        <rect key="frame" x="8" y="28" width="329" height="223"/>
+                        <rect key="frame" x="8" y="30" width="329" height="220"/>
                         <clipView key="contentView" id="Z7L-Ef-90Z">
-                            <rect key="frame" x="0.0" y="0.0" width="329" height="223"/>
+                            <rect key="frame" x="0.0" y="0.0" width="329" height="220"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="20" headerView="85y-4a-860" id="Q0t-hQ-orw">
-                                    <rect key="frame" x="0.0" y="0.0" width="329" height="200"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="329" height="197"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -296,7 +296,7 @@ DQ
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="QRU-bQ-qf9">
-                                                <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -312,7 +312,7 @@ DQ
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="j4V-8w-sXt">
-                                                <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -351,12 +351,12 @@ DQ
                         </tableHeaderView>
                     </scrollView>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="L5U-OI-Tkv">
-                        <rect key="frame" x="18" y="117" width="309" height="22"/>
+                        <rect key="frame" x="18" y="118" width="309" height="22"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="22" id="vJh-uH-1OY"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="" id="iFR-Vo-eLR">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/Preferences/ja.lproj/CLPreferencesView.xib b/Clocker/Preferences/ja.lproj/CLPreferencesView.xib
index 53c57fe..9e96d99 100644
--- a/Clocker/Preferences/ja.lproj/CLPreferencesView.xib
+++ b/Clocker/Preferences/ja.lproj/CLPreferencesView.xib
@@ -82,7 +82,7 @@ CA
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="HJL-uw-ZOC">
-                                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -95,7 +95,7 @@ CA
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="xOd-3p-ihC">
-                                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -182,9 +182,9 @@ CA
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <searchField toolTip="Search a timezone" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="biT-6m-ElR">
-                        <rect key="frame" x="8" y="288" width="329" height="24"/>
+                        <rect key="frame" x="8" y="287" width="329" height="25"/>
                         <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="ijc-z6-99E">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </searchFieldCell>
@@ -198,13 +198,13 @@ CA
                             <constraint firstAttribute="height" constant="20" id="rr3-gU-VUn"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="COF-wH-VLX">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="ifx-PO-gfq">
-                        <rect key="frame" x="164" y="147" width="16" height="16"/>
+                        <rect key="frame" x="164" y="146" width="16" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="16" id="dUF-zC-zcm"/>
                             <constraint firstAttribute="height" constant="16" id="igc-Hk-413"/>
@@ -226,7 +226,7 @@ CA
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="Close" bezelStyle="roundedRect" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="YjP-c4-vTl">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="12" name="SFUIDisplay-Light"/>
+                            <font key="font" size="12" name="HelveticaNeue-Light"/>
                         </buttonCell>
                         <connections>
                             <action selector="closePanel:" target="-2" id="YRs-VA-eFr"/>
@@ -240,7 +240,7 @@ CA
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="Add" bezelStyle="roundedRect" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="x6l-8x-qnu">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="12" name="SFUIDisplay-Light"/>
+                            <font key="font" size="12" name="HelveticaNeue-Light"/>
                         </buttonCell>
                         <connections>
                             <action selector="addToFavorites:" target="-2" id="Mdg-7P-kDy"/>
@@ -252,13 +252,13 @@ CA
                         </connections>
                     </button>
                     <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MiN-SF-nnU">
-                        <rect key="frame" x="6" y="257" width="294" height="24"/>
+                        <rect key="frame" x="6" y="256" width="294" height="24"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="290" id="bEt-xB-Cf4"/>
                             <constraint firstAttribute="height" constant="21" id="uOZ-MR-dr4"/>
                         </constraints>
                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="P1v-7w-asy">
-                            <font key="font" size="12" name="SFUIDisplay-Regular"/>
+                            <font key="font" size="12" name="HelveticaNeue"/>
                             <segments>
                                 <segment label="Search By City" width="144" selected="YES"/>
                                 <segment label="Search by Timezone(s)" width="143" tag="1"/>
@@ -269,13 +269,13 @@ CA
                         </connections>
                     </segmentedControl>
                     <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LM9-75-vkc">
-                        <rect key="frame" x="8" y="28" width="329" height="223"/>
+                        <rect key="frame" x="8" y="28" width="329" height="222"/>
                         <clipView key="contentView" id="Z7L-Ef-90Z">
-                            <rect key="frame" x="0.0" y="0.0" width="329" height="223"/>
+                            <rect key="frame" x="0.0" y="0.0" width="329" height="222"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="20" headerView="85y-4a-860" id="Q0t-hQ-orw">
-                                    <rect key="frame" x="0.0" y="0.0" width="329" height="200"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="329" height="199"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -289,7 +289,7 @@ CA
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="QRU-bQ-qf9">
-                                                <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -305,7 +305,7 @@ CA
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="j4V-8w-sXt">
-                                                <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -344,12 +344,12 @@ CA
                         </tableHeaderView>
                     </scrollView>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="L5U-OI-Tkv">
-                        <rect key="frame" x="18" y="117" width="309" height="22"/>
+                        <rect key="frame" x="18" y="116" width="309" height="22"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="22" id="vJh-uH-1OY"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="" id="iFR-Vo-eLR">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/Preferences/zh-Hans.lproj/CLPreferencesView.xib b/Clocker/Preferences/zh-Hans.lproj/CLPreferencesView.xib
index 264604d..7bd6ee4 100644
--- a/Clocker/Preferences/zh-Hans.lproj/CLPreferencesView.xib
+++ b/Clocker/Preferences/zh-Hans.lproj/CLPreferencesView.xib
@@ -82,7 +82,7 @@ CA
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="HJL-uw-ZOC">
-                                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -95,7 +95,7 @@ CA
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="xOd-3p-ihC">
-                                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -182,9 +182,9 @@ CA
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <searchField toolTip="Search a timezone" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="biT-6m-ElR">
-                        <rect key="frame" x="8" y="288" width="329" height="24"/>
+                        <rect key="frame" x="8" y="287" width="329" height="25"/>
                         <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" focusRingType="none" placeholderString="输入城市，州，国名" usesSingleLineMode="YES" maximumRecents="5" id="ijc-z6-99E">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </searchFieldCell>
@@ -198,13 +198,13 @@ CA
                             <constraint firstAttribute="height" constant="20" id="rr3-gU-VUn"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="COF-wH-VLX">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="ifx-PO-gfq">
-                        <rect key="frame" x="164" y="147" width="16" height="16"/>
+                        <rect key="frame" x="164" y="146" width="16" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="16" id="dUF-zC-zcm"/>
                             <constraint firstAttribute="height" constant="16" id="igc-Hk-413"/>
@@ -226,7 +226,7 @@ CA
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="关闭" bezelStyle="roundedRect" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="YjP-c4-vTl">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="12" name="SFUIDisplay-Light"/>
+                            <font key="font" size="12" name="HelveticaNeue-Light"/>
                         </buttonCell>
                         <connections>
                             <action selector="closePanel:" target="-2" id="YRs-VA-eFr"/>
@@ -240,7 +240,7 @@ CA
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="加" bezelStyle="roundedRect" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="x6l-8x-qnu">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="12" name="SFUIDisplay-Light"/>
+                            <font key="font" size="12" name="HelveticaNeue-Light"/>
                         </buttonCell>
                         <connections>
                             <action selector="addToFavorites:" target="-2" id="Mdg-7P-kDy"/>
@@ -252,13 +252,13 @@ CA
                         </connections>
                     </button>
                     <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MiN-SF-nnU">
-                        <rect key="frame" x="6" y="257" width="294" height="24"/>
+                        <rect key="frame" x="6" y="256" width="294" height="24"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="290" id="bEt-xB-Cf4"/>
                             <constraint firstAttribute="height" constant="21" id="uOZ-MR-dr4"/>
                         </constraints>
                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="P1v-7w-asy">
-                            <font key="font" size="12" name="SFUIDisplay-Regular"/>
+                            <font key="font" size="12" name="HelveticaNeue"/>
                             <segments>
                                 <segment label="按城市搜索" width="144" selected="YES"/>
                                 <segment label="通过时区搜索" width="143" tag="1"/>
@@ -269,13 +269,13 @@ CA
                         </connections>
                     </segmentedControl>
                     <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LM9-75-vkc">
-                        <rect key="frame" x="8" y="28" width="329" height="223"/>
+                        <rect key="frame" x="8" y="28" width="329" height="222"/>
                         <clipView key="contentView" id="Z7L-Ef-90Z">
-                            <rect key="frame" x="0.0" y="0.0" width="329" height="223"/>
+                            <rect key="frame" x="0.0" y="0.0" width="329" height="222"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="20" headerView="85y-4a-860" id="Q0t-hQ-orw">
-                                    <rect key="frame" x="0.0" y="0.0" width="329" height="200"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="329" height="199"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -289,7 +289,7 @@ CA
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="QRU-bQ-qf9">
-                                                <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -305,7 +305,7 @@ CA
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="j4V-8w-sXt">
-                                                <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -344,12 +344,12 @@ CA
                         </tableHeaderView>
                     </scrollView>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="L5U-OI-Tkv">
-                        <rect key="frame" x="18" y="117" width="309" height="22"/>
+                        <rect key="frame" x="18" y="116" width="309" height="22"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="22" id="vJh-uH-1OY"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="" id="iFR-Vo-eLR">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/Preferences/zh-Hant.lproj/CLPreferencesView.xib b/Clocker/Preferences/zh-Hant.lproj/CLPreferencesView.xib
index f14bbf5..92a303a 100644
--- a/Clocker/Preferences/zh-Hant.lproj/CLPreferencesView.xib
+++ b/Clocker/Preferences/zh-Hant.lproj/CLPreferencesView.xib
@@ -82,7 +82,7 @@ CA
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="HJL-uw-ZOC">
-                                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -95,7 +95,7 @@ CA
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="xOd-3p-ihC">
-                                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -182,9 +182,9 @@ CA
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <searchField toolTip="Search a timezone" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="biT-6m-ElR">
-                        <rect key="frame" x="8" y="288" width="329" height="24"/>
+                        <rect key="frame" x="8" y="287" width="329" height="25"/>
                         <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" focusRingType="none" placeholderString="输入城市，州，国名" usesSingleLineMode="YES" maximumRecents="5" id="ijc-z6-99E">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </searchFieldCell>
@@ -198,13 +198,13 @@ CA
                             <constraint firstAttribute="height" constant="20" id="rr3-gU-VUn"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="COF-wH-VLX">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="ifx-PO-gfq">
-                        <rect key="frame" x="164" y="147" width="16" height="16"/>
+                        <rect key="frame" x="164" y="146" width="16" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="16" id="dUF-zC-zcm"/>
                             <constraint firstAttribute="height" constant="16" id="igc-Hk-413"/>
@@ -226,7 +226,7 @@ CA
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="关闭" bezelStyle="roundedRect" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="YjP-c4-vTl">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="12" name="SFUIDisplay-Light"/>
+                            <font key="font" size="12" name="HelveticaNeue-Light"/>
                         </buttonCell>
                         <connections>
                             <action selector="closePanel:" target="-2" id="YRs-VA-eFr"/>
@@ -240,7 +240,7 @@ CA
                         </constraints>
                         <buttonCell key="cell" type="roundRect" title="加" bezelStyle="roundedRect" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="x6l-8x-qnu">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" size="12" name="SFUIDisplay-Light"/>
+                            <font key="font" size="12" name="HelveticaNeue-Light"/>
                         </buttonCell>
                         <connections>
                             <action selector="addToFavorites:" target="-2" id="Mdg-7P-kDy"/>
@@ -252,13 +252,13 @@ CA
                         </connections>
                     </button>
                     <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MiN-SF-nnU">
-                        <rect key="frame" x="6" y="257" width="294" height="24"/>
+                        <rect key="frame" x="6" y="256" width="294" height="24"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="290" id="bEt-xB-Cf4"/>
                             <constraint firstAttribute="height" constant="21" id="uOZ-MR-dr4"/>
                         </constraints>
                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="P1v-7w-asy">
-                            <font key="font" size="12" name="SFUIDisplay-Regular"/>
+                            <font key="font" size="12" name="HelveticaNeue"/>
                             <segments>
                                 <segment label="按城市搜索" width="144" selected="YES"/>
                                 <segment label="通过时区搜索" width="143" tag="1"/>
@@ -269,13 +269,13 @@ CA
                         </connections>
                     </segmentedControl>
                     <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LM9-75-vkc">
-                        <rect key="frame" x="8" y="28" width="329" height="223"/>
+                        <rect key="frame" x="8" y="28" width="329" height="222"/>
                         <clipView key="contentView" id="Z7L-Ef-90Z">
-                            <rect key="frame" x="0.0" y="0.0" width="329" height="223"/>
+                            <rect key="frame" x="0.0" y="0.0" width="329" height="222"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="20" headerView="85y-4a-860" id="Q0t-hQ-orw">
-                                    <rect key="frame" x="0.0" y="0.0" width="329" height="200"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="329" height="199"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -289,7 +289,7 @@ CA
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="QRU-bQ-qf9">
-                                                <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -305,7 +305,7 @@ CA
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="j4V-8w-sXt">
-                                                <font key="font" size="13" name="SFUIDisplay-Light"/>
+                                                <font key="font" size="13" name="HelveticaNeue-Light"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -344,12 +344,12 @@ CA
                         </tableHeaderView>
                     </scrollView>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="L5U-OI-Tkv">
-                        <rect key="frame" x="18" y="117" width="309" height="22"/>
+                        <rect key="frame" x="18" y="116" width="309" height="22"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="22" id="vJh-uH-1OY"/>
                         </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="" id="iFR-Vo-eLR">
-                            <font key="font" size="13" name="SFUIDisplay-Light"/>
+                            <font key="font" size="13" name="HelveticaNeue-Light"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
diff --git a/Clocker/en.lproj/Panel.xib b/Clocker/en.lproj/Panel.xib
index f0e000e..35044e6 100755
--- a/Clocker/en.lproj/Panel.xib
+++ b/Clocker/en.lproj/Panel.xib
@@ -64,7 +64,7 @@
                                                                 <constraint firstAttribute="height" constant="22" id="vod-YN-iNX"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" placeholderString="Timezone Name" id="rnh-AP-ooc">
-                                                                <font key="font" size="15" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="15" name="HelveticaNeue-Thin"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -79,19 +79,19 @@
                                                                 <constraint firstAttribute="width" constant="72" id="fkH-oq-qvM"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="74U-rv-5xj">
-                                                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="101" preferredMaxLayoutWidth="110" translatesAutoresizingMaskIntoConstraints="NO" id="vnv-J2-7r1">
-                                                            <rect key="frame" x="159" y="21" width="114" height="35"/>
+                                                            <rect key="frame" x="159" y="21" width="114" height="32"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="35" id="3WU-de-OQL"/>
+                                                                <constraint firstAttribute="height" constant="32" id="3WU-de-OQL"/>
                                                                 <constraint firstAttribute="width" constant="110" id="cQV-gJ-zMz"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="g8s-EU-UHx">
-                                                                <font key="font" size="22" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="22" name="HelveticaNeue-Thin"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -126,7 +126,7 @@
                                                         <constraint firstItem="uOg-ij-alO" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" constant="-5" id="j2E-3l-6B2"/>
                                                         <constraint firstItem="7OQ-cr-VJS" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" constant="-5" id="uZd-y0-d6A"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="9" id="ueW-ow-ZRq"/>
-                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="5" id="vGp-XY-wiJ"/>
+                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="8" id="vGp-XY-wiJ"/>
                                                         <constraint firstAttribute="trailing" secondItem="vnv-J2-7r1" secondAttribute="trailing" constant="8" id="zXo-eA-0bQ"/>
                                                     </constraints>
                                                     <connections>
diff --git a/Clocker/ja.lproj/Panel.xib b/Clocker/ja.lproj/Panel.xib
index bd23fc4..96f90a3 100755
--- a/Clocker/ja.lproj/Panel.xib
+++ b/Clocker/ja.lproj/Panel.xib
@@ -64,7 +64,7 @@
                                                                 <constraint firstAttribute="height" constant="22" id="vod-YN-iNX"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Timezone Name" id="rnh-AP-ooc">
-                                                                <font key="font" size="15" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="15" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -87,7 +87,7 @@
                                                                 <constraint firstAttribute="width" constant="45" id="zNy-He-GNo"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" placeholderString="" id="Yxf-ti-4jB">
-                                                                <font key="font" size="11" name="SFUIDisplay-Light"/>
+                                                                <font key="font" size="11" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -99,7 +99,7 @@
                                                                 <constraint firstAttribute="width" constant="72" id="fkH-oq-qvM"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="74U-rv-5xj">
-                                                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -111,7 +111,7 @@
                                                                 <constraint firstAttribute="width" constant="110" id="cQV-gJ-zMz"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="g8s-EU-UHx">
-                                                                <font key="font" size="22" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="22" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
diff --git a/Clocker/zh-Hans.lproj/Panel.xib b/Clocker/zh-Hans.lproj/Panel.xib
index f0d2a36..02c8c69 100755
--- a/Clocker/zh-Hans.lproj/Panel.xib
+++ b/Clocker/zh-Hans.lproj/Panel.xib
@@ -64,7 +64,7 @@
                                                                 <constraint firstAttribute="height" constant="22" id="vod-YN-iNX"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Timezone Name" id="rnh-AP-ooc">
-                                                                <font key="font" size="15" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="15" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -87,7 +87,7 @@
                                                                 <constraint firstAttribute="width" constant="45" id="r3N-lG-lbQ"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" placeholderString="" id="7e9-Cy-Q3m">
-                                                                <font key="font" size="11" name="SFUIDisplay-Light"/>
+                                                                <font key="font" size="11" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -99,7 +99,7 @@
                                                                 <constraint firstAttribute="width" constant="72" id="fkH-oq-qvM"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="74U-rv-5xj">
-                                                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -111,7 +111,7 @@
                                                                 <constraint firstAttribute="width" constant="110" id="cQV-gJ-zMz"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="g8s-EU-UHx">
-                                                                <font key="font" size="22" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="22" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
diff --git a/Clocker/zh-Hant.lproj/Panel.xib b/Clocker/zh-Hant.lproj/Panel.xib
index 2aa288d..781230d 100755
--- a/Clocker/zh-Hant.lproj/Panel.xib
+++ b/Clocker/zh-Hant.lproj/Panel.xib
@@ -64,7 +64,7 @@
                                                                 <constraint firstAttribute="height" constant="22" id="vod-YN-iNX"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Timezone Name" id="rnh-AP-ooc">
-                                                                <font key="font" size="15" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="15" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -87,7 +87,7 @@
                                                                 <constraint firstAttribute="width" constant="45" id="psP-EH-mNo"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" placeholderString="" id="uGx-ek-RAy">
-                                                                <font key="font" size="11" name="SFUIDisplay-Light"/>
+                                                                <font key="font" size="11" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -99,7 +99,7 @@
                                                                 <constraint firstAttribute="width" constant="72" id="fkH-oq-qvM"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="74U-rv-5xj">
-                                                                <font key="font" size="13" name="SFUIDisplay-Bold"/>
+                                                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
                                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
@@ -111,7 +111,7 @@
                                                                 <constraint firstAttribute="width" constant="110" id="cQV-gJ-zMz"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="g8s-EU-UHx">
-                                                                <font key="font" size="22" name="SFUIDisplay-Thin"/>
+                                                                <font key="font" size="22" name="HelveticaNeue-Light"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>