diff --git a/Readme.md b/Readme.md
index cb0fbc2..0a27b5a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -7,6 +7,21 @@ This project went through a lot of phases and has now reached a new Arduino ~~US
 with a lot of new functions like extended HID. It also supports HoodLoader1+2.
 The idea is to enable enhanced USB functions to almost all 'standard' Arduino boards.
 
+**Supported Arduinos (IDE 1.6.6 or higher!):**
+* Uno (with HoodLoader2)
+* Mega (with HoodLoader2)
+* Leonardo
+* (Pro)Micro
+* Any other 8u2/16u/at90usb162/32u2/32u4 compatible board
+
+**Supported HID devices:**
+* Keyboard ~~with Leds out (modifiers + 6 keys pressed at the same time)~~
+* Mouse (5 buttons, move, wheel)
+* Absolute Mouse
+* Consumer/Media Keys (4 keys for music player, web browser and more)
+* System Key (for PC standby/shutdown)
+* Gamepad (32 buttons, 4 16bit axis, 2 8bit axis, 2 D-Pads)
+
 See the [wiki](https://github.com/NicoHood/HID/wiki/Features) for more information about features etc.
 
 
@@ -66,7 +81,7 @@ Version History
 * Changed USB-Core into a simple library, only possible with Pluggable HID
 * Removed HID presets (like mouse + keyboard + consumer + system)
 
-2.3 Release (xx.xx.2015) (never released)
+2.3 Release (never released)
 * Updated Libraries
 * Updated Arduino Core
 * Added Minor Consumer definitions
diff --git a/src/Consumer.h b/src/Consumer.h
index 1039137..f5f9fd8 100644
--- a/src/Consumer.h
+++ b/src/Consumer.h
@@ -55,6 +55,8 @@ THE SOFTWARE.
 
 #define CONSUMER_SCREENSAVER 0x19e
 
+#define CONSUMER_PROGRAMMABLE_BUTTON_CONFIGURATION 0x182
+#define CONSUMER_CONTROL_CONFIGURATION 0x183
 #define CONSUMER_EMAIL_READER	0x18A
 #define CONSUMER_CALCULATOR	0x192
 #define CONSUMER_EXPLORER	0x194
diff --git a/src/HID-Project.h b/src/HID-Project.h
index e2c20bc..0260c32 100644
--- a/src/HID-Project.h
+++ b/src/HID-Project.h
@@ -41,7 +41,7 @@ THE SOFTWARE.
 //#define LAYOUT_FRENCH
 //#define LAYOUT_FRENCH_BELGIAN
 //#define LAYOUT_FRENCH_SWISS
-//#define LAYOUT_GERMAN
+#define LAYOUT_GERMAN
 //#define LAYOUT_GERMAN_MAC
 //#define LAYOUT_GERMAN_SWISS
 //#define LAYOUT_ICELANDIC
@@ -102,13 +102,13 @@ THE SOFTWARE.
 #define HID_REPORTID_TEENSY_KEYBOARD 9
 #endif
 
+#include "HID.h"
+
 extern HID_ HID;
 
 #include "HID-Tables.h"
 
 // Include all HID libraries (.a linkage required to work) properly
-#include "ImprovedKeylayouts.h"
-#include "ImprovedKeyboard.h"
 #include "AbsoluteMouse.h"
 #include "Consumer.h"
 #include "Gamepad.h"
@@ -117,4 +117,7 @@ extern HID_ HID;
 // Include Teensy HID afterwards to overwrite key definitions if used
 #ifdef USE_TEENSY_KEYBOARD
 #include "TeensyKeyboard.h"
+#else
+#include "ImprovedKeylayouts.h"
+#include "ImprovedKeyboard.h"
 #endif
diff --git a/src/ImprovedKeylayouts.h b/src/ImprovedKeylayouts.h
index b76ebe1..5a5a5f4 100644
--- a/src/ImprovedKeylayouts.h
+++ b/src/ImprovedKeylayouts.h
@@ -21,6 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+// Include guard
 #pragma once
 
 //================================================================================
@@ -87,8 +88,6 @@ THE SOFTWARE.
 // LAYOUT_US_ENGLISH
 //================================================================================
 
-#ifdef LAYOUT_US_ENGLISH
-
 #define RAW_KEYBOARD_LEFT_CTRL   (1 << 0)
 #define RAW_KEYBOARD_LEFT_SHIFT  (1 << 1)
 #define RAW_KEYBOARD_LEFT_ALT    (1 << 2)
@@ -323,9 +322,3 @@ static const uint8_t _asciimap[128] PROGMEM =
 	0x35|SHIFT,    // ~
 	0				// DEL
 };
-
-#else
-
-//TODO other layouts
-
-#endif