6 files changed, 4 insertions, 7 deletions

diff --git a/layouts/community/numpad_5x6/bjohnson/config.h b/layouts/community/numpad_5x6/bjohnson/config.h
index 668450d88..6f1c53970 100644
--- a/layouts/community/numpad_5x6/bjohnson/config.h
+++ b/layouts/community/numpad_5x6/bjohnson/config.h
@@ -1,7 +1,5 @@
 #pragma once
 
-// #define B6_AUDIO
-
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 13     // Number of LEDs
diff --git a/layouts/community/numpad_5x6/drashna/config.h b/layouts/community/numpad_5x6/drashna/config.h
index 97c1170d7..1f485e193 100644
--- a/layouts/community/numpad_5x6/drashna/config.h
+++ b/layouts/community/numpad_5x6/drashna/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-// #define B6_AUDIO
 
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
 #    define RGB_DI_PIN B1
diff --git a/layouts/community/ortho_4x12/bakingpy/config.h b/layouts/community/ortho_4x12/bakingpy/config.h
index a153adffb..f7d2c2425 100644
--- a/layouts/community/ortho_4x12/bakingpy/config.h
+++ b/layouts/community/ortho_4x12/bakingpy/config.h
@@ -16,5 +16,5 @@
 #define RGBLIGHT_VAL_STEP 8
 
 #ifdef AUDIO_ENABLE
-#define C6_AUDIO
+#define AUDIO_PIN C6
 #endif
diff --git a/layouts/community/ortho_5x12/drashna/config.h b/layouts/community/ortho_5x12/drashna/config.h
index 76bd642a3..619b460a7 100644
--- a/layouts/community/ortho_5x12/drashna/config.h
+++ b/layouts/community/ortho_5x12/drashna/config.h
@@ -33,6 +33,6 @@
 
 #    define RGBLIGHT_EFFECT_KNIGHT_OFFSET 3
 #    define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 14
-#    define B7_AUDIO
+#    define AUDIO_PIN B7
 #    define NO_MUSIC_MODE
 #endif
diff --git a/layouts/community/ortho_5x14/yet-another-developer/config.h b/layouts/community/ortho_5x14/yet-another-developer/config.h
index 7504338ff..3f8dbd3c5 100644
--- a/layouts/community/ortho_5x14/yet-another-developer/config.h
+++ b/layouts/community/ortho_5x14/yet-another-developer/config.h
@@ -17,6 +17,6 @@
 
 #    define RGBLIGHT_EFFECT_KNIGHT_OFFSET 3
 #    define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 14
-#    define B7_AUDIO
+#    define AUDIO_PIN B7
 #    define NO_MUSIC_MODE
 #endif
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index b9b1d073d..17d7b9ec7 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -74,7 +74,7 @@
 #endif
 
 #ifdef AUDIO_ENABLE
-#    define B6_AUDIO
+#    define AUDIO_PIN B6
 #    define NO_MUSIC_MODE
 #endif