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 92ace40..c61a980 100644
--- a/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
+++ b/RGB.NET.Devices.Corsair/Layouts/Corsair/Keyboards/K70RGB/UK.xml
@@ -1,910 +1,245 @@
 <?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">
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="../../../DeviceLayout.xsd">
   <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>
   <Lighting>Key</Lighting>
   <Vendor>Corsair</Vendor>
   <Model>K70RGB</Model>
-  <Shape>Rectangle</Shape>
   <Width>436</Width>
   <Height>165</Height>
   <Leds>
-    <Led>
-      <Id>GraveAccentAndTilde</Id>
-      <Shape>Rectangle</Shape>
-      <X>6.75</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D1</Id>
-      <Shape>Rectangle</Shape>
-      <X>25.75</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D2</Id>
-      <Shape>Rectangle</Shape>
-      <X>44.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D3</Id>
-      <Shape>Rectangle</Shape>
-      <X>63.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D4</Id>
-      <Shape>Rectangle</Shape>
-      <X>82.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D5</Id>
-      <Shape>Rectangle</Shape>
-      <X>101.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D6</Id>
-      <Shape>Rectangle</Shape>
-      <X>120.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D7</Id>
-      <Shape>Rectangle</Shape>
-      <X>139.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D8</Id>
-      <Shape>Rectangle</Shape>
-      <X>158.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D9</Id>
-      <Shape>Rectangle</Shape>
-      <X>177.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D0</Id>
-      <Shape>Rectangle</Shape>
-      <X>196.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>MinusAndUnderscore</Id>
-      <Shape>Rectangle</Shape>
-      <X>215.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>EqualsAndPlus</Id>
-      <Shape>Rectangle</Shape>
-      <X>234.5</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Q</Id>
-      <Shape>Rectangle</Shape>
-      <X>35</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>W</Id>
-      <Shape>Rectangle</Shape>
-      <X>54</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>E</Id>
-      <Shape>Rectangle</Shape>
-      <X>73</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>R</Id>
-      <Shape>Rectangle</Shape>
-      <X>92</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>T</Id>
-      <Shape>Rectangle</Shape>
-      <X>111</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Y</Id>
-      <Shape>Rectangle</Shape>
-      <X>130</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>U</Id>
-      <Shape>Rectangle</Shape>
-      <X>149</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>I</Id>
-      <Shape>Rectangle</Shape>
-      <X>168</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>O</Id>
-      <Shape>Rectangle</Shape>
-      <X>186.75</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>P</Id>
-      <Shape>Rectangle</Shape>
-      <X>205.75</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>BracketLeft</Id>
-      <Shape>Rectangle</Shape>
-      <X>224.75</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>BracketRight</Id>
-      <Shape>Rectangle</Shape>
-      <X>243.75</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>A</Id>
-      <Shape>Rectangle</Shape>
-      <X>39.75</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>S</Id>
-      <Shape>Rectangle</Shape>
-      <X>58.75</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>D</Id>
-      <Shape>Rectangle</Shape>
-      <X>77.75</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F</Id>
-      <Shape>Rectangle</Shape>
-      <X>96.5</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>G</Id>
-      <Shape>Rectangle</Shape>
-      <X>115.5</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>H</Id>
-      <Shape>Rectangle</Shape>
-      <X>134.5</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>J</Id>
-      <Shape>Rectangle</Shape>
-      <X>153.5</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>K</Id>
-      <Shape>Rectangle</Shape>
-      <X>172.5</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>L</Id>
-      <Shape>Rectangle</Shape>
-      <X>191.5</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>SemicolonAndColon</Id>
-      <Shape>Rectangle</Shape>
-      <X>210.5</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>ApostropheAndDoubleQuote</Id>
-      <Shape>Rectangle</Shape>
-      <X>229.5</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>NonUsTilde</Id>
-      <Shape>Rectangle</Shape>
-      <X>248.25</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>NonUsBackslash</Id>
-      <Shape>Rectangle</Shape>
-      <X>30.5</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Z</Id>
-      <Shape>Rectangle</Shape>
-      <X>49.5</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>X</Id>
-      <Shape>Rectangle</Shape>
-      <X>68.5</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>C</Id>
-      <Shape>Rectangle</Shape>
-      <X>87.5</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>V</Id>
-      <Shape>Rectangle</Shape>
-      <X>106.25</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>B</Id>
-      <Shape>Rectangle</Shape>
-      <X>125.25</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>N</Id>
-      <Shape>Rectangle</Shape>
-      <X>144.25</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>M</Id>
-      <Shape>Rectangle</Shape>
-      <X>163</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>CommaAndLessThan</Id>
-      <Shape>Rectangle</Shape>
-      <X>182</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>PeriodAndBiggerThan</Id>
-      <Shape>Rectangle</Shape>
-      <X>201</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>SlashAndQuestionMark</Id>
-      <Shape>Rectangle</Shape>
-      <X>220</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Backspace</Id>
-      <Shape>Rectangle</Shape>
-      <X>253</X>
-      <Y>50.5</Y>
-      <Width>33</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Tab</Id>
-      <Shape>Rectangle</Shape>
-      <X>6.75</X>
-      <Y>69.5</Y>
-      <Width>23</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Enter</Id>
-      <Shape>Rectangle</Shape>
-      <X>266</X>
-      <Y>69.5</Y>
-      <Width>20</Width>
-      <Height>32.75</Height>
-    </Led>
-    <Led>
-      <Id>CapsLock</Id>
-      <Shape>Rectangle</Shape>
-      <X>6.75</X>
-      <Y>88.25</Y>
-      <Width>28</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>LeftShift</Id>
-      <Shape>Rectangle</Shape>
-      <X>6.75</X>
-      <Y>107</Y>
-      <Width>20</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>RightShift</Id>
-      <Shape>Rectangle</Shape>
-      <X>239</X>
-      <Y>107</Y>
-      <Width>47</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>LeftCtrl</Id>
-      <Shape>Rectangle</Shape>
-      <X>6.75</X>
-      <Y>126</Y>
-      <Width>23</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>LeftGui</Id>
-      <Shape>Rectangle</Shape>
-      <X>35</X>
-      <Y>126</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>LeftAlt</Id>
-      <Shape>Rectangle</Shape>
-      <X>54.5</X>
-      <Y>126</Y>
-      <Width>18</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Space</Id>
-      <Shape>Rectangle</Shape>
-      <X>78</X>
-      <Y>126</Y>
-      <Width>118</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>RightAlt</Id>
-      <Shape>Rectangle</Shape>
-      <X>201</X>
-      <Y>126</Y>
-      <Width>18</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>RightGui</Id>
-      <Shape>Rectangle</Shape>
-      <X>224.5</X>
-      <Y>126</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Application</Id>
-      <Shape>Rectangle</Shape>
-      <X>243.5</X>
-      <Y>126</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>RightCtrl</Id>
-      <Shape>Rectangle</Shape>
-      <X>262.5</X>
-      <Y>126</Y>
-      <Width>23</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Escape</Id>
-      <Shape>Rectangle</Shape>
-      <X>6.75</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F1</Id>
-      <Shape>Rectangle</Shape>
-      <X>38.25</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F2</Id>
-      <Shape>Rectangle</Shape>
-      <X>57</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F3</Id>
-      <Shape>Rectangle</Shape>
-      <X>76</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F4</Id>
-      <Shape>Rectangle</Shape>
-      <X>95</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F5</Id>
-      <Shape>Rectangle</Shape>
-      <X>126.5</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F6</Id>
-      <Shape>Rectangle</Shape>
-      <X>145.5</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F7</Id>
-      <Shape>Rectangle</Shape>
-      <X>164.5</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F8</Id>
-      <Shape>Rectangle</Shape>
-      <X>183.5</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F9</Id>
-      <Shape>Rectangle</Shape>
-      <X>215</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F10</Id>
-      <Shape>Rectangle</Shape>
-      <X>234</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F11</Id>
-      <Shape>Rectangle</Shape>
-      <X>253</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>F12</Id>
-      <Shape>Rectangle</Shape>
-      <X>272</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>PrintScreen</Id>
-      <Shape>Rectangle</Shape>
-      <X>296</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>ScrollLock</Id>
-      <Shape>Rectangle</Shape>
-      <X>315</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>PauseBreak</Id>
-      <Shape>Rectangle</Shape>
-      <X>334</X>
-      <Y>29.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Insert</Id>
-      <Shape>Rectangle</Shape>
-      <X>296</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Home</Id>
-      <Shape>Rectangle</Shape>
-      <X>315</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>PageUp</Id>
-      <Shape>Rectangle</Shape>
-      <X>334</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Delete</Id>
-      <Shape>Rectangle</Shape>
-      <X>296</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>End</Id>
-      <Shape>Rectangle</Shape>
-      <X>315</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>PageDown</Id>
-      <Shape>Rectangle</Shape>
-      <X>334</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>UpArrow</Id>
-      <Shape>Rectangle</Shape>
-      <X>315</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>LeftArrow</Id>
-      <Shape>Rectangle</Shape>
-      <X>296</X>
-      <Y>126</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>DownArrow</Id>
-      <Shape>Rectangle</Shape>
-      <X>315</X>
-      <Y>126</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>RightArrow</Id>
-      <Shape>Rectangle</Shape>
-      <X>334</X>
-      <Y>126</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>NumLock</Id>
-      <Shape>Rectangle</Shape>
-      <X>358</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>KeypadSlash</Id>
-      <Shape>Rectangle</Shape>
-      <X>377</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>KeypadAsterisk</Id>
-      <Shape>Rectangle</Shape>
-      <X>396</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>KeypadMinus</Id>
-      <Shape>Rectangle</Shape>
-      <X>415</X>
-      <Y>50.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Keypad7</Id>
-      <Shape>Rectangle</Shape>
-      <X>358</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Keypad8</Id>
-      <Shape>Rectangle</Shape>
-      <X>377</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Keypad9</Id>
-      <Shape>Rectangle</Shape>
-      <X>396</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>KeypadPlus</Id>
-      <Shape>Rectangle</Shape>
-      <X>415</X>
-      <Y>69.5</Y>
-      <Width>14</Width>
-      <Height>33</Height>
-    </Led>
-    <Led>
-      <Id>Keypad4</Id>
-      <Shape>Rectangle</Shape>
-      <X>358</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Keypad5</Id>
-      <Shape>Rectangle</Shape>
-      <X>377</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Keypad6</Id>
-      <Shape>Rectangle</Shape>
-      <X>396</X>
-      <Y>88.25</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Keypad1</Id>
-      <Shape>Rectangle</Shape>
-      <X>358</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Keypad2</Id>
-      <Shape>Rectangle</Shape>
-      <X>377</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Keypad3</Id>
-      <Shape>Rectangle</Shape>
-      <X>396</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>KeypadEnter</Id>
-      <Shape>Rectangle</Shape>
-      <X>415</X>
-      <Y>107</Y>
-      <Width>14</Width>
-      <Height>33</Height>
-    </Led>
-    <Led>
-      <Id>Keypad0</Id>
-      <Shape>Rectangle</Shape>
-      <X>358</X>
-      <Y>126</Y>
-      <Width>33</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>KeypadPeriodAndDelete</Id>
-      <Shape>Rectangle</Shape>
-      <X>396</X>
-      <Y>126</Y>
-      <Width>14</Width>
-      <Height>14</Height>
-    </Led>
-    <Led>
-      <Id>Mute</Id>
-      <Shape>Rectangle</Shape>
-      <X>375.5</X>
-      <Y>6.5</Y>
-      <Width>17.5</Width>
-      <Height>11.5</Height>
-    </Led>
-    <Led>
-      <Id>Stop</Id>
-      <Shape>Rectangle</Shape>
-      <X>357</X>
-      <Y>29</Y>
-      <Width>17.5</Width>
-      <Height>11.5</Height>
-    </Led>
-    <Led>
-      <Id>ScanPreviousTrack</Id>
-      <Shape>Rectangle</Shape>
-      <X>375.5</X>
-      <Y>29</Y>
-      <Width>17.5</Width>
-      <Height>11.5</Height>
-    </Led>
-    <Led>
-      <Id>PlayPause</Id>
-      <Shape>Rectangle</Shape>
-      <X>394</X>
-      <Y>29</Y>
-      <Width>17.5</Width>
-      <Height>11.5</Height>
-    </Led>
-    <Led>
-      <Id>ScanNextTrack</Id>
-      <Shape>Rectangle</Shape>
-      <X>412.5</X>
-      <Y>29</Y>
-      <Width>17.5</Width>
-      <Height>11.5</Height>
-    </Led>
-    <Led>
-      <Id>Brightness</Id>
+    <!-- Extra-Keys: Brightness -> Mute -->
+    <Led Id="Brightness">
       <Shape>Circle</Shape>
-      <X>298.5</X>
-      <Y>7.5</Y>
-      <Width>9.5</Width>
-      <Height>9.5</Height>
+      <X>298</X>
+      <Y>7</Y>
+      <Width>10mm</Width>
+      <Height>10mm</Height>
     </Led>
-    <Led>
-      <Id>WinLock</Id>
+    <Led Id="WinLock">
       <Shape>Circle</Shape>
-      <X>317.5</X>
-      <Y>7.5</Y>
-      <Width>9.5</Width>
-      <Height>9.5</Height>
+      <X>+9</X>
+      <Width>10mm</Width>
+      <Height>10mm</Height>
     </Led>
+
+    <Led Id="Mute">
+      <X>375</X>
+      <Y>6</Y>
+      <Height>13mm</Height>
+    </Led>
+
+    <!-- Esc -> NextTrack -->
+    <Led Id="Escape">
+      <X>4</X>
+      <Y>28</Y>
+    </Led>
+
+    <Led Id="F1">
+      <X>+12.667</X>
+    </Led>
+    <Led Id="F2" />
+    <Led Id="F3" />
+    <Led Id="F4" />
+
+    <Led Id="F5">
+      <X>+12.667</X>
+    </Led>
+    <Led Id="F6" />
+    <Led Id="F7" />
+    <Led Id="F8" />
+
+    <Led Id="F9">
+      <X>+12.667</X>
+    </Led>
+    <Led Id="F10" />
+    <Led Id="F11" />
+    <Led Id="F12" />
+
+    <Led Id="PrintScreen">
+      <X>+5</X>
+    </Led>
+    <Led Id="ScrollLock" />
+    <Led Id="PauseBreak" />
+
+    <Led Id="Stop">
+      <X>+5</X>
+      <Height>14mm</Height>
+    </Led>
+    <Led Id="ScanPreviousTrack">
+      <Height>14mm</Height>
+    </Led>
+    <Led Id="PlayPause">
+      <Height>14mm</Height>
+    </Led>
+    <Led Id="ScanNextTrack">
+      <Height>14mm</Height>
+    </Led>
+
+    <!-- ^ -> Num- -->
+    <Led Id="GraveAccentAndTilde">
+      <X>4</X>
+      <Y>49</Y>
+    </Led>
+    <Led Id="D1" />
+    <Led Id="D2" />
+    <Led Id="D3" />
+    <Led Id="D4" />
+    <Led Id="D5" />
+    <Led Id="D6" />
+    <Led Id="D7" />
+    <Led Id="D8" />
+    <Led Id="D9" />
+    <Led Id="D0" />
+    <Led Id="MinusAndUnderscore" />
+    <Led Id="EqualsAndPlus" />
+    <Led Id="Backspace">
+      <Width>2</Width>
+    </Led>
+
+    <Led Id="Insert">
+      <X>+5</X>
+    </Led>
+    <Led Id="Home" />
+    <Led Id="PageUp" />
+
+    <Led Id="NumLock">
+      <X>+5</X>
+    </Led>
+    <Led Id="KeypadSlash" />
+    <Led Id="KeypadAsterisk" />
+    <Led Id="KeypadMinus" />
+
+    <!-- Tab -> Num+ -->
+    <Led Id="Tab">
+      <X>4</X>
+      <Y>+</Y>
+      <Width>1.5</Width>
+    </Led>
+    <Led Id="Q" />
+    <Led Id="W" />
+    <Led Id="E" />
+    <Led Id="R" />
+    <Led Id="T" />
+    <Led Id="Y" />
+    <Led Id="U" />
+    <Led Id="I" />
+    <Led Id="O" />
+    <Led Id="P" />
+    <Led Id="BracketLeft" />
+    <Led Id="BracketRight" />
+    <Led Id="Enter">
+      <Width>1.5</Width>
+      <Height>2</Height>
+    </Led>
+
+    <Led Id="Delete">
+      <X>+5</X>
+    </Led>
+    <Led Id="End" />
+    <Led Id="PageDown" />
+
+    <Led Id="Keypad7">
+      <X>+5</X>
+    </Led>
+    <Led Id="Keypad8" />
+    <Led Id="Keypad9" />
+    <Led Id="KeypadPlus">
+      <Height>2</Height>
+    </Led>
+
+    <!-- CapsLock -> Num6 -->
+    <Led Id="CapsLock">
+      <X>4</X>
+      <Y>~</Y>
+      <Width>1.75</Width>
+    </Led>
+    <Led Id="A" />
+    <Led Id="S" />
+    <Led Id="D" />
+    <Led Id="F" />
+    <Led Id="G" />
+    <Led Id="H" />
+    <Led Id="J" />
+    <Led Id="K" />
+    <Led Id="L" />
+    <Led Id="SemicolonAndColon" />
+    <Led Id="ApostropheAndDoubleQuote" />
+    <Led Id="NonUsTilde" />
+
+    <Led Id="Keypad4">
+      <X>+90.75</X>
+    </Led>
+    <Led Id="Keypad5" />
+    <Led Id="Keypad6" />
+
+    <!-- LShift -> NumEnter -->
+    <Led Id="LeftShift">
+      <X>4</X>
+      <Y>+</Y>
+      <Width>1.25</Width>
+    </Led>
+    <Led Id="NonUsBackslash" />
+    <Led Id="Z" />
+    <Led Id="X" />
+    <Led Id="C" />
+    <Led Id="V" />
+    <Led Id="B" />
+    <Led Id="N" />
+    <Led Id="M" />
+    <Led Id="CommaAndLessThan" />
+    <Led Id="PeriodAndBiggerThan" />
+    <Led Id="SlashAndQuestionMark" />
+    <Led Id="RightShift">
+      <Width>2.75</Width>
+    </Led>
+
+    <Led Id="UpArrow">
+      <X>+24</X>
+    </Led>
+
+    <Led Id="Keypad1">
+      <X>+24</X>
+    </Led>
+    <Led Id="Keypad2" />
+    <Led Id="Keypad3" />
+    <Led Id="KeypadEnter">
+      <Height>2</Height>
+    </Led>
+
+    <!-- LCtrl -> NumPeriod -->
+    <Led Id="LeftCtrl">
+      <X>4</X>
+      <Y>~</Y>
+      <Width>1.5</Width>
+    </Led>
+    <Led Id="LeftGui" />
+    <Led Id="LeftAlt">
+      <Width>1.25</Width>
+    </Led>
+    <Led Id="Space">
+      <Width>6.5</Width>
+    </Led>
+    <Led Id="RightAlt">
+      <Width>1.25</Width>
+    </Led>
+    <Led Id="RightGui" />
+    <Led Id="Application" />
+    <Led Id="RightCtrl">
+      <Width>1.5</Width>
+    </Led>
+
+    <Led Id="LeftArrow">
+      <X>+5</X>
+    </Led>
+    <Led Id="DownArrow" />
+    <Led Id="RightArrow" />
+
+    <Led Id="Keypad0">
+      <X>+5</X>
+      <Width>2</Width>
+    </Led>
+    <Led Id="KeypadPeriodAndDelete" />
   </Leds>
 </Device>
\ No newline at end of file