diff --git a/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.cpp b/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.cpp
index 6bc14141..620c02dd 100644
--- a/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.cpp
+++ b/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.cpp
@@ -1,14 +1,16 @@
-/*-----------------------------------------------*\
-|  HoltekA070Controller.cpp                       |
-|                                                 |
-|  Driver for Holtek USB Gaming Mouse [04d9:a070] |
-|                                                 |
-|  Santeri Pikarinen (santeri3700) 8/01/2020      |
-\*-----------------------------------------------*/
-
-#include "HoltekA070Controller.h"
+/*---------------------------------------------------------*\
+| HoltekA070Controller.cpp                                  |
+|                                                           |
+|   Driver for Holtek mouse                                 |
+|                                                           |
+|   Santeri Pikarinen (santeri3700)             01 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <cstring>
+#include "HoltekA070Controller.h"
 
 HoltekA070Controller::HoltekA070Controller(hid_device* dev_handle, const char* path)
 {
diff --git a/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.h b/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.h
index 7005339d..6bcef8a3 100644
--- a/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.h
+++ b/Controllers/HoltekController/HoltekA070Controller/HoltekA070Controller.h
@@ -1,17 +1,19 @@
-/*---------------------------------------------------------------*\
-|  HoltekA070Controller.h                                         |
-|                                                                 |
-|  Definitions and types for Holtek USB Gaming Mouse [04d9:a070]  |
-|                                                                 |
-|  Santeri Pikarinen (santeri3700) 8/01/2020                      |
-\*---------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| HoltekA070Controller.h                                    |
+|                                                           |
+|   Driver for Holtek mouse                                 |
+|                                                           |
+|   Santeri Pikarinen (santeri3700)             01 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "RGBController.h"
+#pragma once
 
 #include <string>
 #include <hidapi/hidapi.h>
-
-#pragma once
+#include "RGBController.h"
 
 enum
 {
diff --git a/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.cpp b/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.cpp
index a083d3cb..d6e76ef0 100644
--- a/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.cpp
+++ b/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.cpp
@@ -1,10 +1,13 @@
-/*--------------------------------------------------------------*\
-|  RGBController_HoltekA070.cpp                                  |
-|                                                                |
-|  Generic RGB Interface for Holtek USB Gaming Mouse [04d9:a070] |
-|                                                                |
-|  Santeri Pikarinen (santeri3700) 8/01/2020                     |
-\*--------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_HoltekA070.cpp                              |
+|                                                           |
+|   RGBController for Holtek mouse                          |
+|                                                           |
+|   Santeri Pikarinen (santeri3700)             01 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_HoltekA070.h"
 
diff --git a/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.h b/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.h
index 45c07119..34f436c6 100644
--- a/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.h
+++ b/Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.h
@@ -1,12 +1,16 @@
-/*--------------------------------------------------------------*\
-|  RGBController_HoltekA070.h                                    |
-|                                                                |
-|  Generic RGB Interface for Holtek USB Gaming Mouse [04d9:a070] |
-|                                                                |
-|  Santeri Pikarinen (santeri3700) 8/01/2020                     |
-\*--------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_HoltekA070.h                                |
+|                                                           |
+|   RGBController for Holtek mouse                          |
+|                                                           |
+|   Santeri Pikarinen (santeri3700)             01 Aug 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
+
 #include "RGBController.h"
 #include "HoltekA070Controller.h"
 
diff --git a/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.cpp b/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.cpp
index ae52f70d..093d3c96 100644
--- a/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.cpp
+++ b/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.cpp
@@ -1,14 +1,16 @@
-/*-----------------------------------------------*\
-|  HoltekA1FAController.cpp                       |
-|                                                 |
-|  Driver for Holtek based Mousemat [04d9:a1fa]   |
-|                                                 |
-|  Edoardo Ridolfi (edo2313) 26/12/2020           |
-\*-----------------------------------------------*/
-
-#include "HoltekA1FAController.h"
+/*---------------------------------------------------------*\
+| HoltekA1FAController.cpp                                  |
+|                                                           |
+|   Driver for Holtek mousemat                              |
+|                                                           |
+|   Edoardo Ridolfi (edo2313)                   26 Dec 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include <cstring>
+#include "HoltekA1FAController.h"
 
 HoltekA1FAController::HoltekA1FAController(hid_device *dev_handle, const char *path)
 {
@@ -21,7 +23,6 @@ HoltekA1FAController::~HoltekA1FAController()
     hid_close(dev);
 }
 
-
 std::string HoltekA1FAController::GetDeviceLocation()
 {
     return ("HID: " + location);
diff --git a/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.h b/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.h
index e2b78585..92ba7a5a 100644
--- a/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.h
+++ b/Controllers/HoltekController/HoltekA1FAController/HoltekA1FAController.h
@@ -1,17 +1,19 @@
-/*---------------------------------------------------------------*\
-|  HoltekA1FAController.h                                         |
-|                                                                 |
-|  Definitions and types for Holtek based Mousemat [04d9:a1fa]    |
-|                                                                 |
-|  Edoardo Ridolfi (edo2313) 26/12/2020                           |
-\*---------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| HoltekA1FAController.h                                    |
+|                                                           |
+|   Driver for Holtek mousemat                              |
+|                                                           |
+|   Edoardo Ridolfi (edo2313)                   26 Dec 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
-#include "RGBController.h"
+#pragma once
 
 #include <string>
 #include <hidapi/hidapi.h>
-
-#pragma once
+#include "RGBController.h"
 
 enum
 {
diff --git a/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.cpp b/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.cpp
index ef96fd51..24903c2a 100644
--- a/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.cpp
+++ b/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.cpp
@@ -1,10 +1,13 @@
-/*--------------------------------------------------------------*\
-|  RGBController_HoltekA1FA.cpp                                  |
-|                                                                |
-|  Generic RGB Interface for Holtek based Mousemat [04d9:a1fa]   |
-|                                                                |
-|  Edoardo Ridolfi (edo2313) 26/12/2020                          |
-\*--------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_HoltekA1FA.cpp                              |
+|                                                           |
+|   RGBController for Holtek mousemat                       |
+|                                                           |
+|   Edoardo Ridolfi (edo2313)                   26 Dec 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #include "RGBController_HoltekA1FA.h"
 
diff --git a/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.h b/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.h
index b79ab80e..d08a8781 100644
--- a/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.h
+++ b/Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.h
@@ -1,12 +1,16 @@
-/*--------------------------------------------------------------*\
-|  RGBController_HoltekA1FA.h                                    |
-|                                                                |
-|  Generic RGB Interface for Holtek based Mousemat [04d9:a1fa]   |
-|                                                                |
-|  Edoardo Ridolfi (edo2313) 26/12/2020                          |
-\*--------------------------------------------------------------*/
+/*---------------------------------------------------------*\
+| RGBController_HoltekA1FA.h                                |
+|                                                           |
+|   RGBController for Holtek mousemat                       |
+|                                                           |
+|   Edoardo Ridolfi (edo2313)                   26 Dec 2020 |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
 
 #pragma once
+
 #include "RGBController.h"
 #include "HoltekA1FAController.h"
 
diff --git a/Controllers/HoltekController/HoltekControllerDetect.cpp b/Controllers/HoltekController/HoltekControllerDetect.cpp
index 8d3032ba..b016d5f8 100644
--- a/Controllers/HoltekController/HoltekControllerDetect.cpp
+++ b/Controllers/HoltekController/HoltekControllerDetect.cpp
@@ -1,11 +1,20 @@
+/*---------------------------------------------------------*\
+| HoltekControllerDetect.cpp                                |
+|                                                           |
+|   Detector for Holtek devices                             |
+|                                                           |
+|   This file is part of the OpenRGB project                |
+|   SPDX-License-Identifier: GPL-2.0-only                   |
+\*---------------------------------------------------------*/
+
+#include <vector>
+#include <hidapi/hidapi.h>
 #include "Detector.h"
 #include "HoltekA070Controller.h"
 #include "RGBController.h"
 #include "RGBController_HoltekA070.h"
 #include "HoltekA1FAController.h"
 #include "RGBController_HoltekA1FA.h"
-#include <vector>
-#include <hidapi/hidapi.h>
 
 /*-----------------------------------------------------*\
 | Holtek Semiconductor Inc. vendor ID                   |