merging

6 files changed, 78 insertions, 697 deletions

diff --git a/keyboards/planck/keymaps/cbbrowne/config.h b/keyboards/planck/keymaps/cbbrowne/config.h
index bd15fd5a2..3a4ee907f 100644
--- a/keyboards/planck/keymaps/cbbrowne/config.h
+++ b/keyboards/planck/keymaps/cbbrowne/config.h
@@ -1,8 +1,12 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
+#ifndef NO_DEBUG
 #define NO_DEBUG
+#endif
+#ifndef NO_PRINT
 #define NO_PRINT
+#endif
 
 #include "../../config.h"
 
diff --git a/keyboards/planck/keymaps/priyadi/Makefile b/keyboards/planck/keymaps/priyadi/Makefile
index 336608b8c..27c2638e2 100644
--- a/keyboards/planck/keymaps/priyadi/Makefile
+++ b/keyboards/planck/keymaps/priyadi/Makefile
@@ -10,12 +10,13 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes          # Audio output on port C6
+AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes     # Unicode map
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 API_SYSEX_ENABLE = no
+FAUXCLICKY_ENABLE = yes
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/planck/keymaps/priyadi/config.h b/keyboards/planck/keymaps/priyadi/config.h
new file mode 100644
index 000000000..82e4a25c6
--- /dev/null
+++ b/keyboards/planck/keymaps/priyadi/config.h
@@ -0,0 +1,39 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#define PRIYADI_PLANCK
+
+/* bootmagic salt key */
+#define BOOTMAGIC_KEY_SALT              KC_ESC
+
+/* skip bootmagic and eeconfig */
+#define BOOTMAGIC_KEY_SKIP              KC_SPACE
+
+#define PREVENT_STUCK_MODIFIERS
+
+#define UNICODE_TYPE_DELAY 0
+
+#define LAYOUT_DVORAK
+#define LAYOUT_COLEMAK
+#define LAYOUT_NORMAN
+#define LAYOUT_WORKMAN
+
+#define DOUBLESPACE_LAYER_ENABLE
+    // #define TOLELOT_ENABLE
+
+#define KEYMAP( \
+    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
+    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
+    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
+    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c \
+) \
+{ \
+    {k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c}, \
+    {k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
+    {k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c}, \
+    {k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c} \
+}
+
+#endif
diff --git a/keyboards/planck/keymaps/priyadi/keymap.c b/keyboards/planck/keymaps/priyadi/keymap.c
index 2e979221a..bb3a2e92c 100644
--- a/keyboards/planck/keymaps/priyadi/keymap.c
+++ b/keyboards/planck/keymaps/priyadi/keymap.c
@@ -1,680 +1 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-
-#include "planck.h"
-#include "action_layer.h"
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-  #include "musical_notes.h"
-#endif
-#include "eeconfig.h"
-#include "process_unicode.h"
-#include "quantum.h"
-
-// #define TOLELOT_ENABLE
-
-extern keymap_config_t keymap_config;
-
-enum layers {
-  _QWERTY,
-  _COLEMAK,
-  _WORKMAN,
-  _PUNC,
-  _NUM,
-  _FUNC,
-  _EMOJI,
-  _GREEKU,
-  _GREEKL,
-  _GUI,
-};
-
-enum planck_keycodes {
-  // layouts
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  WORKMAN,
-
-  // layer switchers
-  PUNC,
-  NUM,
-  FUNC,
-  EMOJI,
-  GUI,
-  GREEK,
-
-  // os switchers
-  LINUX,
-  WIN,
-  OSX,
-};
-
-// Fillers to make layering clearer
-
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
-// unicode map
-
-enum unicode_name {
-  GRIN, // grinning face 😊
-  TJOY, // tears of joy 😂
-  SMILE, // grining face with smiling eyes 😁
-  HEART, // heart ❤
-  EYERT, // smiling face with heart shaped eyes 😍
-  CRY, // crying face 😭
-  SMEYE, // smiling face with smiling eyes 😊
-  UNAMU, // unamused 😒
-  KISS, // kiss 😘
-  HART2, // two hearts 💕
-  WEARY, // weary 😩
-  OKHND, // ok hand sign 👌
-  PENSV, // pensive 😔
-  SMIRK, // smirk 😏
-  RECYC, // recycle ♻
-  WINK, // wink 😉
-  THMUP, // thumb up 👍
-  THMDN, // thumb down 👎
-  PRAY, // pray 🙏
-  PHEW, // relieved 😌
-  MUSIC, // musical notes
-  FLUSH, // flushed 😳
-  CELEB, // celebration 🙌
-  CRY2, // crying face 😢
-  COOL, // smile with sunglasses 😎
-  NOEVS, // see no evil
-  NOEVH, // hear no evil
-  NOEVK, // speak no evil
-  POO, // pile of poo
-  EYES, // eyes
-  VIC, // victory hand
-  BHART, // broken heart
-  SLEEP, // sleeping face
-  SMIL2, // smiling face with open mouth & sweat
-  HUNRD, // 100
-  CONFU, // confused
-  TONGU, // face with tongue & winking eye
-  DISAP, // disappointed
-  YUMMY, // face savoring delicious food
-  CLAP, // hand clapping
-  FEAR, // face screaming in fear
-  HORNS, // smiling face with horns
-  HALO, // smiling face with halo
-  BYE, // waving hand
-  SUN, // sun
-  MOON, // moon
-  SKULL, // skull
-
-  // greek letters
-  UALPH,
-  UBETA,
-  UGAMM,
-  UDELT,
-  UEPSI,
-  UZETA,
-  UETA,
-  UTHET,
-  UIOTA,
-  UKAPP,
-  ULAMB,
-  UMU,
-  UNU,
-  UXI,
-  UOMIC,
-  UPI,
-  URHO,
-  USIGM,
-  UTAU,
-  UUPSI,
-  UPHI,
-  UCHI,
-  UPSI,
-  UOMEG,
-
-  LALPH,
-  LBETA,
-  LGAMM,
-  LDELT,
-  LEPSI,
-  LZETA,
-  LETA,
-  LTHET,
-  LIOTA,
-  LKAPP,
-  LLAMB,
-  LMU,
-  LNU,
-  LXI,
-  LOMIC,
-  LPI,
-  LRHO,
-  LSIGM,
-  LTAU,
-  LUPSI,
-  LPHI,
-  LCHI,
-  LPSI,
-  LOMEG,
-
-  FSIGM,
-};
-
-const uint32_t PROGMEM unicode_map[] = {
-  [GRIN] = 0x1F600,
-  [TJOY] = 0x1F602,
-  [SMILE] = 0x1F601,
-  [HEART] = 0x2764,
-  [EYERT] = 0x1f60d,
-  [CRY] = 0x1f62d,
-  [SMEYE] = 0x1F60A,
-  [UNAMU] = 0x1F612,
-  [KISS] = 0x1F618,
-  [HART2] = 0x1F495,
-  [WEARY] = 0x1F629,
-  [OKHND] = 0x1F44C,
-  [PENSV] = 0x1F614,
-  [SMIRK] = 0x1F60F,
-  [RECYC] = 0x267B,
-  [WINK] = 0x1F609,
-  [THMUP] = 0x1F44D,
-  [THMDN] = 0x1F44E,
-  [PRAY] = 0x1F64F,
-  [PHEW] = 0x1F60C,
-  [MUSIC] = 0x1F3B6,
-  [FLUSH] = 0x1F633,
-  [CELEB] = 0x1F64C,
-  [CRY2] = 0x1F622,
-  [COOL] = 0x1F60E,
-  [NOEVS] = 0x1F648,
-  [NOEVH] = 0x1F649,
-  [NOEVK] = 0x1F64A,
-  [POO] = 0x1F4A9,
-  [EYES] = 0x1F440,
-  [VIC] = 0x270C,
-  [BHART] = 0x1F494,
-  [SLEEP] = 0x1F634,
-  [SMIL2] = 0x1F605,
-  [HUNRD] = 0x1F4AF,
-  [CONFU] = 0x1F615,
-  [TONGU] = 0x1F61C,
-  [DISAP] = 0x1F61E,
-  [YUMMY] = 0x1F60B,
-  [CLAP] = 0x1F44F,
-  [FEAR] = 0x1F631,
-  [HORNS] = 0x1F608,
-  [HALO] = 0x1F607,
-  [BYE] = 0x1F44B,
-  [SUN] = 0x2600,
-  [MOON] = 0x1F314,
-  [SKULL] = 0x1F480,
-
-  // greek letters
-  [UALPH] = 0x0391,
-  [UBETA] = 0x0392,
-  [UGAMM] = 0x0393,
-  [UDELT] = 0x0394,
-  [UEPSI] = 0x0395,
-  [UZETA] = 0x0396,
-  [UETA] = 0x0397,
-  [UTHET] = 0x0398,
-  [UIOTA] = 0x0399,
-  [UKAPP] = 0x039A,
-  [ULAMB] = 0x039B,
-  [UMU] = 0x039C,
-  [UNU] = 0x039D,
-  [UXI] = 0x039E,
-  [UOMIC] = 0x039F,
-  [UPI] = 0x03A0,
-  [URHO] = 0x03A1,
-  [USIGM] = 0x03A3,
-  [UTAU] = 0x03A4,
-  [UUPSI] = 0x03A5,
-  [UPHI] = 0x03A6,
-  [UCHI] = 0x03A7,
-  [UPSI] = 0x03A8,
-  [UOMEG] = 0x03A9,
-  [LALPH] = 0x03B1,
-  [LBETA] = 0x03B2,
-  [LGAMM] = 0x03B3,
-  [LDELT] = 0x03B4,
-  [LEPSI] = 0x03B5,
-  [LZETA] = 0x03B6,
-  [LETA] = 0x03B7,
-  [LTHET] = 0x03B8,
-  [LIOTA] = 0x03B9,
-  [LKAPP] = 0x03BA,
-  [LLAMB] = 0x03BB,
-  [LMU] = 0x03BC,
-  [LNU] = 0x03BD,
-  [LXI] = 0x03BE,
-  [LOMIC] = 0x03BF,
-  [LPI] = 0x03C0,
-  [LRHO] = 0x03C1,
-  [LSIGM] = 0x03C3,
-  [LTAU] = 0x03C4,
-  [LUPSI] = 0x03C5,
-  [LPHI] = 0x03C6,
-  [LCHI] = 0x03C7,
-  [LPSI] = 0x03C8,
-  [LOMEG] = 0x03C9,
-  [FSIGM] = 0x03C2,
-};
-
-
-// hybrid shift - =
-// #undef KC_LSFT
-// #define KC_LSFT MT(MOD_LSFT, KC_MINS)
-// #undef KC_RSFT
-// #define KC_RSFT MT(MOD_LSFT, KC_EQL)
-
-
-// hybrid right-gui & scroll lock (mapped to Compose in OS)
-#undef KC_RCTL
-#define KC_RCTL MT(MOD_LCTL, KC_SLCK)
-
-// keymaps
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Punc | Num  |    Space    | Func |Emoji |Greek |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = {
-  {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
-  {KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT },
-  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT},
-  {KC_LCTL, KC_LALT, KC_LGUI, PUNC,    NUM,     KC_SPC,  KC_SPC,  FUNC,    EMOJI,   GREEK,   KC_RALT, KC_RCTL}
-},
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Punc | Num  |    Space    | Func |Emoji |AltGr | GUI  | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = {
-  {_______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT, _______},
-  {_______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    _______},
-  {_______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-},
-
-/* Workman
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   D  |   R  |   W  |   B  |   J  |   F  |   U  |   P  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   H  |   T  |   G  |   Y  |   N  |   E  |   O  |   I  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   K  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Punc | Num  |    Space    | Func |Emoji |AltGr | GUI  | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_WORKMAN] = {
-  {_______, KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_QUOT, _______},
-  {_______, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    _______},
-  {_______, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-},
-
-/* Uppercase Greek
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_GREEKU] = {
-  {_______, _______, _______,X(UEPSI), X(URHO), X(UTAU),X(UUPSI),X(UTHET),X(UIOTA),X(UOMIC),  X(UPI), _______},
-  {_______,X(UALPH),X(USIGM),X(UDELT), X(UPHI),X(UGAMM), X(UETA),  X(UXI),X(UKAPP),X(ULAMB), _______, _______},
-  {_______,X(UZETA), X(UCHI), X(UPSI),X(UOMEG),X(UBETA),  X(UNU),  X(UMU), _______, _______, _______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-},
-
-/* Lowercase Greek
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_GREEKL] = {
-  {_______, _______,X(FSIGM),X(LEPSI), X(LRHO), X(LTAU),X(LUPSI),X(LTHET),X(LIOTA),X(LOMIC),  X(LPI), _______},
-  {_______,X(LALPH),X(LSIGM),X(LDELT), X(LPHI),X(LGAMM), X(LETA),  X(LXI),X(LKAPP),X(LLAMB), _______, _______},
-  {_______,X(LZETA), X(LCHI), X(LPSI),X(LOMEG),X(LBETA),  X(LNU),  X(LMU), _______, _______, _______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-},
-
-/* Punc
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   `  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |   \  |   -  |   =  |   <  |   >  |   (  |   )  |   '  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |   |  |   _  |   +  |   {  |   }  |   [  |   ]  |   "  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PUNC] = {
-  {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_GRV },
-  {XXXXXXX, XXXXXXX, KC_BSLS, KC_MINS,  KC_EQL, KC_LABK, KC_RABK, KC_LPRN, KC_RPRN, KC_QUOT, XXXXXXX, XXXXXXX},
-  {XXXXXXX, XXXXXXX, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_DQUO, XXXXXXX, XXXXXXX},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-},
-
-/* Num
- * ,-----------------------------------------------------------------------------------.
- * |  ^   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |  @   |  A   |  B   |  C   |  (   |  )   |   4  |   5  |   6  |   :  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |  &   |  #   |  D   |  E   |  F   |  [   |  ]   |   1  |   2  |   3  |   /  |  *   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  x   |      |             |   0  |   ,  |   .  |   +  |  -   |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUM] = {
-  {KC_CIRC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC},
-  { KC_ESC,   KC_AT, S(KC_A), S(KC_B), S(KC_C), KC_LPRN, KC_RPRN,    KC_4,    KC_5,    KC_6, KC_COLN,  KC_ENT},
-  {KC_AMPR, KC_HASH, S(KC_D), S(KC_E), S(KC_F), KC_LBRC, KC_RBRC,    KC_1,    KC_2,    KC_3, KC_SLSH, KC_ASTR},
-  {_______, _______, _______,    KC_X, _______,  KC_SPC,  KC_SPC,    KC_0, KC_COMM,  KC_DOT, KC_PLUS, KC_MINS}
-},
-
-/* Func
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |      |      | PgUp |  Up  | PgDn | PgUp | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F5  |  F6  |  F7  |  F8  |PrtSc |      | Left | Down | Right| PgDn | Ins  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |      |      |      | Home |  End |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = {
-  {XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX, XXXXXXX, KC_PGUP,   KC_UP, KC_PGDN, KC_PGUP,  KC_DEL},
-  {XXXXXXX,   KC_F5,   KC_F6,   KC_F7,  KC_F8,KC_PSCREEN,XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  KC_INS},
-  {_______,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME,  KC_END, XXXXXXX, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-},
-
-/* Emoji
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_EMOJI] = {
-  {X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW)},
-  {X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART),  X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS)},
-  {X(THMDN),X(SLEEP), X(CLAP),  X(CRY),  X(VIC),X(BHART),  X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH)},
-  {  X(POO), X(EYES),X(HUNRD), _______,X(SKULL),X(HORNS), X(HALO), X(FEAR), _______,X(YUMMY),X(DISAP),X(NOEVK)}
-},
-
-/* GUI
- * ,-----------------------------------------------------------------------------------.
- * |      |  D1  |  D2  |  D3  |  D4  |  D5  |  D6  |  D7  |  D8  |  D9  |  D10 |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Linux |      | Vol- | Mute | Vol+ |      |      |  D-  |      |  D+  |      |Qwerty|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Win  |      | Prev | Play | Next |      |      |      |      |      |      |Colmak|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | OSX  |      |      |      |      |  BL- |  BL+ |      |      |      |      |Workmn|
- * `-----------------------------------------------------------------------------------'
- */
-[_GUI] = {
-  {_______, LGUI(KC_1),LGUI(KC_2),LGUI(KC_3),LGUI(KC_4),LGUI(KC_5),LGUI(KC_6),LGUI(KC_7),LGUI(KC_8),LGUI(KC_9),LGUI(KC_0), _______},
-  {  LINUX, _______, KC_VOLD, KC_MUTE, KC_VOLU,_______,_______,KC_WWW_BACK,_______,KC_WWW_FORWARD,_______, QWERTY},
-  {    WIN, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, COLEMAK},
-  {    OSX, _______, _______, _______, _______,  BL_DEC,  BL_INC, _______, _______, _______, _______, WORKMAN}
-},
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_workman[][2]    = SONG(DVORAK_SOUND);
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-float tone_linux[][2] = SONG(CAPS_LOCK_ON_SOUND);
-float tone_windows[][2] = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_osx[][2] = SONG(NUM_LOCK_ON_SOUND);
-float tone_click[][2] = SONG(MUSICAL_NOTE(_F3, 2));
-float tone_release[][2] = SONG(MUSICAL_NOTE(_A3, 2));
-float tone_tolelot[][2] = SONG(Q__NOTE(_E5), Q__NOTE(_C5), Q__NOTE(_D5));
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // faux clicky
-  // if (record->event.pressed) PLAY_NOTE_ARRAY(tone_click, false, 0);
-  #ifdef AUDIO_ENABLE
-  #ifdef TOLELOT_ENABLE
-  if (record->event.pressed) {
-    PLAY_NOTE_ARRAY(tone_tolelot, false, 0);
-  }
-  #else
-  if (record->event.pressed) {
-    PLAY_NOTE_ARRAY(tone_click, false, 0);
-  } else {
-    PLAY_NOTE_ARRAY(tone_release, false, 0);
-  }
-  #endif
-  #endif
-
-  bool lshifted = keyboard_report->mods & MOD_BIT(KC_LSFT);
-  bool rshifted = keyboard_report->mods & MOD_BIT(KC_RSFT);
-
-  switch (keycode) {
-    // Greek layer handling
-    case GREEK:
-      if (record->event.pressed) {
-        if (lshifted || rshifted) {
-          layer_on(_GREEKU);
-          layer_off(_GREEKL);
-        } else {
-          layer_on(_GREEKL);
-          layer_off(_GREEKU);
-        }
-      } else {
-        layer_off(_GREEKU);
-        layer_off(_GREEKL);
-      }
-      return false;
-      break;
-
-    case KC_LSFT:
-    case KC_RSFT:
-      ;
-      uint8_t layer = biton32(layer_state);
-      if (layer == _GREEKU || layer == _GREEKL) {
-        if (record->event.pressed) {
-          layer_on(_GREEKU);
-          layer_off(_GREEKL);
-        } else {
-          if (lshifted ^ rshifted) { // if only one shift is pressed
-            layer_on(_GREEKL);
-            layer_off(_GREEKU);
-          }
-        }
-      }
-      return true;
-      break;
-
-    // QWERTZ style comma and dot: semicolon and colon when shifted
-    case KC_COMM:
-      if (record->event.pressed) {
-        if (lshifted || rshifted) {
-          if (lshifted) unregister_code(KC_LSFT);
-          if (rshifted) unregister_code(KC_RSFT);
-          register_code(KC_SCLN);
-          unregister_code(KC_SCLN);
-          if (lshifted) register_code(KC_LSFT);
-          if (rshifted) register_code(KC_RSFT);
-        } else {
-          register_code(KC_COMM);
-          unregister_code(KC_COMM);
-        }
-      }
-      return false;
-      break;
-    case KC_DOT:
-      if (record->event.pressed) {
-        if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT))) {
-          register_code(KC_SCLN);
-          unregister_code(KC_SCLN);
-        } else {
-          register_code(KC_DOT);
-          unregister_code(KC_DOT);
-        }
-      }
-      return false;
-      break;
-
-    // layout switcher
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_colemak, false, 0);
-        #endif
-        persistant_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case WORKMAN:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_workman, false, 0);
-        #endif
-        persistant_default_layer_set(1UL<<_WORKMAN);
-      }
-      return false;
-      break;
-
-    // layer switchers
-    case PUNC:
-      if (record->event.pressed) {
-        layer_on(_PUNC);
-        update_tri_layer(_PUNC, _EMOJI, _GUI);
-      } else {
-        layer_off(_PUNC);
-        update_tri_layer(_PUNC, _EMOJI, _GUI);
-      }
-      return false;
-      break;
-    case EMOJI:
-      if (record->event.pressed) {
-        layer_on(_EMOJI);
-        update_tri_layer(_PUNC, _EMOJI, _GUI);
-      } else {
-        layer_off(_EMOJI);
-        update_tri_layer(_PUNC, _EMOJI, _GUI);
-      }
-      return false;
-      break;
-    case NUM:
-      if (record->event.pressed) {
-        layer_on(_NUM);
-      } else {
-        layer_off(_NUM);
-      }
-      return false;
-      break;
-    case FUNC:
-      if (record->event.pressed) {
-        layer_on(_FUNC);
-      } else {
-        layer_off(_FUNC);
-      }
-      return false;
-      break;
-
-    // OS switchers
-    case LINUX:
-      set_unicode_input_mode(UC_LNX);
-      #ifdef AUDIO_ENABLE
-        PLAY_NOTE_ARRAY(tone_linux, false, 0);
-      #endif
-      return false;
-      break;
-    case WIN:
-      set_unicode_input_mode(UC_WINC);
-      #ifdef AUDIO_ENABLE
-        PLAY_NOTE_ARRAY(tone_windows, false, 0);
-      #endif
-      return false;
-      break;
-    case OSX:
-      set_unicode_input_mode(UC_OSX);
-      #ifdef AUDIO_ENABLE
-        PLAY_NOTE_ARRAY(tone_osx, false, 0);
-      #endif
-      return false;
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-  #ifdef AUDIO_ENABLE
-      startup_user();
-  #endif
-  set_unicode_input_mode(UC_LNX);
-}
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_NOTE_ARRAY(tone_startup, false, 0);
-}
-
-void shutdown_user()
-{
-    PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-#endif
\ No newline at end of file
+#include "../../../handwired/promethium/keymaps/priyadi/keymap.c"
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/unicode/keymap.c b/keyboards/planck/keymaps/unicode/keymap.c
index d73e7e09d..1b4ca8ed7 100644
--- a/keyboards/planck/keymaps/unicode/keymap.c
+++ b/keyboards/planck/keymaps/unicode/keymap.c
@@ -195,24 +195,20 @@ const uint16_t PROGMEM fn_actions[] = {
 };
 
 #ifdef AUDIO_ENABLE
-float tone_startup[][2] = {
-  {440.0*pow(2.0,(31)/12.0), 12},
-  {440.0*pow(2.0,(28)/12.0), 8},
-  {440.0*pow(2.0,(19)/12.0), 8},
-  {440.0*pow(2.0,(24)/12.0), 8},
-  {440.0*pow(2.0,(28)/12.0), 20}
-};
 
+float tone_startup[][2]    = SONG(STARTUP_SOUND);
 float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
 float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 float tone_plover[][2]     = SONG(PLOVER_SOUND);
 float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
 
-float goodbye[][2] = SONG(GOODBYE_SOUND);
+float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
 #endif
 
 
+
 void persistant_default_layer_set(uint16_t default_layer) {
   eeconfig_update_default_layer(default_layer);
   default_layer_set(default_layer);
@@ -309,18 +305,35 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 };
 
 void matrix_init_user(void) {
-  #ifdef AUDIO_ENABLE
-    _delay_ms(20); // stops the tick
-    PLAY_NOTE_ARRAY(tone_startup, false, 0);
-  #endif
+    #ifdef AUDIO_ENABLE
+        startup_user();
+    #endif
 }
 
 #ifdef AUDIO_ENABLE
-void play_goodbye_tone()
+
+void startup_user()
 {
-  PLAY_NOTE_ARRAY(goodbye, false, 0);
-  _delay_ms(150);
+    _delay_ms(20); // gets rid of tick
+    PLAY_NOTE_ARRAY(tone_startup, false, 0);
+}
+
+void shutdown_user()
+{
+    PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
+    _delay_ms(150);
+    stop_all_notes();
+}
+
+void music_on_user(void)
+{
+    music_scale_user();
 }
-#endif
 
+void music_scale_user(void)
+{
+    PLAY_NOTE_ARRAY(music_scale, false, 0);
+}
+
+#endif
 
diff --git a/keyboards/planck/rev3/Makefile b/keyboards/planck/rev3/Makefile
new file mode 100644
index 000000000..191c6bb66
--- /dev/null
+++ b/keyboards/planck/rev3/Makefile
@@ -0,0 +1,3 @@
+ifndef MAKEFILE_INCLUDED
+	include ../../../Makefile
+endif
\ No newline at end of file