diff --git a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
index 60f682f..31bcef5 100644
--- a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
@@ -61,7 +61,7 @@ namespace RGB.NET.Devices.Corsair
         /// Applies the given layout.
         /// </summary>
         /// <param name="layoutPath">The file containing the layout.</param>
-        /// <param name="imageLayout">The name of the layout used tp get the images of the leds.</param>
+        /// <param name="imageLayout">The name of the layout used to get the images of the leds.</param>
         /// <param name="imageBasePath">The path images for this device are collected in.</param>
         protected void ApplyLayoutFromFile(string layoutPath, string imageLayout, string imageBasePath)
         {
diff --git a/RGB.NET.Devices.Corsair/Helper/PathHelper.cs b/RGB.NET.Devices.Corsair/Helper/PathHelper.cs
index 0cbc5aa..e0f414a 100644
--- a/RGB.NET.Devices.Corsair/Helper/PathHelper.cs
+++ b/RGB.NET.Devices.Corsair/Helper/PathHelper.cs
@@ -6,14 +6,14 @@ namespace RGB.NET.Devices.Corsair.Helper
     /// <summary>
     /// Offers some helper-methods for file-path related things.
     /// </summary>
-    public static class PathHelper
+    internal static class PathHelper
     {
         /// <summary>
         /// Returns an absolute path created from an relative path relatvie to the location of the executung assembly.
         /// </summary>
         /// <param name="relativePath">The relative path to convert.</param>
         /// <returns>The absolute path.</returns>
-        public static string GetAbsolutePath(string relativePath)
+        internal static string GetAbsolutePath(string relativePath)
         {
             string assemblyLocation = Assembly.GetEntryAssembly()?.Location;
             if (assemblyLocation == null) return relativePath;
diff --git a/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs b/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
index 12dd8ad..9e3981c 100644
--- a/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
+++ b/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
@@ -60,7 +60,7 @@ namespace RGB.NET.Devices.Logitech
         /// Applies the given layout.
         /// </summary>
         /// <param name="layoutPath">The file containing the layout.</param>
-        /// <param name="imageLayout">The name of the layout used tp get the images of the leds.</param>
+        /// <param name="imageLayout">The name of the layout used to get the images of the leds.</param>
         /// <param name="imageBasePath">The path images for this device are collected in.</param>
         protected void ApplyLayoutFromFile(string layoutPath, string imageLayout, string imageBasePath)
         {
diff --git a/RGB.NET.Devices.Logitech/Helper/CultureHelper.cs b/RGB.NET.Devices.Logitech/Helper/CultureHelper.cs
index ee5e787..d1bb98f 100644
--- a/RGB.NET.Devices.Logitech/Helper/CultureHelper.cs
+++ b/RGB.NET.Devices.Logitech/Helper/CultureHelper.cs
@@ -7,12 +7,12 @@ namespace RGB.NET.Devices.Logitech
     /// <summary>
     /// Offers some helper-methods for culture related things.
     /// </summary>
-    public static class CultureHelper
+    internal static class CultureHelper
     {
         #region DLLImports
 
         [DllImport("user32.dll")]
-        static extern IntPtr GetKeyboardLayout(uint thread);
+        private static extern IntPtr GetKeyboardLayout(uint thread);
 
         #endregion
 
@@ -26,7 +26,7 @@ namespace RGB.NET.Devices.Logitech
         /// Gets the current keyboard-layout from the OS.
         /// </summary>
         /// <returns>The current keyboard-layout</returns>
-        public static CultureInfo GetCurrentCulture()
+        internal static CultureInfo GetCurrentCulture()
         {
             try
             {
diff --git a/RGB.NET.Devices.Logitech/Helper/PathHelper.cs b/RGB.NET.Devices.Logitech/Helper/PathHelper.cs
index 3247212..80acac3 100644
--- a/RGB.NET.Devices.Logitech/Helper/PathHelper.cs
+++ b/RGB.NET.Devices.Logitech/Helper/PathHelper.cs
@@ -6,14 +6,14 @@ namespace RGB.NET.Devices.Logitech
     /// <summary>
     /// Offers some helper-methods for file-path related things.
     /// </summary>
-    public static class PathHelper
+    internal static class PathHelper
     {
         /// <summary>
         /// Returns an absolute path created from an relative path relatvie to the location of the executung assembly.
         /// </summary>
         /// <param name="relativePath">The relative path to convert.</param>
         /// <returns>The absolute path.</returns>
-        public static string GetAbsolutePath(string relativePath)
+        internal static string GetAbsolutePath(string relativePath)
         {
             string assemblyLocation = Assembly.GetEntryAssembly()?.Location;
             if (assemblyLocation == null) return relativePath;
diff --git a/RGB.NET.Devices.Logitech/Keyboard/LogitechKeyboardRGBDeviceInfo.cs b/RGB.NET.Devices.Logitech/Keyboard/LogitechKeyboardRGBDeviceInfo.cs
index e4ce2da..58b7d32 100644
--- a/RGB.NET.Devices.Logitech/Keyboard/LogitechKeyboardRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Logitech/Keyboard/LogitechKeyboardRGBDeviceInfo.cs
@@ -3,8 +3,6 @@
 
 using System;
 using System.Globalization;
-using System.IO;
-using System.Reflection;
 using RGB.NET.Core;
 
 namespace RGB.NET.Devices.Logitech
@@ -33,17 +31,15 @@ namespace RGB.NET.Devices.Logitech
         /// <summary>
         /// Internal constructor of managed <see cref="LogitechKeyboardRGBDeviceInfo"/>.
         /// </summary>
-        /// <param name="deviceType">The type of the <see cref="IRGBDevice"/>.</param>
         /// <param name="model">The represented device model.</param>
         /// <param name="deviceCaps">The lighting-capabilities of the device.</param>
         /// <param name="culture">The <see cref="CultureInfo"/> of the layout this keyboard is using</param>
-        internal LogitechKeyboardRGBDeviceInfo(RGBDeviceType deviceType, string model, LogitechDeviceCaps deviceCaps, CultureInfo culture)
-            : base(deviceType, model, deviceCaps)
+        internal LogitechKeyboardRGBDeviceInfo(string model, LogitechDeviceCaps deviceCaps, CultureInfo culture)
+            : base(RGBDeviceType.Keyboard, model, deviceCaps)
         {
             SetLayouts(culture.KeyboardLayoutId);
 
-            Image = new Uri(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location),
-                $@"Images\Logitech\Keyboards\{Model.Replace(" ", string.Empty).ToUpper()}.png"), UriKind.Absolute);
+            Image = new Uri(PathHelper.GetAbsolutePath($@"Images\Logitech\Keyboards\{Model.Replace(" ", string.Empty).ToUpper()}.png"), UriKind.Absolute);
         }
 
         private void SetLayouts(int keyboardLayoutId)
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 d748514..7ed8d7f 100644
--- a/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
+++ b/RGB.NET.Devices.Logitech/Layouts/Logitech/Keyboards/G910/UK.xml
@@ -261,7 +261,6 @@
   <LedImageLayouts>
     <LedImageLayout Layout="DE">
       <LedImages>
-
         <LedImage Id="ESC" Image="Raptor_Keys\Escape.png" />
         <LedImage Id="F1" Image="Raptor_Keys\F1.png" />
         <LedImage Id="F2" Image="Raptor_Keys\F2.png" />
diff --git a/RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs b/RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs
index 9a3fbe5..18eb79f 100644
--- a/RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs
+++ b/RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs
@@ -76,7 +76,7 @@ namespace RGB.NET.Devices.Logitech
                 if (DeviceChecker.IsDeviceConnected)
                 {
                     LogitechRGBDevice device = new LogitechKeyboardRGBDevice(new LogitechKeyboardRGBDeviceInfo(
-                        RGBDeviceType.Keyboard, DeviceChecker.ConnectedDeviceModel, LogitechDeviceCaps.PerKeyRGB, GetCulture()));
+                        DeviceChecker.ConnectedDeviceModel, LogitechDeviceCaps.PerKeyRGB, GetCulture()));
                     devices.Add(device);
 
                     try