diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index 380e69ee..36098f1e 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -4,8 +4,8 @@
 #include "led.h"
 
 #ifdef AUDIO_ENABLE
-	#include "audio.h"
-	#include "song_list.h"
+    #include "audio.h"
+    #include "song_list.h"
 #endif
 
 #define LAYER_QWERTY         0
@@ -56,6 +56,18 @@
 #define AUD_ON              M(MACRO_AUDIO_ON)
 
 
+#define SC_UNDO             LCTL(KC_Z)
+#define SC_REDO             LCTL(KC_Y)
+#define SC_CUT              LCTL(KC_X)
+#define SC_COPY             LCTL(KC_C)
+#define SC_PSTE             LCTL(KC_V)
+#define SC_SELA             LCTL(KC_A)
+#define SC_SAVE             LCTL(KC_S)
+#define SC_OPEN             LCTL(KC_O)
+#define SC_ACLS             LALT(KC_F4)
+#define SC_CCLS             LCTL(KC_F4)
+
+
 #define _______             KC_TRNS
 #define ___T___             KC_TRNS
 #define XXXXXXX             KC_NO
@@ -107,11 +119,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* DVORAK
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | [      | ]      | XXXXXX . BACKSP |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | '      | ,      | .      | P      | Y      | F      | G      | C      | R      | L      | [      | ]      | \      | DEL    |
+ * | TAB    | '      | ,      | .      | P      | Y      | F      | G      | C      | R      | L      | /      | =      | \      | DEL    |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | CAPS   | A      | O      | E      | U      | I      | D      | H      | T      | N      | S      | /      | XXXXXX . ENTER  | PG UP  |
+ * | CAPS   | A      | O      | E      | U      | I      | D      | H      | T      | N      | S      | -      | XXXXXX . ENTER  | PG UP  |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
  * | LSHIFT | ;      | Q      | J      | K      | X      | B      | M      | W      | V      | Z      | XXXXXX . RSHIFT | UP     | PG DN  |
  * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
@@ -120,9 +132,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
  [LAYER_DVORAK] = { /* DVORAK */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC  },
-  { KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
-  { KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP  },
+  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC, KC_BSPC  },
+  { KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS, KC_DEL   },
+  { KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, KC_ENT,  KC_ENT,  KC_PGUP  },
   { KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN  },
   { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC,  XXXXXXX, M_LOWER, KC_RALT, KC_HOME, KC_END,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
  },
@@ -130,18 +142,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  [LAYER_LOWER] = { /* LOWERED */
   { 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,  ___T___, ___T___  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS   },
+  { _______, _______, _______, _______, SC_CCLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS   },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, SC_REDO, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
+  { _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
 
  [LAYER_RAISE] = { /* RAISED */
   { KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS   },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, _______, _______, _______, SC_ACLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS   },
+  { _______, SC_SELA, SC_SAVE, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
+  { _______, SC_UNDO, SC_CUT,  SC_COPY, SC_PSTE, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
+  { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
 
  [LAYER_FUNCTION] = { /* FUNCTION */
@@ -157,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
 
  [LAYER_MUSIC] = {
@@ -165,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
 };
 
@@ -192,37 +204,37 @@ float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
 /*
 void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
 {
-	if (order)
-	{
-		if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
-		{
-			layer_on(layer3);
-		}
-		else
-		{
-		    layer_off(layer3);
-		    layer_off(layer4);
-		}
-	}
-	else
-	{
-		if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
-		{
-			layer_on(layer4);
-		}
-		else
-		{
-			layer_off(layer3);
-		    layer_off(layer4);
-		}
-	}
+    if (order)
+    {
+        if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
+        {
+            layer_on(layer3);
+        }
+        else
+        {
+            layer_off(layer3);
+            layer_off(layer4);
+        }
+    }
+    else
+    {
+        if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
+        {
+            layer_on(layer4);
+        }
+        else
+        {
+            layer_off(layer3);
+            layer_off(layer4);
+        }
+    }
 }
 */
 
 void persistant_default_layer_set(uint16_t default_layer)
 {
-	eeconfig_write_default_layer(default_layer);
-	default_layer_set(default_layer);
+    eeconfig_write_default_layer(default_layer);
+    default_layer_set(default_layer);
 }
 
 const uint16_t PROGMEM fn_actions[] = {
@@ -231,148 +243,148 @@ const uint16_t PROGMEM fn_actions[] = {
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
 
-	// MACRODOWN only works in this function
-	switch(id)
-	{
-
-		case MACRO_QWERTY:
-			if (record->event.pressed)
-			{
-				persistant_default_layer_set(1UL<<LAYER_QWERTY);
-				PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO);
-			}
-			break;
-
-		case MACRO_COLEMAK:
-			if (record->event.pressed)
-			{
-				persistant_default_layer_set(1UL<<LAYER_COLEMAK);
-				PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO);
-			}
-			break;
-
-		case MACRO_DVORAK:
-			if (record->event.pressed)
-			{
-				persistant_default_layer_set(1UL<<LAYER_DVORAK);
-				PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO);
-			}
-			break;
-
-
-		case MACRO_LOWER:
-			if (record->event.pressed)
-			{
-				layer_on(LAYER_LOWER);
-				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
-			}
-			else
-			{
-				layer_off(LAYER_LOWER);
-				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
-			}
-			break;
-
-		case MACRO_RAISE:
-			if (record->event.pressed)
-			{
-				layer_on(LAYER_RAISE);
-				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
-			}
-			else
-			{
-				layer_off(LAYER_RAISE);
-				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
-			}
-			break;
-
-		case MACRO_FUNCTION:
-			if (record->event.pressed)
-			{
-				layer_on(LAYER_FUNCTION);
-			}
-			else
-			{
-				layer_off(LAYER_FUNCTION);
-			}
-			break;
-
-		case MACRO_TIMBRE_1:
-			if (record->event.pressed) set_timbre(TIMBRE_12);
-			break;
-
-		case MACRO_TIMBRE_2:
-			if (record->event.pressed) set_timbre(TIMBRE_25);
-			break;
-
-		case MACRO_TIMBRE_3:
-			if (record->event.pressed) set_timbre(TIMBRE_50);
-			break;
-
-		case MACRO_TIMBRE_4:
-			if (record->event.pressed) set_timbre(TIMBRE_75);
-			break;
-
-		case MACRO_TEMPO_U:
-			if (record->event.pressed) increase_tempo(10);
-			break;
-
-		case MACRO_TEMPO_D:
-			if (record->event.pressed) decrease_tempo(10);
-			break;
-
-		case MACRO_TONE_DEFAULT:
-			if (record->event.pressed)
-			{
-				set_timbre(TIMBRE_DEFAULT);
-				set_tempo(TEMPO_DEFAULT);
-			}
-			break;
-
-		case MACRO_AUDIO_OFF:
-			if (record->event.pressed)
-			{
-				#ifdef AUDIO_ENABLE
-					audio_off();
-				#endif
-			}
-			break;
-
-		case MACRO_AUDIO_ON:
-			if (record->event.pressed)
-			{
-				#ifdef AUDIO_ENABLE
-					audio_on();
-				PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
-				#endif
-			}
-			break;
-
-		case MACRO_MUSIC_ON:
-			if (record->event.pressed)
-			{
-				#ifdef AUDIO_ENABLE
-					PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
-					layer_on(LAYER_MUSIC);
-				#endif
-			}
-			break;
-
-		case MACRO_MUSIC_OFF:
-			if (record->event.pressed)
-			{
-				#ifdef AUDIO_ENABLE
-					layer_off(LAYER_MUSIC);
-					stop_all_notes();
-				#endif
-			}
-			break;
-
-		default:
-			break;
-
-	}
-	return MACRO_NONE;
+    // MACRODOWN only works in this function
+    switch(id)
+    {
+
+        case MACRO_QWERTY:
+            if (record->event.pressed)
+            {
+                persistant_default_layer_set(1UL<<LAYER_QWERTY);
+                PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO);
+            }
+            break;
+
+        case MACRO_COLEMAK:
+            if (record->event.pressed)
+            {
+                persistant_default_layer_set(1UL<<LAYER_COLEMAK);
+                PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO);
+            }
+            break;
+
+        case MACRO_DVORAK:
+            if (record->event.pressed)
+            {
+                persistant_default_layer_set(1UL<<LAYER_DVORAK);
+                PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO);
+            }
+            break;
+
+
+        case MACRO_LOWER:
+            if (record->event.pressed)
+            {
+                layer_on(LAYER_LOWER);
+                update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+            }
+            else
+            {
+                layer_off(LAYER_LOWER);
+                update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+            }
+            break;
+
+        case MACRO_RAISE:
+            if (record->event.pressed)
+            {
+                layer_on(LAYER_RAISE);
+                update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+            }
+            else
+            {
+                layer_off(LAYER_RAISE);
+                update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+            }
+            break;
+
+        case MACRO_FUNCTION:
+            if (record->event.pressed)
+            {
+                layer_on(LAYER_FUNCTION);
+            }
+            else
+            {
+                layer_off(LAYER_FUNCTION);
+            }
+            break;
+
+        case MACRO_TIMBRE_1:
+            if (record->event.pressed) set_timbre(TIMBRE_12);
+            break;
+
+        case MACRO_TIMBRE_2:
+            if (record->event.pressed) set_timbre(TIMBRE_25);
+            break;
+
+        case MACRO_TIMBRE_3:
+            if (record->event.pressed) set_timbre(TIMBRE_50);
+            break;
+
+        case MACRO_TIMBRE_4:
+            if (record->event.pressed) set_timbre(TIMBRE_75);
+            break;
+
+        case MACRO_TEMPO_U:
+            if (record->event.pressed) increase_tempo(10);
+            break;
+
+        case MACRO_TEMPO_D:
+            if (record->event.pressed) decrease_tempo(10);
+            break;
+
+        case MACRO_TONE_DEFAULT:
+            if (record->event.pressed)
+            {
+                set_timbre(TIMBRE_DEFAULT);
+                set_tempo(TEMPO_DEFAULT);
+            }
+            break;
+
+        case MACRO_AUDIO_OFF:
+            if (record->event.pressed)
+            {
+                #ifdef AUDIO_ENABLE
+                    audio_off();
+                #endif
+            }
+            break;
+
+        case MACRO_AUDIO_ON:
+            if (record->event.pressed)
+            {
+                #ifdef AUDIO_ENABLE
+                    audio_on();
+                PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
+                #endif
+            }
+            break;
+
+        case MACRO_MUSIC_ON:
+            if (record->event.pressed)
+            {
+                #ifdef AUDIO_ENABLE
+                    PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
+                    layer_on(LAYER_MUSIC);
+                #endif
+            }
+            break;
+
+        case MACRO_MUSIC_OFF:
+            if (record->event.pressed)
+            {
+                #ifdef AUDIO_ENABLE
+                    layer_off(LAYER_MUSIC);
+                    stop_all_notes();
+                #endif
+            }
+            break;
+
+        default:
+            break;
+
+    }
+    return MACRO_NONE;
 };
 
 
@@ -384,74 +396,74 @@ int offset = 7;
 
 void process_action_user(keyrecord_t *record)
 {
-	if (IS_LAYER_ON(LAYER_MUSIC))
-	{
-		if (record->event.pressed)
-		{
-			play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
-		}
-		else
-		{
-			stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
-		}
-	}
+    if (IS_LAYER_ON(LAYER_MUSIC))
+    {
+        if (record->event.pressed)
+        {
+            play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
+        }
+        else
+        {
+            stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
+        }
+    }
 }
 
 
 void matrix_init_user(void)
 {
-	init_notes();
-	play_startup_tone();
-	println("Matrix Init");
+    init_notes();
+    play_startup_tone();
+    println("Matrix Init");
 }
 
 void led_set_user(uint8_t usb_led)
 {
-	static uint8_t old_usb_led = 0;
+    static uint8_t old_usb_led = 0;
 
-	if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
-	{
-			// If CAPS LK LED is turning on...
-			PLAY_NOTE_ARRAY(tone_caps_on,  false, LEGATO);
+    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+    {
+            // If CAPS LK LED is turning on...
+            PLAY_NOTE_ARRAY(tone_caps_on,  false, LEGATO);
     }
-	else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
     {
-			// If CAPS LK LED is turning off...
-			PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
+            // If CAPS LK LED is turning off...
+            PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
     }
-	else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
-	{
-			// If NUM LK LED is turning on...
-			PLAY_NOTE_ARRAY(tone_numlk_on,  false, LEGATO);
+    else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
+    {
+            // If NUM LK LED is turning on...
+            PLAY_NOTE_ARRAY(tone_numlk_on,  false, LEGATO);
     }
-	else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
+    else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
     {
-			// If NUM LED is turning off...
-			PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
+            // If NUM LED is turning off...
+            PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
     }
-	else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
-	{
-			// If SCROLL LK LED is turning on...
-			PLAY_NOTE_ARRAY(tone_scroll_on,  false, LEGATO);
+    else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+    {
+            // If SCROLL LK LED is turning on...
+            PLAY_NOTE_ARRAY(tone_scroll_on,  false, LEGATO);
     }
-	else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+    else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
     {
-			// If SCROLL LED is turning off...
-			PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
+            // If SCROLL LED is turning off...
+            PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
     }
-	old_usb_led = usb_led;
+    old_usb_led = usb_led;
 }
 
 
 void play_startup_tone()
 {
-	PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
+    PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
 }
 
 void play_goodbye_tone()
 {
-	PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
-	_delay_ms(2000);
+    PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
+    _delay_ms(2000);
 }
 
 #endif /* AUDIO_ENABLE */
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index c07c2801..e295dbe1 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -9,10 +9,16 @@
 #include "suspend.h"
 #include "timer.h"
 #include "led.h"
+
 #ifdef PROTOCOL_LUFA
-#include "lufa.h"
+	#include "lufa.h"
 #endif
 
+#ifdef AUDIO_ENABLE
+    #include "audio.h"
+#endif /* AUDIO_ENABLE */
+
+
 
 #define wdt_intr_enable(value)   \
 __asm__ __volatile__ (  \
@@ -72,6 +78,10 @@ static void power_down(uint8_t wdto)
 	// Turn off LED indicators
 	led_set(0);
 
+	#ifdef AUDIO_ENABLE
+		stop_all_notes();
+	#endif /* AUDIO_ENABLE */
+
     // TODO: more power saving
     // See PicoPower application note
     // - I/O port input with pullup