diff --git a/src/openrct2/interface/colour.c b/src/openrct2/interface/colour.c
index 41cef573fc..86da749f21 100644
--- a/src/openrct2/interface/colour.c
+++ b/src/openrct2/interface/colour.c
@@ -18,7 +18,7 @@
 #include "colour.h"
 #include "../sprites.h"
 
-rct_colour_map ColourMapA[32] = { 0 };
+rct_colour_map ColourMapA[COLOUR_COUNT] = { 0 };
 
 enum
 {
@@ -38,12 +38,14 @@ enum
 
 void colours_init_maps()
 {
-    if (g1Elements == NULL) {
+    if (g1Elements == NULL)
+    {
         return;
     }
 
     // Get colour maps from g1
-    for (sint32 i = 0; i < 32; i++) {
+    for (sint32 i = 0; i < COLOUR_COUNT; i++)
+    {
         rct_g1_element *g1Element = &g1Elements[SPR_PALETTE_2_START + i];
 
         ColourMapA[i].colour_0 = g1Element->offset[INDEX_COLOUR_0];
diff --git a/src/openrct2/interface/colour.h b/src/openrct2/interface/colour.h
index 38e402434c..735982e830 100644
--- a/src/openrct2/interface/colour.h
+++ b/src/openrct2/interface/colour.h
@@ -22,7 +22,8 @@
 /**
  * Colour IDs as used by the colour dropdown, NOT palette indices.
  */
-enum {
+enum
+{
     COLOUR_BLACK,
     COLOUR_GREY,
     COLOUR_WHITE,
@@ -62,12 +63,14 @@ enum {
 /**
  * These colours change depending on the current water colours.
  */
-enum {
+enum
+{
     COLOUR_DARK_WATER = 9,
     COLOUR_LIGHT_WATER = 10
 };
 
-enum {
+enum
+{
     PALETTE_INDEX_0 = 0,        //
     PALETTE_INDEX_10 = 10,      // Black (0-dark), Dark gray (0)
     PALETTE_INDEX_11 = 11,      // Black (middark)
@@ -121,7 +124,8 @@ enum {
 #define NOT_TRANSLUCENT(x) ((x) & ~COLOUR_FLAG_TRANSLUCENT)
 #define BASE_COLOUR(x)          ((x) & 0x1F)
 
-typedef struct rct_colour_map {
+typedef struct rct_colour_map
+{
     uint8 colour_0;
     uint8 colour_1;
     uint8 darkest;