diff --git a/src/color.h b/src/color.h
index b61d04d1..edd38ee0 100644
--- a/src/color.h
+++ b/src/color.h
@@ -54,59 +54,59 @@ constexpr int rgb555(int rgb)
     return ((rgb >> 19) & 0x1F) << 10 | ((rgb >> 11) & 0x1F) << 5 | ((rgb >> 3) & 0x1F);
 }
 
-#define COLOR_LIGHT_RED    _colorTable[rgb555(0xFF5252)]
-#define COLOR_RED          _colorTable[rgb555(0xFF0000)]
-#define COLOR_RED_2        _colorTable[rgb555(0xE60000)]
-#define COLOR_DARK_RED     _colorTable[rgb555(0xBD1042)]
+#define COLOR_LIGHT_RED _colorTable[rgb555(0xFF5252)]
+#define COLOR_RED _colorTable[rgb555(0xFF0000)]
+#define COLOR_RED_2 _colorTable[rgb555(0xE60000)]
+#define COLOR_DARK_RED _colorTable[rgb555(0xBD1042)]
 
-#define COLOR_WHITE        _colorTable[rgb555(0xFFFFFF)]
-#define COLOR_PALE_BLUE    _colorTable[rgb555(0xC5D6FF)]
+#define COLOR_WHITE _colorTable[rgb555(0xFFFFFF)]
+#define COLOR_PALE_BLUE _colorTable[rgb555(0xC5D6FF)]
 
-#define COLOR_LIGHT_GREY   _colorTable[rgb555(0xA5A5A5)]
+#define COLOR_LIGHT_GREY _colorTable[rgb555(0xA5A5A5)]
 #define COLOR_LIGHT_GREY_2 _colorTable[rgb555(0x9C94A5)]
-#define COLOR_GREY         _colorTable[rgb555(0x8C8C8C)]
-#define COLOR_GREY_2       _colorTable[rgb555(0x7B7B7B)]
-#define COLOR_DARK_GREY    _colorTable[rgb555(0x424242)]
-#define COLOR_DARK_GREY_2  _colorTable[rgb555(0x525252)]
-#define COLOR_DARK_GREY_3  _colorTable[rgb555(0x212121)]
+#define COLOR_GREY _colorTable[rgb555(0x8C8C8C)]
+#define COLOR_GREY_2 _colorTable[rgb555(0x7B7B7B)]
+#define COLOR_DARK_GREY _colorTable[rgb555(0x424242)]
+#define COLOR_DARK_GREY_2 _colorTable[rgb555(0x525252)]
+#define COLOR_DARK_GREY_3 _colorTable[rgb555(0x212121)]
 
-#define COLOR_BLACK        _colorTable[rgb555(0x000000)]
-#define COLOR_BLACK_2      _colorTable[rgb555(0x000010)]
+#define COLOR_BLACK _colorTable[rgb555(0x000000)]
+#define COLOR_BLACK_2 _colorTable[rgb555(0x000010)]
 
-#define COLOR_CYAN         _colorTable[rgb555(0x4AFFFF)]
-#define COLOR_LIGHT_BLUE   _colorTable[rgb555(0x315A8C)]
-#define COLOR_BLUE         _colorTable[rgb555(0x0000FF)]
-#define COLOR_BLUE_2       _colorTable[rgb555(0x0000AD)]
-#define COLOR_SAGE_GREEN   _colorTable[rgb555(0x8CBD8C)]
+#define COLOR_CYAN _colorTable[rgb555(0x4AFFFF)]
+#define COLOR_LIGHT_BLUE _colorTable[rgb555(0x315A8C)]
+#define COLOR_BLUE _colorTable[rgb555(0x0000FF)]
+#define COLOR_BLUE_2 _colorTable[rgb555(0x0000AD)]
+#define COLOR_SAGE_GREEN _colorTable[rgb555(0x8CBD8C)]
 
-#define COLOR_LIGHT_PINK   _colorTable[rgb555(0xFF7B7B)]
-#define COLOR_MAGENTA      _colorTable[rgb555(0xFF00FF)]
+#define COLOR_LIGHT_PINK _colorTable[rgb555(0xFF7B7B)]
+#define COLOR_MAGENTA _colorTable[rgb555(0xFF00FF)]
 #define COLOR_LIGHT_PINK_2 _colorTable[rgb555(0xF77B7B)]
 
-#define COLOR_LIGHT_GREEN   _colorTable[rgb555(0x007300)]
+#define COLOR_LIGHT_GREEN _colorTable[rgb555(0x007300)]
 #define COLOR_LIGHT_GREEN_2 _colorTable[rgb555(0x429C21)]
 #define COLOR_LIGHT_GREEN_3 _colorTable[rgb555(0x00C500)]
-#define COLOR_GREEN         _colorTable[rgb555(0x00FF00)]
-#define COLOR_DARK_GREEN    _colorTable[rgb555(0x007B00)]
-#define COLOR_DARK_GREEN_2  _colorTable[rgb555(0x084A08)]
-#define COLOR_GRASS_GREEN   _colorTable[rgb555(0x7B7B29)]
+#define COLOR_GREEN _colorTable[rgb555(0x00FF00)]
+#define COLOR_DARK_GREEN _colorTable[rgb555(0x007B00)]
+#define COLOR_DARK_GREEN_2 _colorTable[rgb555(0x084A08)]
+#define COLOR_GRASS_GREEN _colorTable[rgb555(0x7B7B29)]
 
-#define COLOR_LIGHT_YELLOW  _colorTable[rgb555(0xFFFF5A)]
-#define COLOR_LIGHT_GOLD    _colorTable[rgb555(0xF7EF10)]
-#define COLOR_LIGHT_GOLD_2  _colorTable[rgb555(0xEFEF42)]
-#define COLOR_AMBER         _colorTable[rgb555(0xFF9442)]
-#define COLOR_YELLOW_2      _colorTable[rgb555(0xA59C19)]
-#define COLOR_SAND          _colorTable[rgb555(0xAD844A)]
-#define COLOR_YELLOW_GREEN  _colorTable[rgb555(0xEFFF08)]
-#define COLOR_DARK_YELLOW   _colorTable[rgb555(0x948C19)]
+#define COLOR_LIGHT_YELLOW _colorTable[rgb555(0xFFFF5A)]
+#define COLOR_LIGHT_GOLD _colorTable[rgb555(0xF7EF10)]
+#define COLOR_LIGHT_GOLD_2 _colorTable[rgb555(0xEFEF42)]
+#define COLOR_AMBER _colorTable[rgb555(0xFF9442)]
+#define COLOR_YELLOW_2 _colorTable[rgb555(0xA59C19)]
+#define COLOR_SAND _colorTable[rgb555(0xAD844A)]
+#define COLOR_YELLOW_GREEN _colorTable[rgb555(0xEFFF08)]
+#define COLOR_DARK_YELLOW _colorTable[rgb555(0x948C19)]
 #define COLOR_DARK_YELLOW_2 _colorTable[rgb555(0x736319)]
 #define COLOR_DARK_YELLOW_3 _colorTable[rgb555(0x947B29)]
 #define COLOR_DARK_YELLOW_4 _colorTable[rgb555(0x948C08)]
-#define COLOR_LIGHT_ORANGE  _colorTable[rgb555(0xFFBD7B)]
+#define COLOR_LIGHT_ORANGE _colorTable[rgb555(0xFFBD7B)]
 
-#define COLOR_DARK_BROWN    _colorTable[rgb555(0x634210)]
-#define COLOR_OLIVE         _colorTable[rgb555(0xADAD5A)]
-#define COLOR_DULL_BROWN    _colorTable[rgb555(0x6B5A4A)]
+#define COLOR_DARK_BROWN _colorTable[rgb555(0x634210)]
+#define COLOR_OLIVE _colorTable[rgb555(0xADAD5A)]
+#define COLOR_DULL_BROWN _colorTable[rgb555(0x6B5A4A)]
 
 } // namespace fallout
 
diff --git a/src/platform/ios/quick_toolbar.cc b/src/platform/ios/quick_toolbar.cc
index fd8534d1..6d211bdc 100644
--- a/src/platform/ios/quick_toolbar.cc
+++ b/src/platform/ios/quick_toolbar.cc
@@ -89,7 +89,7 @@ namespace {
         fillRect(buffer, pitch, x, y, 1, h, border);
         fillRect(buffer, pitch, x + w - 1, y, 1, h, border);
 
-        drawCenteredLabel(buffer, pitch, x, y, w, h, label, intensityColorTable[COLOR_LIGHT_YELLOW ][48]);
+        drawCenteredLabel(buffer, pitch, x, y, w, h, label, intensityColorTable[COLOR_LIGHT_YELLOW][48]);
     }
 
     void paintAll()