diff --git a/Controllers/CougarController/CougarControllerDetect.cpp b/Controllers/CougarController/CougarControllerDetect.cpp
index a9c88a35..4b773954 100644
--- a/Controllers/CougarController/CougarControllerDetect.cpp
+++ b/Controllers/CougarController/CougarControllerDetect.cpp
@@ -1,6 +1,14 @@
+/*---------------------------------------------------------*\
+| CougarControllerDetect.cpp                                |
+|                                                           |
+|   Detector for Cougar devices                             |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include "Detector.h"
 #include "RGBController.h"
-
 #include "RGBController_CougarKeyboard.h"
 #include "RGBController_CougarRevengerST.h"
 
@@ -29,7 +37,6 @@ void DetectCougarRevengerSTControllers(hid_device_info* info, const std::string&
     }
 }
 
-
 void DetectCougar700kEvo(hid_device_info* info, const std::string& name)
 {
     hid_device* dev = hid_open_path(info->path);
@@ -44,6 +51,5 @@ void DetectCougar700kEvo(hid_device_info* info, const std::string& name)
     }
 }
 
-
 REGISTER_HID_DETECTOR_IPU("Cougar 700K EVO Gaming Keyboard",        DetectCougar700kEvo,                COUGAR_VID_2,   COUGAR_700K_EVO_PID,    3, 0xFF00, 1);
 REGISTER_HID_DETECTOR_IPU("Cougar Revenger ST",                     DetectCougarRevengerSTControllers,  COUGAR_VID,     COUGAR_REVENGER_ST_PID, 0, 0x0001, 2);
diff --git a/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.cpp b/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.cpp
index c2ea0ed0..58d5ebb0 100644
--- a/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.cpp
+++ b/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.cpp
@@ -1,10 +1,13 @@
-/*-------------------------------------------------------------------*\
-|  CougarKeyboardController.cpp                                       |
-|                                                                     |
-|  Driver for CougarKeyboard USB Controller                           |
-|                                                                     |
-|  Chris M (DrNo)          5 Apr 2022                                 |
-\*-------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| CougarKeyboardController.cpp                              |
+|                                                           |
+|   Driver for Cougar keyboard                              |
+|                                                           |
+|   Chris M (DrNo)                              05 Apr 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <cstring>
 #include "CougarKeyboardController.h"
diff --git a/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.h b/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.h
index 7120ec34..1de636e3 100644
--- a/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.h
+++ b/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.h
@@ -1,17 +1,20 @@
-/*-------------------------------------------------------------------*\
-|  CougarKeyboardController.h                                         |
-|                                                                     |
-|  Driver for CougarKeyboard USB Controller                           |
-|                                                                     |
-|  Chris M (DrNo)          5 Apr 2022                                 |
-\*-------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| CougarKeyboardController.h                                |
+|                                                           |
+|   Driver for Cougar keyboard                              |
+|                                                           |
+|   Chris M (DrNo)                              05 Apr 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#pragma once
 
 #include <string>
 #include <hidapi/hidapi.h>
 #include "RGBController.h"
 
-#pragma once
-
 #define COUGARKEYBOARDCONTROLLER_WRITE_PACKET_SIZE  65      //Buffer requires a prepended ReportID hence + 1
 #define HID_MAX_STR                                 255
 
diff --git a/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.cpp b/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.cpp
index 9b59c739..84e48bcf 100644
--- a/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.cpp
+++ b/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.cpp
@@ -1,10 +1,13 @@
-/*-------------------------------------------------------------------*\
-|  RGBController_CougarKeyboard.cpp                                   |
-|                                                                     |
-|  Driver for CougarKeyboard USB Controller                           |
-|                                                                     |
-|  Chris M (DrNo)          5 Apr 2022                                 |
-\*-------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_CougarKeyboard.cpp                          |
+|                                                           |
+|   RGBController for Cougar keyboard                       |
+|                                                           |
+|   Chris M (DrNo)                              05 Apr 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #define NA 0xFFFFFFFF
 
diff --git a/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.h b/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.h
index a546f466..cc4bf6d3 100644
--- a/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.h
+++ b/Controllers/CougarController/CougarKeyboardController/RGBController_CougarKeyboard.h
@@ -1,16 +1,20 @@
-/*-------------------------------------------------------------------*\
-|  RGBController_CougarKeyboardController.h                           |
-|                                                                     |
-|  Driver for CougarKeyboard USB Controller                           |
-|                                                                     |
-|  Chris M (DrNo)          5 Apr 2022                                 |
-\*-------------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_CougarKeyboard.h                            |
+|                                                           |
+|   RGBController for Cougar keyboard                       |
+|                                                           |
+|   Chris M (DrNo)                              05 Apr 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
+
+#include <vector>
 #include "LogManager.h"
 #include "RGBController.h"
 #include "CougarKeyboardController.h"
-#include <vector>
 
 class RGBController_CougarKeyboard : public RGBController
 {
diff --git a/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.cpp b/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.cpp
index 2d42c94f..bb2046ff 100644
--- a/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.cpp
+++ b/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.cpp
@@ -1,13 +1,16 @@
-/*-----------------------------------------*\
-|  CougarRevengerSTController.cpp           |
-|                                           |
-|  Driver for Cougar Revenger ST lighting   |
-|  controller                               |
-|                                           |
-|  Guimard Morgan (morg) 3/17/2022          |
-\*-----------------------------------------*/
-#include "CougarRevengerSTController.h"
+/*---------------------------------------------------------*\
+| CougarRevengerSTController.cpp                            |
+|                                                           |
+|   Driver for Cougar Revenger ST                           |
+|                                                           |
+|   Morgan Guimard (morg)                       17 Mar 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #include <string.h>
+#include "CougarRevengerSTController.h"
 
 CougarRevengerSTController::CougarRevengerSTController(hid_device* dev_handle, const hid_device_info& info)
 {
@@ -81,7 +84,7 @@ void CougarRevengerSTController::SetDirect(unsigned char zone, RGBColor color, u
 }
 
 void CougarRevengerSTController::SetModeData(unsigned char zone, unsigned char mode_value, std::vector<RGBColor> colors, unsigned char brightness, unsigned char speed)
-{    
+{
     unsigned char usb_buf[PACKET_DATA_LENGTH];
 
     const cougar_mode& m = modes_mapping.at(mode_value);
@@ -195,7 +198,7 @@ void CougarRevengerSTController::ActivateMode(unsigned char zone, unsigned char
 }
 
 void CougarRevengerSTController::Apply()
-{   
+{
     unsigned char usb_buf[PACKET_DATA_LENGTH];
     memset(usb_buf, 0x00, PACKET_DATA_LENGTH);
 
diff --git a/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h b/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h
index ae3cf151..e3fea30f 100644
--- a/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h
+++ b/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h
@@ -1,11 +1,14 @@
-/*-----------------------------------------*\
-|  CougarRevengerSTController.h             |
-|                                           |
-|  Driver for Cougar Revenger ST lighting   |
-|  controller - header file                 |
-|                                           |
-|  Guimard Morgan (morg) 3/17/2022          |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| CougarRevengerSTController.h                              |
+|                                                           |
+|   Driver for Cougar Revenger ST                           |
+|                                                           |
+|   Morgan Guimard (morg)                       17 Mar 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
 #pragma once
 
 #include "RGBController.h"
diff --git a/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.cpp b/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.cpp
index 5ec48c23..3d71329e 100644
--- a/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.cpp
+++ b/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.cpp
@@ -1,16 +1,17 @@
-/*-----------------------------------------*\
-|  RGBController_CougarRevengerST.cpp       |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  Cougar Revenger ST USB Driver            |
-|                                           |
-|  Guimard Morgan (morg) 3/17/2022          |
-\*-----------------------------------------*/
-
-#include "RGBController_CougarRevengerST.h"
+/*---------------------------------------------------------*\
+| RGBController_CougarRevengerST.cpp                        |
+|                                                           |
+|   RGBController for Cougar Revenger ST                    |
+|                                                           |
+|   Morgan Guimard (morg)                       17 Mar 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <thread>
 #include <chrono>
+#include "RGBController_CougarRevengerST.h"
 
 /**------------------------------------------------------------------*\
     @name Cougar Revenger ST
diff --git a/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.h b/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.h
index 77897078..b621c2ea 100644
--- a/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.h
+++ b/Controllers/CougarController/CougarRevengerSTController/RGBController_CougarRevengerST.h
@@ -1,11 +1,13 @@
-/*-----------------------------------------*\
-|  RGBController_CougarRevengerST.h         |
-|                                           |
-|  Generic RGB Interface for OpenRGB        |
-|  Cougar Revenger ST USB Driver            |
-|                                           |
-|  Guimard Morgan (morg) 3/17/2022          |
-\*-----------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_CougarRevengerST.h                          |
+|                                                           |
+|   RGBController for Cougar Revenger ST                    |
+|                                                           |
+|   Morgan Guimard (morg)                       17 Mar 2022 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
 
@@ -20,7 +22,7 @@ public:
 
     void SetupZones();
     void ResizeZone(int zone, int new_size);
-    
+
     void DeviceUpdateLEDs();
     void UpdateZoneLEDs(int zone);
     void UpdateSingleLED(int led);