diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
index cfddd9cc6..f79af9ea7 100644
--- a/LoopFollow/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
+++ b/LoopFollow/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
@@ -11,24 +11,6 @@
         }
       },
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "0.500",
-          "blue" : "0.988",
-          "green" : "0.588",
-          "red" : "0.118"
-        }
-      },
-      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/DarkerBlue.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/DarkerBlue.colorset/Contents.json
deleted file mode 100644
index ef3fc0431..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/DarkerBlue.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "0.288",
-          "red" : "0.118"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "0.288",
-          "red" : "0.118"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/Insulin.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/Insulin.colorset/Contents.json
index e90ba2467..3b84e3d81 100644
--- a/LoopFollow/Resources/Assets.xcassets/Colors/Insulin.colorset/Contents.json
+++ b/LoopFollow/Resources/Assets.xcassets/Colors/Insulin.colorset/Contents.json
@@ -11,24 +11,6 @@
         }
       },
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.988",
-          "green" : "0.588",
-          "red" : "0.118"
-        }
-      },
-      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/Lemon.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/Lemon.colorset/Contents.json
deleted file mode 100644
index 8bc12a80a..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/Lemon.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.089",
-          "green" : "0.940",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.089",
-          "green" : "0.940",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/LoopGray.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/LoopGray.colorset/Contents.json
deleted file mode 100644
index 39be926d8..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/LoopGray.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.741",
-          "green" : "0.741",
-          "red" : "0.741"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.741",
-          "green" : "0.741",
-          "red" : "0.741"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/LoopGreen.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/LoopGreen.colorset/Contents.json
deleted file mode 100644
index 729c894c3..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/LoopGreen.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.592",
-          "green" : "0.812",
-          "red" : "0.435"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.592",
-          "green" : "0.812",
-          "red" : "0.435"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/LoopPink.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/LoopPink.colorset/Contents.json
deleted file mode 100644
index 1a570bbeb..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/LoopPink.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.796",
-          "green" : "0.750",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.796",
-          "green" : "0.750",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/LoopRed.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/LoopRed.colorset/Contents.json
deleted file mode 100644
index a5b9b86dd..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/LoopRed.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.341",
-          "green" : "0.341",
-          "red" : "0.922"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.341",
-          "green" : "0.341",
-          "red" : "0.922"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/LoopYellow.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/LoopYellow.colorset/Contents.json
index 92162bd7c..c9895a683 100644
--- a/LoopFollow/Resources/Assets.xcassets/Colors/LoopYellow.colorset/Contents.json
+++ b/LoopFollow/Resources/Assets.xcassets/Colors/LoopYellow.colorset/Contents.json
@@ -11,24 +11,6 @@
         }
       },
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.271",
-          "green" : "0.757",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/ManualTempBasal.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/ManualTempBasal.colorset/Contents.json
deleted file mode 100644
index e90ba2467..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/ManualTempBasal.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.988",
-          "green" : "0.588",
-          "red" : "0.118"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.988",
-          "green" : "0.588",
-          "red" : "0.118"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/NonPumpInsulin.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/NonPumpInsulin.colorset/Contents.json
deleted file mode 100644
index 2286e0275..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/NonPumpInsulin.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "250",
-          "green" : "213",
-          "red" : "63"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "250",
-          "green" : "213",
-          "red" : "63"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/SMB.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/SMB.colorset/Contents.json
index 8a5ff421b..8d5adcda9 100644
--- a/LoopFollow/Resources/Assets.xcassets/Colors/SMB.colorset/Contents.json
+++ b/LoopFollow/Resources/Assets.xcassets/Colors/SMB.colorset/Contents.json
@@ -11,24 +11,6 @@
         }
       },
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "194",
-          "green" : "117",
-          "red" : "58"
-        }
-      },
-      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/UAM.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/UAM.colorset/Contents.json
index a3bf89da0..ab3c66629 100644
--- a/LoopFollow/Resources/Assets.xcassets/Colors/UAM.colorset/Contents.json
+++ b/LoopFollow/Resources/Assets.xcassets/Colors/UAM.colorset/Contents.json
@@ -5,27 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.271",
-          "green" : "0.518",
-          "red" : "1.000"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.271",
-          "green" : "0.518",
-          "red" : "1.000"
+          "blue" : "0.969",
+          "green" : "0.169",
+          "red" : "0.820"
         }
       },
       "idiom" : "universal"
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/ZT.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/ZT.colorset/Contents.json
index 096ab644e..4a3e27148 100644
--- a/LoopFollow/Resources/Assets.xcassets/Colors/ZT.colorset/Contents.json
+++ b/LoopFollow/Resources/Assets.xcassets/Colors/ZT.colorset/Contents.json
@@ -11,24 +11,6 @@
         }
       },
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.937",
-          "green" : "0.380",
-          "red" : "0.443"
-        }
-      },
-      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/darkGray.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/darkGray.colorset/Contents.json
deleted file mode 100644
index b05e49b84..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/darkGray.colorset/Contents.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "extended-gray",
-        "components" : {
-          "alpha" : "1.000",
-          "white" : "0.145"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "extended-gray",
-        "components" : {
-          "alpha" : "1.000",
-          "white" : "0.145"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/LoopFollow/Resources/Assets.xcassets/Colors/minus.colorset/Contents.json b/LoopFollow/Resources/Assets.xcassets/Colors/minus.colorset/Contents.json
deleted file mode 100644
index d7ff24888..000000000
--- a/LoopFollow/Resources/Assets.xcassets/Colors/minus.colorset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.976",
-          "green" : "0.839",
-          "red" : "0.635"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.976",
-          "green" : "0.839",
-          "red" : "0.635"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}