diff --git a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
index 5c312e4..60f682f 100644
--- a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
@@ -92,7 +92,7 @@ namespace RGB.NET.Devices.Corsair
                                 LedImage image = ledImageLayout?.LedImages.FirstOrDefault(x => x.Id == layoutLed.Id);
                                 led.Image = (!string.IsNullOrEmpty(image?.Image))
                                     ? new Uri(Path.Combine(imageBasePath, image.Image), UriKind.Absolute)
-                                    : new Uri(Path.Combine(imageBasePath, "Clean.png"), UriKind.Absolute);
+                                    : new Uri(Path.Combine(imageBasePath, "Missing.png"), UriKind.Absolute);
                             }
                         }
                     }
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB.png
new file mode 100644
index 0000000..c743a51
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/BE.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/BE.png
deleted file mode 100644
index 310e715..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/BE.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/CH.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/CH.png
deleted file mode 100644
index bf6714e..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/CH.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/DE.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/DE.png
deleted file mode 100644
index b3d5487..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/DE.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/ES.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/ES.png
deleted file mode 100644
index 18f6783..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/ES.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/EU.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/EU.png
deleted file mode 100644
index 6b5650f..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/EU.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/FR.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/FR.png
deleted file mode 100644
index 5bb8a08..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/FR.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/IT.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/IT.png
deleted file mode 100644
index 1fdbac6..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/IT.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/MEX.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/MEX.png
deleted file mode 100644
index 720b5e5..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/MEX.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/ND.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/ND.png
deleted file mode 100644
index f4e6748..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/ND.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/RU.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/RU.png
deleted file mode 100644
index c57f6ba..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/RU.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/UK.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/UK.png
deleted file mode 100644
index 9b6836e..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/UK.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/US_Int.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/US_Int.png
deleted file mode 100644
index 9b6836e..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K70RGB/US_Int.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB.png
new file mode 100644
index 0000000..3c00987
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/BE.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/BE.png
deleted file mode 100644
index 6c03657..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/BE.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/CH.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/CH.png
deleted file mode 100644
index 608a926..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/CH.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/DE.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/DE.png
deleted file mode 100644
index 2b233a3..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/DE.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/ES.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/ES.png
deleted file mode 100644
index b9c4424..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/ES.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/EU.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/EU.png
deleted file mode 100644
index 8a36232..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/EU.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/FR.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/FR.png
deleted file mode 100644
index 276c34a..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/FR.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/IT.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/IT.png
deleted file mode 100644
index 7dc1ef7..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/IT.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/MEX.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/MEX.png
deleted file mode 100644
index 3e9db42..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/MEX.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/ND.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/ND.png
deleted file mode 100644
index 86959c8..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/ND.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/RU.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/RU.png
deleted file mode 100644
index 94fc8bd..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/RU.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/UK.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/UK.png
deleted file mode 100644
index 357fc9d..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/UK.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/US_Int.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/US_Int.png
deleted file mode 100644
index 357fc9d..0000000
Binary files a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K95RGB/US_Int.png and /dev/null differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_Equals_CurlyBracketRight.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_Equals_CurlyBracketRight.png
new file mode 100644
index 0000000..604abaa
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/0_Equals_CurlyBracketRight.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/1_ExclamationMark.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/1_ExclamationMark.png
new file mode 100644
index 0000000..4a45cf0
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/1_ExclamationMark.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_QuotationMark_Exponent2.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_QuotationMark_Exponent2.png
new file mode 100644
index 0000000..250ddf1
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/2_QuotationMark_Exponent2.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_SectionSign_Exponent3.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_SectionSign_Exponent3.png
new file mode 100644
index 0000000..b8d99a8
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/3_SectionSign_Exponent3.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/4_Dollar.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/4_Dollar.png
new file mode 100644
index 0000000..d5373b6
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/4_Dollar.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent.png
new file mode 100644
index 0000000..8531a2a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/5_Percent.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Ampersand.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Ampersand.png
new file mode 100644
index 0000000..dac8bff
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/6_Ampersand.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Slash_CurlyBracketLeft.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Slash_CurlyBracketLeft.png
new file mode 100644
index 0000000..1935236
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/7_Slash_CurlyBracketLeft.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_BracketLeft_SquareBracketLeft.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_BracketLeft_SquareBracketLeft.png
new file mode 100644
index 0000000..27f020d
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/8_BracketLeft_SquareBracketLeft.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight_SquareBracketRight.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight_SquareBracketRight.png
new file mode 100644
index 0000000..4da485d
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/9_BracketRight_SquareBracketRight.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/A.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/A.png
new file mode 100644
index 0000000..1085e2e
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/A.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AE.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AE.png
new file mode 100644
index 0000000..b8bdffe
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AE.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_AccentAcute.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_AccentAcute.png
new file mode 100644
index 0000000..8ae4006
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AccentGrave_AccentAcute.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Alt.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Alt.png
new file mode 100644
index 0000000..5fa4122
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Alt.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AltGr.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AltGr.png
new file mode 100644
index 0000000..38655d1
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/AltGr.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Asterisk.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Asterisk.png
new file mode 100644
index 0000000..426b937
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Asterisk.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/B.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/B.png
new file mode 100644
index 0000000..43a8ab5
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/B.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Backspace.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Backspace.png
new file mode 100644
index 0000000..e4534b8
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Backspace.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildDown.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildDown.png
new file mode 100644
index 0000000..026127e
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildDown.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildUp.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildUp.png
new file mode 100644
index 0000000..aa80d4a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/BildUp.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Brightness.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Brightness.png
new file mode 100644
index 0000000..cf10d0a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Brightness.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/C.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/C.png
new file mode 100644
index 0000000..272c0ce
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/C.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLock.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLock.png
new file mode 100644
index 0000000..f0088ca
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CapsLock.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretDown.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretDown.png
new file mode 100644
index 0000000..13c4be1
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretDown.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretLeft.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretLeft.png
new file mode 100644
index 0000000..d9d6392
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretLeft.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretRight.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretRight.png
new file mode 100644
index 0000000..545ae3e
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretRight.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretUp.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretUp.png
new file mode 100644
index 0000000..6e7c93c
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/CaretUp.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Circumflex_Degree.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Circumflex_Degree.png
new file mode 100644
index 0000000..be181e9
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Circumflex_Degree.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Entf.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Entf.png
new file mode 100644
index 0000000..ad955bc
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Entf.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Semicolon.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Semicolon.png
new file mode 100644
index 0000000..f7ba577
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Comma_Semicolon.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/D.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/D.png
new file mode 100644
index 0000000..66267c5
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/D.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Dot_Colon.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Dot_Colon.png
new file mode 100644
index 0000000..7629b1d
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Dot_Colon.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Drucken.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Drucken.png
new file mode 100644
index 0000000..e748c2b
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Drucken.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E_Euro.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E_Euro.png
new file mode 100644
index 0000000..27ca714
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/E_Euro.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Einfg.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Einfg.png
new file mode 100644
index 0000000..7f82942
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Einfg.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ende.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ende.png
new file mode 100644
index 0000000..08c3c78
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Ende.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Enter.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Enter.png
new file mode 100644
index 0000000..686595d
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Enter.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Entf.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Entf.png
new file mode 100644
index 0000000..33c6179
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Entf.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Escape.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Escape.png
new file mode 100644
index 0000000..cb2315a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Escape.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F.png
new file mode 100644
index 0000000..74dc6ae
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F1.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F1.png
new file mode 100644
index 0000000..dea58fc
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F1.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F10.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F10.png
new file mode 100644
index 0000000..ef9ef86
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F10.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F11.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F11.png
new file mode 100644
index 0000000..af254af
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F11.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F12.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F12.png
new file mode 100644
index 0000000..3e2e702
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F12.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F2.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F2.png
new file mode 100644
index 0000000..7320e0a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F2.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F3.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F3.png
new file mode 100644
index 0000000..36996b2
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F3.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F4.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F4.png
new file mode 100644
index 0000000..645f5ec
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F4.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F5.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F5.png
new file mode 100644
index 0000000..174991a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F5.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F6.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F6.png
new file mode 100644
index 0000000..a7d76f8
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F6.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F7.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F7.png
new file mode 100644
index 0000000..6aa6968
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F7.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F8.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F8.png
new file mode 100644
index 0000000..6250590
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F8.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F9.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F9.png
new file mode 100644
index 0000000..8669a1e
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/F9.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G.png
new file mode 100644
index 0000000..7893fa4
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G1.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G1.png
new file mode 100644
index 0000000..69912a5
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G1.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G10.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G10.png
new file mode 100644
index 0000000..32496fd
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G10.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G11.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G11.png
new file mode 100644
index 0000000..810ad5a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G11.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G12.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G12.png
new file mode 100644
index 0000000..67aac53
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G12.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G13.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G13.png
new file mode 100644
index 0000000..7445c9a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G13.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G14.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G14.png
new file mode 100644
index 0000000..b541387
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G14.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G15.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G15.png
new file mode 100644
index 0000000..856262c
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G15.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G16.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G16.png
new file mode 100644
index 0000000..2bc9281
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G16.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G17.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G17.png
new file mode 100644
index 0000000..d17d320
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G17.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G18.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G18.png
new file mode 100644
index 0000000..898204b
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G18.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G2.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G2.png
new file mode 100644
index 0000000..093ad3a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G2.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G3.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G3.png
new file mode 100644
index 0000000..cad2b9e
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G3.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G4.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G4.png
new file mode 100644
index 0000000..74a09e4
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G4.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G5.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G5.png
new file mode 100644
index 0000000..623d836
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G5.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G6.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G6.png
new file mode 100644
index 0000000..b655db0
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G6.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G7.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G7.png
new file mode 100644
index 0000000..50f3074
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G7.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G8.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G8.png
new file mode 100644
index 0000000..dbeca11
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G8.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G9.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G9.png
new file mode 100644
index 0000000..d6e979f
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/G9.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/H.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/H.png
new file mode 100644
index 0000000..cd2e968
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/H.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hyphen_Underscore.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hyphen_Underscore.png
new file mode 100644
index 0000000..3938ba7
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Hyphen_Underscore.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/I.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/I.png
new file mode 100644
index 0000000..4219a77
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/I.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/J.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/J.png
new file mode 100644
index 0000000..3a6d39f
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/J.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/K.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/K.png
new file mode 100644
index 0000000..8993adf
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/K.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/L.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/L.png
new file mode 100644
index 0000000..8ce2965
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/L.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_GreaterThan_Pipe.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_GreaterThan_Pipe.png
new file mode 100644
index 0000000..16c883d
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/LessThan_GreaterThan_Pipe.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M1.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M1.png
new file mode 100644
index 0000000..74f923e
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M1.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M2.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M2.png
new file mode 100644
index 0000000..6923aba
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M2.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M3.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M3.png
new file mode 100644
index 0000000..ca9c351
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M3.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/MR.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/MR.png
new file mode 100644
index 0000000..7e4fd20
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/MR.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M_Mu.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M_Mu.png
new file mode 100644
index 0000000..a30d360
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/M_Mu.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Menu.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Menu.png
new file mode 100644
index 0000000..f9c06d3
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Menu.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Minus.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Minus.png
new file mode 100644
index 0000000..015e3ff
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Minus.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Mute.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Mute.png
new file mode 100644
index 0000000..f82621c
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Mute.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/N.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/N.png
new file mode 100644
index 0000000..65a44ff
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/N.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NextTrack.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NextTrack.png
new file mode 100644
index 0000000..7e18465
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NextTrack.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num.png
new file mode 100644
index 0000000..12e24fb
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Einfg.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Einfg.png
new file mode 100644
index 0000000..81b4f6c
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num0_Einfg.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_Ende.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_Ende.png
new file mode 100644
index 0000000..0fe8d52
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num1_Ende.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num2_ArrowDown.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num2_ArrowDown.png
new file mode 100644
index 0000000..b45e840
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num2_ArrowDown.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_BildDown.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_BildDown.png
new file mode 100644
index 0000000..3103af3
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num3_BildDown.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num4_ArrowLeft.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num4_ArrowLeft.png
new file mode 100644
index 0000000..e0d0537
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num4_ArrowLeft.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num5.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num5.png
new file mode 100644
index 0000000..dc8455b
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num5.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num6_ArrowRight.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num6_ArrowRight.png
new file mode 100644
index 0000000..7f482fe
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num6_ArrowRight.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Pos1.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Pos1.png
new file mode 100644
index 0000000..43b6340
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num7_Pos1.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num8_ArrowUp.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num8_ArrowUp.png
new file mode 100644
index 0000000..d03824b
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num8_ArrowUp.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_BildUp.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_BildUp.png
new file mode 100644
index 0000000..0762da7
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Num9_BildUp.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumEnter.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumEnter.png
new file mode 100644
index 0000000..fd84530
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumEnter.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumPlus.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumPlus.png
new file mode 100644
index 0000000..bc98c0c
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/NumPlus.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/O.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/O.png
new file mode 100644
index 0000000..97ffea3
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/O.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/OE.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/OE.png
new file mode 100644
index 0000000..20d995f
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/OE.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/P.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/P.png
new file mode 100644
index 0000000..cc8e7a5
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/P.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseUntbr.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseUntbr.png
new file mode 100644
index 0000000..d8c1421
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PauseUntbr.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PlayPause.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PlayPause.png
new file mode 100644
index 0000000..7851722
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PlayPause.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Plus_Asterisk_Tilde.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Plus_Asterisk_Tilde.png
new file mode 100644
index 0000000..2e7ac78
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Plus_Asterisk_Tilde.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Pos1.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Pos1.png
new file mode 100644
index 0000000..2da2979
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Pos1.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PreviousTrack.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PreviousTrack.png
new file mode 100644
index 0000000..138ef72
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/PreviousTrack.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q_At.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q_At.png
new file mode 100644
index 0000000..5fc7e07
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Q_At.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_SharpS_Backslash.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_SharpS_Backslash.png
new file mode 100644
index 0000000..be2a79b
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/QuestionMark_SharpS_Backslash.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/R.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/R.png
new file mode 100644
index 0000000..bf1b956
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/R.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Rollen.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Rollen.png
new file mode 100644
index 0000000..87af712
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Rollen.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/S.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/S.png
new file mode 100644
index 0000000..1c8e7d4
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/S.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Sharp_Apostrophe.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Sharp_Apostrophe.png
new file mode 100644
index 0000000..69c3fa4
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Sharp_Apostrophe.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Shift.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Shift.png
new file mode 100644
index 0000000..bbcac9f
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Shift.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftBig.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftBig.png
new file mode 100644
index 0000000..da2f5e7
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/ShiftBig.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Slash.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Slash.png
new file mode 100644
index 0000000..5704546
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Slash.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Space.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Space.png
new file mode 100644
index 0000000..cfd12b6
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Space.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Stop.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Stop.png
new file mode 100644
index 0000000..af375e9
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Stop.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Strg.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Strg.png
new file mode 100644
index 0000000..495be21
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Strg.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/T.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/T.png
new file mode 100644
index 0000000..096ad1f
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/T.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Tab.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Tab.png
new file mode 100644
index 0000000..490c380
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Tab.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/U.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/U.png
new file mode 100644
index 0000000..a6fe40e
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/U.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/UE.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/UE.png
new file mode 100644
index 0000000..019a0c7
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/UE.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/V.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/V.png
new file mode 100644
index 0000000..c7bce1e
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/V.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/W.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/W.png
new file mode 100644
index 0000000..271ed92
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/W.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/WinLock.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/WinLock.png
new file mode 100644
index 0000000..8829689
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/WinLock.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/X.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/X.png
new file mode 100644
index 0000000..4f09bc5
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/X.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Y.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Y.png
new file mode 100644
index 0000000..c505cc7
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Y.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Z.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Z.png
new file mode 100644
index 0000000..8a45b4a
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/Z.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/windows.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/windows.png
new file mode 100644
index 0000000..27d3ec0
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/K_Keys/windows.png differ
diff --git a/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/Missing.png b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/Missing.png
new file mode 100644
index 0000000..42807f8
Binary files /dev/null and b/RGB.NET.Devices.Corsair/Images/Corsair/Keyboards/Missing.png differ
diff --git a/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs b/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs
index 540f4e2..71d82e5 100644
--- a/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs
@@ -60,7 +60,7 @@ namespace RGB.NET.Devices.Corsair
             string model = KeyboardDeviceInfo.Model.Replace(" ", string.Empty).ToUpper();
             ApplyLayoutFromFile(PathHelper.GetAbsolutePath(
                 $@"Layouts\Corsair\Keyboards\{model}\{KeyboardDeviceInfo.PhysicalLayout.ToString().ToUpper()}.xml"),
-                KeyboardDeviceInfo.LogicalLayout.ToString(), PathHelper.GetAbsolutePath($@"Images\Corsair\Keyboards\{model}"));
+                KeyboardDeviceInfo.LogicalLayout.ToString(), PathHelper.GetAbsolutePath($@"Images\Corsair\Keyboards"));
         }
 
         #endregion
diff --git a/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDeviceInfo.cs b/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDeviceInfo.cs
index f27c542..24b6ef0 100644
--- a/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDeviceInfo.cs
@@ -40,7 +40,7 @@ namespace RGB.NET.Devices.Corsair
             this.LogicalLayout = (CorsairLogicalKeyboardLayout)nativeInfo.logicalLayout;
 
             string model = Model.Replace(" ", string.Empty).ToUpper();
-            Image = new Uri(PathHelper.GetAbsolutePath($@"Images\Corsair\Keyboards\{model}\{model}.png"), UriKind.Absolute);
+            Image = new Uri(PathHelper.GetAbsolutePath($@"Images\Corsair\Keyboards\{model}.png"), UriKind.Absolute);
         }
 
         #endregion
diff --git a/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml b/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
index c61a980..884c5f5 100644
--- a/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
+++ b/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="../../../DeviceLayout.xsd">
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>Corsair K70 RGB - Physical UK</Name>
   <Description>Physical UK-Layout of Corsairs K70 RGB (Logical: BE, CH, DE, ES, EU, FR, IT, ND, MEX, RU, UK, US_Int)</Description>
   <Type>Keyboard</Type>
@@ -13,7 +13,7 @@
     <Led Id="Brightness">
       <Shape>Circle</Shape>
       <X>298</X>
-      <Y>7</Y>
+      <Y>6</Y>
       <Width>10mm</Width>
       <Height>10mm</Height>
     </Led>
@@ -27,7 +27,7 @@
     <Led Id="Mute">
       <X>375</X>
       <Y>6</Y>
-      <Height>13mm</Height>
+      <Height>12mm</Height>
     </Led>
 
     <!-- Esc -> NextTrack -->
@@ -65,16 +65,16 @@
 
     <Led Id="Stop">
       <X>+5</X>
-      <Height>14mm</Height>
+      <Height>12mm</Height>
     </Led>
     <Led Id="ScanPreviousTrack">
-      <Height>14mm</Height>
+      <Height>12mm</Height>
     </Led>
     <Led Id="PlayPause">
-      <Height>14mm</Height>
+      <Height>12mm</Height>
     </Led>
     <Led Id="ScanNextTrack">
-      <Height>14mm</Height>
+      <Height>12mm</Height>
     </Led>
 
     <!-- ^ -> Num- -->
@@ -130,6 +130,7 @@
     <Led Id="BracketLeft" />
     <Led Id="BracketRight" />
     <Led Id="Enter">
+      <Shape>M0,0 L0,0.5 L0.16666666666,0.5 L0.16666666666,1 L1,1 L1,0 Z</Shape>
       <Width>1.5</Width>
       <Height>2</Height>
     </Led>
@@ -242,4 +243,129 @@
     </Led>
     <Led Id="KeypadPeriodAndDelete" />
   </Leds>
+
+  <LedImageLayouts>
+    <LedImageLayout Layout="DE">
+      <LedImages>
+        <LedImage Id="Brightness" Image="K_Keys\Brightness.png" />
+        <LedImage Id="WinLock" Image="K_Keys\WinLock.png" />
+        <LedImage Id="Mute" Image="K_Keys\Mute.png" />
+
+        <LedImage Id="Escape" Image="K_Keys\Escape.png" />
+        <LedImage Id="F1" Image="K_Keys\F1.png" />
+        <LedImage Id="F2" Image="K_Keys\F2.png" />
+        <LedImage Id="F3" Image="K_Keys\F3.png" />
+        <LedImage Id="F4" Image="K_Keys\F4.png" />
+        <LedImage Id="F5" Image="K_Keys\F5.png" />
+        <LedImage Id="F6" Image="K_Keys\F6.png" />
+        <LedImage Id="F7" Image="K_Keys\F7.png" />
+        <LedImage Id="F8" Image="K_Keys\F8.png" />
+        <LedImage Id="F9" Image="K_Keys\F9.png" />
+        <LedImage Id="F10" Image="K_Keys\F10.png" />
+        <LedImage Id="F11" Image="K_Keys\F11.png" />
+        <LedImage Id="F12" Image="K_Keys\F12.png" />
+        <LedImage Id="PrintScreen" Image="K_Keys\Drucken.png" />
+        <LedImage Id="ScrollLock" Image="K_Keys\Rollen.png" />
+        <LedImage Id="PauseBreak" Image="K_Keys\PauseUntbr.png" />
+        <LedImage Id="Stop" Image="K_Keys\Stop.png" />
+        <LedImage Id="ScanPreviousTrack" Image="K_Keys\PreviousTrack.png" />
+        <LedImage Id="PlayPause" Image="K_Keys\PlayPause.png" />
+        <LedImage Id="ScanNextTrack" Image="K_Keys\NextTrack.png" />
+
+        <LedImage Id="GraveAccentAndTilde" Image="K_Keys\Circumflex_Degree.png" />
+        <LedImage Id="D1" Image="K_Keys\1_ExclamationMark.png" />
+        <LedImage Id="D2" Image="K_Keys\2_QuotationMark_Exponent2.png" />
+        <LedImage Id="D3" Image="K_Keys\3_SectionSign_Exponent3.png" />
+        <LedImage Id="D4" Image="K_Keys\4_Dollar.png" />
+        <LedImage Id="D5" Image="K_Keys\5_Percent.png" />
+        <LedImage Id="D6" Image="K_Keys\6_Ampersand.png" />
+        <LedImage Id="D7" Image="K_Keys\7_Slash_CurlyBracketLeft.png" />
+        <LedImage Id="D8" Image="K_Keys\8_BracketLeft_SquareBracketLeft.png" />
+        <LedImage Id="D9" Image="K_Keys\9_BracketRight_SquareBracketRight.png" />
+        <LedImage Id="D0" Image="K_Keys\0_Equals_CurlyBracketRight.png" />
+        <LedImage Id="MinusAndUnderscore" Image="K_Keys\QuestionMark_SharpS_Backslash.png" />
+        <LedImage Id="EqualsAndPlus" Image="K_Keys\AccentGrave_AccentAcute.png" />
+        <LedImage Id="Backspace" Image="K_Keys\Backspace.png" />
+        <LedImage Id="Insert" Image="K_Keys\Einfg.png" />
+        <LedImage Id="Home" Image="K_Keys\Pos1.png" />
+        <LedImage Id="PageUp" Image="K_Keys\BildUp.png" />
+        <LedImage Id="NumLock" Image="K_Keys\Num.png" />
+        <LedImage Id="KeypadSlash" Image="K_Keys\Slash.png" />
+        <LedImage Id="KeypadAsterisk" Image="K_Keys\Asterisk.png" />
+        <LedImage Id="KeypadMinus" Image="K_Keys\Minus.png" />
+
+        <LedImage Id="Tab" Image="K_Keys\Tab.png" />
+        <LedImage Id="Q" Image="K_Keys\Q_At.png" />
+        <LedImage Id="W" Image="K_Keys\W.png" />
+        <LedImage Id="E" Image="K_Keys\E_Euro.png" />
+        <LedImage Id="R" Image="K_Keys\R.png" />
+        <LedImage Id="T" Image="K_Keys\T.png" />
+        <LedImage Id="Y" Image="K_Keys\Z.png" />
+        <LedImage Id="U" Image="K_Keys\U.png" />
+        <LedImage Id="I" Image="K_Keys\I.png" />
+        <LedImage Id="O" Image="K_Keys\O.png" />
+        <LedImage Id="P" Image="K_Keys\P.png" />
+        <LedImage Id="BracketLeft" Image="K_Keys\UE.png" />
+        <LedImage Id="BracketRight" Image="K_Keys\Plus_Asterisk_Tilde.png" />
+        <LedImage Id="Enter" Image="K_Keys\Enter.png" />
+        <LedImage Id="Delete" Image="K_Keys\Entf.png" />
+        <LedImage Id="End" Image="K_Keys\Ende.png" />
+        <LedImage Id="PageDown" Image="K_Keys\BildDown.png" />
+        <LedImage Id="Keypad7" Image="K_Keys\Num7_Pos1.png" />
+        <LedImage Id="Keypad8" Image="K_Keys\Num8_ArrowUp.png" />
+        <LedImage Id="Keypad9" Image="K_Keys\Num9_BildUp.png" />
+        <LedImage Id="KeypadPlus" Image="K_Keys\NumPlus.png" />
+
+        <LedImage Id="CapsLock" Image="K_Keys\CapsLock.png" />
+        <LedImage Id="A" Image="K_Keys\A.png" />
+        <LedImage Id="S" Image="K_Keys\S.png" />
+        <LedImage Id="D" Image="K_Keys\D.png" />
+        <LedImage Id="F" Image="K_Keys\F.png" />
+        <LedImage Id="G" Image="K_Keys\G.png" />
+        <LedImage Id="H" Image="K_Keys\H.png" />
+        <LedImage Id="J" Image="K_Keys\J.png" />
+        <LedImage Id="K" Image="K_Keys\K.png" />
+        <LedImage Id="L" Image="K_Keys\L.png" />
+        <LedImage Id="SemicolonAndColon" Image="K_Keys\OE.png" />
+        <LedImage Id="ApostropheAndDoubleQuote" Image="K_Keys\AE.png" />
+        <LedImage Id="NonUsTilde" Image="K_Keys\Sharp_Apostrophe.png" />
+        <LedImage Id="Keypad4" Image="K_Keys\Num4_ArrowLeft.png" />
+        <LedImage Id="Keypad5" Image="K_Keys\Num5.png" />
+        <LedImage Id="Keypad6" Image="K_Keys\Num6_ArrowRight.png" />
+
+        <LedImage Id="LeftShift" Image="K_Keys\Shift.png" />
+        <LedImage Id="NonUsBackslash" Image="K_Keys\LessThan_GreaterThan_Pipe.png" />
+        <LedImage Id="CommaAndLessThan" Image="K_Keys\Comma_Semicolon.png" />
+        <LedImage Id="Z" Image="K_Keys\Y.png" />
+        <LedImage Id="X" Image="K_Keys\X.png" />
+        <LedImage Id="C" Image="K_Keys\C.png" />
+        <LedImage Id="V" Image="K_Keys\V.png" />
+        <LedImage Id="B" Image="K_Keys\B.png" />
+        <LedImage Id="N" Image="K_Keys\N.png" />
+        <LedImage Id="M" Image="K_Keys\M_Mu.png" />
+        <LedImage Id="PeriodAndBiggerThan" Image="K_Keys\Dot_Colon.png" />
+        <LedImage Id="SlashAndQuestionMark" Image="K_Keys\Hyphen_Underscore.png" />
+        <LedImage Id="RightShift" Image="K_Keys\ShiftBig.png" />
+        <LedImage Id="UpArrow" Image="K_Keys\CaretUp.png" />
+        <LedImage Id="Keypad1" Image="K_Keys\Num1_Ende.png" />
+        <LedImage Id="Keypad2" Image="K_Keys\Num2_ArrowDown.png" />
+        <LedImage Id="Keypad3" Image="K_Keys\Num3_BildDown.png" />
+        <LedImage Id="KeypadEnter" Image="K_Keys\NumEnter.png" />
+
+        <LedImage Id="LeftCtrl" Image="K_Keys\Strg.png" />
+        <LedImage Id="LeftGui" Image="K_Keys\Windows.png" />
+        <LedImage Id="LeftAlt" Image="K_Keys\Alt.png" />
+        <LedImage Id="Space" Image="K_Keys\Space.png" />
+        <LedImage Id="RightAlt" Image="K_Keys\AltGr.png" />
+        <LedImage Id="RightGui" Image="K_Keys\Windows.png" />
+        <LedImage Id="Application" Image="K_Keys\Menu.png" />
+        <LedImage Id="RightCtrl" Image="K_Keys\Strg.png" />
+        <LedImage Id="LeftArrow" Image="K_Keys\CaretLeft.png" />
+        <LedImage Id="DownArrow" Image="K_Keys\CaretDown.png" />
+        <LedImage Id="RightArrow" Image="K_Keys\CaretRight.png" />
+        <LedImage Id="Keypad0" Image="K_Keys\Num0_Einfg.png" />
+        <LedImage Id="KeypadPeriodAndDelete" Image="K_Keys\Comma_Entf.png" />
+      </LedImages>
+    </LedImageLayout>
+  </LedImageLayouts>
 </Device>
\ No newline at end of file
diff --git a/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml b/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml
index c95053a..dfea1aa 100644
--- a/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml
+++ b/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K95RGB/UK.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="../../../DeviceLayout.xsd">
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>Corsair K95 RGB - Physical UK</Name>
   <Description>Physical UK-Layout of Corsairs K95 RGB (Logical: BE, CH, DE, ES, EU, FR, IT, ND, MEX, RU, UK, US_Int)</Description>
   <Type>Keyboard</Type>
   <Lighting>Key</Lighting>
   <Vendor>Corsair</Vendor>
   <Model>K95RGB</Model>
-  <Width>501</Width>
+  <Width>500</Width>
   <Height>165</Height>
   <Leds>
     <!-- Extra-Keys: MR -> Mute -->
@@ -53,7 +53,7 @@
     <Led Id="Mute">
       <X>439</X>
       <Y>6</Y>
-      <Height>13mm</Height>
+      <Height>12mm</Height>
     </Led>
 
     <!-- Esc -> NextTrack -->
@@ -91,16 +91,16 @@
 
     <Led Id="Stop">
       <X>+5</X>
-      <Height>14mm</Height>
+      <Height>12mm</Height>
     </Led>
     <Led Id="ScanPreviousTrack">
-      <Height>14mm</Height>
+      <Height>12mm</Height>
     </Led>
     <Led Id="PlayPause">
-      <Height>14mm</Height>
+      <Height>12mm</Height>
     </Led>
     <Led Id="ScanNextTrack">
-      <Height>14mm</Height>
+      <Height>12mm</Height>
     </Led>
 
     <!-- ^ -> Num- -->
@@ -156,6 +156,7 @@
     <Led Id="BracketLeft" />
     <Led Id="BracketRight" />
     <Led Id="Enter">
+      <Shape>M0,0 L0,0.5 L0.16666666666,0.5 L0.16666666666,1 L1,1 L1,0 Z</Shape>
       <Width>1.5</Width>
       <Height>2</Height>
     </Led>
@@ -356,4 +357,152 @@
       <Height>18mm</Height>
     </Led>
   </Leds>
+
+  <LedImageLayouts>
+    <LedImageLayout Layout="DE">
+      <LedImages>
+        <LedImage Id="MR" Image="K_Keys\MR.png" />
+        <LedImage Id="M1" Image="K_Keys\M1.png" />
+        <LedImage Id="M2" Image="K_Keys\M2.png" />
+        <LedImage Id="M3" Image="K_Keys\M3.png" />
+        <LedImage Id="Brightness" Image="K_Keys\Brightness.png" />
+        <LedImage Id="WinLock" Image="K_Keys\WinLock.png" />
+        <LedImage Id="Mute" Image="K_Keys\Mute.png" />
+
+        <LedImage Id="Escape" Image="K_Keys\Escape.png" />
+        <LedImage Id="F1" Image="K_Keys\F1.png" />
+        <LedImage Id="F2" Image="K_Keys\F2.png" />
+        <LedImage Id="F3" Image="K_Keys\F3.png" />
+        <LedImage Id="F4" Image="K_Keys\F4.png" />
+        <LedImage Id="F5" Image="K_Keys\F5.png" />
+        <LedImage Id="F6" Image="K_Keys\F6.png" />
+        <LedImage Id="F7" Image="K_Keys\F7.png" />
+        <LedImage Id="F8" Image="K_Keys\F8.png" />
+        <LedImage Id="F9" Image="K_Keys\F9.png" />
+        <LedImage Id="F10" Image="K_Keys\F10.png" />
+        <LedImage Id="F11" Image="K_Keys\F11.png" />
+        <LedImage Id="F12" Image="K_Keys\F12.png" />
+        <LedImage Id="PrintScreen" Image="K_Keys\Drucken.png" />
+        <LedImage Id="ScrollLock" Image="K_Keys\Rollen.png" />
+        <LedImage Id="PauseBreak" Image="K_Keys\PauseUntbr.png" />
+        <LedImage Id="Stop" Image="K_Keys\Stop.png" />
+        <LedImage Id="ScanPreviousTrack" Image="K_Keys\PreviousTrack.png" />
+        <LedImage Id="PlayPause" Image="K_Keys\PlayPause.png" />
+        <LedImage Id="ScanNextTrack" Image="K_Keys\NextTrack.png" />
+
+        <LedImage Id="GraveAccentAndTilde" Image="K_Keys\Circumflex_Degree.png" />
+        <LedImage Id="D1" Image="K_Keys\1_ExclamationMark.png" />
+        <LedImage Id="D2" Image="K_Keys\2_QuotationMark_Exponent2.png" />
+        <LedImage Id="D3" Image="K_Keys\3_SectionSign_Exponent3.png" />
+        <LedImage Id="D4" Image="K_Keys\4_Dollar.png" />
+        <LedImage Id="D5" Image="K_Keys\5_Percent.png" />
+        <LedImage Id="D6" Image="K_Keys\6_Ampersand.png" />
+        <LedImage Id="D7" Image="K_Keys\7_Slash_CurlyBracketLeft.png" />
+        <LedImage Id="D8" Image="K_Keys\8_BracketLeft_SquareBracketLeft.png" />
+        <LedImage Id="D9" Image="K_Keys\9_BracketRight_SquareBracketRight.png" />
+        <LedImage Id="D0" Image="K_Keys\0_Equals_CurlyBracketRight.png" />
+        <LedImage Id="MinusAndUnderscore" Image="K_Keys\QuestionMark_SharpS_Backslash.png" />
+        <LedImage Id="EqualsAndPlus" Image="K_Keys\AccentGrave_AccentAcute.png" />
+        <LedImage Id="Backspace" Image="K_Keys\Backspace.png" />
+        <LedImage Id="Insert" Image="K_Keys\Einfg.png" />
+        <LedImage Id="Home" Image="K_Keys\Pos1.png" />
+        <LedImage Id="PageUp" Image="K_Keys\BildUp.png" />
+        <LedImage Id="NumLock" Image="K_Keys\Num.png" />
+        <LedImage Id="KeypadSlash" Image="K_Keys\Slash.png" />
+        <LedImage Id="KeypadAsterisk" Image="K_Keys\Asterisk.png" />
+        <LedImage Id="KeypadMinus" Image="K_Keys\Minus.png" />
+
+        <LedImage Id="Tab" Image="K_Keys\Tab.png" />
+        <LedImage Id="Q" Image="K_Keys\Q_At.png" />
+        <LedImage Id="W" Image="K_Keys\W.png" />
+        <LedImage Id="E" Image="K_Keys\E_Euro.png" />
+        <LedImage Id="R" Image="K_Keys\R.png" />
+        <LedImage Id="T" Image="K_Keys\T.png" />
+        <LedImage Id="Y" Image="K_Keys\Z.png" />
+        <LedImage Id="U" Image="K_Keys\U.png" />
+        <LedImage Id="I" Image="K_Keys\I.png" />
+        <LedImage Id="O" Image="K_Keys\O.png" />
+        <LedImage Id="P" Image="K_Keys\P.png" />
+        <LedImage Id="BracketLeft" Image="K_Keys\UE.png" />
+        <LedImage Id="BracketRight" Image="K_Keys\Plus_Asterisk_Tilde.png" />
+        <LedImage Id="Enter" Image="K_Keys\Enter.png" />
+        <LedImage Id="Delete" Image="K_Keys\Entf.png" />
+        <LedImage Id="End" Image="K_Keys\Ende.png" />
+        <LedImage Id="PageDown" Image="K_Keys\BildDown.png" />
+        <LedImage Id="Keypad7" Image="K_Keys\Num7_Pos1.png" />
+        <LedImage Id="Keypad8" Image="K_Keys\Num8_ArrowUp.png" />
+        <LedImage Id="Keypad9" Image="K_Keys\Num9_BildUp.png" />
+        <LedImage Id="KeypadPlus" Image="K_Keys\NumPlus.png" />
+
+        <LedImage Id="CapsLock" Image="K_Keys\CapsLock.png" />
+        <LedImage Id="A" Image="K_Keys\A.png" />
+        <LedImage Id="S" Image="K_Keys\S.png" />
+        <LedImage Id="D" Image="K_Keys\D.png" />
+        <LedImage Id="F" Image="K_Keys\F.png" />
+        <LedImage Id="G" Image="K_Keys\G.png" />
+        <LedImage Id="H" Image="K_Keys\H.png" />
+        <LedImage Id="J" Image="K_Keys\J.png" />
+        <LedImage Id="K" Image="K_Keys\K.png" />
+        <LedImage Id="L" Image="K_Keys\L.png" />
+        <LedImage Id="SemicolonAndColon" Image="K_Keys\OE.png" />
+        <LedImage Id="ApostropheAndDoubleQuote" Image="K_Keys\AE.png" />
+        <LedImage Id="NonUsTilde" Image="K_Keys\Sharp_Apostrophe.png" />
+        <LedImage Id="Keypad4" Image="K_Keys\Num4_ArrowLeft.png" />
+        <LedImage Id="Keypad5" Image="K_Keys\Num5.png" />
+        <LedImage Id="Keypad6" Image="K_Keys\Num6_ArrowRight.png" />
+
+        <LedImage Id="LeftShift" Image="K_Keys\Shift.png" />
+        <LedImage Id="NonUsBackslash" Image="K_Keys\LessThan_GreaterThan_Pipe.png" />
+        <LedImage Id="CommaAndLessThan" Image="K_Keys\Comma_Semicolon.png" />
+        <LedImage Id="Z" Image="K_Keys\Y.png" />
+        <LedImage Id="X" Image="K_Keys\X.png" />
+        <LedImage Id="C" Image="K_Keys\C.png" />
+        <LedImage Id="V" Image="K_Keys\V.png" />
+        <LedImage Id="B" Image="K_Keys\B.png" />
+        <LedImage Id="N" Image="K_Keys\N.png" />
+        <LedImage Id="M" Image="K_Keys\M_Mu.png" />
+        <LedImage Id="PeriodAndBiggerThan" Image="K_Keys\Dot_Colon.png" />
+        <LedImage Id="SlashAndQuestionMark" Image="K_Keys\Hyphen_Underscore.png" />
+        <LedImage Id="RightShift" Image="K_Keys\ShiftBig.png" />
+        <LedImage Id="UpArrow" Image="K_Keys\CaretUp.png" />
+        <LedImage Id="Keypad1" Image="K_Keys\Num1_Ende.png" />
+        <LedImage Id="Keypad2" Image="K_Keys\Num2_ArrowDown.png" />
+        <LedImage Id="Keypad3" Image="K_Keys\Num3_BildDown.png" />
+        <LedImage Id="KeypadEnter" Image="K_Keys\NumEnter.png" />
+
+        <LedImage Id="LeftCtrl" Image="K_Keys\Strg.png" />
+        <LedImage Id="LeftGui" Image="K_Keys\Windows.png" />
+        <LedImage Id="LeftAlt" Image="K_Keys\Alt.png" />
+        <LedImage Id="Space" Image="K_Keys\Space.png" />
+        <LedImage Id="RightAlt" Image="K_Keys\AltGr.png" />
+        <LedImage Id="RightGui" Image="K_Keys\Windows.png" />
+        <LedImage Id="Application" Image="K_Keys\Menu.png" />
+        <LedImage Id="RightCtrl" Image="K_Keys\Strg.png" />
+        <LedImage Id="LeftArrow" Image="K_Keys\CaretLeft.png" />
+        <LedImage Id="DownArrow" Image="K_Keys\CaretDown.png" />
+        <LedImage Id="RightArrow" Image="K_Keys\CaretRight.png" />
+        <LedImage Id="Keypad0" Image="K_Keys\Num0_Einfg.png" />
+        <LedImage Id="KeypadPeriodAndDelete" Image="K_Keys\Comma_Entf.png" />
+
+        <LedImage Id="G1" Image="K_Keys\G1.png" />
+        <LedImage Id="G2" Image="K_Keys\G2.png" />
+        <LedImage Id="G3" Image="K_Keys\G3.png" />
+        <LedImage Id="G4" Image="K_Keys\G4.png" />
+        <LedImage Id="G5" Image="K_Keys\G5.png" />
+        <LedImage Id="G6" Image="K_Keys\G6.png" />
+        <LedImage Id="G7" Image="K_Keys\G7.png" />
+        <LedImage Id="G8" Image="K_Keys\G8.png" />
+        <LedImage Id="G9" Image="K_Keys\G9.png" />
+        <LedImage Id="G10" Image="K_Keys\G10.png" />
+        <LedImage Id="G11" Image="K_Keys\G11.png" />
+        <LedImage Id="G12" Image="K_Keys\G12.png" />
+        <LedImage Id="G13" Image="K_Keys\G13.png" />
+        <LedImage Id="G14" Image="K_Keys\G14.png" />
+        <LedImage Id="G15" Image="K_Keys\G15.png" />
+        <LedImage Id="G16" Image="K_Keys\G16.png" />
+        <LedImage Id="G17" Image="K_Keys\G17.png" />
+        <LedImage Id="G18" Image="K_Keys\G18.png" />
+      </LedImages>
+    </LedImageLayout>
+  </LedImageLayouts>
 </Device>
\ No newline at end of file
diff --git a/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj b/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj
index 92bf5f6..4f0fc45 100644
--- a/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj
+++ b/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj
@@ -97,30 +97,141 @@
     <Folder Include="Layouts\Corsair\Mousemats\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Images\Corsair\Keyboards\K70RGB\BE.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\CH.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\DE.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\ES.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\EU.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\FR.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\IT.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\MEX.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\ND.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\RU.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\US_Int.png" />
-    <Content Include="Images\Corsair\Keyboards\K70RGB\UK.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\BE.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\CH.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\DE.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\ES.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\EU.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\FR.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\IT.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\MEX.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\ND.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\RU.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\US_Int.png" />
-    <Content Include="Images\Corsair\Keyboards\K95RGB\UK.png" />
+    <Content Include="Images\Corsair\Keyboards\K70RGB.png" />
+    <Content Include="Images\Corsair\Keyboards\K95RGB.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\0_Equals_CurlyBracketRight.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\1_ExclamationMark.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\2_QuotationMark_Exponent2.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\3_SectionSign_Exponent3.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\4_Dollar.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\5_Percent.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\6_Ampersand.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\7_Slash_CurlyBracketLeft.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\8_BracketLeft_SquareBracketLeft.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\9_BracketRight_SquareBracketRight.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\A.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\AccentGrave_AccentAcute.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\AE.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Alt.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\AltGr.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Asterisk.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\B.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Backspace.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\BildDown.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\BildUp.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Brightness.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\C.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\CapsLock.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\CaretDown.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\CaretLeft.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\CaretRight.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\CaretUp.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Circumflex_Degree.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Comma_Entf.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Comma_Semicolon.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\D.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Dot_Colon.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Drucken.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Einfg.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Ende.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Enter.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Entf.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Escape.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\E_Euro.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F1.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F10.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F11.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F12.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F2.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F3.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F4.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F5.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F6.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F7.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F8.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\F9.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G1.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G10.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G11.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G12.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G13.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G14.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G15.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G16.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G17.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G18.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G2.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G3.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G4.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G5.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G6.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G7.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G8.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\G9.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\H.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Hyphen_Underscore.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\I.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\J.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\K.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\L.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\LessThan_GreaterThan_Pipe.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\M1.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\M2.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\M3.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Menu.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Minus.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\MR.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Mute.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\M_Mu.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\N.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\NextTrack.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num0_Einfg.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num1_Ende.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num2_ArrowDown.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num3_BildDown.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num4_ArrowLeft.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num5.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num6_ArrowRight.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num7_Pos1.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num8_ArrowUp.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Num9_BildUp.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\NumEnter.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\NumPlus.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\O.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\OE.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\P.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\PauseUntbr.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\PlayPause.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Plus_Asterisk_Tilde.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Pos1.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\PreviousTrack.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\QuestionMark_SharpS_Backslash.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Q_At.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\R.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Rollen.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\S.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Sharp_Apostrophe.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Shift.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\ShiftBig.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Slash.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Space.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Stop.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Strg.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\T.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Tab.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\U.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\UE.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\V.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\W.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\windows.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\WinLock.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\X.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Y.png" />
+    <Content Include="Images\Corsair\Keyboards\K_Keys\Z.png" />
+    <Content Include="Images\Corsair\Keyboards\Missing.png" />
     <Content Include="Layouts\Corsair\Keyboards\K70RGB\UK.xml">
       <SubType>Designer</SubType>
     </Content>
diff --git a/RGB.NET.WPF/Styles/LedVisualizer.xaml b/RGB.NET.WPF/Styles/LedVisualizer.xaml
index 05692ed..0ad5a21 100644
--- a/RGB.NET.WPF/Styles/LedVisualizer.xaml
+++ b/RGB.NET.WPF/Styles/LedVisualizer.xaml
@@ -74,7 +74,7 @@
         <Setter Property="Canvas.Left" Value="{Binding Led.LedRectangle.Location.X, RelativeSource={RelativeSource Self}}" />
         <Setter Property="Canvas.Top" Value="{Binding Led.LedRectangle.Location.Y, RelativeSource={RelativeSource Self}}" />
 
-        <Setter Property="BorderBrush" Value="#A8202020" />
+        <Setter Property="BorderBrush" Value="#000000" />
         <Setter Property="Background" Value="{Binding Led.Color, RelativeSource={RelativeSource Self}, 
                                                       Converter={StaticResource ConverterColorToSolidColorBrush}}" />
 
@@ -82,7 +82,7 @@
 
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" Value="#A8FFFFFF" />
+                <Setter Property="BorderBrush" Value="#FFFFFF" />
             </Trigger>
 
             <DataTrigger Binding="{Binding Led.Shape, RelativeSource={RelativeSource Self}}" Value="Circle">