diff --git a/CHANGELOG.md b/CHANGELOG.md
index d15a6c3..5a03eb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.3.0 (Jan 29, 2022)
+* added sunrise, sunset and civil twilights (powered by https://github.com/haraldh/SunCalc library)
+
 # 1.2.2 (Jun 21, 2021)
 * watch face available for Descent™ Mk2 S, Forerunner® 945 LTE
 
diff --git a/README.md b/README.md
index ab37ef9..5510984 100644
--- a/README.md
+++ b/README.md
@@ -27,3 +27,4 @@ Arc indicators around the screen display:
 * do not disturb status
 * number of alarms. First alarm is displayed as five minutes arc, each other as one minute arc.
 * heart rate (on watches supporting partial update)
+* sunrise, sunset and civil twilights
diff --git a/connect_iq_store/power_saver.png b/connect_iq_store/power_saver.png
new file mode 100644
index 0000000..8f1e012
Binary files /dev/null and b/connect_iq_store/power_saver.png differ
diff --git a/connect_iq_store/sun.png b/connect_iq_store/sun.png
new file mode 100644
index 0000000..bedc51d
Binary files /dev/null and b/connect_iq_store/sun.png differ
diff --git a/manifest.xml b/manifest.xml
index 111daee..009f1d9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.2.2">
+    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.0">
         <iq:products>
             <iq:product id="d2air"/>
             <iq:product id="d2charlie"/>
@@ -49,6 +49,7 @@
             <iq:product id="vivolife"/>
         </iq:products>
         <iq:permissions>
+            <iq:uses-permission id="Positioning"/>
             <iq:uses-permission id="SensorHistory"/>
         </iq:permissions>
         <iq:languages>
diff --git a/manifest.xml.beta b/manifest.xml.beta
index 1efab68..5451042 100644
--- a/manifest.xml.beta
+++ b/manifest.xml.beta
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="SmartArcsTripApp" id="5b7bdde686cc4867be63faf4c6ca83fb" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.2.0">
+    <iq:application entry="SmartArcsTripApp" id="5b7bdde686cc4867be63faf4c6ca83fb" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.0">
         <iq:products>
             <iq:product id="d2air"/>
             <iq:product id="d2charlie"/>
@@ -46,6 +46,7 @@
             <iq:product id="vivolife"/>
         </iq:products>
         <iq:permissions>
+            <iq:uses-permission id="Positioning"/>
             <iq:uses-permission id="SensorHistory"/>
         </iq:permissions>
         <iq:languages>
diff --git a/manifest.xml.prod b/manifest.xml.prod
index 111daee..009f1d9 100644
--- a/manifest.xml.prod
+++ b/manifest.xml.prod
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.2.2">
+    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.0">
         <iq:products>
             <iq:product id="d2air"/>
             <iq:product id="d2charlie"/>
@@ -49,6 +49,7 @@
             <iq:product id="vivolife"/>
         </iq:products>
         <iq:permissions>
+            <iq:uses-permission id="Positioning"/>
             <iq:uses-permission id="SensorHistory"/>
         </iq:permissions>
         <iq:languages>
diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
index 81fab53..ffa3160 100644
--- a/resources/settings/properties.xml
+++ b/resources/settings/properties.xml
@@ -42,6 +42,9 @@
         <property id="dndColor" type="number">0xAA00FF</property>
         <property id="alarmColor" type="number">0xFFAA00</property>
 
+        <property id="sunriseColor" type="number">0xAA0000</property>
+        <property id="sunsetColor" type="number">0x0000FF</property>
+
 <!--
         <property id="dateFormat" type="number">1</property>
         <property id="dateColor" type="number">0xAAAAAA</property>
@@ -96,6 +99,9 @@
 
         <string id="alarmColor">Alarm indicator color (off or color)</string>
 
+        <string id="sunriseColor">Sunrise indicator color (off or color)</string>
+        <string id="sunsetColor">Sunset indicator color (off or color)</string>
+
 <!--
         <string id="dateColor">Date color (off or color)</string>
         <string id="dateFormat">Date format</string>
@@ -418,6 +424,46 @@
             </settingConfig>
         </setting>
 
+        <setting propertyKey="@Properties.sunriseColor" title="@Strings.sunriseColor">
+            <settingConfig type="list">
+                <listEntry value="-999">@Strings.off</listEntry>
+                <listEntry value="0xFFFFFF">@Strings.white</listEntry>
+                <listEntry value="0xAAAAAA">@Strings.ltGray</listEntry>
+                <listEntry value="0x555555">@Strings.dkGray</listEntry>
+                <listEntry value="0x000000">@Strings.black</listEntry>
+                <listEntry value="0xFF0000">@Strings.red</listEntry>
+                <listEntry value="0xAA0000">@Strings.dkRed</listEntry>
+                <listEntry value="0xFF5500">@Strings.orange</listEntry>
+                <listEntry value="0xFFAA00">@Strings.yellow</listEntry>
+                <listEntry value="0x00FF00">@Strings.green</listEntry>
+                <listEntry value="0x00AA00">@Strings.dkGreen</listEntry>
+                <listEntry value="0x00AAFF">@Strings.blue</listEntry>
+                <listEntry value="0x0000FF">@Strings.dkBlue</listEntry>
+                <listEntry value="0xAA00FF">@Strings.purple</listEntry>
+                <listEntry value="0xFF00FF">@Strings.pink</listEntry>
+            </settingConfig>
+        </setting>
+
+        <setting propertyKey="@Properties.sunsetColor" title="@Strings.sunsetColor">
+            <settingConfig type="list">
+                <listEntry value="-999">@Strings.off</listEntry>
+                <listEntry value="0xFFFFFF">@Strings.white</listEntry>
+                <listEntry value="0xAAAAAA">@Strings.ltGray</listEntry>
+                <listEntry value="0x555555">@Strings.dkGray</listEntry>
+                <listEntry value="0x000000">@Strings.black</listEntry>
+                <listEntry value="0xFF0000">@Strings.red</listEntry>
+                <listEntry value="0xAA0000">@Strings.dkRed</listEntry>
+                <listEntry value="0xFF5500">@Strings.orange</listEntry>
+                <listEntry value="0xFFAA00">@Strings.yellow</listEntry>
+                <listEntry value="0x00FF00">@Strings.green</listEntry>
+                <listEntry value="0x00AA00">@Strings.dkGreen</listEntry>
+                <listEntry value="0x00AAFF">@Strings.blue</listEntry>
+                <listEntry value="0x0000FF">@Strings.dkBlue</listEntry>
+                <listEntry value="0xAA00FF">@Strings.purple</listEntry>
+                <listEntry value="0xFF00FF">@Strings.pink</listEntry>
+            </settingConfig>
+        </setting>
+
 <!--
         <setting propertyKey="@Properties.dateColor" title="@Strings.dateColor">
             <settingConfig type="list">
diff --git a/source/SmartArcsTripView.mc b/source/SmartArcsTripView.mc
index cf4bac6..1287e7a 100644
--- a/source/SmartArcsTripView.mc
+++ b/source/SmartArcsTripView.mc
@@ -19,6 +19,7 @@
 using Toybox.Application;
 using Toybox.Graphics;
 using Toybox.Lang;
+using Toybox.Position;
 using Toybox.SensorHistory;
 using Toybox.System;
 using Toybox.Time;
@@ -60,6 +61,10 @@ class SmartArcsTripView extends WatchUi.WatchFace {
     var startPowerSaverMin;
     var endPowerSaverMin;
     var powerSaverIconRatio;
+	var sunriseStartAngle = 0;
+	var sunriseEndAngle = 0;
+	var sunsetStartAngle = 0;
+	var sunsetEndAngle = 0;
 
     //user settings
     var bgColor;
@@ -97,6 +102,8 @@ class SmartArcsTripView extends WatchUi.WatchFace {
     var powerSaver;
     var powerSaverRefreshInterval;
     var powerSaverIconColor;
+    var sunriseColor;
+    var sunsetColor;
 
     function initialize() {
         loadUserSettings();
@@ -165,6 +172,11 @@ class SmartArcsTripView extends WatchUi.WatchFace {
             computeConstants(dc);
         }
 
+		//recompute sunrise/sunset constants every hour - to address new location when traveling
+		if (clockTime.min == 0) {
+			computeSunConstants();
+		}
+
         //we always want to refresh the full screen when we get a regular onUpdate call.
         fullScreenRefresh = true;
 
@@ -199,6 +211,8 @@ class SmartArcsTripView extends WatchUi.WatchFace {
             drawAlarms(targetDc, deviceSettings.alarmCount);
         }
 
+    	drawSun(targetDc);
+
         if (showTicks) {
             drawTicks(targetDc);
         }
@@ -393,11 +407,15 @@ class SmartArcsTripView extends WatchUi.WatchFace {
             bluetoothColor = app.getProperty("bluetoothColor");
             dndColor = app.getProperty("dndColor");
             alarmColor = app.getProperty("alarmColor");
+            sunriseColor = app.getProperty("sunriseColor");
+			sunsetColor = app.getProperty("sunsetColor");
         } else {
             notificationColor = oneColor;
             bluetoothColor = oneColor;
             dndColor = oneColor;
             alarmColor = oneColor;
+            sunriseColor = oneColor;
+			sunsetColor = oneColor;
         }
         bgColor = app.getProperty("bgColor");
         ticksColor = app.getProperty("ticksColor");
@@ -503,6 +521,8 @@ class SmartArcsTripView extends WatchUi.WatchFace {
         hrTextDimension = dc.getTextDimensions("888", Graphics.FONT_TINY); //to compute correct clip boundaries
         halfHRTextWidth = hrTextDimension[0] / 2;
 
+		computeSunConstants();
+
         //constants pre-computed, doesn't need to be computed again
         precompute = false;
     }
@@ -524,10 +544,10 @@ class SmartArcsTripView extends WatchUi.WatchFace {
 
     function computeTicks() {
         var angle;
-        ticks = new [31];
-        //to save the memory compute only half of the ticks, second half will be mirrored.
+        ticks = new [16];
+        //to save the memory compute only a quarter of the ticks, the rest will be mirrored.
         //I believe it will still save some CPU utilization
-        for (var i = 0; i < 31; i++) {
+        for (var i = 0; i < 16; i++) {
             angle = i * twoPI / 60.0;
             if ((i % 15) == 0) { //quarter tick
                 if (ticks15MinWidth > 0) {
@@ -634,16 +654,30 @@ class SmartArcsTripView extends WatchUi.WatchFace {
     function drawTicks(dc) {
         var coord = new [4];
         dc.setColor(ticksColor, Graphics.COLOR_TRANSPARENT);
-        for (var i = 0; i < 31; i++) {
+        for (var i = 0; i < 16; i++) {
+        	//30-45 ticks
             if (ticks[i] != null) {
                 dc.fillPolygon(ticks[i]);
             }
 
-            //mirror pre-computed ticks from the left side to the right side
-            if (i > 0 && i <30 && ticks[i] != null) {
+            //mirror pre-computed ticks
+            if (i >= 0 && i <= 15 && ticks[i] != null) {
+            	//15-30 ticks
                 for (var j = 0; j < 4; j++) {
                     coord[j] = [screenWidth - ticks[i][j][0], ticks[i][j][1]];
                 }
+                dc.fillPolygon(coord);
+
+				//45-60 ticks
+                for (var j = 0; j < 4; j++) {
+                    coord[j] = [ticks[i][j][0], screenWidth - ticks[i][j][1]];
+                }
+                dc.fillPolygon(coord);
+
+				//0-15 ticks
+                for (var j = 0; j < 4; j++) {
+                    coord[j] = [screenWidth - ticks[i][j][0], screenWidth - ticks[i][j][1]];
+                }
                 dc.fillPolygon(coord);
             }
         }
@@ -954,4 +988,41 @@ class SmartArcsTripView extends WatchUi.WatchFace {
 
         powerSaverDrawn = true;
     }
+
+	function computeSunConstants() {
+    	var posInfo = Toybox.Position.getInfo();
+    	if (posInfo != null && posInfo.position != null) {
+	    	var sc = new SunCalc();
+	    	var time_now = Time.now();    	
+	    	var loc = posInfo.position.toRadians();		
+	        sunriseStartAngle = computeSunAngle(sc.calculate(time_now, loc, SunCalc.DAWN));	        
+	        sunriseEndAngle = computeSunAngle(sc.calculate(time_now, loc, SunCalc.SUNRISE));
+	        sunsetStartAngle = computeSunAngle(sc.calculate(time_now, loc, SunCalc.SUNSET));
+	        sunsetEndAngle = computeSunAngle(sc.calculate(time_now, loc, SunCalc.DUSK));
+        }
+	}
+
+	function computeSunAngle(time) {
+        var timeInfo = Time.Gregorian.info(time, Time.FORMAT_SHORT);       
+        var angle = ((timeInfo.hour % 12) * 60.0) + timeInfo.min;
+        angle = angle / (12 * 60.0) * twoPI;
+        return -(angle - Math.PI/2) * 180 / Math.PI;	
+	}
+
+	function drawSun(dc) {
+        dc.setPenWidth(7);
+
+        //draw sunrise
+        if (sunriseColor != offSettingFlag) {
+	        dc.setColor(sunriseColor, Graphics.COLOR_TRANSPARENT);
+			dc.drawArc(screenRadius, screenRadius, screenRadius - 17, Graphics.ARC_CLOCKWISE, sunriseStartAngle, sunriseEndAngle);
+		}
+
+        //draw sunset
+        if (sunsetColor != offSettingFlag) {
+	        dc.setColor(sunsetColor, Graphics.COLOR_TRANSPARENT);
+			dc.drawArc(screenRadius, screenRadius, screenRadius - 13, Graphics.ARC_CLOCKWISE, sunsetStartAngle, sunsetEndAngle);
+		}
+	}
+	
 }
diff --git a/source/SunCalc.mc b/source/SunCalc.mc
new file mode 100644
index 0000000..3f98a27
--- /dev/null
+++ b/source/SunCalc.mc
@@ -0,0 +1,205 @@
+//https://github.com/haraldh/SunCalc/blob/master/source/SunCalc.mc
+
+using Toybox.Math as Math;
+using Toybox.Time as Time;
+using Toybox.Position as Pos;
+
+enum {
+	NIGHT_END,
+	NAUTICAL_DAWN,
+	DAWN,
+	BLUE_HOUR_AM,
+	SUNRISE,
+	SUNRISE_END,
+	GOLDEN_HOUR_AM,
+	NOON,
+	GOLDEN_HOUR_PM,
+	SUNSET_START,
+	SUNSET,
+	BLUE_HOUR_PM,
+	DUSK,
+	NAUTICAL_DUSK,
+	NIGHT,
+	NUM_RESULTS
+}
+
+class SunCalc {
+
+    hidden const PI   = Math.PI,
+        RAD  = Math.PI / 180.0,
+        PI2  = Math.PI * 2.0,
+        DAYS = Time.Gregorian.SECONDS_PER_DAY,
+        J1970 = 2440588,
+        J2000 = 2451545,
+        J0 = 0.0009;
+
+    hidden const TIMES = [
+        -18 * RAD,    // ASTRO_DAWN
+        -12 * RAD,    // NAUTIC_DAWN
+        -6 * RAD,     // DAWN
+        -4 * RAD,     // BLUE_HOUR
+        -0.833 * RAD, // SUNRISE
+        -0.3 * RAD,   // SUNRISE_END
+        6 * RAD,      // GOLDEN_HOUR_AM
+        null,         // NOON
+        6 * RAD,
+        -0.3 * RAD,
+        -0.833 * RAD,
+        -4 * RAD,
+        -6 * RAD,
+        -12 * RAD,
+        -18 * RAD
+        ];
+
+    var lastD, lastLng;
+    var	n, ds, M, sinM, C, L, sin2L, dec, Jnoon;
+
+    function initialize() {
+        lastD = null;
+        lastLng = null;
+    }
+
+    function fromJulian(j) {
+        return new Time.Moment((j + 0.5 - J1970) * DAYS);
+    }
+
+    function round(a) {
+        if (a > 0) {
+            return (a + 0.5).toNumber().toFloat();
+        } else {
+            return (a - 0.5).toNumber().toFloat();
+        }
+    }
+
+    // lat and lng in radians
+    function calculate(moment, pos, what) {
+        var lat = pos[0];
+        var lng = pos[1];
+
+        var d = moment.value().toDouble() / DAYS - 0.5 + J1970 - J2000;
+        if (lastD != d || lastLng != lng) {
+            n = round(d - J0 + lng / PI2);
+//			ds = J0 - lng / PI2 + n;
+            ds = J0 - lng / PI2 + n - 1.1574e-5 * 68;
+            M = 6.240059967 + 0.0172019715 * ds;
+            sinM = Math.sin(M);
+            C = (1.9148 * sinM + 0.02 * Math.sin(2 * M) + 0.0003 * Math.sin(3 * M)) * RAD;
+            L = M + C + 1.796593063 + PI;
+            sin2L = Math.sin(2 * L);
+            dec = Math.asin( 0.397783703 * Math.sin(L) );
+            Jnoon = J2000 + ds + 0.0053 * sinM - 0.0069 * sin2L;
+            lastD = d;
+            lastLng = lng;
+        }
+
+        if (what == NOON) {
+            return fromJulian(Jnoon);
+        }
+
+        var x = (Math.sin(TIMES[what]) - Math.sin(lat) * Math.sin(dec)) / (Math.cos(lat) * Math.cos(dec));
+
+        if (x > 1.0 || x < -1.0) {
+            return null;
+        }
+
+        var ds = J0 + (Math.acos(x) - lng) / PI2 + n - 1.1574e-5 * 68;
+
+        var Jset = J2000 + ds + 0.0053 * sinM - 0.0069 * sin2L;
+        if (what > NOON) {
+            return fromJulian(Jset);
+        }
+
+        var Jrise = Jnoon - (Jset - Jnoon);
+
+        return fromJulian(Jrise);
+    }
+
+    function momentToString(moment, is24Hour) {
+
+        if (moment == null) {
+            return "--:--";
+        }
+
+        var tinfo = Time.Gregorian.info(new Time.Moment(moment.value() + 30), Time.FORMAT_SHORT);
+        var text;
+        if (is24Hour) {
+            text = tinfo.hour.format("%02d") + ":" + tinfo.min.format("%02d");
+        } else {
+            var hour = tinfo.hour % 12;
+            if (hour == 0) {
+                hour = 12;
+            }
+            text = hour.format("%02d") + ":" + tinfo.min.format("%02d");
+            // wtf... get used to 24 hour format...
+            if (tinfo.hour < 12 || tinfo.hour == 24) {
+                text = text + " AM";
+            } else {
+                text = text + " PM";
+            }
+        }
+        var today = Time.today();
+        var days = ((moment.value() - today.value()) / Time.Gregorian.SECONDS_PER_DAY).toNumber();
+
+        if (moment.value() > today.value() ) {
+            if (days > 0) {
+                text = text + " +" + days;
+            }
+        } else {
+            days = days - 1;
+            text = text + " " + days;
+        }
+        return text;
+    }
+
+    static function printMoment(moment) {
+        var info = Time.Gregorian.info(moment, Time.FORMAT_SHORT);
+        return info.day.format("%02d") + "." + info.month.format("%02d") + "." + info.year.toString()
+            + " " + info.hour.format("%02d") + ":" + info.min.format("%02d") + ":" + info.sec.format("%02d");
+    }
+
+    (:test) static function testCalc(logger) {
+
+        var testMatrix = [
+            [ 1496310905, 48.1009616, 11.759784, NOON, 1496315468 ],
+            [ 1496310905, 70.6632359, 23.681726, NOON, 1496312606 ],
+            [ 1496310905, 70.6632359, 23.681726, SUNSET, null ],
+            [ 1496310905, 70.6632359, 23.681726, SUNRISE, null ],
+            [ 1496310905, 70.6632359, 23.681726, ASTRO_DAWN, null ],
+            [ 1496310905, 70.6632359, 23.681726, NAUTIC_DAWN, null ],
+            [ 1496310905, 70.6632359, 23.681726, DAWN, null ],
+            [ 1483225200, 70.6632359, 23.681726, SUNRISE, null ],
+            [ 1483225200, 70.6632359, 23.681726, NOON, 1483266532 ],
+            [ 1483225200, 70.6632359, 23.681726, ASTRO_DAWN, 1483247635 ],
+            [ 1483225200, 70.6632359, 23.681726, NAUTIC_DAWN, 1483252565 ],
+            [ 1483225200, 70.6632359, 23.681726, DAWN, 1483259336 ]
+            ];
+
+        var sc = new SunCalc();
+        var moment;
+
+        for (var i = 0; i < testMatrix.size(); i++) {
+            moment = sc.calculate(new Time.Moment(testMatrix[i][0]),
+                                  new Pos.Location(
+                                      { :latitude => testMatrix[i][1], :longitude => testMatrix[i][2], :format => :degrees }
+                                      ).toRadians(),
+                                  testMatrix[i][3]);
+
+            if (   (moment == null  && testMatrix[i][4] != moment)
+                   || (moment != null && moment.value().toLong() != testMatrix[i][4])) {
+                var val;
+
+                if (moment == null) {
+                    val = "null";
+                } else {
+                    val = moment.value().toLong();
+                }
+
+                logger.debug("Expected " + testMatrix[i][4] + " but got: " + val);
+                logger.debug(printMoment(moment));
+                return false;
+            }
+        }
+
+        return true;
+    }
+}