diff --git a/Clocker/Clocker/Clocker.entitlements b/Clocker/Clocker/Clocker.entitlements
index 1754713..9f43c40 100644
--- a/Clocker/Clocker/Clocker.entitlements
+++ b/Clocker/Clocker/Clocker.entitlements
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.icloud-container-identifiers</key>
-	<array/>
-	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
-	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.cs.disable-library-validation</key>
diff --git a/Clocker/Clocker/ar.lproj/Localizable.strings b/Clocker/Clocker/ar.lproj/Localizable.strings
index 9652a9e..4a0d690 100644
--- a/Clocker/Clocker/ar.lproj/Localizable.strings
+++ b/Clocker/Clocker/ar.lproj/Localizable.strings
@@ -158,3 +158,6 @@
 "New Zealand" = "New Zealand";
 "Florida" = "Florida";
 "San Francisco" = "San Francisco";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/ca.lproj/Localizable.strings b/Clocker/Clocker/ca.lproj/Localizable.strings
index d4d47b5..a7e6ad8 100644
--- a/Clocker/Clocker/ca.lproj/Localizable.strings
+++ b/Clocker/Clocker/ca.lproj/Localizable.strings
@@ -164,3 +164,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/de.lproj/Localizable.strings b/Clocker/Clocker/de.lproj/Localizable.strings
index 30cb9aa..27ce101 100644
--- a/Clocker/Clocker/de.lproj/Localizable.strings
+++ b/Clocker/Clocker/de.lproj/Localizable.strings
@@ -164,3 +164,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/en.lproj/Localizable.strings b/Clocker/Clocker/en.lproj/Localizable.strings
index 0840228..73ae1c9 100644
--- a/Clocker/Clocker/en.lproj/Localizable.strings
+++ b/Clocker/Clocker/en.lproj/Localizable.strings
@@ -168,3 +168,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/es.lproj/Localizable.strings b/Clocker/Clocker/es.lproj/Localizable.strings
index 7870ae7..77f94d7 100644
--- a/Clocker/Clocker/es.lproj/Localizable.strings
+++ b/Clocker/Clocker/es.lproj/Localizable.strings
@@ -166,3 +166,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/fr.lproj/Localizable.strings b/Clocker/Clocker/fr.lproj/Localizable.strings
index 5182cb7..5174df9 100644
--- a/Clocker/Clocker/fr.lproj/Localizable.strings
+++ b/Clocker/Clocker/fr.lproj/Localizable.strings
@@ -165,3 +165,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/hi.lproj/Localizable.strings b/Clocker/Clocker/hi.lproj/Localizable.strings
index 13353a5..0044df9 100644
--- a/Clocker/Clocker/hi.lproj/Localizable.strings
+++ b/Clocker/Clocker/hi.lproj/Localizable.strings
@@ -160,3 +160,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/hr.lproj/Localizable.strings b/Clocker/Clocker/hr.lproj/Localizable.strings
index e5d28ac..11e6925 100644
--- a/Clocker/Clocker/hr.lproj/Localizable.strings
+++ b/Clocker/Clocker/hr.lproj/Localizable.strings
@@ -166,3 +166,6 @@
 "No upcoming events for today!" = "Za danas nema predstojećih događaja!";
 "Great going." = "Super.";
 "Happy Weekend." = "Uživaj vikend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/it.lproj/Localizable.strings b/Clocker/Clocker/it.lproj/Localizable.strings
index e1b4c00..3f0369f 100644
--- a/Clocker/Clocker/it.lproj/Localizable.strings
+++ b/Clocker/Clocker/it.lproj/Localizable.strings
@@ -165,3 +165,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/ja.lproj/Localizable.strings b/Clocker/Clocker/ja.lproj/Localizable.strings
index 9548555..8733095 100644
--- a/Clocker/Clocker/ja.lproj/Localizable.strings
+++ b/Clocker/Clocker/ja.lproj/Localizable.strings
@@ -355,3 +355,6 @@
 
 
 "start-at-login" = "ログイン時に開始";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/ko.lproj/Localizable.strings b/Clocker/Clocker/ko.lproj/Localizable.strings
index d424b7d..e2dbb7c 100644
--- a/Clocker/Clocker/ko.lproj/Localizable.strings
+++ b/Clocker/Clocker/ko.lproj/Localizable.strings
@@ -167,3 +167,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/nl.lproj/Localizable.strings b/Clocker/Clocker/nl.lproj/Localizable.strings
index d4d47b5..a7e6ad8 100644
--- a/Clocker/Clocker/nl.lproj/Localizable.strings
+++ b/Clocker/Clocker/nl.lproj/Localizable.strings
@@ -164,3 +164,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/pl.lproj/Localizable.strings b/Clocker/Clocker/pl.lproj/Localizable.strings
index add8334..f3e319b 100644
--- a/Clocker/Clocker/pl.lproj/Localizable.strings
+++ b/Clocker/Clocker/pl.lproj/Localizable.strings
@@ -158,3 +158,6 @@
 "New Zealand" = "Nowa Zelandia";
 "Florida" = "Floryda";
 "San Francisco" = "San Francisco";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/pt-BR.lproj/Localizable.strings b/Clocker/Clocker/pt-BR.lproj/Localizable.strings
index 6bb78f1..62fff41 100644
--- a/Clocker/Clocker/pt-BR.lproj/Localizable.strings
+++ b/Clocker/Clocker/pt-BR.lproj/Localizable.strings
@@ -165,3 +165,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/ru.lproj/Localizable.strings b/Clocker/Clocker/ru.lproj/Localizable.strings
index 864f2b6..15bf74d 100644
--- a/Clocker/Clocker/ru.lproj/Localizable.strings
+++ b/Clocker/Clocker/ru.lproj/Localizable.strings
@@ -157,3 +157,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/tr.lproj/Localizable.strings b/Clocker/Clocker/tr.lproj/Localizable.strings
index 3a1e01b..a8c05ff 100644
--- a/Clocker/Clocker/tr.lproj/Localizable.strings
+++ b/Clocker/Clocker/tr.lproj/Localizable.strings
@@ -159,3 +159,6 @@ Takvimleri Görüntüle";
 "New Zealand" = "New Zealand";
 "Florida" = "Florida";
 "San Francisco" = "San Francisco";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/zh-Hans.lproj/Localizable.strings b/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
index 1c4358f..c1bc99c 100644
--- a/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
+++ b/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
@@ -158,3 +158,6 @@
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
 "Happy Weekend." = "Happy Weekend.";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Clocker/zh-Hant.lproj/Localizable.strings b/Clocker/Clocker/zh-Hant.lproj/Localizable.strings
index 24b5603..7fb5639 100644
--- a/Clocker/Clocker/zh-Hant.lproj/Localizable.strings
+++ b/Clocker/Clocker/zh-Hant.lproj/Localizable.strings
@@ -355,3 +355,6 @@
 
 
 "start-at-login" = "在登入時啟動";
+
+// iCloud
+"Enable iCloud Sync" = "Enable iCloud Sync";
diff --git a/Clocker/Overall App/Strings.swift b/Clocker/Overall App/Strings.swift
index e9fa746..b28c608 100644
--- a/Clocker/Overall App/Strings.swift	
+++ b/Clocker/Overall App/Strings.swift	
@@ -37,3 +37,4 @@ let CLInstallHomeIndicatorObject = "installHomeIndicatorObject"
 let CLSwitchToCompactModeAlert = "com.abhishek.switchToCompactMode"
 let CLDisplayDSTTransitionInfo = "com.abhishek.showDSTTransitionInfo"
 let CLAppleInterfaceStyleKey = "AppleInterfaceStyle"
+let CLEnableSyncKey = "com.abhishek.enableSync"
diff --git a/Clocker/Preferences/Appearance/AppearanceViewController.swift b/Clocker/Preferences/Appearance/AppearanceViewController.swift
index 79558af..bf0d79f 100644
--- a/Clocker/Preferences/Appearance/AppearanceViewController.swift
+++ b/Clocker/Preferences/Appearance/AppearanceViewController.swift
@@ -16,7 +16,8 @@ class AppearanceViewController: ParentViewController {
     @IBOutlet var includePlaceNameControl: NSSegmentedControl!
     @IBOutlet var appearanceTab: NSTabView!
     @IBOutlet var appDisplayControl: NSSegmentedControl!
-
+    @IBOutlet weak var syncLabel: NSTextField!
+    
     private var themeDidChangeNotification: NSObjectProtocol?
 
     private var previewTimezones: [TimezoneData] = []
@@ -162,6 +163,7 @@ class AppearanceViewController: ParentViewController {
         showSliderLabel.stringValue = "Time Scroller".localized()
         showSunriseLabel.stringValue = "Show Sunrise/Sunset".localized()
         largerTextLabel.stringValue = "Larger Text".localized()
+        syncLabel.stringValue = "Enable iCloud Sync".localized()
         futureSliderRangeLabel.stringValue = "Future Slider Range".localized()
         includeDateLabel.stringValue = "Include Date".localized()
         includeDayLabel.stringValue = "Include Day".localized()
@@ -172,7 +174,7 @@ class AppearanceViewController: ParentViewController {
 
         [timeFormatLabel, panelTheme,
          dayDisplayOptionsLabel, showSliderLabel,
-         showSunriseLabel, largerTextLabel, futureSliderRangeLabel,
+         showSunriseLabel, largerTextLabel, syncLabel, futureSliderRangeLabel,
          includeDayLabel, includeDateLabel, includePlaceLabel, appDisplayLabel, menubarModeLabel,
          previewLabel, miscelleaneousLabel, dstTransitionField].forEach {
             $0?.textColor = Themer.shared().mainTextColor()
@@ -356,6 +358,11 @@ class AppearanceViewController: ParentViewController {
     @IBAction func toggleDSTTransitionOption(_: Any) {
         previewPanelTableView.reloadData()
     }
+    
+    @IBAction func toggleSync(_ sender: Any) {
+        print("Toggle Sync")
+    }
+    
 }
 
 extension AppearanceViewController: NSTableViewDataSource, NSTableViewDelegate {
diff --git a/Clocker/Preferences/Preferences.storyboard b/Clocker/Preferences/Preferences.storyboard
index f3fe745..99c81cd 100644
--- a/Clocker/Preferences/Preferences.storyboard
+++ b/Clocker/Preferences/Preferences.storyboard
@@ -768,20 +768,20 @@
             <objects>
                 <viewController title=" Appearance " id="1aL-zR-8L4" userLabel="Appearance" customClass="AppearanceViewController" customModule="Clocker" customModuleProvider="target" sceneMemberID="viewController">
                     <customView key="view" wantsLayer="YES" id="7EQ-1G-xRP" customClass="ParentView" customModule="Clocker" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="586" height="502"/>
+                        <rect key="frame" x="0.0" y="0.0" width="586" height="530"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <subviews>
                             <tabView initialItem="ztQ-ui-wYI" translatesAutoresizingMaskIntoConstraints="NO" id="SGu-yd-JQh">
-                                <rect key="frame" x="13" y="10" width="560" height="478"/>
+                                <rect key="frame" x="13" y="10" width="560" height="506"/>
                                 <font key="font" metaFont="system"/>
                                 <tabViewItems>
                                     <tabViewItem label="Panel" identifier="" id="vnW-vq-Ote">
                                         <view key="view" id="zFb-Gb-3dB">
-                                            <rect key="frame" x="10" y="33" width="540" height="432"/>
+                                            <rect key="frame" x="10" y="33" width="540" height="460"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <gridView focusRingType="none" xPlacement="leading" yPlacement="none" rowAlignment="firstBaseline" rowSpacing="20" columnSpacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="oOU-yl-p1o">
-                                                    <rect key="frame" x="20" y="186" width="500" height="226"/>
+                                                    <rect key="frame" x="20" y="172" width="500" height="268"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="500" id="qIz-In-XWZ"/>
                                                         <constraint firstItem="vrm-cg-RMn" firstAttribute="width" secondItem="wtO-uL-QBf" secondAttribute="width" multiplier="0.97" id="qm5-y6-MDQ"/>
@@ -793,6 +793,7 @@
                                                         <gridRow id="ad4-FM-AWq"/>
                                                         <gridRow id="yUG-1W-BQ2"/>
                                                         <gridRow id="fbk-ef-Req"/>
+                                                        <gridRow id="B74-Mt-1h8"/>
                                                     </rows>
                                                     <columns>
                                                         <gridColumn xPlacement="trailing" id="ARE-A4-4k4"/>
@@ -801,7 +802,7 @@
                                                     <gridCells>
                                                         <gridCell row="3zv-Qe-ePN" column="ARE-A4-4k4" id="fRB-cT-Ydc">
                                                             <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="wtO-uL-QBf">
-                                                                <rect key="frame" x="109" y="207" width="104" height="18"/>
+                                                                <rect key="frame" x="98" y="249" width="104" height="18"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="WNN-Le-h1b"/>
                                                                 </constraints>
@@ -814,7 +815,7 @@
                                                         </gridCell>
                                                         <gridCell row="3zv-Qe-ePN" column="YBI-pK-gPQ" id="QZh-9h-ecx">
                                                             <popUpButton key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iiG-Xu-4id">
-                                                                <rect key="frame" x="228" y="202" width="78" height="25"/>
+                                                                <rect key="frame" x="217" y="244" width="78" height="25"/>
                                                                 <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="5tQ-hE-OyI" id="rzx-jH-Vr6">
                                                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                     <font key="font" metaFont="menu"/>
@@ -834,7 +835,7 @@
                                                         </gridCell>
                                                         <gridCell row="YtR-o1-nGp" column="ARE-A4-4k4" id="gzZ-cp-CkC">
                                                             <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="vrm-cg-RMn">
-                                                                <rect key="frame" x="112" y="167" width="101" height="18"/>
+                                                                <rect key="frame" x="101" y="209" width="101" height="18"/>
                                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Panel Theme" id="ZKN-5V-B4D">
                                                                     <font key="font" size="13" name="Avenir-Light"/>
                                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -844,7 +845,7 @@
                                                         </gridCell>
                                                         <gridCell row="YtR-o1-nGp" column="YBI-pK-gPQ" id="kQ8-mu-Ax8">
                                                             <popUpButton key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="89w-KN-GJ6">
-                                                                <rect key="frame" x="228" y="162" width="125" height="25"/>
+                                                                <rect key="frame" x="217" y="204" width="125" height="25"/>
                                                                 <popUpButtonCell key="cell" type="push" title="Light" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="xgz-r4-aaD" id="vql-m4-qSG">
                                                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                     <font key="font" size="13" name="Avenir-Book"/>
@@ -866,7 +867,7 @@
                                                         </gridCell>
                                                         <gridCell row="vjb-Ch-BZs" column="ARE-A4-4k4" id="Tkw-Kt-dMr">
                                                             <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="gFE-hZ-J92">
-                                                                <rect key="frame" x="29" y="126" width="184" height="18"/>
+                                                                <rect key="frame" x="18" y="168" width="184" height="18"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="180" id="SCi-hT-hxG"/>
                                                                 </constraints>
@@ -879,7 +880,7 @@
                                                         </gridCell>
                                                         <gridCell row="vjb-Ch-BZs" column="YBI-pK-gPQ" xPlacement="leading" yPlacement="none" id="Fnt-fn-6Wr">
                                                             <segmentedControl key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="d4S-hM-MSP">
-                                                                <rect key="frame" x="229" y="123" width="273" height="24"/>
+                                                                <rect key="frame" x="218" y="165" width="273" height="24"/>
                                                                 <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="564-Re-f1d">
                                                                     <font key="font" size="12" name="Avenir-Light"/>
                                                                     <segments>
@@ -897,7 +898,7 @@
                                                         </gridCell>
                                                         <gridCell row="ad4-FM-AWq" column="ARE-A4-4k4" id="XeO-qn-EGI">
                                                             <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="4lt-X6-3uU">
-                                                                <rect key="frame" x="9" y="84" width="204" height="18"/>
+                                                                <rect key="frame" x="-2" y="126" width="204" height="18"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="200" id="hAp-By-Lzj"/>
                                                                 </constraints>
@@ -910,7 +911,7 @@
                                                         </gridCell>
                                                         <gridCell row="ad4-FM-AWq" column="YBI-pK-gPQ" id="sA0-Dw-yO0">
                                                             <segmentedControl key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9WW-jp-NeO">
-                                                                <rect key="frame" x="229" y="81" width="81" height="24"/>
+                                                                <rect key="frame" x="218" y="123" width="81" height="24"/>
                                                                 <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="CcB-5w-IoG">
                                                                     <font key="font" size="12" name="Avenir-Light"/>
                                                                     <segments>
@@ -926,7 +927,7 @@
                                                         </gridCell>
                                                         <gridCell row="yUG-1W-BQ2" column="ARE-A4-4k4" id="M8P-5s-oL4">
                                                             <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="ZWy-WW-6H9">
-                                                                <rect key="frame" x="50" y="42" width="163" height="18"/>
+                                                                <rect key="frame" x="39" y="84" width="163" height="18"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="159" id="NX0-Bo-SU8"/>
                                                                 </constraints>
@@ -939,7 +940,7 @@
                                                         </gridCell>
                                                         <gridCell row="yUG-1W-BQ2" column="YBI-pK-gPQ" id="N12-lC-Pe1">
                                                             <segmentedControl key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DCB-IB-UxK">
-                                                                <rect key="frame" x="229" y="39" width="81" height="24"/>
+                                                                <rect key="frame" x="218" y="81" width="81" height="24"/>
                                                                 <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="PZZ-H7-LgV">
                                                                     <font key="font" size="12" name="Avenir-Light"/>
                                                                     <segments>
@@ -955,7 +956,7 @@
                                                         </gridCell>
                                                         <gridCell row="fbk-ef-Req" column="ARE-A4-4k4" id="Vth-MP-nfS">
                                                             <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="xwt-pY-1w9">
-                                                                <rect key="frame" x="9" y="1" width="204" height="18"/>
+                                                                <rect key="frame" x="-2" y="43" width="204" height="18"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="7fj-Em-Lyh"/>
                                                                 </constraints>
@@ -968,7 +969,7 @@
                                                         </gridCell>
                                                         <gridCell row="fbk-ef-Req" column="YBI-pK-gPQ" id="dCk-cz-no0">
                                                             <slider key="contentView" verticalHuggingPriority="750" alphaValue="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="3cU-IS-3Qu">
-                                                                <rect key="frame" x="229" y="-6" width="104" height="28"/>
+                                                                <rect key="frame" x="218" y="36" width="104" height="28"/>
                                                                 <sliderCell key="cell" state="on" alignment="left" minValue="4" maxValue="7" doubleValue="4" tickMarkPosition="above" numberOfTickMarks="4" allowsTickMarkValuesOnly="YES" sliderType="linear" id="eAh-k3-cof"/>
                                                                 <connections>
                                                                     <action selector="fontSliderChanged:" target="1aL-zR-8L4" id="YAW-aA-5aR"/>
@@ -976,10 +977,39 @@
                                                                 </connections>
                                                             </slider>
                                                         </gridCell>
+                                                        <gridCell row="B74-Mt-1h8" column="ARE-A4-4k4" id="PbY-PK-2xB">
+                                                            <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="kkn-L8-yOj">
+                                                                <rect key="frame" x="-2" y="2" width="204" height="18"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="eD6-Fv-2tz"/>
+                                                                </constraints>
+                                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Enable iCloud Sync" id="MDa-w4-4Xw">
+                                                                    <font key="font" size="13" name="Avenir-Light"/>
+                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                        </gridCell>
+                                                        <gridCell row="B74-Mt-1h8" column="YBI-pK-gPQ" id="kVc-I2-8Kp">
+                                                            <segmentedControl key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ncK-Q6-ag9">
+                                                                <rect key="frame" x="218" y="-1" width="81" height="24"/>
+                                                                <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="bio-ov-phY">
+                                                                    <font key="font" size="12" name="Avenir-Light"/>
+                                                                    <segments>
+                                                                        <segment label="Yes" width="36"/>
+                                                                        <segment label="No" width="36" selected="YES" tag="1"/>
+                                                                    </segments>
+                                                                </segmentedCell>
+                                                                <connections>
+                                                                    <action selector="toggleSync:" target="1aL-zR-8L4" id="4Mg-ie-F7U"/>
+                                                                    <binding destination="Gpv-Gr-MxZ" name="selectedIndex" keyPath="values.com.abhishek.enableSync" id="xhH-uC-qcY"/>
+                                                                </connections>
+                                                            </segmentedControl>
+                                                        </gridCell>
                                                     </gridCells>
                                                 </gridView>
                                                 <scrollView borderType="line" autohidesScrollers="YES" horizontalLineScroll="113" horizontalPageScroll="10" verticalLineScroll="113" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ytg-0u-Mtu">
-                                                    <rect key="frame" x="70" y="39" width="400" height="100"/>
+                                                    <rect key="frame" x="70" y="25" width="400" height="100"/>
                                                     <clipView key="contentView" ambiguous="YES" id="gnX-f5-31D">
                                                         <rect key="frame" x="1" y="1" width="398" height="98"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1156,7 +1186,7 @@
                                                     </scroller>
                                                 </scrollView>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZNm-TN-RRJ">
-                                                    <rect key="frame" x="214" y="144" width="112" height="22"/>
+                                                    <rect key="frame" x="214" y="130" width="112" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="108" id="KwL-So-Ymu"/>
                                                         <constraint firstAttribute="height" constant="22" id="bBD-fJ-Xm7"/>
@@ -1487,6 +1517,7 @@
                         <outlet property="showSliderLabel" destination="8Jv-Cf-blJ" id="UHb-hK-VVl"/>
                         <outlet property="showSunriseLabel" destination="4lt-X6-3uU" id="tez-s5-RzL"/>
                         <outlet property="sliderDayRangePopup" destination="8Nx-Xq-XDU" id="PBM-yB-Yo1"/>
+                        <outlet property="syncLabel" destination="kkn-L8-yOj" id="egW-Df-fnH"/>
                         <outlet property="theme" destination="89w-KN-GJ6" id="SAL-Sh-eqp"/>
                         <outlet property="timeFormat" destination="iiG-Xu-4id" id="oM3-1Y-fAF"/>
                         <outlet property="timeFormatLabel" destination="wtO-uL-QBf" id="udS-d6-Tep"/>
@@ -1513,7 +1544,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <searchField toolTip="Search a timezone" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dha-h9-Nd0">
-                                <rect key="frame" x="8" y="205" width="320" height="23"/>
+                                <rect key="frame" x="8" y="169" width="320" height="23"/>
                                 <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" focusRingType="none" placeholderString="Enter a city, state, country name" usesSingleLineMode="YES" maximumRecents="5" id="ikU-Tm-0WZ">
                                     <font key="font" size="13" name="Avenir-Light"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1570,13 +1601,13 @@ DQ
                                 </connections>
                             </button>
                             <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="32" horizontalPageScroll="10" verticalLineScroll="32" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0wY-ff-FLW">
-                                <rect key="frame" x="8" y="30" width="320" height="165"/>
+                                <rect key="frame" x="8" y="30" width="320" height="129"/>
                                 <clipView key="contentView" drawsBackground="NO" id="rGc-3M-cCq">
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="165"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="129"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="30" rowSizeStyle="automatic" viewBased="YES" id="xkl-2X-ZCb">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="165"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="129"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1666,14 +1697,14 @@ DQ
                                 </scroller>
                             </scrollView>
                             <progressIndicator wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="0A5-gp-lay">
-                                <rect key="frame" x="160" y="132" width="16" height="16"/>
+                                <rect key="frame" x="160" y="114" width="16" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="fgE-77-Vda"/>
                                     <constraint firstAttribute="width" constant="16" id="pwe-em-e0a"/>
                                 </constraints>
                             </progressIndicator>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xgb-wU-8RU">
-                                <rect key="frame" x="18" y="102" width="300" height="22"/>
+                                <rect key="frame" x="18" y="84" width="300" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="zqt-d8-yas"/>
                                 </constraints>