diff --git a/.github/workflows/tidy-format-validation.yml b/.github/workflows/tidy-format-validation.yml
index bfb5c19..035b7ee 100644
--- a/.github/workflows/tidy-format-validation.yml
+++ b/.github/workflows/tidy-format-validation.yml
@@ -50,7 +50,7 @@ jobs:
           mkdir clang-tidy-result
       - name: Analyze
         run: |
-          git diff -U0 HEAD^ -- 'src' 'include' ':!include/libultraship/color.h' ':!include/libultraship/libultra/*' ':!src/libultraship/libultra/*' ':!src/fast/*' ':!include/fast/*' ':!src/ship/utils/AppleFolderManager.mm' | clang-tidy-diff -p1 -path build -export-fixes clang-tidy-result/fixes.yml
+          git diff -U0 HEAD^ -- 'src' 'include' ':!include/libultraship/color.h' ':!include/ship/utils/color.h' ':!include/libultraship/libultra/*' ':!src/libultraship/libultra/*' ':!src/fast/*' ':!include/fast/*' ':!src/ship/utils/AppleFolderManager.mm' | clang-tidy-diff -p1 -path build -export-fixes clang-tidy-result/fixes.yml
       - name: Save PR metadata
         run: |
           echo ${{ github.event.number }} > clang-tidy-result/pr-id.txt
diff --git a/include/libultraship/color.h b/include/libultraship/color.h
index 83eb3b9..b1f1693 100644
--- a/include/libultraship/color.h
+++ b/include/libultraship/color.h
@@ -2,18 +2,12 @@
 
 #include <stdint.h>
 
+#include <ship/utils/color.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct {
-    uint8_t r, g, b;
-} Color_RGB8;
-
-typedef struct {
-    uint8_t r, g, b, a;
-} Color_RGBA8;
-
 // only use when necessary for alignment purposes
 typedef union {
     struct {
diff --git a/include/libultraship/controller/controldevice/controller/Controller.h b/include/libultraship/controller/controldevice/controller/Controller.h
index 19149f9..cc2276e 100644
--- a/include/libultraship/controller/controldevice/controller/Controller.h
+++ b/include/libultraship/controller/controldevice/controller/Controller.h
@@ -8,7 +8,7 @@
 #include <vector>
 #include <map>
 #include "libultraship/libultra/controller.h"
-#include "libultraship/color.h"
+#include "ship/utils/color.h"
 #include <unordered_map>
 #include "ship/controller/controldevice/controller/Controller.h"
 
diff --git a/include/ship/config/ConsoleVariable.h b/include/ship/config/ConsoleVariable.h
index 2dbcec1..82fbb5d 100644
--- a/include/ship/config/ConsoleVariable.h
+++ b/include/ship/config/ConsoleVariable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libultraship/color.h"
+#include "ship/utils/color.h"
 #include <nlohmann/json.hpp>
 #include <stdint.h>
 #include <memory>
diff --git a/include/ship/controller/controldevice/controller/mapping/ControllerLEDMapping.h b/include/ship/controller/controldevice/controller/mapping/ControllerLEDMapping.h
index baf319d..84e61ef 100644
--- a/include/ship/controller/controldevice/controller/mapping/ControllerLEDMapping.h
+++ b/include/ship/controller/controldevice/controller/mapping/ControllerLEDMapping.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <string>
 #include "ControllerMapping.h"
-#include "libultraship/color.h"
+#include "ship/utils/color.h"
 
 namespace Ship {
 
diff --git a/include/ship/utils/color.h b/include/ship/utils/color.h
new file mode 100644
index 0000000..141abc6
--- /dev/null
+++ b/include/ship/utils/color.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+    uint8_t r, g, b;
+} Color_RGB8;
+
+typedef struct {
+    uint8_t r, g, b, a;
+} Color_RGBA8;
+
+#ifdef __cplusplus
+};
+#endif