diff --git a/keyboard/valkey/Makefile.lufa b/keyboard/valkey/Makefile.lufa
index 4f03465..64e82b9 100644
--- a/keyboard/valkey/Makefile.lufa
+++ b/keyboard/valkey/Makefile.lufa
@@ -51,8 +51,7 @@ TARGET_DIR = .
 # List C source files here. (C dependencies are automatically generated.)
 SRC +=  keymap.c \
     matrix.c \
-    led.c \
-    backlight.c
+    led.c
 
 CONFIG_H = config.h
 
@@ -103,11 +102,10 @@ F_USB = $(F_CPU)
 BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
-CONSOLE_ENABLE = no     # Console for debug(+400) (Issue 93 in UEFI)
+#CONSOLE_ENABLE = yes    # Console for debug(+400) (See issue 93 in UEFI)
 COMMAND_ENABLE = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes       # USB Nkey Rollover - not yet supported in LUFA
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+#SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend (Disabled because it blocks the wakeup)
+#NKRO_ENABLE = yes       # USB Nkey Rollover - not yet supported in LUFA
 
 
 #    Teensy   halfKay    512
diff --git a/keyboard/valkey/backlight.c b/keyboard/valkey/backlight.c
deleted file mode 100644
index e75b52f..0000000
--- a/keyboard/valkey/backlight.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2014 Ralf Schmitt <ralf@bunkertor.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <avr/io.h>
-#include "backlight.h"
-
-/* Backlight pin configuration
- * 
- * HOME_ROW : PD1
- * FUNCTIONS: PD0
- */
-void backlight_init_ports() {
-    DDRD |= (1<<0) | (1<<1);
-    //PORTD |= (1<<0) | (1<<1);
-    DDRD |= (1<<6);
-    PORTD |= (1<<6);
-}
-
-void backlight_set(uint8_t level) {
-    (level & BACKLIGHT_FNCT) ? backlight_enable_fn() : backlight_disable_fn();
-    (level & BACKLIGHT_HOME) ? backlight_enable_home() : backlight_disable_home();
-}
-
-void backlight_enable_fn() {
-    DDRD |= (1<<0) | (1<<1);
-    PORTD |= (1<<0);
-}
-
-void backlight_disable_fn() {
-    DDRD |= (1<<0) | (1<<1);
-    PORTD &= ~(1<<0);
-}
-
-void backlight_invert_fn() {
-    DDRD |= (1<<0) | (1<<1);
-    PORTD ^= (1<<0);
-}
-
-void backlight_enable_home() {
-    DDRD |= (1<<0) | (1<<1);
-    PORTD |= (1<<1);
-}
-
-void backlight_disable_home() {
-    DDRD |= (1<<0) | (1<<1);
-    PORTD &= ~(1<<1);
-}
-
-void backlight_invert_home() {
-    DDRD |= (1<<0) | (1<<1);
-    PORTD ^= (1<<1);
-}
diff --git a/keyboard/valkey/backlight.h b/keyboard/valkey/backlight.h
deleted file mode 100644
index cf77381..0000000
--- a/keyboard/valkey/backlight.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-enum backlight_level {
-    BACKLIGHT_FNCT    = 0b0000001,
-    BACKLIGHT_HOME    = 0b0000010,
-};
-
-void backlight_init_ports(void);
-
-void backlight_invert_fn(void);
-void backlight_enable_fn(void);
-void backlight_disable_fn(void);
-
-void backlight_invert_home(void);
-void backlight_enable_home(void);
-void backlight_disable_home(void);
diff --git a/keyboard/valkey/config.h b/keyboard/valkey/config.h
index 90b0613..3a447e2 100644
--- a/keyboard/valkey/config.h
+++ b/keyboard/valkey/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6057
+#define PRODUCT_ID      0x6058
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    t.m.k.
 #define PRODUCT         Valdor-Key
@@ -33,18 +33,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if need no debouncing */
 #define DEBOUNCE    7
 
 /* Set LED brightness 0-255.
  * This have no effect if sleep LED is enabled. */
-#define LED_BRIGHTNESS  250
-
-#define BACKLIGHT_LEVELS 4
-
+#define LED_BRIGHTNESS  50
 /* key combination for command */
 #define IS_COMMAND() ( \
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
diff --git a/keyboard/valkey/keymap.c b/keyboard/valkey/keymap.c
index 4331f10..e439a0f 100644
--- a/keyboard/valkey/keymap.c
+++ b/keyboard/valkey/keymap.c
@@ -32,18 +32,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Convert physical keyboard layout to matrix array.
 // This is a macro to define keymap easily in keyboard layout form.
 #define KEYMAP( \
-         K5B, K5C, K5D, K5E, K5F,      K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O,   K5P, K5Q, K5R, \
+         K5B,      K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O,   K5P, K5Q, K5R, \
     K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O,   K4P, K4Q, K4R, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,        K3P, K3Q, K3R, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O,   K2P, K2Q, K2R, \
+    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O,   K3P, K3Q, K3R, \
+    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N,                       \
     K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M,      K1O,        K1Q,      \
     K0A, K0B, K0C, K0D,                K0H,                K0L, K0M, K0N, K0O,   K0P, K0Q, K0R  \
 ) { \
 /*             0         1         2         3         4         5         6         7         8         9         10        11        12        13        14        15        16        17  */  \
-/* 5 */   { KC_NO,    KC_##K5B, KC_##K5C, KC_##K5D, KC_##K5E, KC_##K5F, KC_NO,    KC_##K5H, KC_##K5I, KC_##K5J, KC_##K5K, KC_##K5L, KC_##K5M, KC_##K5N, KC_##K5O, KC_##K5P, KC_##K5Q, KC_##K5R}, \
+/* 5 */   { KC_NO,    KC_##K5B, KC_NO,    KC_##K5D, KC_##K5E, KC_##K5F, KC_##K5G, KC_##K5H, KC_##K5I, KC_##K5J, KC_##K5K, KC_##K5L, KC_##K5M, KC_##K5N, KC_##K5O, KC_##K5P, KC_##K5Q, KC_##K5R}, \
 /* 4 */   { KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_##K4F, KC_##K4G, KC_##K4H, KC_##K4I, KC_##K4J, KC_##K4K, KC_##K4L, KC_##K4M, KC_##K4N, KC_##K4O, KC_##K4P, KC_##K4Q, KC_##K4R}, \
-/* 3 */   { KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F, KC_##K3G, KC_##K3H, KC_##K3I, KC_##K3J, KC_##K3K, KC_##K3L, KC_##K3M, KC_##K3N, KC_NO,    KC_##K3P, KC_##K3Q, KC_##K3R}, \
-/* 2 */   { KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F, KC_##K2G, KC_##K2H, KC_##K2I, KC_##K2J, KC_##K2K, KC_##K2L, KC_##K2M, KC_##K2N, KC_##K2O, KC_##K2P, KC_##K2Q, KC_##K2R}, \
+/* 3 */   { KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F, KC_##K3G, KC_##K3H, KC_##K3I, KC_##K3J, KC_##K3K, KC_##K3L, KC_##K3M, KC_##K3N, KC_##K3O, KC_##K3P, KC_##K3Q, KC_##K3R}, \
+/* 2 */   { KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F, KC_##K2G, KC_##K2H, KC_##K2I, KC_##K2J, KC_##K2K, KC_##K2L, KC_##K2M, KC_##K2N, KC_NO,    KC_NO,    KC_NO,    KC_NO   }, \
 /* 1 */   { KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F, KC_##K1G, KC_##K1H, KC_##K1I, KC_##K1J, KC_##K1K, KC_##K1L, KC_##K1M, KC_NO,    KC_##K1O, KC_NO,    KC_##K1Q, KC_NO   }, \
 /* 0 */   { KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_NO,    KC_NO,    KC_NO,    KC_##K0H, KC_NO,    KC_NO,    KC_NO,    KC_##K0L, KC_##K0M, KC_##K0N, KC_##K0O, KC_##K0P, KC_##K0Q, KC_##K0R} \
 }
diff --git a/keyboard/valkey/keymap_iso.h b/keyboard/valkey/keymap_iso.h
index ec33473..a5938b6 100644
--- a/keyboard/valkey/keymap_iso.h
+++ b/keyboard/valkey/keymap_iso.h
@@ -1,4 +1,3 @@
-#include "backlight.h"
 #include "action_layer.h"
 
 #define FUNCTION_ENABLE_LAYER1 1
@@ -9,26 +8,26 @@
 static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: qwerty */
     KEYMAP(\
-             ESC, F1,  F2,  F3,  F4,       F5,  F6,  F7,  F8,  F9,  F10, F11, F12,       PSCR,SLCK,BRK,  \
+             ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,       PSCR,SLCK,BRK,  \
         FN4, GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,      INS, HOME,PGUP, \
-        FN3, TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,           DEL, END, PGDN, \
-        FN2, CLCK,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NUHS, ENT,      FN5, FN6, FN7,  \
+        FN3, TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC, ENT,      DEL, END, PGDN, \
+        FN2, CLCK,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NUHS,                           \
         FN1, LSFT,NUBS,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     RSFT,           UP,        \
         FN0, LCTL,LGUI,LALT,               SPC,                RALT,RGUI,APP, RCTL,      LEFT,DOWN,RGHT  ),
     /* 1: media keys */
     KEYMAP(\
              TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,      TRNS,TRNS,SLEP, \
         FN14,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,TRNS,      TRNS,TRNS,TRNS, \
-        FN13,TRNS,TRNS,UP  ,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,           TRNS,TRNS,TRNS, \
-        FN12,TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, ENT,      TRNS,TRNS,TRNS, \
+        FN13,TRNS,TRNS,UP  ,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT, ENT,      TRNS,TRNS,TRNS, \
+        FN12,TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,                           \
         NO,  TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,           TRNS,      \
         FN10,TRNS,TRNS,TRNS,               TRNS,               TRNS,TRNS,TRNS,TRNS,      TRNS,TRNS,TRNS),
     /* 2: mouse keys */
     KEYMAP(\
              TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,      TRNS,TRNS,SLEP, \
         FN24,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,TRNS,      TRNS,TRNS,TRNS, \
-        FN23,TRNS,BTN1,MS_U,BTN2,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,           TRNS,TRNS,TRNS, \
-        FN22,TRNS,MS_L,MS_D,MS_R,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, ENT,      TRNS,TRNS,TRNS, \
+        FN23,TRNS,BTN1,MS_U,BTN2,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT, ENT,      TRNS,TRNS,TRNS, \
+        FN22,TRNS,MS_L,MS_D,MS_R,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,                           \
         NO,  TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,           TRNS,      \
         FN20,TRNS,TRNS,TRNS,               TRNS,               TRNS,TRNS,TRNS,TRNS,      TRNS,TRNS,TRNS)
 };
@@ -44,24 +43,16 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
     switch(id) {
         case FUNCTION_ENABLE_LAYER1:
             layer_on(1);
-            backlight_enable_home();
-            backlight_enable_fn();
             break;
         case FUNCTION_DISABLE_LAYER1:
             layer_off(1);
-            backlight_disable_home();
-            backlight_disable_fn();
             break;
             
         case FUNCTION_ENABLE_LAYER2:
             layer_on(2);
-            backlight_enable_home();
-            backlight_enable_fn();
             break;
         case FUNCTION_DISABLE_LAYER2:
             layer_off(2);
-            backlight_disable_home();
-            backlight_disable_fn();
             break;
     }
 }
diff --git a/keyboard/valkey/matrix.c b/keyboard/valkey/matrix.c
index c5e7804..18d15b1 100644
--- a/keyboard/valkey/matrix.c
+++ b/keyboard/valkey/matrix.c
@@ -55,8 +55,8 @@ void setup_leds(void)
     OCR1B = LED_BRIGHTNESS;    // Output compare register 1B
     OCR1C = LED_BRIGHTNESS;    // Output compare register 1C
     // LEDs: LED_A -> PORTB6, LED_B -> PORTB7
-    DDRB  |= (1<<6);
-    PORTB  &= ~(1<<6);
+    DDRB  |= (1<<6) | (1<<7);
+    PORTB  &= ~((1<<6) | (1<<7));
 }
 #endif