From b8744f6cdf5f3e650bc30f8914fcf5c472c6af0a Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Thu, 31 Mar 2022 18:04:40 +0200
Subject: [PATCH] overview and action dialog icons , colors for light theme

---
 .../drawable/ic_actions_cancelextbolus.xml    |  8 ++--
 app/src/main/res/drawable/ic_cancelbasal.xml  |  7 +--
 .../main/res/drawable/ic_loop_disabled.xml    |  6 +--
 .../res/drawable/ic_loop_disconnected.xml     |  4 +-
 app/src/main/res/drawable/ic_loop_lgs.xml     | 12 ++---
 app/src/main/res/drawable/ic_loop_open.xml    | 14 +++---
 app/src/main/res/drawable/ic_loop_paused.xml  |  6 +--
 .../main/res/drawable/ic_loop_reconnect.xml   |  4 +-
 app/src/main/res/drawable/ic_loop_resume.xml  |  4 +-
 .../main/res/drawable/ic_loop_superbolus.xml  |  4 +-
 .../main/res/drawable/ic_target_activity.xml  | 16 +++----
 .../main/res/drawable/ic_target_cancel.xml    | 14 +++---
 .../res/drawable/ic_target_eatingsoon.xml     | 12 ++---
 app/src/main/res/drawable/ic_target_hypo.xml  | 10 ++--
 .../res/drawable/ic_actions_startextbolus.xml |  5 +-
 .../main/res/drawable/ic_cp_announcement.xml  | 10 ++--
 core/src/main/res/drawable/ic_cp_bgcheck.xml  |  6 +--
 .../main/res/drawable/ic_cp_cgm_insert.xml    |  4 +-
 core/src/main/res/drawable/ic_cp_exercise.xml |  4 +-
 core/src/main/res/drawable/ic_cp_note.xml     |  2 +-
 .../main/res/drawable/ic_cp_pump_battery.xml  |  4 +-
 .../main/res/drawable/ic_cp_pump_canula.xml   |  2 +-
 core/src/main/res/drawable/ic_cp_question.xml |  4 +-
 core/src/main/res/drawable/ic_loop_closed.xml |  2 +-
 .../src/main/res/drawable/ic_pump_history.xml |  4 +-
 .../main/res/drawable/ic_temptarget_high.xml  |  4 +-
 core/src/main/res/values-night/colors.xml     | 10 ++++
 core/src/main/res/values-night/styles.xml     | 39 +++++++++++++---
 core/src/main/res/values/attrs.xml            | 29 ++++++++++++
 core/src/main/res/values/colors.xml           | 22 ++++++---
 core/src/main/res/values/styles.xml           | 46 +++++++++++++++----
 31 files changed, 213 insertions(+), 105 deletions(-)

diff --git a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
index 913b1b9aeb..92998ff78e 100644
--- a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
+++ b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="24">
   <path
       android:pathData="M20.164,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.312c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C23.218,10.989 22.001,8.909 20.164,7.697zM16.448,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S19.63,19.119 16.448,19.119z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/extBolusStopColor"/>
   <path
       android:pathData="M16.45,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C20.983,10.85 18.95,8.816 16.45,8.814z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/extBolusStopColor"/>
   <path
       android:pathData="M1.972,12.381c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C2.228,12.333 2.1,12.381 1.972,12.381z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/extBolusStopColor"/>
   <path
       android:pathData="M7.486,12.381c-0.128,0 -0.256,-0.049 -0.354,-0.146L1.618,6.721c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C7.743,12.333 7.614,12.381 7.486,12.381z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/extBolusStopColor"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cancelbasal.xml b/app/src/main/res/drawable/ic_cancelbasal.xml
index 76640a4534..dcc01452e3 100644
--- a/app/src/main/res/drawable/ic_cancelbasal.xml
+++ b/app/src/main/res/drawable/ic_cancelbasal.xml
@@ -4,7 +4,8 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#CF8BFE" android:pathData="M3.923,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C4.179,11.972 4.051,12.021 3.923,12.021z"/>
-    <path android:fillColor="#CF8BFE" android:pathData="M9.438,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146L3.569,6.361c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C9.694,11.972 9.566,12.021 9.438,12.021z"/>
-    <path android:fillColor="#CF8BFE" android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"/>
+    <path android:fillColor="?attr/basalCancelColor"
+        android:pathData="M3.923,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C4.179,11.972 4.051,12.021 3.923,12.021z"/>
+    <path android:fillColor="?attr/basalCancelColor" android:pathData="M9.438,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146L3.569,6.361c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C9.694,11.972 9.566,12.021 9.438,12.021z"/>
+    <path android:fillColor="?attr/basalCancelColor" android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_disabled.xml b/app/src/main/res/drawable/ic_loop_disabled.xml
index 685118b92d..e8004f78fe 100644
--- a/app/src/main/res/drawable/ic_loop_disabled.xml
+++ b/app/src/main/res/drawable/ic_loop_disabled.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopDisabled"/>
+      android:fillColor="?attr/loopDisabled"/>
   <path
       android:pathData="M10.2429,8.7408l5.0162,5.0162l-1.5026,1.5026l-5.0162,-5.0162z"
-      android:fillColor="@color/loopDisabled"/>
+      android:fillColor="?attr/loopDisabled"/>
   <path
       android:pathData="M8.7408,13.7571l5.0162,-5.0162l1.5026,1.5026l-5.0162,5.0162z"
-      android:fillColor="@color/loopDisabled"/>
+      android:fillColor="?attr/loopDisabled"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_disconnected.xml b/app/src/main/res/drawable/ic_loop_disconnected.xml
index ea2cd137f4..3753c6a451 100644
--- a/app/src/main/res/drawable/ic_loop_disconnected.xml
+++ b/app/src/main/res/drawable/ic_loop_disconnected.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M17.523,3.764c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938c0,1.803 0.484,3.49 1.325,4.945l-0.319,0.365c-0.001,0.842 0.325,1.681 1.01,2.277l2.416,2.103l0.872,-1.002l1.746,1.523l0.472,-0.542l-1.747,-1.523l1.272,-1.461l1.748,1.524l0.472,-0.542l-1.749,-1.525l0.872,-1.001l-2.416,-2.103c-0.684,-0.596 -1.557,-0.803 -2.39,-0.687l-0.277,0.318c-0.335,-0.825 -0.528,-1.723 -0.528,-2.67c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784L17.523,3.764z"
-      android:fillColor="@color/loopDisconnected"/>
+      android:fillColor="?attr/loopDisconnected"/>
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,0.938 -0.183,1.833 -0.511,2.653l-0.263,-0.302c-0.833,-0.116 -1.706,0.091 -2.39,0.687l-2.416,2.103l3.96,4.549l2.416,-2.103c0.685,-0.596 1.011,-1.435 1.01,-2.277l-0.346,-0.397C21.51,15.526 22,13.855 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopDisconnected"/>
+      android:fillColor="?attr/loopDisconnected"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_lgs.xml b/app/src/main/res/drawable/ic_loop_lgs.xml
index c570403dbf..23a4ddf300 100644
--- a/app/src/main/res/drawable/ic_loop_lgs.xml
+++ b/app/src/main/res/drawable/ic_loop_lgs.xml
@@ -5,20 +5,20 @@
     android:viewportHeight="24">
   <path
       android:pathData="M6.349,7.767c0.408,-0.542 0.89,-1.022 1.433,-1.429L6.38,3.917C5.424,4.584 4.593,5.415 3.924,6.37L6.349,7.767z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M9.258,5.478c0.613,-0.262 1.272,-0.436 1.959,-0.517l-0.003,-2.793c-1.191,0.101 -2.318,0.414 -3.352,0.898L9.258,5.478z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M12.922,2.189l0.003,2.773c0.754,0.093 1.472,0.301 2.135,0.608c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538C16.182,2.88 14.61,2.336 12.922,2.189z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M4.963,11.199c0.083,-0.687 0.259,-1.345 0.523,-1.958L3.072,7.85c-0.485,1.034 -0.801,2.16 -0.903,3.351L4.963,11.199z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-2.345,0 -4.42,-1.133 -5.725,-2.876l-2.421,1.401C5.712,20.315 8.689,22 12.063,22C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M5.478,14.867c-0.262,-0.614 -0.436,-1.272 -0.517,-1.96L2.168,12.91c0.101,1.191 0.414,2.319 0.898,3.353L5.478,14.867z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_open.xml b/app/src/main/res/drawable/ic_loop_open.xml
index 6f97953808..c7b4f00e3b 100644
--- a/app/src/main/res/drawable/ic_loop_open.xml
+++ b/app/src/main/res/drawable/ic_loop_open.xml
@@ -5,23 +5,23 @@
     android:viewportHeight="24">
   <path
       android:pathData="M6.349,7.767c0.408,-0.542 0.89,-1.022 1.433,-1.429L6.38,3.917C5.424,4.584 4.593,5.415 3.924,6.37L6.349,7.767z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M3.072,7.85c-0.485,1.034 -0.801,2.16 -0.903,3.351l2.795,-0.003c0.083,-0.687 0.259,-1.345 0.523,-1.958L3.072,7.85z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M21.059,7.862l-2.412,1.396c0.262,0.614 0.437,1.272 0.518,1.96l2.793,-0.003C21.856,10.024 21.543,8.896 21.059,7.862z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M17.787,7.781l2.421,-1.401c-0.668,-0.956 -1.499,-1.787 -2.454,-2.456l-1.397,2.425C16.9,6.757 17.38,7.238 17.787,7.781z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M19.162,12.926c-0.427,3.544 -3.44,6.293 -7.099,6.293c-3.666,0 -6.684,-2.758 -7.102,-6.312L2.168,12.91C2.599,18.001 6.86,22 12.063,22c5.198,0 9.457,-3.992 9.894,-9.077L19.162,12.926z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M9.258,5.478c0.613,-0.262 1.272,-0.436 1.959,-0.517l-0.003,-2.793c-1.191,0.101 -2.318,0.414 -3.352,0.898L9.258,5.478z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M12.925,4.963c0.687,0.083 1.345,0.259 1.958,0.522l1.391,-2.414c-1.034,-0.485 -2.161,-0.801 -3.352,-0.903L12.925,4.963z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_paused.xml b/app/src/main/res/drawable/ic_loop_paused.xml
index c49d3084c3..372b6a7d61 100644
--- a/app/src/main/res/drawable/ic_loop_paused.xml
+++ b/app/src/main/res/drawable/ic_loop_paused.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopSuspended"/>
+      android:fillColor="?attr/loopDisabled"/>
   <path
       android:pathData="M8.813,8.453h2.125v7.094h-2.125z"
-      android:fillColor="@color/loopSuspended"/>
+      android:fillColor="?attr/loopDisabled"/>
   <path
       android:pathData="M13.063,8.453h2.125v7.094h-2.125z"
-      android:fillColor="@color/loopSuspended"/>
+      android:fillColor="?attr/loopDisabled"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_reconnect.xml b/app/src/main/res/drawable/ic_loop_reconnect.xml
index f61d0f97b1..ca8e54fa6c 100644
--- a/app/src/main/res/drawable/ic_loop_reconnect.xml
+++ b/app/src/main/res/drawable/ic_loop_reconnect.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M14.868,22.154c0.794,0 1.49,-0.418 1.973,-1.054l-0.001,-3.926c-0.482,-0.634 -1.177,-1.052 -1.969,-1.052l-5.612,-0.001c-0.793,0 -1.487,0.416 -1.97,1.05l-0.004,3.926c0.482,0.636 1.178,1.055 1.972,1.055"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_resume.xml b/app/src/main/res/drawable/ic_loop_resume.xml
index ade6ba2f8d..cf80f79567 100644
--- a/app/src/main/res/drawable/ic_loop_resume.xml
+++ b/app/src/main/res/drawable/ic_loop_resume.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M9.401,8.391l6.599,3.609l-6.599,3.609z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_superbolus.xml b/app/src/main/res/drawable/ic_loop_superbolus.xml
index 2f94edf2c4..fd9223c587 100644
--- a/app/src/main/res/drawable/ic_loop_superbolus.xml
+++ b/app/src/main/res/drawable/ic_loop_superbolus.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="#FEAD01"/>
+      android:fillColor="?attr/loopSuperBolus"/>
   <path
       android:pathData="M15.026,13.715c-0.267,0.334 -0.555,0.58 -0.875,0.798c-0.304,0.206 -0.678,0.313 -0.966,0.376c-0.552,0.1 -0.201,0.151 0.077,0.528c-1.002,1.431 -2.69,1.526 -4.098,0.796c-0.113,-0.059 -0.219,-0.132 -0.324,-0.205c-0.222,-0.152 -0.32,-0.189 -0.506,0.003c-0.151,0.155 -0.504,0.496 -0.684,0.673l-0.394,-0.427c0.193,-0.176 0.417,-0.394 0.577,-0.545c0.349,-0.328 0.27,-0.368 -0.009,-0.767c-0.968,-1.386 -0.672,-3.195 0.69,-4.207c0.58,0.372 0.455,0.284 0.643,-0.263c0.201,-0.583 0.544,-1.081 1.064,-1.427c0.529,0.467 0.441,0.254 0.654,-0.282c0.23,-0.58 0.59,-1.052 1.087,-1.451c0.559,0.368 0.815,0.776 1.006,1.236c0.219,0.527 0.304,0.35 0.689,-0.024c0.822,-0.797 1.826,-1.113 2.805,-0.873c0.23,1.274 -0.314,2.414 -1.494,3.159c0.619,0.167 1.205,0.502 1.78,1.179c-0.352,0.516 -0.974,1.011 -1.601,1.117C14.247,13.26 14.753,13.295 15.026,13.715zM15.918,8.562c0.01,-0.355 -0.102,-0.449 -0.41,-0.408c-0.999,0.134 -1.939,1.031 -2.105,2.011c-0.058,0.339 0.121,0.52 0.459,0.442c0.215,-0.049 0.432,-0.116 0.629,-0.213C15.279,10.004 15.77,9.378 15.918,8.562zM12.764,9.962c0.009,-0.561 -0.185,-1.011 -0.454,-1.433c-0.259,-0.406 -0.438,-0.405 -0.697,-0.009c-0.598,0.914 -0.355,1.977 0.122,2.758c0.152,0.25 0.358,0.252 0.537,0.009C12.57,10.882 12.775,10.436 12.764,9.962zM10.889,16.107c0.415,0 1,-0.187 1.3,-0.414c0.255,-0.193 0.276,-0.35 0.024,-0.524c-0.935,-0.644 -1.891,-0.785 -2.88,-0.096c-0.333,0.232 -0.314,0.421 0.05,0.635C9.848,15.981 10.355,16.096 10.889,16.107zM11.037,11.638c0.016,-0.535 -0.186,-0.998 -0.457,-1.435c-0.254,-0.407 -0.427,-0.398 -0.686,0.021c-0.5,0.806 -0.458,1.935 0.101,2.707c0.194,0.268 0.361,0.285 0.568,0.024C10.866,12.571 11.048,12.136 11.037,11.638zM14.217,12.716c0.531,-0.002 1.109,-0.174 1.411,-0.403c0.257,-0.196 0.264,-0.324 0.029,-0.53c-0.752,-0.659 -2.116,-0.702 -2.896,-0.091c-0.282,0.221 -0.288,0.423 0.015,0.592C13.239,12.543 13.729,12.732 14.217,12.716zM7.835,13.214c-0.019,0.44 0.1,0.897 0.359,1.312c0.245,0.392 0.457,0.397 0.717,0.029c0.566,-0.8 0.518,-2.014 -0.108,-2.762c-0.204,-0.244 -0.378,-0.243 -0.573,0.024C7.939,12.217 7.829,12.674 7.835,13.214zM12.42,12.948c-0.536,-0.025 -1.004,0.155 -1.422,0.473c-0.209,0.159 -0.218,0.334 -0.004,0.511c0.685,0.566 2.162,0.614 2.891,0.091c0.295,-0.212 0.302,-0.387 0.004,-0.583C13.445,13.147 12.968,12.935 12.42,12.948z"
-      android:fillColor="#FEAD01"/>
+      android:fillColor="?attr/loopSuperBolus"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_target_activity.xml b/app/src/main/res/drawable/ic_target_activity.xml
index 4439597b75..4873b388cc 100644
--- a/app/src/main/res/drawable/ic_target_activity.xml
+++ b/app/src/main/res/drawable/ic_target_activity.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="24">
   <path
       android:pathData="M18.253,15.869c1.19,0 2.158,-1.02 2.158,-2.274c0,-1.254 -0.968,-2.275 -2.158,-2.275c-1.19,0 -2.158,1.02 -2.158,2.275C16.095,14.849 17.063,15.869 18.253,15.869zM18.253,12.018c0.824,0 1.496,0.707 1.496,1.576c0,0.869 -0.671,1.576 -1.496,1.576s-1.496,-0.707 -1.496,-1.576C16.757,12.725 17.429,12.018 18.253,12.018z"
-      android:fillColor="@color/exercise"/>
+      android:fillColor="?attr/exerciseColor"/>
   <path
       android:pathData="M21.442,18.522c-0.03,-0.043 -0.745,-1.039 -1.801,-1.039c-0.785,0 -1.295,0.514 -1.746,0.969c-0.399,0.402 -0.744,0.75 -1.226,0.75h-0.001c-0.393,0 -0.714,-0.242 -1.034,-0.538l1.665,-1.325l-4.553,-6.356l-4.394,3.496c-0.259,0.242 -0.627,0.87 -0.164,1.515c0.214,0.298 0.463,0.387 0.635,0.41c0.409,0.053 0.738,-0.217 0.765,-0.24l2.759,-2.195l0.676,0.943l-3.964,3.153c-0.371,-0.351 -0.791,-0.637 -1.305,-0.637H7.753c-0.788,0 -1.457,0.64 -2.048,1.205c-0.352,0.337 -0.752,0.72 -0.973,0.72c-0.428,0 -0.982,-0.647 -1.142,-0.874c-0.109,-0.154 -0.316,-0.186 -0.464,-0.071c-0.147,0.115 -0.178,0.333 -0.069,0.488c0.083,0.119 0.837,1.155 1.674,1.155c0.477,0 0.913,-0.417 1.418,-0.9c0.502,-0.48 1.071,-1.024 1.603,-1.024h0c0.469,0 0.879,0.45 1.313,0.927c0.482,0.529 0.981,1.077 1.659,1.077c0.647,0 1.193,-0.472 1.722,-0.929c0.494,-0.427 1.005,-0.868 1.542,-0.868c0.321,0.001 0.622,0.293 0.97,0.631c0.453,0.439 0.965,0.936 1.71,0.936h0.001c0.748,0 1.245,-0.501 1.684,-0.943c0.413,-0.416 0.769,-0.776 1.287,-0.776c0.719,0 1.264,0.751 1.269,0.759c0.11,0.155 0.317,0.184 0.464,0.07C21.52,18.894 21.551,18.677 21.442,18.522zM12.027,18.661c-0.459,0.396 -0.892,0.771 -1.301,0.771c-0.395,-0.001 -0.777,-0.42 -1.181,-0.862c-0.002,-0.003 -0.005,-0.005 -0.007,-0.008l4.415,-3.512l-1.475,-2.059L9.18,15.614c-0.022,0.019 -0.161,0.12 -0.276,0.096c-0.024,-0.003 -0.097,-0.012 -0.186,-0.136c-0.195,-0.273 0.01,-0.509 0.055,-0.555l3.844,-3.058l3.754,5.241l-1.24,0.986c-0.332,-0.301 -0.69,-0.554 -1.143,-0.554C13.214,17.635 12.584,18.18 12.027,18.661z"
-      android:fillColor="@color/exercise"/>
-  <path
-      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
-      android:fillColor="@color/inrange"/>
-  <path
-      android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+      android:fillColor="?attr/exerciseColor"/>
+    <path
+        android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+        android:fillColor="?attr/bgInRange"/>
+    <path
+        android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+        android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_target_cancel.xml b/app/src/main/res/drawable/ic_target_cancel.xml
index 50d7304662..c00ad238f7 100644
--- a/app/src/main/res/drawable/ic_target_cancel.xml
+++ b/app/src/main/res/drawable/ic_target_cancel.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M16.954,15.325l3.851,-3.85c0.314,-0.314 0.314,-0.821 0.001,-1.134c-0.315,-0.315 -0.82,-0.314 -1.134,-0.001l-3.851,3.851l-3.851,-3.851c-0.315,-0.313 -0.821,-0.314 -1.134,0.001c-0.313,0.313 -0.313,0.82 0.001,1.134l3.851,3.85l-3.851,3.851c-0.314,0.313 -0.314,0.82 -0.001,1.133c0.157,0.156 0.362,0.235 0.567,0.235s0.41,-0.078 0.567,-0.235l3.851,-3.85l3.851,3.85c0.157,0.156 0.362,0.235 0.567,0.235c0.205,0 0.411,-0.078 0.567,-0.235c0.313,-0.313 0.313,-0.82 -0.001,-1.133L16.954,15.325z"
-      android:fillColor="@color/tempTargetConfirmation"/>
-  <path
-      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
-      android:fillColor="@color/inrange"/>
-  <path
-      android:pathData="M13.949,6.338H2.595c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h11.354c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+      android:fillColor="?attr/tempTargetConfirmation"/>
+    <path
+        android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+        android:fillColor="?attr/bgInRange"/>
+    <path
+        android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+        android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_target_eatingsoon.xml b/app/src/main/res/drawable/ic_target_eatingsoon.xml
index ec35d67c48..70d0ab72d4 100644
--- a/app/src/main/res/drawable/ic_target_eatingsoon.xml
+++ b/app/src/main/res/drawable/ic_target_eatingsoon.xml
@@ -12,10 +12,10 @@
   <path
       android:pathData="M8.051,17.801c-0.029,0.001 -0.061,-0.003 -0.095,-0.011c-0.188,-0.047 -0.304,-0.239 -0.257,-0.427c0.43,-1.726 1.665,-3.196 3.304,-3.933c0.043,-0.019 0.088,-0.029 0.135,-0.031c0.143,-0.004 0.273,0.078 0.331,0.208c0.039,0.086 0.042,0.182 0.008,0.271c-0.034,0.088 -0.099,0.158 -0.185,0.196c-1.444,0.649 -2.531,1.942 -2.909,3.458C8.346,17.687 8.209,17.797 8.051,17.801z"
       android:fillColor="?attr/carbsColor"/>
-  <path
-      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
-      android:fillColor="@color/inrange"/>
-  <path
-      android:pathData="M11.122,8.486H5.436c-0.232,0 -0.42,-0.193 -0.42,-0.431l0,-1.717h-2.42c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.84c0.232,0 0.42,0.193 0.42,0.431l0,1.717h4.845V5.907c0,-0.238 0.188,-0.431 0.421,-0.431h2.827c0.232,0 0.421,0.193 0.421,0.431c0,0.238 -0.188,0.431 -0.421,0.431h-2.407v1.717C11.542,8.293 11.354,8.486 11.122,8.486z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+    <path
+        android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+        android:fillColor="?attr/bgInRange"/>
+    <path
+        android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+        android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_target_hypo.xml b/app/src/main/res/drawable/ic_target_hypo.xml
index 30721cbf14..eab6df8e3f 100644
--- a/app/src/main/res/drawable/ic_target_hypo.xml
+++ b/app/src/main/res/drawable/ic_target_hypo.xml
@@ -5,17 +5,17 @@
     android:viewportHeight="24">
   <path
       android:pathData="M8.822,17.137c-0.016,-0.28 0.022,-0.543 0.363,-0.583c0.313,-0.037 0.426,0.189 0.462,0.448c0.135,0.983 0.67,1.563 1.668,1.692c0.292,0.038 0.514,0.167 0.459,0.498c-0.051,0.305 -0.324,0.337 -0.568,0.336C10.03,19.526 8.835,18.321 8.822,17.137z"
-      android:fillColor="@color/low"/>
+      android:fillColor="?attr/lowColor"/>
   <path
       android:pathData="M15.21,16.109c-0.631,-2.484 -3.383,-6.32 -3.773,-6.32s-3.151,3.845 -3.779,6.324c-0.42,1.658 0.111,3.081 1.577,4.049c1.43,0.944 2.973,0.929 4.402,-0.013C15.106,19.18 15.634,17.779 15.21,16.109zM13.255,19.568c-0.603,0.397 -1.221,0.599 -1.835,0.599c-0.607,0 -1.213,-0.197 -1.802,-0.586c-1.206,-0.796 -1.639,-1.906 -1.287,-3.298c0.489,-1.929 2.895,-5.336 3.105,-5.336s2.609,3.403 3.1,5.333C14.889,17.668 14.458,18.774 13.255,19.568z"
-      android:fillColor="@color/low"/>
+      android:fillColor="?attr/lowColor"/>
   <path
       android:pathData="M19.522,16.771v-6.712h-1.423v6.712h-2.135l2.846,3.82l2.846,-3.82H19.522z"
-      android:fillColor="@color/low"/>
+      android:fillColor="?attr/lowColor"/>
   <path
       android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
-      android:fillColor="@color/inrange"/>
+      android:fillColor="?attr/bgInRange"/>
   <path
       android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+      android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_actions_startextbolus.xml b/core/src/main/res/drawable/ic_actions_startextbolus.xml
index 35aa4cfb27..8d7f5bc3db 100644
--- a/core/src/main/res/drawable/ic_actions_startextbolus.xml
+++ b/core/src/main/res/drawable/ic_actions_startextbolus.xml
@@ -4,6 +4,7 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/extendedBolus" android:pathData="M15.714,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.313c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C18.768,10.989 17.551,8.909 15.714,7.697zM11.998,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S15.18,19.119 11.998,19.119z"/>
-    <path android:fillColor="@color/extendedBolus" android:pathData="M12,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C16.533,10.85 14.5,8.816 12,8.814z"/>
+    <path android:fillColor="?attr/extBolusColor"
+        android:pathData="M15.714,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.313c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C18.768,10.989 17.551,8.909 15.714,7.697zM11.998,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S15.18,19.119 11.998,19.119z"/>
+    <path android:fillColor="?attr/extBolusColor" android:pathData="M12,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C16.533,10.85 14.5,8.816 12,8.814z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_announcement.xml b/core/src/main/res/drawable/ic_cp_announcement.xml
index 3799ad551c..1488a6e33a 100644
--- a/core/src/main/res/drawable/ic_cp_announcement.xml
+++ b/core/src/main/res/drawable/ic_cp_announcement.xml
@@ -5,17 +5,17 @@
     android:viewportHeight="24">
   <path
       android:pathData="M11.206,16.276c0.251,0.308 0.504,0.635 0.459,1.095c-0.02,0.201 0.178,0.295 0.327,0.395c0.265,0.178 0.542,0.34 0.793,0.536c0.408,0.32 0.385,0.624 -0.047,0.896c-0.017,0.011 -0.037,0.016 -0.054,0.026c-1.333,0.78 -1.335,0.782 -2.448,-0.311c-0.215,-0.211 -0.453,-0.389 -0.696,-0.565c-0.365,-0.264 -0.719,-0.395 -1.143,-0.101c-0.277,0.192 -0.624,0.169 -0.934,0.111c-1.354,-0.252 -2.631,-1.535 -2.535,-3.042c0.019,-0.294 0.105,-0.547 0.297,-0.763c0.331,-0.373 0.657,-0.751 1.001,-1.112c0.736,-0.77 1.133,-1.67 1.129,-2.747C7.352,9.78 7.347,8.864 7.824,8.024C8.29,7.202 8.837,6.939 9.766,7.135c1.042,0.219 1.921,0.766 2.751,1.396c1.204,0.914 2.211,2.014 2.978,3.322c0.396,0.675 0.718,1.372 0.734,2.185c0.011,0.586 -0.253,1.005 -0.706,1.303c-0.505,0.331 -1.057,0.532 -1.687,0.526c-0.775,-0.007 -1.55,0.059 -2.314,0.208C11.404,16.097 11.284,16.119 11.206,16.276zM14.578,14.418c0.569,0.014 0.801,-0.217 0.737,-0.695c-0.053,-0.395 -0.183,-0.77 -0.384,-1.124c-0.907,-1.598 -2.196,-2.833 -3.677,-3.881c-0.47,-0.333 -0.977,-0.61 -1.569,-0.705C9.095,7.917 8.867,8.093 8.882,8.694C8.892,9.151 9.077,9.55 9.303,9.927c0.927,1.55 2.165,2.807 3.667,3.802C13.487,14.072 14.032,14.361 14.578,14.418zM13.257,14.946c-2.056,-1.171 -3.673,-2.769 -4.904,-4.794c-0.061,0.218 -0.053,0.408 -0.063,0.597c-0.032,0.619 -0.081,1.262 -0.399,1.789c-0.344,0.571 -0.24,1.045 0.049,1.556c0.411,0.726 0.998,1.233 1.805,1.473c0.216,0.064 0.444,0.108 0.642,-0.002C11.274,15.069 12.238,14.986 13.257,14.946z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
   <path
       android:pathData="M16.92,11.417c-0.248,0 -0.368,0.005 -0.487,-0.001c-0.156,-0.008 -0.262,-0.092 -0.297,-0.245c-0.037,-0.161 0.051,-0.281 0.186,-0.335c0.294,-0.118 0.596,-0.219 0.898,-0.317c0.245,-0.079 0.496,-0.141 0.743,-0.212c0.48,-0.137 0.537,-0.086 0.689,0.353c0.159,0.461 -0.153,0.519 -0.447,0.573C17.737,11.318 17.264,11.369 16.92,11.417z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
   <path
       android:pathData="M11.785,6.597c0.078,-0.501 0.158,-1.052 0.25,-1.6c0.063,-0.378 0.362,-0.329 0.61,-0.283c0.282,0.052 0.473,0.195 0.346,0.547c-0.182,0.506 -0.335,1.022 -0.505,1.531c-0.072,0.216 -0.175,0.437 -0.45,0.385C11.746,7.123 11.777,6.868 11.785,6.597z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
   <path
       android:pathData="M14.693,8.893c-0.307,-0.002 -0.468,-0.26 -0.292,-0.486c0.388,-0.501 0.798,-0.987 1.226,-1.453c0.207,-0.225 0.452,-0.092 0.631,0.079c0.161,0.154 0.301,0.364 0.087,0.569c-0.472,0.453 -0.968,0.879 -1.508,1.251C14.792,8.884 14.725,8.885 14.693,8.893z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
   <path
       android:pathData="M12.97,11.989c0,0.14 0.021,0.283 -0.004,0.419c-0.061,0.328 -0.321,0.463 -0.563,0.249c-0.644,-0.568 -1.271,-1.159 -1.812,-1.829c-0.18,-0.223 -0.127,-0.384 0.163,-0.488C11.871,9.941 12.986,10.76 12.97,11.989z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_bgcheck.xml b/core/src/main/res/drawable/ic_cp_bgcheck.xml
index 76a9bbe22f..9448450909 100644
--- a/core/src/main/res/drawable/ic_cp_bgcheck.xml
+++ b/core/src/main/res/drawable/ic_cp_bgcheck.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M6.384,15.052c-0.018,-0.323 0.025,-0.625 0.418,-0.671c0.36,-0.042 0.49,0.218 0.531,0.516c0.155,1.131 0.771,1.799 1.92,1.948c0.336,0.043 0.592,0.192 0.528,0.573c-0.059,0.351 -0.373,0.388 -0.654,0.387C7.775,17.801 6.4,16.415 6.384,15.052z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/calibrationButtonColor"/>
   <path
       android:pathData="M18.817,9.875c-0.377,-1.485 -1.932,-3.719 -2.256,-3.719c-0.325,0 -1.884,2.238 -2.26,3.721c-0.251,0.991 0.067,1.842 0.943,2.421c0.855,0.565 1.778,0.556 2.632,-0.008C18.755,11.712 19.071,10.874 18.817,9.875zM17.437,11.623c-0.297,0.196 -0.595,0.295 -0.886,0.295c-0.286,0 -0.577,-0.097 -0.866,-0.287c-0.586,-0.387 -0.779,-0.882 -0.608,-1.558c0.236,-0.933 0.997,-2.169 1.484,-2.813c0.486,0.644 1.244,1.878 1.481,2.812C18.213,10.745 18.021,11.237 17.437,11.623z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/calibrationButtonColor"/>
   <path
       android:pathData="M13.737,13.869c-0.726,-2.859 -3.893,-7.275 -4.343,-7.275c-0.45,0 -3.627,4.425 -4.349,7.278c-0.483,1.908 0.128,3.546 1.816,4.66c1.646,1.087 3.422,1.07 5.067,-0.015C13.617,17.403 14.225,15.791 13.737,13.869zM11.487,17.85c-0.694,0.457 -1.405,0.689 -2.112,0.689c-0.698,0 -1.396,-0.227 -2.074,-0.675c-1.389,-0.916 -1.887,-2.193 -1.481,-3.796c0.563,-2.22 3.332,-6.141 3.574,-6.141s3.003,3.917 3.568,6.138C13.368,15.663 12.871,16.937 11.487,17.85z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/calibrationButtonColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_cgm_insert.xml b/core/src/main/res/drawable/ic_cp_cgm_insert.xml
index 30107ac8fe..20e16e9b7d 100644
--- a/core/src/main/res/drawable/ic_cp_cgm_insert.xml
+++ b/core/src/main/res/drawable/ic_cp_cgm_insert.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M22.44,7.685l-1.772,-1.804L7.299,6.383C5.777,6.404 4.707,7.29 4.373,8.099c-1.247,0.944 -2.605,2.549 -2.668,3.198c-0.035,0.357 0.038,0.638 0.216,0.834c0.104,0.115 0.292,0.251 0.599,0.251h18.345c0.719,0 1.282,-0.721 1.282,-1.642c0,-0.065 -0.011,-0.137 -0.028,-0.213c0.221,-0.181 0.402,-0.429 0.53,-0.737C22.965,9.026 22.875,8.119 22.44,7.685zM5.398,8.111C5.56,7.917 6.176,7.283 7.322,7.267l12.99,-0.488l1.501,1.528c0.139,0.139 0.217,0.666 0.019,1.144c-0.146,0.352 -0.375,0.531 -0.682,0.531h-2.753l-2.385,-0.57H13.83c-0.459,0 -0.699,-0.151 -0.713,-0.449l-0.021,-0.421l-7.942,0C5.177,8.45 5.246,8.294 5.398,8.111zM20.865,11.498l-18.284,0c-0.002,-0.025 -0.002,-0.059 0.002,-0.103c0.061,-0.277 0.881,-1.363 1.879,-2.229C4.61,9.327 4.83,9.423 5.1,9.427h7.216c0.201,0.546 0.748,0.87 1.514,0.87h2.078l2.385,0.57h2.857c0.036,0 0.07,-0.002 0.105,-0.004C21.219,11.258 21.016,11.498 20.865,11.498z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/cgmInsertColor"/>
   <path
       android:pathData="M15.313,15.801c-0.167,-0.195 -0.463,-0.218 -0.659,-0.052l-2.228,1.903v-4.09c0,-0.259 -0.209,-0.468 -0.468,-0.468s-0.468,0.209 -0.468,0.468v4.09l-2.229,-1.904c-0.196,-0.167 -0.492,-0.145 -0.659,0.052c-0.168,0.196 -0.145,0.491 0.052,0.659l3,2.563c0.023,0.02 0.05,0.03 0.076,0.044c0.018,0.01 0.033,0.023 0.052,0.03c0.057,0.023 0.116,0.038 0.176,0.038s0.12,-0.015 0.176,-0.038c0.019,-0.008 0.034,-0.02 0.052,-0.03c0.025,-0.015 0.053,-0.025 0.076,-0.044l3,-2.563C15.458,16.292 15.481,15.997 15.313,15.801z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/cgmInsertColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_exercise.xml b/core/src/main/res/drawable/ic_cp_exercise.xml
index de04c4ecce..60b246221d 100644
--- a/core/src/main/res/drawable/ic_cp_exercise.xml
+++ b/core/src/main/res/drawable/ic_cp_exercise.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M19.75,12.706c1.526,0 2.769,-1.242 2.769,-2.769s-1.242,-2.769 -2.769,-2.769s-2.769,1.242 -2.769,2.769S18.224,12.706 19.75,12.706zM19.75,8.019c1.058,0 1.919,0.86 1.919,1.918s-0.861,1.918 -1.919,1.918s-1.919,-0.86 -1.919,-1.918S18.692,8.019 19.75,8.019z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/exerciseColor"/>
   <path
       android:pathData="M23.841,15.936c-0.039,-0.052 -0.956,-1.265 -2.311,-1.265c-1.007,0 -1.661,0.626 -2.239,1.18c-0.512,0.489 -0.954,0.913 -1.572,0.913h-0.001c-0.504,0 -0.916,-0.294 -1.326,-0.655l2.136,-1.613l-5.841,-7.737l-5.636,4.256c-0.332,0.294 -0.804,1.059 -0.211,1.845c0.274,0.363 0.594,0.472 0.814,0.499c0.524,0.064 0.946,-0.265 0.981,-0.292l3.539,-2.671l0.867,1.148l-5.085,3.838c-0.476,-0.427 -1.015,-0.776 -1.674,-0.776c0,0 -0.001,0 -0.001,0c-1.011,0 -1.87,0.779 -2.627,1.467c-0.452,0.41 -0.965,0.876 -1.248,0.876c-0.549,0 -1.259,-0.787 -1.465,-1.063c-0.14,-0.188 -0.405,-0.227 -0.595,-0.087c-0.188,0.14 -0.228,0.405 -0.088,0.594c0.106,0.145 1.074,1.406 2.147,1.406c0.611,0 1.171,-0.508 1.819,-1.096c0.644,-0.584 1.374,-1.247 2.056,-1.247h0c0.601,0 1.127,0.548 1.684,1.128c0.619,0.645 1.259,1.311 2.128,1.311c0.83,0 1.531,-0.574 2.209,-1.131c0.634,-0.52 1.289,-1.057 1.979,-1.057c0.411,0.001 0.798,0.356 1.244,0.768c0.581,0.534 1.238,1.14 2.193,1.14h0.001c0.96,0 1.598,-0.61 2.16,-1.148c0.529,-0.507 0.986,-0.944 1.651,-0.944c0.923,0 1.621,0.914 1.628,0.924c0.142,0.188 0.407,0.224 0.595,0.085C23.94,16.389 23.98,16.124 23.841,15.936zM11.763,16.105c-0.588,0.482 -1.144,0.938 -1.669,0.938c-0.507,-0.001 -0.997,-0.511 -1.515,-1.05c-0.003,-0.003 -0.006,-0.006 -0.009,-0.009l5.663,-4.275L12.34,9.204l-4.229,3.193c-0.028,0.023 -0.207,0.146 -0.354,0.117c-0.031,-0.004 -0.124,-0.015 -0.238,-0.166c-0.25,-0.332 0.013,-0.619 0.071,-0.675l4.932,-3.722l4.815,6.38l-1.591,1.201c-0.426,-0.366 -0.885,-0.674 -1.466,-0.674C13.286,14.856 12.477,15.52 11.763,16.105z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/exerciseColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_note.xml b/core/src/main/res/drawable/ic_cp_note.xml
index 8308aabedf..9b0459d1bb 100644
--- a/core/src/main/res/drawable/ic_cp_note.xml
+++ b/core/src/main/res/drawable/ic_cp_note.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M13.909,5.715l-7.634,7.634c-0.061,0.061 -0.102,0.139 -0.118,0.224l-0.911,4.941c-0.025,0.138 0.019,0.279 0.118,0.378c0.099,0.099 0.24,0.143 0.378,0.118l4.941,-0.911c0.085,-0.016 0.163,-0.057 0.224,-0.118l7.634,-7.634c0.445,-0.445 0.444,-1.17 -0.003,-1.617l-3.012,-3.012C15.079,5.271 14.354,5.27 13.909,5.715zM9.891,16.927c0.097,0.097 0.132,0.24 0.091,0.371c-0.018,0.058 -0.05,0.109 -0.091,0.15c-0.053,0.053 -0.121,0.089 -0.197,0.102l-2.462,0.435c-0.244,-0.008 -0.486,-0.103 -0.673,-0.29c-0.187,-0.187 -0.282,-0.429 -0.29,-0.673l0.435,-2.463c0.024,-0.135 0.121,-0.246 0.252,-0.287c0.131,-0.041 0.274,-0.006 0.371,0.091L9.891,16.927zM17.903,9.269c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L17.903,9.269zM16.588,7.933c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L16.588,7.933zM15.273,6.596c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L15.273,6.596z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/noteColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_pump_battery.xml b/core/src/main/res/drawable/ic_cp_pump_battery.xml
index e83067fded..f83d3289c1 100644
--- a/core/src/main/res/drawable/ic_cp_pump_battery.xml
+++ b/core/src/main/res/drawable/ic_cp_pump_battery.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M20.234,10.422c-0.362,0 -0.656,0.294 -0.656,0.656v0.297h-0.469V9.031c0,-0.87 -0.708,-1.578 -1.578,-1.578H4.188c-0.87,0 -1.578,0.708 -1.578,1.578v5.938c0,0.87 0.708,1.578 1.578,1.578h13.344c0.72,0 1.323,-0.488 1.511,-1.149c0.01,0.001 0.018,0.006 0.028,0.006c0.332,0 0.602,-0.297 0.602,-0.664c0,-0.351 -0.25,-0.632 -0.563,-0.655v-1.46h0.469v0.297c0,0.362 0.294,0.656 0.656,0.656s0.656,-0.294 0.656,-0.656v-1.844C20.891,10.716 20.597,10.422 20.234,10.422zM18.109,14.969c0,0.318 -0.26,0.578 -0.578,0.578H4.188c-0.319,0 -0.578,-0.26 -0.578,-0.578V9.031c0,-0.319 0.259,-0.578 0.578,-0.578h13.344c0.318,0 0.578,0.259 0.578,0.578V14.969z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="?attr/pumpBatteryColor"/>
   <path
       android:pathData="M9.703,10.273l-3.937,2.922l3.453,-1.218l1.781,1.765l4.438,-3.484l-4.297,1.687z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="?attr/pumpBatteryColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_pump_canula.xml b/core/src/main/res/drawable/ic_cp_pump_canula.xml
index b43de7ceaa..7e8bce4d17 100644
--- a/core/src/main/res/drawable/ic_cp_pump_canula.xml
+++ b/core/src/main/res/drawable/ic_cp_pump_canula.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M23.706,7.373c-0.149,-0.541 -0.728,-0.854 -1.294,-0.699L19.87,7.373c-0.325,-0.913 -1.301,-1.438 -2.255,-1.175l-3.008,0.826c-0.954,0.262 -1.525,1.212 -1.338,2.163l-2.542,0.698c-0.499,0.137 -0.799,0.593 -0.767,1.07c-1.696,0.439 -3.037,0.067 -4.101,-0.248c-1.047,-0.309 -1.951,-0.578 -2.713,0.152c-1.307,1.253 -0.369,2.87 0.384,4.17c0.501,0.863 1.019,1.757 0.766,2.3c-0.519,1.124 -2.729,1.128 -3.537,1.033c-0.203,-0.022 -0.392,0.122 -0.417,0.328c-0.024,0.206 0.123,0.391 0.329,0.414c0.086,0.01 1.376,0.152 2.554,-0.172c0.734,-0.202 1.424,-0.585 1.753,-1.292c0.416,-0.896 -0.173,-1.912 -0.797,-2.987c-0.844,-1.456 -1.336,-2.47 -0.515,-3.257c0.426,-0.409 0.972,-0.272 1.977,0.026c1.128,0.334 2.648,0.808 4.674,0.215c0.255,0.206 0.598,0.304 0.949,0.207l5.63,-1.547l2.016,7.338l0.127,-1.203l-1.718,-6.252l5.63,-1.547C23.517,8.479 23.855,7.914 23.706,7.373z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/pumpCanulaColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_question.xml b/core/src/main/res/drawable/ic_cp_question.xml
index fc6d14c656..11e4f2cff6 100644
--- a/core/src/main/res/drawable/ic_cp_question.xml
+++ b/core/src/main/res/drawable/ic_cp_question.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M12.042,18.479m-0.979,0a0.979,0.979 0,1 1,1.958 0a0.979,0.979 0,1 1,-1.958 0"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/questionColor"/>
   <path
       android:pathData="M12,16.126c-0.392,0 -0.708,-0.317 -0.708,-0.709c0,-2.548 1.188,-3.437 2.142,-4.151c0.8,-0.599 1.378,-1.032 1.378,-2.432c0,-1.931 -1.854,-2.531 -2.53,-2.531c-1.456,0 -2.631,0.873 -3.225,2.393C8.914,9.06 8.501,9.241 8.138,9.098C7.773,8.955 7.594,8.544 7.736,8.18c0.806,-2.063 2.505,-3.294 4.545,-3.294c1.592,0 3.948,1.255 3.948,3.948c0,2.11 -1.079,2.917 -1.946,3.566c-0.88,0.659 -1.574,1.178 -1.574,3.017C12.709,15.809 12.392,16.126 12,16.126z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/questionColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_loop_closed.xml b/core/src/main/res/drawable/ic_loop_closed.xml
index 9bddec63b6..110a3537ee 100644
--- a/core/src/main/res/drawable/ic_loop_closed.xml
+++ b/core/src/main/res/drawable/ic_loop_closed.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_pump_history.xml b/core/src/main/res/drawable/ic_pump_history.xml
index d4ef6ac5f0..fbd047a23a 100644
--- a/core/src/main/res/drawable/ic_pump_history.xml
+++ b/core/src/main/res/drawable/ic_pump_history.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M12.069,3.578c-4.48,0 -8.144,3.518 -8.398,7.936L2.71,10.552c-0.268,-0.267 -0.699,-0.267 -0.966,0c-0.267,0.267 -0.267,0.699 0,0.966l2.103,2.102c0.133,0.133 0.308,0.2 0.483,0.2c0.175,0 0.35,-0.067 0.483,-0.2l2.102,-2.102c0.267,-0.267 0.267,-0.699 0,-0.966c-0.267,-0.267 -0.699,-0.267 -0.966,0L5.04,11.461c0.277,-3.64 3.32,-6.518 7.03,-6.518c3.891,0 7.057,3.166 7.057,7.057c0,3.891 -3.166,7.057 -7.057,7.057c-1.921,0 -3.719,-0.762 -5.062,-2.148c-0.263,-0.27 -0.695,-0.276 -0.966,-0.015c-0.271,0.262 -0.278,0.695 -0.015,0.966c1.603,1.652 3.749,2.562 6.043,2.562c4.644,0 8.423,-3.779 8.423,-8.423S16.714,3.578 12.069,3.578z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/pumpHistoryColor"/>
   <path
       android:pathData="M12.069,12.683h3.814c0.377,0 0.683,-0.306 0.683,-0.683s-0.305,-0.683 -0.683,-0.683h-3.131V6.915c0,-0.377 -0.306,-0.683 -0.683,-0.683s-0.683,0.306 -0.683,0.683V12C11.387,12.377 11.692,12.683 12.069,12.683z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/pumpHistoryColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_temptarget_high.xml b/core/src/main/res/drawable/ic_temptarget_high.xml
index 9fbfe2eb08..ae0e9799ca 100644
--- a/core/src/main/res/drawable/ic_temptarget_high.xml
+++ b/core/src/main/res/drawable/ic_temptarget_high.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M7.242,17.689c-0.005,0 -0.011,0 -0.017,0c-0.695,-0.013 -1.318,-0.829 -1.709,-2.24c-0.285,-1.029 -0.542,-2.103 -0.792,-3.141c-0.156,-0.65 -0.313,-1.301 -0.476,-1.945L4.14,9.929c-0.369,-1.486 -0.75,-3.024 -1.746,-3.197c-0.116,-0.02 -0.193,-0.13 -0.173,-0.246s0.129,-0.189 0.246,-0.173C3.735,6.534 4.15,8.208 4.552,9.827l0.108,0.432c0.164,0.646 0.321,1.298 0.478,1.951c0.249,1.035 0.506,2.104 0.789,3.127c0.322,1.163 0.834,1.92 1.307,1.929c0.002,0 0.005,0 0.008,0c0.443,0 0.905,-0.656 1.269,-1.804c0.188,-0.592 0.349,-1.229 0.504,-1.847l0.124,-0.487c0.138,-0.536 0.268,-1.08 0.398,-1.624c0.267,-1.114 0.542,-2.265 0.878,-3.332c0.373,-1.182 0.928,-1.836 1.565,-1.842c0.003,0 0.005,0 0.008,0c0.639,0 1.208,0.65 1.603,1.832c0.278,0.833 0.514,1.729 0.74,2.598l0.177,0.671c0.147,0.553 0.288,1.112 0.43,1.672c0.24,0.956 0.489,1.945 0.769,2.879c0.229,0.77 0.619,1.26 1.017,1.28c0.356,0.043 0.729,-0.362 1.011,-1.041c0.271,-0.651 0.521,-1.41 0.761,-2.318c0.333,-1.265 0.648,-2.547 0.964,-3.829c0.146,-0.592 0.291,-1.184 0.438,-1.773c0.281,-1.125 0.812,-1.774 1.62,-1.983c0.111,-0.028 0.229,0.04 0.259,0.153c0.029,0.114 -0.039,0.229 -0.153,0.259c-0.652,0.168 -1.069,0.7 -1.313,1.674c-0.147,0.589 -0.293,1.181 -0.438,1.772c-0.316,1.284 -0.633,2.568 -0.966,3.836c-0.245,0.928 -0.5,1.704 -0.779,2.374c-0.487,1.17 -1.097,1.32 -1.426,1.302c-0.59,-0.03 -1.114,-0.622 -1.402,-1.584c-0.281,-0.941 -0.531,-1.936 -0.773,-2.896c-0.14,-0.558 -0.28,-1.115 -0.427,-1.666l-0.178,-0.673c-0.225,-0.861 -0.458,-1.751 -0.731,-2.57c-0.323,-0.966 -0.772,-1.541 -1.201,-1.541c-0.001,0 -0.002,0 -0.004,0c-0.425,0.003 -0.86,0.581 -1.164,1.544c-0.331,1.052 -0.605,2.196 -0.87,3.303c-0.131,0.546 -0.262,1.092 -0.399,1.63l-0.124,0.486c-0.158,0.623 -0.32,1.268 -0.512,1.871C8.367,17.32 7.706,17.689 7.242,17.689z"
-      android:fillColor="@color/inrange"/>
+      android:fillColor="?attr/bgInRange"/>
   <path
       android:pathData="M21.569,12.709h-4.772c-0.392,0 -0.709,-0.317 -0.709,-0.709V9.177H7.927l0,2.823c0,0.392 -0.317,0.709 -0.708,0.709H2.431c-0.392,0 -0.708,-0.317 -0.708,-0.709s0.317,-0.708 0.708,-0.708H6.51l0,-2.823c0,-0.392 0.317,-0.708 0.708,-0.708h9.578c0.392,0 0.709,0.317 0.709,0.708v2.823h4.063c0.392,0 0.709,0.317 0.709,0.708S21.961,12.709 21.569,12.709z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+      android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index 407645b3d1..ba771afa38 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -204,6 +204,16 @@
 
     <color name="splashBackground">#000000</color>
 
+    <color name="extBolusStop">#FEAF05</color>
+    <color name="actionBasal">#CF8BFE</color>
+    <color name="pumpCanula">#67dfe8</color>
+    <color name="cgmInsert">#67dfe8</color>
+    <color name="pumpBattery">#36FF00</color>
+    <color name="note">#FEAF05</color>
+    <color name="announcement">#CF8BFE</color>
+    <color name="question">#FEAF05</color>
+    <color name="pumpHistory">#67DFE8</color>
+
     <!-- Gray colors -->
     <color name="darkgray">#323232</color>
     <color name="darkgrayVariant">#424242</color>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 2d60869111..b55dc56cb4 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -29,7 +29,6 @@
         <item name="notificationLow">@color/notificationLow</item>
         <item name="notificationInfo">@color/notificationInfo</item>
         <item name="notificationAnnouncement">@color/notificationAnnouncement</item>
-
         <item name="actionModeCloseDrawable">@drawable/ic_close</item>
         <!---bolus color -->
         <item name="bolusColor">@color/bolus</item>
@@ -47,14 +46,10 @@
         <item name="setTempButton">@color/colorSetTempButton</item>
         <!-- Card Item-->
         <item name="cardItemBackgroundColor">@color/cardColorBackground</item>
-        <!-- Carbs -->
-        <item name="carbsColor">@color/carbs</item>
         <!-- Exercise -->
         <item name="exerciseColor">@color/exercise</item>
         <!-- BG low -->
         <item name="lowColor">@color/low</item>
-        <!-- Temp Target -->
-        <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
         <!-- Treatments -->
         <item name="setExtendedButtonColor">@color/colorSetExtendedButton</item>
         <item name="activeColor">@color/colorActive</item>
@@ -154,7 +149,6 @@
         <!---Warning Colors : WarnColors.kt-->
         <item name="warnColor">@color/omni_yellow</item>
         <item name="urgentColor">@color/alarm</item>
-
         <!---Automation -->
         <item name="userAction">@color/mdtp_line_dark</item>
         <item name="validActions">@color/ribbonDefault</item>
@@ -176,6 +170,39 @@
         <item name="icQuickWizardColor">@color/colorQuickWizardButton</item>
         <item name="icCalibrationColor">@color/colorCalibrationButton</item>
         <item name="icTreatmentColor">@color/colorTreatmentButton</item>
+        <!-- IOB -->
+        <item name="iobColor">@color/iob</item>
+        <!-- Basal -->
+        <item name="basal">@color/basal</item>
+        <!-- Carbs -->
+        <item name="carbsColor">@color/carbs</item>
+        <!-- Temp Target -->
+        <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
+        <!---Loop Icon-->
+        <!---Loop Paused Icon Color-->
+        <item name="loopPaused">@color/loopSuspended</item>
+        <!---Loop Closed Icon Color-->
+        <item name="loopClosed">@color/loopClosed</item>
+        <!---Loop Disabled Icon Color-->
+        <item name="loopDisabled">@color/loopDisabled</item>
+        <!---Loop Disconnected Icon Color-->
+        <item name="loopDisconnected">@color/loopDisconnected</item>
+        <!---Loop Opened Icon Color-->
+        <item name="loopOpened">@color/loopOpened</item>
+        <!---Loop Super Bolus Icon Color-->
+        <item name="loopSuperBolus">@color/carbs</item>
+        <!---Action Icons Color-->
+        <item name="extBolusColor">@color/extendedBolus</item>
+        <item name="extBolusStopColor">@color/extBolusStop</item>
+        <item name="basalstartColor">@color/actionBasal</item>
+        <item name="basalCancelColor">@color/actionBasal</item>
+        <item name="pumpCanulaColor">@color/pumpCanula</item>
+        <item name="cgmInsertColor">@color/cgmInsert</item>
+        <item name="pumpBatteryColor">@color/pumpBattery</item>
+        <item name="noteColor">@color/note</item>
+        <item name="announcementColor">@color/announcement</item>
+        <item name="questionColor">@color/question</item>
+        <item name="pumpHistoryColor">@color/pumpHistory</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 9c2f6300a2..c7c2ca658d 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -150,4 +150,33 @@
     <attr name="icQuickWizardColor" format="reference|color" />
     <attr name="icCalibrationColor" format="reference|color" />
     <attr name="icTreatmentColor" format="reference|color" />
+    <!-- IOB -->
+    <attr name="iobColor" format="reference|color" />
+    <!-- Basal -->
+    <attr name="basal" format="reference|color" />
+    <!---Loop Icon-->
+    <!---Loop Paused Icon Color-->
+    <attr name="loopPaused" format="reference|color" />
+    <!---Loop Closed Icon Color-->
+    <attr name="loopClosed" format="reference|color" />
+    <!---Loop Disabled Icon Color-->
+    <attr name="loopDisabled" format="reference|color" />
+    <!---Loop Disconnected Icon Color-->
+    <attr name="loopDisconnected" format="reference|color" />
+    <!---Loop Opened Icon Color-->
+    <attr name="loopOpened" format="reference|color" />
+    <!---Loop Super Bolus Icon Color-->
+    <attr name="loopSuperBolus" format="reference|color" />
+    <!---Extended Bolus Icon Color-->
+    <attr name="extBolusColor" format="reference|color" />
+    <attr name="extBolusStopColor" format="reference|color" />
+    <attr name="basalstartColor" format="reference|color" />
+    <attr name="basalCancelColor" format="reference|color" />
+    <attr name="pumpCanulaColor" format="reference|color" />
+    <attr name="cgmInsertColor" format="reference|color" />
+    <attr name="pumpBatteryColor" format="reference|color" />
+    <attr name="noteColor" format="reference|color" />
+    <attr name="announcementColor" format="reference|color" />
+    <attr name="questionColor" format="reference|color" />
+    <attr name="pumpHistoryColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index f112deb931..ca608ef91c 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -32,11 +32,11 @@
     <color name="background_light">#FFFFFF</color>
 
     <!--    Tabs-->
-    <color name="tabText">#d0d0d0</color>
-    <color name="tabSelectedText">@color/white</color>
+    <color name="tabText">@color/black_alpha_90</color>
+    <color name="tabSelectedText">@color/black_alpha_90</color>
 
     <!--    Buttons-->
-    <color name="buttonBackground">#555555</color>
+    <color name="buttonBackground">#888888</color>
     <color name="buttonText">#ffffff</color>
     <color name="okButtonText">@color/colorAccent</color>
     <color name="okButtonSelected">#33969696</color>
@@ -82,7 +82,7 @@
     <color name="low">#FF0000</color>
     <color name="high">#FFFB8C00</color>
     <color name="iob">#1e88e5</color>
-    <color name="extendedBolus">#67DFE8</color>
+    <color name="extendedBolus">#1e88e5</color>
     <color name="iobPredAS">#1ea3e5</color>
     <color name="cob">#FFFB8C00</color>
     <color name="carbs">#FFFB8C00</color>
@@ -151,7 +151,7 @@
     <color name="ribbonCritical">#ff0400</color>
     <color name="ribbonTextDefault">#FFFFFF</color>
     <color name="ribbonTextWarning">#303030</color>
-    <color name="tempTargetConfirmation">#77dd77</color>
+    <color name="tempTargetConfirmation">#6BD16B</color>
 
     <color name="prediction">#ff00ff</color>
     <color name="iobPred">#00d2d2</color>
@@ -175,7 +175,7 @@
     <color name="dummy_background">#7DFF0000</color>
 
     <color name="tempTargetBackground">#77dd77</color>
-    <color name="exercise">#67DFE8</color>
+    <color name="exercise">#42A5F5</color>
 
     <color name="action">#ffffbb33</color>
     <color name="alarm">#ffff4444</color>
@@ -205,6 +205,16 @@
 
     <color name="splashBackground">#FFFFFF</color>
 
+    <color name="extBolusStop">#FEAF05</color>
+    <color name="actionBasal">#CF8BFE</color>
+    <color name="pumpCanula">#42A5F5</color>
+    <color name="cgmInsert">#42A5F5</color>
+    <color name="pumpBattery">#66BB6A</color>
+    <color name="note">#FEAF05</color>
+    <color name="announcement">#CF8BFE</color>
+    <color name="question">#FEAF05</color>
+    <color name="pumpHistory">#42A5F5</color>
+
     <!-- Gray colors -->
     <color name="darkgray">#323232</color>
     <color name="darkgrayVariant">#424242</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index fd14dc94f5..d1f9e81951 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -3,7 +3,7 @@
 
     <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!---Example light theme colors -->
-        <item name="colorPrimary">@color/lightSandGray</item>
+        <item name="colorPrimary">@color/plastic</item>
         <item name="colorOnPrimary">@color/aaps_theme_light_onPrimary</item>
         <item name="colorSecondary">@color/aaps_theme_light_secondary</item>
         <item name="colorOnSecondary">@color/aaps_theme_light_onSecondary</item>
@@ -13,7 +13,6 @@
         <item name="colorOnBackground">@color/aaps_theme_light_onBackground</item>
         <item name="colorSurface">@color/aaps_theme_light_surface</item>
         <item name="colorOnSurface">@color/aaps_theme_light_onSurface</item>
-
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/aaps_theme_light_secondary</item>
         <item name="dialogTitleBackground">@color/dialog_title_background</item>
@@ -25,6 +24,9 @@
         <item name="scrimBackground">@color/white</item>
         <item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu</item>
         <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
+        <!---Text Colors -->
+        <item name="android:textColorPrimary">@color/black</item>
+        <item name="android:textColor">@color/black</item>
         <!---Notification -->
         <item name="notificationUrgent">@color/notificationUrgent</item>
         <item name="notificationNormal">@color/notificationNormal</item>
@@ -50,14 +52,10 @@
         <item name="setTempButton">@color/colorSetTempButton</item>
         <!-- Card Item-->
         <item name="cardItemBackgroundColor">@color/cardColorBackground</item>
-        <!-- Carbs -->
-        <item name="carbsColor">@color/carbs</item>
         <!-- Exercise -->
         <item name="exerciseColor">@color/exercise</item>
         <!-- BG low -->
         <item name="lowColor">@color/low</item>
-        <!-- Temp Target -->
-        <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
         <!-- Treatments -->
         <item name="setExtendedButtonColor">@color/colorSetExtendedButton</item>
         <item name="activeColor">@color/colorActive</item>
@@ -129,7 +127,7 @@
         <!---BG color-->
         <item name="bgLow">@color/low</item>
         <item name="highColor">@color/high</item>
-        <item name="bgInRange">@color/inrange</item>
+        <item name="bgInRange">@color/tempTargetConfirmation</item>
         <!---Profile Helper -->
         <item name="helperProfileColor">@color/helperProfile</item>
         <item name="examinedProfileColor">@color/examinedProfile</item>
@@ -179,7 +177,39 @@
         <item name="icQuickWizardColor">@color/colorQuickWizardButton</item>
         <item name="icCalibrationColor">@color/colorCalibrationButton</item>
         <item name="icTreatmentColor">@color/bolus</item>
-
+        <!-- IOB -->
+        <item name="iobColor">@color/iob</item>
+        <!-- Basal -->
+        <item name="basal">@color/basal</item>
+        <!-- Carbs -->
+        <item name="carbsColor">@color/carbs</item>
+        <!-- Temp Target -->
+        <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
+        <!---Loop Icon-->
+        <!---Loop Paused Icon Color-->
+        <item name="loopPaused">@color/loopSuspended</item>
+        <!---Loop Closed Icon Color-->
+        <item name="loopClosed">@color/loopClosed</item>
+        <!---Loop Disabled Icon Color-->
+        <item name="loopDisabled">@color/loopDisabled</item>
+        <!---Loop Disconnected Icon Color-->
+        <item name="loopDisconnected">@color/loopDisconnected</item>
+        <!---Loop Opened Icon Color-->
+        <item name="loopOpened">@color/loopOpened</item>
+        <!---Loop Super Bolus Icon Color-->
+        <item name="loopSuperBolus">@color/carbs</item>
+        <!---Action Icons Color-->
+        <item name="extBolusColor">@color/extendedBolus</item>
+        <item name="extBolusStopColor">@color/extBolusStop</item>
+        <item name="basalstartColor">@color/actionBasal</item>
+        <item name="basalCancelColor">@color/actionBasal</item>
+        <item name="pumpCanulaColor">@color/pumpCanula</item>
+        <item name="cgmInsertColor">@color/cgmInsert</item>
+        <item name="pumpBatteryColor">@color/pumpBattery</item>
+        <item name="noteColor">@color/note</item>
+        <item name="announcementColor">@color/announcement</item>
+        <item name="questionColor">@color/question</item>
+        <item name="pumpHistoryColor">@color/pumpHistory</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>