diff --git a/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib
index b38410c..d08306d 100644
--- a/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/zh-Hant.lproj/CLFloatingWindow.xib	
@@ -87,7 +87,7 @@
                                                                 <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">
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="left" 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"/>
diff --git a/Clocker/ja.lproj/Panel.xib b/Clocker/ja.lproj/Panel.xib
index 37e84ab..3dac164 100755
--- a/Clocker/ja.lproj/Panel.xib
+++ b/Clocker/ja.lproj/Panel.xib
@@ -72,6 +72,26 @@
                                                                 <action selector="labelDidChange:" target="qbN-ba-fho" id="7uY-zA-yJS"/>
                                                             </connections>
                                                         </textField>
+                                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="32s-jh-CdZ">
+                                                            <rect key="frame" x="203" y="1" width="20" height="20"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="20" id="LN0-5e-Uw7"/>
+                                                                <constraint firstAttribute="width" constant="20" id="Txb-Xo-JPl"/>
+                                                            </constraints>
+                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Sunrise" id="eLr-Js-g3E"/>
+                                                        </imageView>
+                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6CM-3s-ZNr">
+                                                            <rect key="frame" x="224" y="4" width="49" height="17"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="17" id="Mho-dg-5yL"/>
+                                                                <constraint firstAttribute="width" constant="45" id="zNy-He-GNo"/>
+                                                            </constraints>
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="07:00 PM" id="Yxf-ti-4jB">
+                                                                <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="QUd-7D-q14">
                                                             <rect key="frame" x="8" y="11" width="76" height="20"/>
                                                             <constraints>
@@ -99,15 +119,21 @@
                                                     </subviews>
                                                     <constraints>
                                                         <constraint firstItem="QUd-7D-q14" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="10" id="0Qz-Ev-efP"/>
+                                                        <constraint firstItem="32s-jh-CdZ" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" id="D0i-kM-n59"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="5" id="Lct-kG-usb"/>
-                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="centerY" secondItem="qbN-ba-fho" secondAttribute="centerY" constant="-8" id="TuQ-gE-ZUh"/>
                                                         <constraint firstItem="QUd-7D-q14" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="bottom" constant="2" id="VO6-Zn-eA3"/>
+                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="4" id="aN5-p4-LEq"/>
+                                                        <constraint firstAttribute="trailing" secondItem="6CM-3s-ZNr" secondAttribute="trailing" constant="8" id="qcf-ej-oC8"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="9" id="ueW-ow-ZRq"/>
+                                                        <constraint firstItem="6CM-3s-ZNr" firstAttribute="leading" secondItem="32s-jh-CdZ" secondAttribute="trailing" constant="3" id="xMj-d9-yh6"/>
+                                                        <constraint firstItem="6CM-3s-ZNr" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" id="yfd-bg-v0L"/>
                                                         <constraint firstAttribute="trailing" secondItem="vnv-J2-7r1" secondAttribute="trailing" constant="8" id="zXo-eA-0bQ"/>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="customName" destination="etF-33-bCB" id="6Yz-qc-WmD"/>
                                                         <outlet property="relativeDate" destination="QUd-7D-q14" id="Ath-zr-bGo"/>
+                                                        <outlet property="sunriseSetImage" destination="32s-jh-CdZ" id="Nl6-eh-Ngd"/>
+                                                        <outlet property="sunriseSetTime" destination="6CM-3s-ZNr" id="avi-g4-Xgg"/>
                                                         <outlet property="textField" destination="etF-33-bCB" id="6fd-cc-Qq2"/>
                                                         <outlet property="time" destination="vnv-J2-7r1" id="XFD-GQ-9CD"/>
                                                     </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>
diff --git a/Clocker/zh-Hans.lproj/Panel.xib b/Clocker/zh-Hans.lproj/Panel.xib
index f4bb50d..ac4ec4a 100755
--- a/Clocker/zh-Hans.lproj/Panel.xib
+++ b/Clocker/zh-Hans.lproj/Panel.xib
@@ -72,6 +72,26 @@
                                                                 <action selector="labelDidChange:" target="qbN-ba-fho" id="7uY-zA-yJS"/>
                                                             </connections>
                                                         </textField>
+                                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ids-Uo-ci6">
+                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="20" id="Tug-eT-kM6"/>
+                                                                <constraint firstAttribute="width" constant="20" id="fw4-xM-R7B"/>
+                                                            </constraints>
+                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Sunrise" id="SQ7-zC-HEd"/>
+                                                        </imageView>
+                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6Lf-Yu-mLH">
+                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="17" id="Erg-ja-DqV"/>
+                                                                <constraint firstAttribute="width" constant="45" id="r3N-lG-lbQ"/>
+                                                            </constraints>
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="07:00 PM" id="7e9-Cy-Q3m">
+                                                                <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="QUd-7D-q14">
                                                             <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="vnv-J2-7r1">
-                                                            <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="height" constant="35" id="3WU-de-OQL"/>
                                                                 <constraint firstAttribute="width" constant="110" id="cQV-gJ-zMz"/>
@@ -99,15 +119,21 @@
                                                     </subviews>
                                                     <constraints>
                                                         <constraint firstItem="QUd-7D-q14" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="10" id="0Qz-Ev-efP"/>
+                                                        <constraint firstItem="6Lf-Yu-mLH" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" id="6Mc-mV-px7"/>
+                                                        <constraint firstAttribute="trailing" secondItem="6Lf-Yu-mLH" secondAttribute="trailing" constant="8" id="EFk-L8-w4w"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="5" id="Lct-kG-usb"/>
-                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="centerY" secondItem="qbN-ba-fho" secondAttribute="centerY" constant="-8" id="TuQ-gE-ZUh"/>
+                                                        <constraint firstItem="6Lf-Yu-mLH" firstAttribute="leading" secondItem="Ids-Uo-ci6" secondAttribute="trailing" constant="3" id="Mh9-0D-cWP"/>
+                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="1" id="Syb-YN-Gsr"/>
                                                         <constraint firstItem="QUd-7D-q14" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="bottom" constant="2" id="VO6-Zn-eA3"/>
+                                                        <constraint firstItem="Ids-Uo-ci6" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" id="sfI-UU-HeB"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="9" id="ueW-ow-ZRq"/>
                                                         <constraint firstAttribute="trailing" secondItem="vnv-J2-7r1" secondAttribute="trailing" constant="8" id="zXo-eA-0bQ"/>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="customName" destination="etF-33-bCB" id="6Yz-qc-WmD"/>
                                                         <outlet property="relativeDate" destination="QUd-7D-q14" id="Ath-zr-bGo"/>
+                                                        <outlet property="sunriseSetImage" destination="Ids-Uo-ci6" id="qZh-SH-33g"/>
+                                                        <outlet property="sunriseSetTime" destination="6Lf-Yu-mLH" id="eIy-7v-jzE"/>
                                                         <outlet property="textField" destination="etF-33-bCB" id="6fd-cc-Qq2"/>
                                                         <outlet property="time" destination="vnv-J2-7r1" id="XFD-GQ-9CD"/>
                                                     </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>
diff --git a/Clocker/zh-Hant.lproj/Panel.xib b/Clocker/zh-Hant.lproj/Panel.xib
index 1d8f7c2..377ded3 100755
--- a/Clocker/zh-Hant.lproj/Panel.xib
+++ b/Clocker/zh-Hant.lproj/Panel.xib
@@ -72,6 +72,26 @@
                                                                 <action selector="labelDidChange:" target="qbN-ba-fho" id="7uY-zA-yJS"/>
                                                             </connections>
                                                         </textField>
+                                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="6Ea-8S-iTa">
+                                                            <rect key="frame" x="203" y="4" width="20" height="20"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="20" id="TYa-1I-fQJ"/>
+                                                                <constraint firstAttribute="width" constant="20" id="b27-EB-ZA9"/>
+                                                            </constraints>
+                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Sunrise" id="k54-vn-T4E"/>
+                                                        </imageView>
+                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="L5a-d8-SuC">
+                                                            <rect key="frame" x="224" y="7" width="49" height="17"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="17" id="Fmh-lZ-7vJ"/>
+                                                                <constraint firstAttribute="width" constant="45" id="psP-EH-mNo"/>
+                                                            </constraints>
+                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="07:00 PM" id="uGx-ek-RAy">
+                                                                <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="QUd-7D-q14">
                                                             <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="vnv-J2-7r1">
-                                                            <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="height" constant="35" id="3WU-de-OQL"/>
                                                                 <constraint firstAttribute="width" constant="110" id="cQV-gJ-zMz"/>
@@ -99,15 +119,21 @@
                                                     </subviews>
                                                     <constraints>
                                                         <constraint firstItem="QUd-7D-q14" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="10" id="0Qz-Ev-efP"/>
+                                                        <constraint firstItem="6Ea-8S-iTa" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" id="0Vx-eb-VjR"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="5" id="Lct-kG-usb"/>
-                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="centerY" secondItem="qbN-ba-fho" secondAttribute="centerY" constant="-8" id="TuQ-gE-ZUh"/>
+                                                        <constraint firstItem="L5a-d8-SuC" firstAttribute="leading" secondItem="6Ea-8S-iTa" secondAttribute="trailing" constant="3" id="SLJ-j1-tPj"/>
                                                         <constraint firstItem="QUd-7D-q14" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="bottom" constant="2" id="VO6-Zn-eA3"/>
+                                                        <constraint firstItem="L5a-d8-SuC" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" id="YdU-5D-bdv"/>
+                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="1" id="brT-M2-0IB"/>
+                                                        <constraint firstAttribute="trailing" secondItem="L5a-d8-SuC" secondAttribute="trailing" constant="8" id="iqR-Tq-tVx"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="9" id="ueW-ow-ZRq"/>
                                                         <constraint firstAttribute="trailing" secondItem="vnv-J2-7r1" secondAttribute="trailing" constant="8" id="zXo-eA-0bQ"/>
                                                     </constraints>
                                                     <connections>
                                                         <outlet property="customName" destination="etF-33-bCB" id="6Yz-qc-WmD"/>
                                                         <outlet property="relativeDate" destination="QUd-7D-q14" id="Ath-zr-bGo"/>
+                                                        <outlet property="sunriseSetImage" destination="6Ea-8S-iTa" id="0q5-qu-IcL"/>
+                                                        <outlet property="sunriseSetTime" destination="L5a-d8-SuC" id="Mmg-Xj-qI5"/>
                                                         <outlet property="textField" destination="etF-33-bCB" id="6fd-cc-Qq2"/>
                                                         <outlet property="time" destination="vnv-J2-7r1" id="XFD-GQ-9CD"/>
                                                     </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>