diff --git a/Controllers/SteelSeriesController/SteelSeriesApexController.cpp b/Controllers/SteelSeriesController/SteelSeriesApexController.cpp
index e768bb88e..e9316a74e 100644
--- a/Controllers/SteelSeriesController/SteelSeriesApexController.cpp
+++ b/Controllers/SteelSeriesController/SteelSeriesApexController.cpp
@@ -39,7 +39,6 @@ void SteelSeriesApexController::SetMode
     std::vector<RGBColor> colors
     )
 {
-    unsigned char color_mode;
     unsigned char mode_colors[9];
 
     active_mode = mode;
diff --git a/RGBController/RGBController_SteelSeriesApex.cpp b/RGBController/RGBController_SteelSeriesApex.cpp
index 41cd8b948..11399df1e 100644
--- a/RGBController/RGBController_SteelSeriesApex.cpp
+++ b/RGBController/RGBController_SteelSeriesApex.cpp
@@ -22,13 +22,13 @@ using namespace std::chrono_literals;
 //0xFFFFFFFF indicates an unused entry in matrix
 #define NA  0xFFFFFFFF
 
-static unsigned int matrix_map[6][23] = //TODO: Create proper matrix map
-    { {   0,  NA,  16,  30,  44,  54,  NA,  65,  75,  84,  95,  NA,   8,  23 ,  38,   6 ,  22,  36,  49,  NA,  NA,  NA,  NA },
-      {   1,  17,  31,  45,  55,  66,  76,  85,  96,   9,  24,  NA,  39,   7 ,  37,  NA ,  60,  70,  80,  52,  63,  73,  82 },
-      {   2,  NA,  18,  32,  46,  56,  NA,  67,  77,  86,  97,  10,  25,  40 ,  90,  101,  50,  61,  71,  51,  62,  72,  93 },
-      {   3,  NA,  19,  33,  47,  57,  NA,  68,  78,  87,  98,  11,  26,  41 ,  28,  14 ,  NA,  NA,  NA,  92, 103,  53,  NA },
-      {   4,  20,  34,  48,  58,  69,  NA,  79,  NA,  88,  99,  12,  27,  42 ,  81,  NA ,  NA, 102,  NA,  64,  74,  83, 104 },
-      {   5,  21,  35,  NA,  NA,  NA,  NA,  59,  NA,  NA,  NA,  NA,  89,  100,  13,  91 ,  15,  29,  43,  94,  NA, 105,  NA } };
+static unsigned int matrix_map[6][23] = 
+    { {   37,  NA,  53,  54,  55,  56,  NA,  57,  58,  59,  60,  NA,  61 ,  62 ,  63 ,  64 ,  65,  66,  67,  NA,  NA,  NA,  NA },
+      {   48,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  41,  42 ,  NA ,  38 ,  NA ,  68,  69,  70,  78,  79,  80,  81 },
+      {   39,  NA,  16,  22,  4 ,  17,  19,  24,  20,  8 ,  14,  15,  43 ,  44 ,  NA ,  36 ,  71,  72,  73,  90,  91,  92,  82 },
+      {   52,  NA,  0 ,  18,  3 ,  5 ,  6 ,  7 ,  9 ,  10,  11,  46,  47 ,  45 ,  NA ,  NA ,  NA,  NA,  NA,  87,  88,  89,  NA },
+      {   97,  95,  25,  23,  2 ,  21,  NA,  1 ,  13,  12,  49,  50,  51 ,  NA ,  101,  NA ,  NA,  77,  NA,  84,  85,  86,  83 },
+      {   96,  99,  98,  NA,  NA,  NA,  NA,  40,  NA,  NA,  NA,  NA,  102,  103,  104,  100,  75,  76,  74,  93,  NA,  94,  NA } }; 
 
 static const char* zone_names[] =
 {