diff --git a/NuGet/RGB.NET.Devices.Logitech.nuspec b/NuGet/RGB.NET.Devices.Logitech.nuspec
index 85e3a5b..0825751 100644
--- a/NuGet/RGB.NET.Devices.Logitech.nuspec
+++ b/NuGet/RGB.NET.Devices.Logitech.nuspec
@@ -17,6 +17,7 @@
     <dependencies>
       <dependency id="RGB.NET.Core" version="0.0.1" />
       <dependency id="System.ValueTuple" version="4.4.0" />
+      <dependency id="HidSharp" version="1.5" />
     </dependencies>
   </metadata>
   <files>
diff --git a/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml b/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml
index da085af..959ae32 100644
--- a/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml
+++ b/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G610/UK.xml
@@ -203,7 +203,7 @@
       <Width>1.5</Width>
     </Led>
 
-    <Led Id="Keyboard_ArrowLef">
+    <Led Id="Keyboard_ArrowLeft">
       <X>+6.75</X>
     </Led>
     <Led Id="Keyboard_ArrowDown" />
diff --git a/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml b/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
index b7f5d22..bc30030 100644
--- a/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
+++ b/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
@@ -203,7 +203,7 @@
       <Width>1.5</Width>
     </Led>
 
-    <Led Id="Keyboard_ArrowLef">
+    <Led Id="Keyboard_ArrowLeft">
       <X>+6.75</X>
     </Led>
     <Led Id="Keyboard_ArrowDown" />
diff --git a/RGB.NET.Devices.Logitech/PerKey/LogitechPerKeyRGBDevice.cs b/RGB.NET.Devices.Logitech/PerKey/LogitechPerKeyRGBDevice.cs
index 56b440e..78603ea 100644
--- a/RGB.NET.Devices.Logitech/PerKey/LogitechPerKeyRGBDevice.cs
+++ b/RGB.NET.Devices.Logitech/PerKey/LogitechPerKeyRGBDevice.cs
@@ -28,7 +28,7 @@ namespace RGB.NET.Devices.Logitech
         #region Methods
 
         /// <inheritdoc />
-        protected override object CreateLedCustomData(LedId ledId) => PerKeyIdMapping.DEFAULT[ledId];
+        protected override object CreateLedCustomData(LedId ledId) => PerKeyIdMapping.DEFAULT.TryGetValue(ledId, out LogitechLedId logitechLedId) ? logitechLedId : LogitechLedId.Invalid;
 
         /// <inheritdoc />
         protected override void UpdateLeds(IEnumerable<Led> ledsToUpdate)
diff --git a/RGB.NET.Devices.Logitech/PerKey/PerKeyIdMapping.cs b/RGB.NET.Devices.Logitech/PerKey/PerKeyIdMapping.cs
index f891f90..68d2cf4 100644
--- a/RGB.NET.Devices.Logitech/PerKey/PerKeyIdMapping.cs
+++ b/RGB.NET.Devices.Logitech/PerKey/PerKeyIdMapping.cs
@@ -122,6 +122,8 @@ namespace RGB.NET.Devices.Logitech
             { LedId.Keyboard_Programmable7, LogitechLedId.G_7 },
             { LedId.Keyboard_Programmable8, LogitechLedId.G_8 },
             { LedId.Keyboard_Programmable9, LogitechLedId.G_9 },
+            { LedId.Logo, LogitechLedId.G_LOGO },
+            { LedId.Keyboard_Custom1, LogitechLedId.G_BADGE },
         };
     }
 }
diff --git a/RGB.NET.Devices.Novation/Launchpad/NovationLaunchpadRGBDevice.cs b/RGB.NET.Devices.Novation/Launchpad/NovationLaunchpadRGBDevice.cs
index 50f7460..cab89d6 100644
--- a/RGB.NET.Devices.Novation/Launchpad/NovationLaunchpadRGBDevice.cs
+++ b/RGB.NET.Devices.Novation/Launchpad/NovationLaunchpadRGBDevice.cs
@@ -52,7 +52,7 @@ namespace RGB.NET.Devices.Novation
         }
 
         /// <inheritdoc />
-        protected override object CreateLedCustomData(LedId ledId) => LaunchpadIdMapping.DEFAULT[ledId];
+        protected override object CreateLedCustomData(LedId ledId) => LaunchpadIdMapping.DEFAULT.TryGetValue(ledId, out NovationLedId novationLedId) ? novationLedId : NovationLedId.Invalid;
 
         #endregion
     }