diff --git a/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib
index 7075590..273c63b 100644
--- a/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/ja.lproj/CLFloatingWindow.xib	
@@ -57,6 +57,26 @@
                                                     <rect key="frame" x="1" y="0.0" width="279" height="60"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
+                                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="6y0-xP-bPZ">
+                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="20" id="VIH-zs-bLn"/>
+                                                                <constraint firstAttribute="width" constant="20" id="XM2-nG-5aU"/>
+                                                            </constraints>
+                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Sunrise" id="ciN-Xz-hJ0"/>
+                                                        </imageView>
+                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xiB-ab-VRH">
+                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="45" id="hMZ-YQ-cjr"/>
+                                                                <constraint firstAttribute="height" constant="17" id="rcL-hY-BVT"/>
+                                                            </constraints>
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="07:00 PM" id="7Oy-jC-4Ad">
+                                                                <font key="font" size="11" name="SFUIDisplay-Ultralight"/>
+                                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                        </textField>
                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="100" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="Zyy-Fw-K7Z" customClass="CLPanelTextField">
                                                             <rect key="frame" x="7" y="33" width="154" height="22"/>
                                                             <constraints>
@@ -85,7 +105,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="101" preferredMaxLayoutWidth="110" translatesAutoresizingMaskIntoConstraints="NO" id="DSw-uJ-JCx">
-                                                            <rect key="frame" x="159" y="21" width="114" height="35"/>
+                                                            <rect key="frame" x="159" y="24" width="114" height="35"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="110" id="seR-NV-Bdf"/>
                                                                 <constraint firstAttribute="height" constant="35" id="wBx-lE-7e5"/>
@@ -102,12 +122,18 @@
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="5" id="B0D-ik-bxk"/>
                                                         <constraint firstAttribute="trailing" secondItem="DSw-uJ-JCx" secondAttribute="trailing" constant="8" id="IA6-vj-gHR"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="9" id="JFG-Yz-esL"/>
-                                                        <constraint firstItem="DSw-uJ-JCx" firstAttribute="centerY" secondItem="8mq-8K-c34" secondAttribute="centerY" constant="-8" id="ko5-Yd-e4R"/>
+                                                        <constraint firstAttribute="trailing" secondItem="xiB-ab-VRH" secondAttribute="trailing" constant="8" id="Y9Q-dK-MDF"/>
+                                                        <constraint firstItem="xiB-ab-VRH" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="n9x-SU-3qn"/>
+                                                        <constraint firstItem="6y0-xP-bPZ" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="o7T-Rh-F7U"/>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="10" id="p0N-YR-EDR"/>
+                                                        <constraint firstItem="DSw-uJ-JCx" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="1" id="sEf-eg-HVT"/>
+                                                        <constraint firstItem="xiB-ab-VRH" firstAttribute="leading" secondItem="6y0-xP-bPZ" secondAttribute="trailing" constant="3" id="xid-jT-U1b"/>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="customName" destination="Zyy-Fw-K7Z" id="X1r-mx-tOf"/>
                                                         <outlet property="relativeDate" destination="wFR-Xg-kpb" id="Yur-Tf-mwV"/>
+                                                        <outlet property="sunriseSetImage" destination="6y0-xP-bPZ" id="gEW-77-QjW"/>
+                                                        <outlet property="sunriseSetTime" destination="xiB-ab-VRH" id="jYx-fZ-fVR"/>
                                                         <outlet property="textField" destination="Zyy-Fw-K7Z" id="8fF-LK-hhX"/>
                                                         <outlet property="time" destination="DSw-uJ-JCx" id="vCh-BC-lB4"/>
                                                     </connections>
@@ -256,12 +282,13 @@
             <connections>
                 <outlet property="delegate" destination="-2" id="8xd-fh-hDu"/>
             </connections>
-            <point key="canvasLocation" x="230" y="392.5"/>
+            <point key="canvasLocation" x="190" y="392.5"/>
         </window>
     </objects>
     <resources>
         <image name="ClockerIcon-16" width="16" height="16"/>
         <image name="NSActionTemplate" width="14" height="14"/>
         <image name="PowerIcon" width="270" height="270"/>
+        <image name="Sunrise" width="512" height="512"/>
     </resources>
 </document>
diff --git a/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib
index 2d1ed7d..9f53201 100644
--- a/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/zh-Hans.lproj/CLFloatingWindow.xib	
@@ -72,6 +72,26 @@
                                                                 <action selector="labelDidChange:" target="8mq-8K-c34" id="CdT-6J-5Bn"/>
                                                             </connections>
                                                         </textField>
+                                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xs9-YL-kjz">
+                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="20" id="Obq-Oh-WXk"/>
+                                                                <constraint firstAttribute="height" constant="20" id="reh-nM-X2T"/>
+                                                            </constraints>
+                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Sunrise" id="s4Y-Ea-vG5"/>
+                                                        </imageView>
+                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4gs-C2-sJo">
+                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="45" id="lao-W5-nM7"/>
+                                                                <constraint firstAttribute="height" constant="17" id="wVS-6m-nWK"/>
+                                                            </constraints>
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="07:00 PM" id="o1Y-yu-qQs">
+                                                                <font key="font" size="11" name="SFUIDisplay-Ultralight"/>
+                                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                        </textField>
                                                         <textField verticalHuggingPriority="750" tag="102" preferredMaxLayoutWidth="72" translatesAutoresizingMaskIntoConstraints="NO" id="wFR-Xg-kpb">
                                                             <rect key="frame" x="8" y="11" width="76" height="20"/>
                                                             <constraints>
@@ -85,7 +105,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="101" preferredMaxLayoutWidth="110" translatesAutoresizingMaskIntoConstraints="NO" id="DSw-uJ-JCx">
-                                                            <rect key="frame" x="159" y="21" width="114" height="35"/>
+                                                            <rect key="frame" x="159" y="24" width="114" height="35"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="110" id="seR-NV-Bdf"/>
                                                                 <constraint firstAttribute="height" constant="35" id="wBx-lE-7e5"/>
@@ -99,15 +119,21 @@
                                                     </subviews>
                                                     <constraints>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="top" secondItem="Zyy-Fw-K7Z" secondAttribute="bottom" constant="2" id="2BN-TO-QwP"/>
+                                                        <constraint firstItem="4gs-C2-sJo" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="ArU-Hf-FT8"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="5" id="B0D-ik-bxk"/>
                                                         <constraint firstAttribute="trailing" secondItem="DSw-uJ-JCx" secondAttribute="trailing" constant="8" id="IA6-vj-gHR"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="9" id="JFG-Yz-esL"/>
-                                                        <constraint firstItem="DSw-uJ-JCx" firstAttribute="centerY" secondItem="8mq-8K-c34" secondAttribute="centerY" constant="-8" id="ko5-Yd-e4R"/>
+                                                        <constraint firstItem="xs9-YL-kjz" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="KY7-eL-ZbD"/>
+                                                        <constraint firstItem="4gs-C2-sJo" firstAttribute="leading" secondItem="xs9-YL-kjz" secondAttribute="trailing" constant="3" id="Kuv-5o-LHK"/>
+                                                        <constraint firstAttribute="trailing" secondItem="4gs-C2-sJo" secondAttribute="trailing" constant="8" id="keh-iW-7So"/>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="10" id="p0N-YR-EDR"/>
+                                                        <constraint firstItem="DSw-uJ-JCx" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="1" id="wWS-el-Al4"/>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="customName" destination="Zyy-Fw-K7Z" id="X1r-mx-tOf"/>
                                                         <outlet property="relativeDate" destination="wFR-Xg-kpb" id="Yur-Tf-mwV"/>
+                                                        <outlet property="sunriseSetImage" destination="xs9-YL-kjz" id="Lyy-8j-oDL"/>
+                                                        <outlet property="sunriseSetTime" destination="4gs-C2-sJo" id="s5V-Ji-wOo"/>
                                                         <outlet property="textField" destination="Zyy-Fw-K7Z" id="8fF-LK-hhX"/>
                                                         <outlet property="time" destination="DSw-uJ-JCx" id="vCh-BC-lB4"/>
                                                     </connections>
@@ -263,5 +289,6 @@
         <image name="ClockerIcon-16" width="16" height="16"/>
         <image name="NSActionTemplate" width="14" height="14"/>
         <image name="PowerIcon" width="270" height="270"/>
+        <image name="Sunrise" width="512" height="512"/>
     </resources>
 </document>
diff --git a/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib
index bf18d80..b38410c 100644
--- a/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib	
@@ -73,6 +73,26 @@
                                                                 <outlet property="delegate" destination="8mq-8K-c34" id="3CA-OP-j1f"/>
                                                             </connections>
                                                         </textField>
+                                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Urg-5y-Zdn">
+                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="20" id="5ea-gY-HZ1"/>
+                                                                <constraint firstAttribute="height" constant="20" id="6Ir-U7-lbX"/>
+                                                            </constraints>
+                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Sunrise" id="gKv-kD-9FC"/>
+                                                        </imageView>
+                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XyF-3h-GbI">
+                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="45" id="8zt-C5-2xb"/>
+                                                                <constraint firstAttribute="height" constant="17" id="dVD-Q8-tsO"/>
+                                                            </constraints>
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="07:00 PM" id="A8n-aG-v8t">
+                                                                <font key="font" size="11" name="SFUIDisplay-Ultralight"/>
+                                                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                            </textFieldCell>
+                                                        </textField>
                                                         <textField verticalHuggingPriority="750" tag="102" preferredMaxLayoutWidth="72" translatesAutoresizingMaskIntoConstraints="NO" id="wFR-Xg-kpb">
                                                             <rect key="frame" x="8" y="11" width="76" height="20"/>
                                                             <constraints>
@@ -86,7 +106,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="101" preferredMaxLayoutWidth="110" translatesAutoresizingMaskIntoConstraints="NO" id="DSw-uJ-JCx">
-                                                            <rect key="frame" x="159" y="21" width="114" height="35"/>
+                                                            <rect key="frame" x="159" y="24" width="114" height="35"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="110" id="seR-NV-Bdf"/>
                                                                 <constraint firstAttribute="height" constant="35" id="wBx-lE-7e5"/>
@@ -100,15 +120,21 @@
                                                     </subviews>
                                                     <constraints>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="top" secondItem="Zyy-Fw-K7Z" secondAttribute="bottom" constant="2" id="2BN-TO-QwP"/>
+                                                        <constraint firstAttribute="trailing" secondItem="XyF-3h-GbI" secondAttribute="trailing" constant="8" id="2Cz-zm-2AY"/>
+                                                        <constraint firstItem="Urg-5y-Zdn" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="80T-WB-Gos"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="5" id="B0D-ik-bxk"/>
+                                                        <constraint firstItem="DSw-uJ-JCx" firstAttribute="top" secondItem="8mq-8K-c34" secondAttribute="top" constant="1" id="C7x-Fx-C3E"/>
                                                         <constraint firstAttribute="trailing" secondItem="DSw-uJ-JCx" secondAttribute="trailing" constant="8" id="IA6-vj-gHR"/>
                                                         <constraint firstItem="Zyy-Fw-K7Z" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="9" id="JFG-Yz-esL"/>
-                                                        <constraint firstItem="DSw-uJ-JCx" firstAttribute="centerY" secondItem="8mq-8K-c34" secondAttribute="centerY" constant="-8" id="ko5-Yd-e4R"/>
                                                         <constraint firstItem="wFR-Xg-kpb" firstAttribute="leading" secondItem="8mq-8K-c34" secondAttribute="leading" constant="10" id="p0N-YR-EDR"/>
+                                                        <constraint firstItem="XyF-3h-GbI" firstAttribute="leading" secondItem="Urg-5y-Zdn" secondAttribute="trailing" constant="3" id="sh1-RK-bLs"/>
+                                                        <constraint firstItem="XyF-3h-GbI" firstAttribute="top" secondItem="DSw-uJ-JCx" secondAttribute="bottom" id="u5A-7t-5sJ"/>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="customName" destination="Zyy-Fw-K7Z" id="X1r-mx-tOf"/>
                                                         <outlet property="relativeDate" destination="wFR-Xg-kpb" id="Yur-Tf-mwV"/>
+                                                        <outlet property="sunriseSetImage" destination="Urg-5y-Zdn" id="yBf-P6-1Ic"/>
+                                                        <outlet property="sunriseSetTime" destination="XyF-3h-GbI" id="pC4-w9-0lZ"/>
                                                         <outlet property="textField" destination="Zyy-Fw-K7Z" id="8fF-LK-hhX"/>
                                                         <outlet property="time" destination="DSw-uJ-JCx" id="vCh-BC-lB4"/>
                                                     </connections>
@@ -264,5 +290,6 @@
         <image name="ClockerIcon-16" width="16" height="16"/>
         <image name="NSActionTemplate" width="14" height="14"/>
         <image name="PowerIcon" width="270" height="270"/>
+        <image name="Sunrise" width="512" height="512"/>
     </resources>
 </document>