diff --git a/68keys/pwarren/keymap.c b/68keys/pwarren/keymap.c
index fd79dc5..09cd22e 100644
--- a/68keys/pwarren/keymap.c
+++ b/68keys/pwarren/keymap.c
@@ -10,9 +10,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		       ),
  [1] = LAYOUT_68_ansi(
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC,          KC_VOLU, KC_HOME,
-    _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,   RESET,          KC_VOLD, KC_END,
+    _______, _______, KC_HOME,   KC_UP,  KC_END, _______, _______, _______, _______, _______, _______, _______, BL_STEP,   RESET,          KC_VOLD, KC_END,
     _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______,                   _______,          KC_MUTE,
+    _______,  BL_DEC,  BL_INC, BL_TOGG,   BL_ON,  BL_OFF, _______, _______, _______, _______, _______,                   _______,          KC_MUTE,
     _______, _______, _______,                            _______,                            _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
 			    ),
 };
diff --git a/68keys/pwarren/rules.mk b/68keys/pwarren/rules.mk
index 95245b3..43addd3 100644
--- a/68keys/pwarren/rules.mk
+++ b/68keys/pwarren/rules.mk
@@ -1,5 +1,5 @@
-BOOTLOADER = atmel-dfu
+BOOTLOADER = avrdude
 
 EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
+CONSOLE_ENABLE = yes
 BACKLIGHT_ENABLE = yes