diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp
index 106896bc8..23e66d19f 100644
--- a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp
+++ b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp
@@ -41,7 +41,7 @@ AMDWraithPrismController::~AMDWraithPrismController()
 
 std::string AMDWraithPrismController::GetLocationString()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 char* AMDWraithPrismController::GetDeviceName()
diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp
index 989c3ba99..57db8fce2 100644
--- a/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp
+++ b/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp
@@ -10,9 +10,10 @@
 #include "AsusAuraCoreController.h"
 #include <cstring>
 
-AuraCoreController::AuraCoreController(hid_device* dev_handle)
+AuraCoreController::AuraCoreController(hid_device* dev_handle, const char* path)
 {
-    dev = dev_handle;
+    dev         = dev_handle;
+    location    = path;
 }
 
 AuraCoreController::~AuraCoreController()
@@ -20,6 +21,11 @@ AuraCoreController::~AuraCoreController()
 
 }
 
+std::string AuraCoreController::GetDeviceLocation()
+{
+    return("HID: " + location);
+}
+
 void AuraCoreController::SendBrightness
     (
     unsigned char   brightness
diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreController.h b/Controllers/AsusAuraCoreController/AsusAuraCoreController.h
index 71348d3c8..504539d09 100644
--- a/Controllers/AsusAuraCoreController/AsusAuraCoreController.h
+++ b/Controllers/AsusAuraCoreController/AsusAuraCoreController.h
@@ -48,9 +48,11 @@ enum
 class AuraCoreController
 {
 public:
-    AuraCoreController(hid_device* dev_handle);
+    AuraCoreController(hid_device* dev_handle, const char* path);
     ~AuraCoreController();
 
+    std::string GetDeviceLocation();
+
     void    SendBrightness
                 (
                 unsigned char   brightness
@@ -72,5 +74,6 @@ public:
 
 private:
     hid_device*             dev;
+    std::string             location;
 
 };
diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp
index fbb279dc4..1c1b724d2 100644
--- a/Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp
+++ b/Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp
@@ -19,7 +19,7 @@ void DetectAsusAuraCoreControllers(hid_device_info* info, const std::string&)
     hid_device* dev = hid_open_path(info->path);
     if( dev )
     {
-        AuraCoreController* controller = new AuraCoreController(dev);
+        AuraCoreController* controller = new AuraCoreController(dev, info->path);
         RGBController_AuraCore* rgb_controller = new RGBController_AuraCore(controller);
         // Constructor sets the name
         ResourceManager::get()->RegisterRGBController(rgb_controller);
diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp
index 1a971db63..eedd7d7c1 100644
--- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp
+++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp
@@ -16,6 +16,7 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* aura_ptr)
     vendor      = "ASUS";
     type        = DEVICE_TYPE_KEYBOARD;
     description = "ASUS Aura Core Device";
+    location    = aura->GetDeviceLocation();
 
     mode Static;
     Static.name       = "Static";
diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp
index 2e333d609..81a9565e4 100644
--- a/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp
+++ b/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp
@@ -24,7 +24,7 @@ AuraMouseController::~AuraMouseController()
 
 std::string AuraMouseController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void AuraMouseController::SendUpdate
diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp
index 34649253e..3416d8a8d 100644
--- a/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp
+++ b/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp
@@ -32,7 +32,7 @@ unsigned int AuraUSBController::GetChannelCount()
 
 std::string AuraUSBController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 std::string AuraUSBController::GetDeviceName()
diff --git a/Controllers/CoolerMasterController/CMARGBcontroller.cpp b/Controllers/CoolerMasterController/CMARGBcontroller.cpp
index 2337b1a27..009ae7443 100644
--- a/Controllers/CoolerMasterController/CMARGBcontroller.cpp
+++ b/Controllers/CoolerMasterController/CMARGBcontroller.cpp
@@ -92,7 +92,7 @@ std::string CMARGBController::GetSerial()
 
 std::string CMARGBController::GetLocation()
 {
-    return location;
+    return("HID: " + location);
 }
 
 unsigned char CMARGBController::GetZoneIndex()
diff --git a/Controllers/CoolerMasterController/CMMP750Controller.cpp b/Controllers/CoolerMasterController/CMMP750Controller.cpp
index e38aaf82e..6e1b5f695 100644
--- a/Controllers/CoolerMasterController/CMMP750Controller.cpp
+++ b/Controllers/CoolerMasterController/CMMP750Controller.cpp
@@ -99,7 +99,7 @@ std::string CMMP750Controller::GetSerial()
 
 std::string CMMP750Controller::GetLocation()
 {
-    return location;
+    return("HID: " + location);
 }
 
 unsigned char CMMP750Controller::GetMode()
diff --git a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp
index 92540d4d9..d0670a2b8 100644
--- a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp
+++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp
@@ -56,7 +56,7 @@ std::string CorsairLightingNodeController::GetFirmwareString()
 
 std::string CorsairLightingNodeController::GetLocationString()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void CorsairLightingNodeController::SetChannelEffect(unsigned char channel,
diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp
index 3ea0024eb..f27c1f702 100644
--- a/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp
+++ b/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp
@@ -73,7 +73,7 @@ device_type CorsairPeripheralController::GetDeviceType()
 
 std::string CorsairPeripheralController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 int CorsairPeripheralController::GetPhysicalLayout()
diff --git a/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp b/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp
index 40d186563..f9d6c4707 100644
--- a/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp
+++ b/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp
@@ -25,7 +25,7 @@ DuckyKeyboardController::~DuckyKeyboardController()
 
 std::string DuckyKeyboardController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void DuckyKeyboardController::SendColors
diff --git a/Controllers/EKController/EKController.cpp b/Controllers/EKController/EKController.cpp
index 79dbcff14..45789b422 100644
--- a/Controllers/EKController/EKController.cpp
+++ b/Controllers/EKController/EKController.cpp
@@ -86,7 +86,7 @@ std::string EKController::GetSerial()
 
 std::string EKController::GetLocation()
 {
-    return location;
+    return("HID: " + location);
 }
 
 void EKController::SetMode(unsigned char mode, unsigned char speed)
diff --git a/Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.cpp b/Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.cpp
index e201002cc..aae37b32a 100644
--- a/Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.cpp
+++ b/Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.cpp
@@ -24,7 +24,7 @@ ATC800Controller::~ATC800Controller()
 
 std::string ATC800Controller::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void ATC800Controller::SendCoolerMode
diff --git a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp
index 7841eb9ff..ad29a9395 100644
--- a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp
+++ b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp
@@ -59,7 +59,7 @@ RGBFusion2USBController::RGBFusion2USBController(hid_device* handle, const char
             D_LED1_count = LedCountToEnum(report.total_leds & 0x0F);
             D_LED2_count = LedCountToEnum(report.total_leds & 0xF0);
         }
-        loc = path;
+        location = path;
 
         EnableBeat(false);
     }
@@ -157,7 +157,7 @@ std::string RGBFusion2USBController::GetFWVersion()
 
 std::string RGBFusion2USBController::GetDeviceLocation()
 {
-    return(loc);
+    return("HID: " + location);
 }
 
 std::string RGBFusion2USBController::GetSerial()
diff --git a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h
index c400ca446..1d9ac6719 100644
--- a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h
+++ b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h
@@ -190,7 +190,7 @@ private:
     IT8297Report            report;
     std::string             name;
     std::string             description;
-    std::string             loc;
+    std::string             location;
     std::string             version;
     std::string             chip_id;
     int                     effect_disabled = 0;
diff --git a/Controllers/HoltekController/HoltekA070Controller.cpp b/Controllers/HoltekController/HoltekA070Controller.cpp
index f7490f330..1dc5bc9a1 100644
--- a/Controllers/HoltekController/HoltekA070Controller.cpp
+++ b/Controllers/HoltekController/HoltekA070Controller.cpp
@@ -18,7 +18,7 @@ HoltekA070Controller::HoltekA070Controller(hid_device* dev_handle, const char* p
 
 std::string HoltekA070Controller::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 /*-------------------------------------------------------------------------------------------------*\
diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp
index d9a4bc41f..4c245ad9d 100644
--- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp
+++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp
@@ -27,7 +27,7 @@ HyperXAlloyOriginsController::~HyperXAlloyOriginsController()
 
 std::string HyperXAlloyOriginsController::GetDeviceLocation()
 {
-    return(location);
+    return("HID " + location);
 }
 
 void HyperXAlloyOriginsController::SetLEDsDirect(std::vector<RGBColor> colors)
diff --git a/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp b/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp
index c06f19356..22f3b8fd5 100644
--- a/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp
+++ b/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp
@@ -40,7 +40,7 @@ HyperXKeyboardController::~HyperXKeyboardController()
 
 std::string HyperXKeyboardController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void HyperXKeyboardController::SetMode
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp
index eb8abdf30..89caa1d13 100644
--- a/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp
+++ b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp
@@ -24,7 +24,7 @@ HyperXPulsefireSurgeController::~HyperXPulsefireSurgeController()
 
 std::string HyperXPulsefireSurgeController::GetDeviceLocation()
 {
-    return(location);
+    return("HID " + location);
 }
 
 /*-------------------------------------------------------------------------------------------------*\
diff --git a/Controllers/HyperXMousematController/HyperXMousematController.cpp b/Controllers/HyperXMousematController/HyperXMousematController.cpp
index b97273b60..b22619a90 100644
--- a/Controllers/HyperXMousematController/HyperXMousematController.cpp
+++ b/Controllers/HyperXMousematController/HyperXMousematController.cpp
@@ -24,7 +24,7 @@ HyperXMousematController::~HyperXMousematController()
 
 std::string HyperXMousematController::GetDeviceLocation()
 {
-    return(location);
+    return("HID " + location);
 }
 
 /*-------------------------------------------------------------------------------------------------*\
diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp
index 89946ddeb..7cf17ed95 100644
--- a/Controllers/LogitechController/LogitechControllerDetect.cpp
+++ b/Controllers/LogitechController/LogitechControllerDetect.cpp
@@ -118,7 +118,7 @@ void DetectLogitechKeyboardG213(hid_device_info* info, const std::string& name)
     hid_device* dev = hid_open_path(info->path);
     if(dev)
     {
-        LogitechG213Controller* controller = new LogitechG213Controller(dev);
+        LogitechG213Controller* controller = new LogitechG213Controller(dev, info->path);
         RGBController_LogitechG213* rgb_controller = new RGBController_LogitechG213(controller);
         rgb_controller->name = name;
         ResourceManager::get()->RegisterRGBController(rgb_controller);
diff --git a/Controllers/LogitechController/LogitechG203Controller.cpp b/Controllers/LogitechController/LogitechG203Controller.cpp
index e9eb32406..11dc1e1aa 100644
--- a/Controllers/LogitechController/LogitechG203Controller.cpp
+++ b/Controllers/LogitechController/LogitechG203Controller.cpp
@@ -19,7 +19,7 @@ LogitechG203Controller::LogitechG203Controller(hid_device* dev_handle, const cha
 
 std::string LogitechG203Controller::GetDeviceLocation()
 {
-    return(location);
+    return("HID " + location);
 }
 
 /*-------------------------------------------------------------------------------------------------*\
diff --git a/Controllers/LogitechController/LogitechG203LController.cpp b/Controllers/LogitechController/LogitechG203LController.cpp
index 333c2fc6d..a767a898d 100644
--- a/Controllers/LogitechController/LogitechG203LController.cpp
+++ b/Controllers/LogitechController/LogitechG203LController.cpp
@@ -10,7 +10,7 @@ LogitechG203LController::LogitechG203LController(hid_device* dev_handle, const c
 
 std::string LogitechG203LController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void LogitechG203LController::SendApply()
@@ -143,4 +143,4 @@ void LogitechG203LController::SetDevice(std::vector<RGBColor> colors)
     hid_read(dev, usb_buf, 20);
 
     SendApply();
-}
\ No newline at end of file
+}
diff --git a/Controllers/LogitechController/LogitechG213Controller.cpp b/Controllers/LogitechController/LogitechG213Controller.cpp
index 348dab104..e0491eb6e 100644
--- a/Controllers/LogitechController/LogitechG213Controller.cpp
+++ b/Controllers/LogitechController/LogitechG213Controller.cpp
@@ -9,14 +9,20 @@
 #include "LogitechG213Controller.h"
 #include <cstring>
 
-LogitechG213Controller::LogitechG213Controller(hid_device* dev_handle)
+LogitechG213Controller::LogitechG213Controller(hid_device* dev_handle, const char* path)
 {
-    dev = dev_handle;
+    dev         = dev_handle;
+    location    = path;
 }
 
 LogitechG213Controller::~LogitechG213Controller()
 {
+    hid_close(dev);
+}
 
+std::string LogitechG213Controller::GetDeviceLocation()
+{
+    return("HID: " + location);
 }
 
 void LogitechG213Controller::SetDirect
diff --git a/Controllers/LogitechController/LogitechG213Controller.h b/Controllers/LogitechController/LogitechG213Controller.h
index 4c0eb7011..72b28899a 100644
--- a/Controllers/LogitechController/LogitechG213Controller.h
+++ b/Controllers/LogitechController/LogitechG213Controller.h
@@ -16,9 +16,11 @@
 class LogitechG213Controller
 {
 public:
-    LogitechG213Controller(hid_device* dev_handle);
+    LogitechG213Controller(hid_device* dev_handle, const char* path);
     ~LogitechG213Controller();
 
+    std::string GetDeviceLocation();
+
     void        SetDirect
                     (
                     unsigned char       zone,
@@ -29,5 +31,6 @@ public:
 
 private:
     hid_device* dev;
+    std::string location;
 
 };
diff --git a/Controllers/LogitechController/LogitechG403Controller.cpp b/Controllers/LogitechController/LogitechG403Controller.cpp
index c90db2d03..2b3ae5b13 100644
--- a/Controllers/LogitechController/LogitechG403Controller.cpp
+++ b/Controllers/LogitechController/LogitechG403Controller.cpp
@@ -24,7 +24,7 @@ LogitechG403Controller::~LogitechG403Controller()
 
 std::string LogitechG403Controller::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void LogitechG403Controller::SendMouseMode
diff --git a/Controllers/LogitechController/LogitechG502PSController.cpp b/Controllers/LogitechController/LogitechG502PSController.cpp
index 5829ec1f3..ce860175d 100644
--- a/Controllers/LogitechController/LogitechG502PSController.cpp
+++ b/Controllers/LogitechController/LogitechG502PSController.cpp
@@ -24,7 +24,7 @@ LogitechG502PSController::~LogitechG502PSController()
 
 std::string LogitechG502PSController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void LogitechG502PSController::SendMouseMode
diff --git a/Controllers/LogitechController/LogitechGPowerPlayController.cpp b/Controllers/LogitechController/LogitechGPowerPlayController.cpp
index a8872c007..f22f17810 100644
--- a/Controllers/LogitechController/LogitechGPowerPlayController.cpp
+++ b/Controllers/LogitechController/LogitechGPowerPlayController.cpp
@@ -24,7 +24,7 @@ LogitechGPowerPlayController::~LogitechGPowerPlayController()
 
 std::string LogitechGPowerPlayController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void LogitechGPowerPlayController::SendMouseMatMode
diff --git a/Controllers/LogitechController/LogitechGProWirelessController.cpp b/Controllers/LogitechController/LogitechGProWirelessController.cpp
index 430c31f8f..72e7aa5fa 100644
--- a/Controllers/LogitechController/LogitechGProWirelessController.cpp
+++ b/Controllers/LogitechController/LogitechGProWirelessController.cpp
@@ -24,7 +24,7 @@ LogitechGProWirelessController::~LogitechGProWirelessController()
 
 std::string LogitechGProWirelessController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void LogitechGProWirelessController::SendMouseMode
diff --git a/Controllers/LogitechController/RGBController_LogitechG213.cpp b/Controllers/LogitechController/RGBController_LogitechG213.cpp
index fb61c05e3..f53ba1af1 100644
--- a/Controllers/LogitechController/RGBController_LogitechG213.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG213.cpp
@@ -36,6 +36,7 @@ RGBController_LogitechG213::RGBController_LogitechG213(LogitechG213Controller* l
     vendor      = "Logitech";
     type        = DEVICE_TYPE_KEYBOARD;
     description = "Logitech G213 Keyboard Device";
+    location    = logitechG213->GetDeviceLocation();
 
     mode Direct;
     Direct.name                     = "Direct";
diff --git a/Controllers/MSI3ZoneController/MSI3ZoneController.cpp b/Controllers/MSI3ZoneController/MSI3ZoneController.cpp
index fe193666f..f88e79335 100644
--- a/Controllers/MSI3ZoneController/MSI3ZoneController.cpp
+++ b/Controllers/MSI3ZoneController/MSI3ZoneController.cpp
@@ -29,7 +29,7 @@ char* MSI3ZoneController::GetDeviceName()
 
 std::string MSI3ZoneController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void MSI3ZoneController::SetLEDs(std::vector<RGBColor> colors)
diff --git a/Controllers/MSIMysticLightController/MSIMysticLightController.cpp b/Controllers/MSIMysticLightController/MSIMysticLightController.cpp
index c8f248800..03cf4ea31 100644
--- a/Controllers/MSIMysticLightController/MSIMysticLightController.cpp
+++ b/Controllers/MSIMysticLightController/MSIMysticLightController.cpp
@@ -18,7 +18,7 @@ MSIMysticLightController::MSIMysticLightController(hid_device* handle, const cha
 
     if(dev)
     {
-        loc = path;
+        location = path;
 
         ReadName();
         ReadSerial();
@@ -123,7 +123,7 @@ std::string MSIMysticLightController::GetFWVersion()
 
 std::string MSIMysticLightController::GetDeviceLocation()
 {
-    return loc;
+    return("HID: " + location);
 }
 
 std::string MSIMysticLightController::GetSerial()
diff --git a/Controllers/MSIMysticLightController/MSIMysticLightController.h b/Controllers/MSIMysticLightController/MSIMysticLightController.h
index 39397239c..3b378effe 100644
--- a/Controllers/MSIMysticLightController/MSIMysticLightController.h
+++ b/Controllers/MSIMysticLightController/MSIMysticLightController.h
@@ -307,7 +307,7 @@ private:
 
     hid_device*             dev;
     std::string             name;
-    std::string             loc;
+    std::string             location;
     std::string             version_APROM;
     std::string             version_LDROM;
     std::string             chip_id;
diff --git a/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp b/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp
index 3739cd295..617075906 100644
--- a/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp
+++ b/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp
@@ -50,7 +50,7 @@ unsigned short NZXTHue2Controller::GetFanRPM
 
 std::string NZXTHue2Controller::GetLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 unsigned int NZXTHue2Controller::GetNumFanChannels()
diff --git a/Controllers/NZXTKrakenController/NZXTKrakenController.cpp b/Controllers/NZXTKrakenController/NZXTKrakenController.cpp
index 2579f3f90..12af33e74 100644
--- a/Controllers/NZXTKrakenController/NZXTKrakenController.cpp
+++ b/Controllers/NZXTKrakenController/NZXTKrakenController.cpp
@@ -50,7 +50,7 @@ std::string NZXTKrakenController::GetFirmwareVersion()
 
 std::string NZXTKrakenController::GetLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void NZXTKrakenController::UpdateStatus()
diff --git a/Controllers/RedragonController/RedragonK556Controller.cpp b/Controllers/RedragonController/RedragonK556Controller.cpp
index 0091213b3..562e7da34 100644
--- a/Controllers/RedragonController/RedragonK556Controller.cpp
+++ b/Controllers/RedragonController/RedragonK556Controller.cpp
@@ -10,7 +10,7 @@ RedragonK556Controller::RedragonK556Controller(hid_device* dev_handle, const cha
 
 std::string RedragonK556Controller::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void RedragonK556Controller::SetKeyboardColors
diff --git a/Controllers/RedragonController/RedragonM711Controller.cpp b/Controllers/RedragonController/RedragonM711Controller.cpp
index 26ffad95a..30cfef9fd 100644
--- a/Controllers/RedragonController/RedragonM711Controller.cpp
+++ b/Controllers/RedragonController/RedragonM711Controller.cpp
@@ -15,7 +15,7 @@ RedragonM711Controller::RedragonM711Controller(hid_device* dev_handle, const cha
 
 std::string RedragonM711Controller::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void RedragonM711Controller::SendMouseColor
diff --git a/Controllers/RoccatController/RoccatKoneAimoController.cpp b/Controllers/RoccatController/RoccatKoneAimoController.cpp
index 863b3a7cb..3ae2dfd93 100644
--- a/Controllers/RoccatController/RoccatKoneAimoController.cpp
+++ b/Controllers/RoccatController/RoccatKoneAimoController.cpp
@@ -58,7 +58,7 @@ std::string RoccatKoneAimoController::GetSerial()
 
 std::string RoccatKoneAimoController::GetLocation()
 {
-    return location;
+    return("HID: " + location);
 }
 
 void RoccatKoneAimoController::SendInit()
diff --git a/Controllers/SinowealthController/SinowealthController.cpp b/Controllers/SinowealthController/SinowealthController.cpp
index c6fe71186..9d05f09b4 100644
--- a/Controllers/SinowealthController/SinowealthController.cpp
+++ b/Controllers/SinowealthController/SinowealthController.cpp
@@ -31,7 +31,7 @@ SinowealthController::~SinowealthController()
 
 std::string SinowealthController::GetLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 unsigned int SinowealthController::GetLEDCount()
diff --git a/Controllers/SonyDS4Controller/SonyDS4Controller.cpp b/Controllers/SonyDS4Controller/SonyDS4Controller.cpp
index 2bbcebc57..46279f525 100644
--- a/Controllers/SonyDS4Controller/SonyDS4Controller.cpp
+++ b/Controllers/SonyDS4Controller/SonyDS4Controller.cpp
@@ -31,9 +31,9 @@ SonyDS4Controller::SonyDS4Controller(hid_device * device_handle, const char * de
     location = device_path;
 }
 
-const char * SonyDS4Controller::GetLocation()
+std::string SonyDS4Controller::GetLocation()
 {
-    return location;
+    return("HID: " + location);
 }
 
 void SonyDS4Controller::SetColors(unsigned char red, unsigned char green, unsigned char blue)
diff --git a/Controllers/SonyDS4Controller/SonyDS4Controller.h b/Controllers/SonyDS4Controller/SonyDS4Controller.h
index 84ac35802..108892ae4 100644
--- a/Controllers/SonyDS4Controller/SonyDS4Controller.h
+++ b/Controllers/SonyDS4Controller/SonyDS4Controller.h
@@ -8,19 +8,21 @@
 
 #include <hidapi/hidapi.h>
 
+#include <string>
+
 class SonyDS4Controller
 {
 public:
     SonyDS4Controller(hid_device * device_handle, const char * device_path);
     
-    const char* GetLocation();
+    std::string GetLocation();
 
     void SetColors(unsigned char red, unsigned char green, unsigned char blue);
 
 private:
     hid_device*     device_handle;
     bool            is_bluetooth = false;
-    const char*     location;
+    std::string     location;
 
     void sendReportUSB(unsigned char red, unsigned char green, unsigned char blue);
     void sendReportBT(unsigned char red, unsigned char green, unsigned char blue);
diff --git a/Controllers/SteelSeriesController/SteelSeriesApexBaseController.h b/Controllers/SteelSeriesController/SteelSeriesApexBaseController.h
index 785ab324a..c0bf79cb5 100644
--- a/Controllers/SteelSeriesController/SteelSeriesApexBaseController.h
+++ b/Controllers/SteelSeriesController/SteelSeriesApexBaseController.h
@@ -20,7 +20,7 @@ public:
 
     std::string GetDeviceLocation()
     {
-        return(location);
+        return("HID: " + location);
     };
 
     steelseries_type        proto_type;
diff --git a/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp b/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp
index d71f40950..0a7f7d98c 100644
--- a/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp
+++ b/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp
@@ -55,7 +55,7 @@ SteelSeriesOldApexController::~SteelSeriesOldApexController()
 
 std::string SteelSeriesOldApexController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 char* SteelSeriesOldApexController::GetDeviceName()
diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
index 80bb5f39c..8d56ef692 100644
--- a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
+++ b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
@@ -46,7 +46,7 @@ SteelSeriesRivalController::~SteelSeriesRivalController()
 
 std::string SteelSeriesRivalController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 char* SteelSeriesRivalController::GetDeviceName()
diff --git a/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp b/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp
index f96ad86d7..02e96b75d 100644
--- a/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp
+++ b/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp
@@ -49,7 +49,7 @@ SteelSeriesSiberiaController::~SteelSeriesSiberiaController()
 
 std::string SteelSeriesSiberiaController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 char* SteelSeriesSiberiaController::GetDeviceName()
diff --git a/Controllers/TecknetController/TecknetController.cpp b/Controllers/TecknetController/TecknetController.cpp
index 12e6da7c6..043b34fc6 100644
--- a/Controllers/TecknetController/TecknetController.cpp
+++ b/Controllers/TecknetController/TecknetController.cpp
@@ -64,7 +64,7 @@ std::string TecknetController::GetSerial()
 
 std::string TecknetController::GetLocation()
 {
-    return location;
+    return("HID: " + location);
 }
 
 void TecknetController::SetMode(unsigned char mode, unsigned char speed, unsigned char brightness)
diff --git a/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp
index 891965d3d..6ec5f9eac 100644
--- a/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp
+++ b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp
@@ -35,7 +35,7 @@ PoseidonZRGBController::~PoseidonZRGBController()
 
 std::string PoseidonZRGBController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void PoseidonZRGBController::SetMode(unsigned char mode, unsigned char direction, unsigned char speed)
diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp
index 314a2b7f2..fc0ecf4df 100644
--- a/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp
+++ b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp
@@ -26,7 +26,7 @@ ThermaltakeRiingController::~ThermaltakeRiingController()
 
 std::string ThermaltakeRiingController::GetDeviceLocation()
 {
-    return(location);
+    return("HID: " + location);
 }
 
 void ThermaltakeRiingController::SetChannelLEDs(unsigned char channel, RGBColor * colors, unsigned int num_colors)