diff --git a/watchface/src/main/res/raw/watchface.xml b/watchface/src/main/res/raw/watchface.xml
index 2ae73c0..5fc4314 100644
--- a/watchface/src/main/res/raw/watchface.xml
+++ b/watchface/src/main/res/raw/watchface.xml
@@ -4,7 +4,7 @@
     <Group height="450" name="Root" width="450" x="0" y="0">
       <PartDraw height="450" name="BackgroundContour" width="450" x="0" y="0">
         <Ellipse height="450.0" width="450.0" x="0.0" y="0.0">
-          <Stroke color="#fffefbea" thickness="10.0"/>
+          <Stroke color="#ffd6d3c3" thickness="10.0"/>
           <Fill color="#ffe6e3d3"/>
         </Ellipse>
       </PartDraw>
@@ -221,10 +221,10 @@
     </Group>
 
     <ComplicationSlot
-        x="2" y="195"
-        width="60" height="60"
+        x="0" y="0"
+        width="450" height="450"
         slotId="0"
-        name="left_complication" displayName="Left"
+        name="ring_complication" displayName="Ring"
         supportedTypes="RANGED_VALUE">
       <!--
         There is no guarantee that the primaryProvider component name is
@@ -232,6 +232,7 @@
         DefaultSystemProvider, to provide a fallback.
         System providers are listed here: https://developer.android.com/reference/android/support/wearable/complications/SystemProviders.html
       -->
+      <!--"com.weartools/com.weartools.weekdayutccomp.complication.SunriseSunsetComplicationService"-->
       <DefaultProviderPolicy
           primaryProvider="com.fitbit.FitbitMobile/com.fitbit.complications.calories.CaloriesComplicationDataSourceService"
           primaryProviderType="RANGED_VALUE"
@@ -243,7 +244,7 @@
         https://developer.android.com/training/wearables/wff/complication/bounding
         This example= only demonstrates a round complication.
       -->
-      <BoundingOval x="0" y="0" width="60" height="60" outlinePadding="2" />
+      <BoundingOval x="0" y="0" width="450" height="450" outlinePadding="2" />
 
       <!--
         Basic example of a Ranged Value complication.
@@ -262,201 +263,40 @@
         evaluates which combination has been provided by the data source and
         renders accordingly.
       -->
+      <!--
+        <Arc centerX="225" centerY="225" height="450" width="450" startAngle="0" endAngle="90" direction="CLOCKWISE">
+          <Stroke color="#ffff0000" thickness="10.0"/>
+        </Arc>
+      -->
       <Complication type="RANGED_VALUE">
-        <Group name="ranged_value_ring_ambient" x="0" y="0" width="60" height="60" alpha="0">
+        <Group name="ranged_value_ring_ambient" x="0" y="0" width="450" height="450" alpha="255">
           <Variant mode="AMBIENT" target="alpha" value="255" />
-          <PartDraw x="0" y="0" height="60" width="60">
-            <Arc direction="CLOCKWISE" startAngle="-150" endAngle="150" centerX="30" centerY="30" width="50" height="50">
-              <Stroke color="[CONFIGURATION.themeColor.3]" cap="ROUND" thickness="10" />
+          <PartDraw x="0" y="0" height="450" width="450">
+            <Arc direction="COUNTER_CLOCKWISE" startAngle="-150" endAngle="150" centerX="225" centerY="225" width="450" height="450">
+              <Stroke color="[CONFIGURATION.themeColor.3]" cap="ROUND" thickness="40" />
             </Arc>
           </PartDraw>
-          <PartDraw x="0" y="0" height="60" width="60" >
-            <Arc direction="CLOCKWISE" startAngle="-150" endAngle="150" centerX="30" centerY="30" width="50" height="50">
+          <PartDraw x="0" y="0" height="450" width="450">
+            <Arc direction="COUNTER_CLOCKWISE" startAngle="-150" endAngle="150" centerX="225" centerY="225" width="450" height="450">
               <Transform target="endAngle" value="-150 + (((clamp(([COMPLICATION.RANGED_VALUE_VALUE]), ([COMPLICATION.RANGED_VALUE_MIN]), ([COMPLICATION.RANGED_VALUE_MAX])) - ([COMPLICATION.RANGED_VALUE_MIN])) / (([COMPLICATION.RANGED_VALUE_MAX]) - ([COMPLICATION.RANGED_VALUE_MIN]))) * (300))" />
-              <Stroke color="#66000000" cap="ROUND" thickness="10" />
+              <Stroke color="#66000066" cap="ROUND" thickness="20" />
             </Arc>
           </PartDraw>
         </Group>
-        <Group name="ranged_value_ring" x="0" y="0" width="60" height="60" alpha="255">
+        <Group name="ranged_value_ring" x="0" y="0" width="450" height="450" alpha="255">
           <Variant mode="AMBIENT" target="alpha" value="0" />
-          <PartDraw x="0" y="0" height="60" width="60">
-            <Arc direction="CLOCKWISE" startAngle="-150" endAngle="150" centerX="30" centerY="30" width="50" height="50">
-              <Stroke color="[CONFIGURATION.themeColor.0]" cap="ROUND" thickness="10" />
+          <PartDraw x="0" y="0" height="450" width="450">
+            <Arc direction="COUNTER_CLOCKWISE" startAngle="-150" endAngle="150" centerX="225" centerY="225" width="450" height="450">
+              <Stroke color="[CONFIGURATION.themeColor.0]" cap="ROUND" thickness="40" />
             </Arc>
           </PartDraw>
-          <PartDraw x="0" y="0" height="60" width="60">
-            <Arc direction="CLOCKWISE" startAngle="-150" endAngle="150" centerX="30" centerY="30" width="50" height="50">
+          <PartDraw x="0" y="0" height="450" width="450">
+            <Arc direction="COUNTER_CLOCKWISE" startAngle="-150" endAngle="150" centerX="225" centerY="225" width="450" height="450">
               <Transform target="endAngle" value="-150 + (((clamp(([COMPLICATION.RANGED_VALUE_VALUE]), ([COMPLICATION.RANGED_VALUE_MIN]), ([COMPLICATION.RANGED_VALUE_MAX])) - ([COMPLICATION.RANGED_VALUE_MIN])) / (([COMPLICATION.RANGED_VALUE_MAX]) - ([COMPLICATION.RANGED_VALUE_MIN]))) * (300))" />
-              <Stroke color="#66000000" cap="ROUND" thickness="10" />
+              <Stroke color="#66000066" cap="ROUND" thickness="20" />
             </Arc>
           </PartDraw>
         </Group>
-        <Condition>
-          <!--
-            Depending on which combination of Icon, Text and Title is present in
-            the complication will be rendered differently.
-          -->
-          <Expressions>
-            <!-- A Title and/or Text, with optionally an image -->
-            <Expression name="rangedValue_maybeImage_textAndOrTitle">
-              <![CDATA[[COMPLICATION.TEXT] != null || [COMPLICATION.TITLE] != null]]>
-            </Expression>
-            <!-- An Image present, with no Text or Title -->
-            <Expression name="rangedValue_image_noTextNorTitle">
-              <![CDATA[[COMPLICATION.TEXT] == null && [COMPLICATION.TITLE] == null && [COMPLICATION.MONOCHROMATIC_IMAGE] != null]]>
-            </Expression>
-          </Expressions>
-          <Compare expression="rangedValue_maybeImage_textAndOrTitle">
-            <Condition>
-              <Expressions>
-                <Expression name="monochromatic_ambientImage">
-                  <![CDATA[[COMPLICATION.MONOCHROMATIC_IMAGE] != null && [COMPLICATION.MONOCHROMATIC_IMAGE_AMBIENT] != null]]>
-                </Expression>
-                <Expression name="monochromatic_noAmbientImage">
-                  <![CDATA[[COMPLICATION.MONOCHROMATIC_IMAGE] != null && [COMPLICATION.MONOCHROMATIC_IMAGE_AMBIENT] == null]]>
-                </Expression>
-              </Expressions>
-              <!--
-                Where the complication has specified an image specifically
-                for ambient mode, use that, with tinting applied.
-              -->
-              <Compare expression="monochromatic_ambientImage">
-                <PartImage x="21" y="44" width="18" height="18" tintColor="#66000000" alpha="0">
-                  <Variant mode="AMBIENT" target="alpha" value="255" />
-                  <Image resource="[COMPLICATION.MONOCHROMATIC_IMAGE_AMBIENT]" />
-                </PartImage>
-                <PartImage x="21" y="44" width="18" height="18" tintColor="#66000000" alpha="255">
-                  <Variant mode="AMBIENT" target="alpha" value="0" />
-                  <Image resource="[COMPLICATION.MONOCHROMATIC_IMAGE]" />
-                </PartImage>
-              </Compare>
-              <!--
-                Where the complication hasn't specified an image specifically
-                for ambient mode, use the normal image, with tinting applied.
-              -->
-              <Compare expression="monochromatic_noAmbientImage">
-                <PartImage x="21" y="44" width="18" height="18" tintColor="#66000000" alpha="0">
-                  <Variant mode="AMBIENT" target="alpha" value="255" />
-                  <Image resource="[COMPLICATION.MONOCHROMATIC_IMAGE]" />
-                </PartImage>
-                <PartImage x="21" y="44" width="18" height="18" tintColor="#66000000" alpha="255">
-                  <Variant mode="AMBIENT" target="alpha" value="0" />
-                  <Image resource="[COMPLICATION.MONOCHROMATIC_IMAGE]" />
-                </PartImage>
-              </Compare>
-            </Condition>
-
-            <Condition>
-              <Expressions>
-                <Expression name="monochromatic_both_labels">
-                  <![CDATA[([COMPLICATION.TEXT] != null && [COMPLICATION.TITLE] != null)]]>
-                </Expression>
-              </Expressions>
-              <!--
-                Both Title and Text are present, show title above text.
-              -->
-              <Compare expression="monochromatic_both_labels">
-                <PartText x="0" y="32" width="60" height="20" alpha="0">
-                  <Variant mode="AMBIENT" target="alpha" value="255" />
-                  <Text align="CENTER" ellipsis="TRUE">
-                    <Font family="SYNC_TO_DEVICE" size="10" weight="NORMAL" slant="NORMAL" color="#66000000">
-                      <Template>%s<Parameter expression="[COMPLICATION.TITLE]"/>
-                      </Template>
-                    </Font>
-                  </Text>
-                </PartText>
-                <PartText x="0" y="20" width="60" height="20" alpha="0">
-                  <Variant mode="AMBIENT" target="alpha" value="255" />
-                  <Text align="CENTER" ellipsis="TRUE">
-                    <Font family="SYNC_TO_DEVICE" size="16" weight="NORMAL" slant="NORMAL" color="#66000000">
-                      <Template>%s<Parameter expression="[COMPLICATION.TEXT]"/>
-                      </Template>
-                    </Font>
-                  </Text>
-                </PartText>
-                <PartText x="0" y="32" width="60" height="20">
-                  <Variant mode="AMBIENT" target="alpha" value="0" />
-                  <Text align="CENTER" ellipsis="TRUE">
-                    <Font family="SYNC_TO_DEVICE" size="10" weight="NORMAL" slant="NORMAL" color="#66000000">
-                      <Template>%s<Parameter expression="[COMPLICATION.TITLE]"/>
-                      </Template>
-                    </Font>
-                  </Text>
-                </PartText>
-                <PartText x="0" y="20" width="60" height="20">
-                  <Variant mode="AMBIENT" target="alpha" value="0" />
-                  <Text align="CENTER" ellipsis="TRUE">
-                    <Font family="SYNC_TO_DEVICE" size="16" weight="NORMAL" slant="NORMAL" color="#66000000">
-                      <Template>%s<Parameter expression="[COMPLICATION.TEXT]"/>
-                      </Template>
-                    </Font>
-                  </Text>
-                </PartText>
-              </Compare>
-              <!--
-                Only one of Title or Text is present, show this is slightly
-                larger than when both are displayed.
-                -->
-              <Default>
-                <PartText x="0" y="0" width="60" height="60" alpha="0">
-                  <Variant mode="AMBIENT" target="alpha" value="255" />
-                  <Text align="CENTER" ellipsis="TRUE">
-                    <Font family="SYNC_TO_DEVICE" size="14" weight="NORMAL" slant="NORMAL" color="#66000000">
-                      <!-- In this example, prefer Text over Title -->
-                      <Template>%s<Parameter expression="[COMPLICATION.TEXT] != null ? [COMPLICATION.TEXT] : [COMPLICATION.TITLE]"/>
-                      </Template>
-                    </Font>
-                  </Text>
-                </PartText>
-                <PartText x="0" y="0" width="60" height="60">
-                  <Variant mode="AMBIENT" target="alpha" value="0" />
-                  <Text align="CENTER" ellipsis="TRUE">
-                    <Font family="SYNC_TO_DEVICE" size="14" weight="NORMAL" slant="NORMAL" color="#66000000">
-                      <!-- In this example, prefer Text over Title -->
-                      <Template>%s<Parameter expression="[COMPLICATION.TEXT] != null ? [COMPLICATION.TEXT] : [COMPLICATION.TITLE]"/></Template>
-                    </Font>
-                  </Text>
-                </PartText>
-              </Default>
-            </Condition>
-          </Compare>
-          <!--
-            Image is present, but no text or title, so show the image centrally
-            in the complication, larger then when the text or title is available
-          -->
-          <Compare expression="rangedValue_image_noTextNorTitle">
-            <Condition>
-              <Expressions>
-                <Expression name="monochromatic_ambientImage">
-                  <![CDATA[[COMPLICATION.MONOCHROMATIC_IMAGE] != null && [COMPLICATION.MONOCHROMATIC_IMAGE_AMBIENT] != null]]>
-                </Expression>
-                <Expression name="monochromatic_noAmbientImage">
-                  <![CDATA[[COMPLICATION.MONOCHROMATIC_IMAGE] != null && [COMPLICATION.MONOCHROMATIC_IMAGE_AMBIENT] == null]]>
-                </Expression>
-              </Expressions>
-              <Compare expression="monochromatic_ambientImage">
-                <PartImage x="30" y="30" width="25" height="25" tintColor="#66000000" alpha="0">
-                  <Variant mode="AMBIENT" target="alpha" value="255" />
-                  <Image resource="[COMPLICATION.MONOCHROMATIC_IMAGE_AMBIENT]" />
-                </PartImage>
-                <PartImage x="30" y="30" width="25" height="25" tintColor="#66000000">
-                  <Variant mode="AMBIENT" target="alpha" value="0" />
-                  <Image resource="[COMPLICATION.MONOCHROMATIC_IMAGE]" />
-                </PartImage>
-              </Compare>
-              <Compare expression="monochromatic_noAmbientImage">
-                <PartImage x="30" y="30" width="25" height="25" tintColor="#66000000" alpha="0">
-                  <Variant mode="AMBIENT" target="alpha" value="255" />
-                  <Image resource="[COMPLICATION.MONOCHROMATIC_IMAGE]" />
-                </PartImage>
-                <PartImage x="30" y="30" width="25" height="25" tintColor="#66000000">
-                  <Variant mode="AMBIENT" target="alpha" value="0" />
-                  <Image resource="[COMPLICATION.MONOCHROMATIC_IMAGE]" />
-                </PartImage>
-              </Compare>
-            </Condition>
-          </Compare>
-        </Condition>
       </Complication>
     </ComplicationSlot>