diff --git a/keyboards/mechwild/obe/keymaps/jonavin/config.h b/keyboards/mechwild/obe/keymaps/jonavin/config.h
new file mode 100644
index 0000000000..8a812f1550
--- /dev/null
+++ b/keyboards/mechwild/obe/keymaps/jonavin/config.h
@@ -0,0 +1,39 @@
+/* Copyright 2021 Jonavin Eng
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
+// TT set to two taps
+
+/*  Handle GRAVESC combo keys */
+#define GRAVE_ESC_ALT_OVERRIDE
+    //Always send Escape if Alt is pressed
+#define GRAVE_ESC_CTRL_OVERRIDE
+    //Always send Escape if Control is pressed
+
+#define TAPPING_TERM 180
+
+#ifdef RGBLIGHT_ENABLE
+    // Redefine number of LED
+    #ifdef RGBLED_NUM
+        #undef RGBLED_NUM
+    #endif // DEBUG
+    #define RGBLED_NUM 20
+
+    #define RGBLIGHT_LAYERS
+    #define RGBLIGHT_SLEEP
+#endif // RGBLIGHT_ENABLE
diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
new file mode 100644
index 0000000000..b5b0829658
--- /dev/null
+++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c
@@ -0,0 +1,114 @@
+/* Copyright 2021 Kyle McCreery
+ *
+ * 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 QMK_KEYBOARD_H
+#include "jonavin.h"
+
+#ifdef RGBLIGHT_ENABLE
+    // Custom RGB Colours
+    #define RGB_OBE_BOW 0x00, 0xE4, 0xFF // colour for matching keycaps
+#endif // RGBLIGHT_ENABLE
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+    KC_MUTE, KC_GESC, 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_BSLS, KC_DEL,
+    KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+    KC_PGDN, TT(_RAISE), KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFTCAPSWIN,KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, LT(_LOWER,KC_B), KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,
+             KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  MO(_FN1),  LT(_RAISE,KC_SPC),       KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN1] = LAYOUT(
+    KC_NO,   KC_ESC,  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_TRNS, KC_INS,
+    KC_HOME, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SLCK, KC_PAUS, KC_NO,   KC_NO,   KC_NO,   RESET,
+    KC_END,  KC_CAPS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_TRNS,
+             KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_NLCK, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PGUP, KC_TRNS,
+             KC_TRNS,KC_WINLCK,KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_NO,   KC_NO,   KC_HOME, KC_PGDN, KC_END
+    ),
+    [_LOWER] = LAYOUT(
+    KC_NO,   KC_TILD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_VAD, RGB_VAI, KC_TRNS, KC_DEL,
+    RGB_HUI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, EMO_TEARS, EMO_SAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_TOG,
+    RGB_HUD, KC_NO,   KC_NO,   EMO_SHRUG,KC_NO,  KC_NO,   KC_NO,   KC_NO,   EMO_JOY, KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_TRNS,
+             KC_NO,   KC_NO,   KC_NO,   EMO_CONFUSE,KC_NO,KC_NO,KC_TRNS,EMO_NERVOUS,KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_MOD, KC_TRNS,
+             KC_TRNS, KC_APP,  KC_TRNS,          KC_BSPC, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+    [_RAISE] = LAYOUT(
+    KC_NO,   KC_TILD,  KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS, KC_PPLS, KC_PSLS, KC_DEL,
+    KC_NO,   KC_NO,    KC_HOME,KC_UP,   KC_END,  KC_PGUP, KC_NO,   KC_TAB,  KC_P4,   KC_P5,   KC_P6,   KC_NO,   KC_NO,   KC_NO,   KC_PEQL,
+    KC_NO,  TT(_RAISE),KC_LEFT,KC_DOWN, KC_RGHT, KC_PGDN, KC_NO,   KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_NO,   KC_PAST,          KC_PENT,
+             KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_P0,   KC_00,   KC_NO,   KC_PDOT, KC_PSLS, CT_PGUP, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, CT_HOME, CT_PGDN, CT_END
+    )
+};
+
+#ifdef RGBLIGHT_ENABLE
+
+    enum custom_rgblight_layers
+    {
+        _rgbWINLOCK,
+        _rgbFN,
+        _rgbLOWER,
+        _rgbRAISE
+    };
+
+    // Optional RGB Light Mapping Zones {LED Posiiton, Number of LEDs, Colour}
+    const rgblight_segment_t PROGMEM _rgb_winlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+        {1, 3, HSV_RED},
+        {15, 3, HSV_RED}
+    );
+    const rgblight_segment_t PROGMEM _rgb_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+        {6, 6, HSV_PURPLE}
+    );
+    // Light LEDs 9 & 10 in cyan when keyboard layer 1 is active
+    const rgblight_segment_t PROGMEM _rgb_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+        {4, 10, HSV_YELLOW}
+    );
+
+    const rgblight_segment_t PROGMEM _rgb_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+        {3, 5, HSV_GREEN},
+        {10, 5, HSV_GREEN}
+    );
+
+    const rgblight_segment_t* const PROGMEM _rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+        _rgb_winlock_layer,
+        _rgb_fn_layer,
+        _rgb_lower_layer,
+        _rgb_raise_layer
+    );
+
+    bool led_update_user(led_t led_state) {
+        rgblight_set_layer_state(_rgbWINLOCK, keymap_config.no_gui);
+        return true;
+    }
+
+    layer_state_t layer_state_set_user(layer_state_t state) {
+        rgblight_set_layer_state(_rgbFN, layer_state_cmp(state, _FN1));
+        rgblight_set_layer_state(_rgbLOWER, layer_state_cmp(state, _LOWER));
+        rgblight_set_layer_state(_rgbRAISE, layer_state_cmp(state, _RAISE));
+        return state;
+    }
+#endif // RGBLIGHT_ENABLE
+
+void keyboard_post_init_keymap(void) {
+    // keyboard_post_init_user() moved to userspace
+    #ifdef RGBLIGHT_ENABLE
+        rgblight_enable_noeeprom();
+        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
+        rgblight_setrgb(RGB_OBE_BOW); // Default startup colour
+        rgblight_layers = _rgb_layers;
+    #endif
+}
+
diff --git a/keyboards/mechwild/obe/keymaps/jonavin/readme.md b/keyboards/mechwild/obe/keymaps/jonavin/readme.md
new file mode 100644
index 0000000000..d60958a4e9
--- /dev/null
+++ b/keyboards/mechwild/obe/keymaps/jonavin/readme.md
@@ -0,0 +1,46 @@
+# Jonavin's MechWild Orange Boy Ergo keymap
+
+-->  This keymap makes user of user/jonavin userspace 
+
+Features
+  - Split spacebars, Split Backspace
+  - RGB Winlock indicator (requires LED stripto be installed)
+  - RGB Layer indicators: FN/MO1 - Purple; LOWER/MO2 - Yellow; RAISE/MO3/NumPad - Green
+  - quick demo https://youtu.be/gR1awbsouLk
+
+- Add PrtScr, Scroll Lock, Break, NumLock to Fn layer
+- Implement Win key lock using Fn+Win 
+- Layer 2 (LOWER) when right B is held -- for emoticons
+- Layer 2 RGB functions
+- Layer 3 (RAISE) mod on Caps Lock with double-tap to switch to this layer, double tap to switch back
+    - provides arrows on WASD and additional nav keys + right hand numpad with 00; an be used for Alt Code entry
+    - left spacebar Backspace
+- add double tap of Left Shift to toggle Caps Lock
+
+
+rules.mk OPTIONS - Active features from userspace
+--------------------------------------------------
+
+STARTUP_NUMLOCK_ON = yes
+- turns on NUMLOCK by default
+
+ENCODER_DEFAULTACTIONS_ENABLE = yes
+- Enables default encoder funtions
+    - holding Left shift, change layers
+    - holding right shift, Navigate page up/down
+    - holding Left Ctrl, navigate prev/next word
+    - holding Left Alt, change media prev/next track
+    - default is change volume
+  
+TD_LSFT_CAPSLOCK_ENABLE = yes
+    - This will enable double tap on Left Shift to toggle CAPSLOCK when using KC_LSFTCAPS
+
+IDLE_TIMEOUT_ENABLE = yes
+    - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
+
+EMOTICON_ENABLE
+    - adds EMO_ keycodes for text emojis
+    
+## All layers diagram
+![image](https://user-images.githubusercontent.com/71780717/135770721-ab263532-f645-4903-99cb-749549944e15.png)
+
diff --git a/keyboards/mechwild/obe/keymaps/jonavin/rules.mk b/keyboards/mechwild/obe/keymaps/jonavin/rules.mk
new file mode 100644
index 0000000000..e371b63498
--- /dev/null
+++ b/keyboards/mechwild/obe/keymaps/jonavin/rules.mk
@@ -0,0 +1,11 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+
+MOUSEKEY_ENABLE = no
+TAP_DANCE_ENABLE = yes
+
+TD_LSFT_CAPSLOCK_ENABLE = yes
+STARTUP_NUMLOCK_ON = yes
+ENCODER_DEFAULTACTIONS_ENABLE = yes
+EMOTICON_ENABLE = yes
diff --git a/keyboards/planck/keymaps/jimmysjolund/config.h b/keyboards/planck/keymaps/jimmysjolund/config.h
new file mode 100644
index 0000000000..5606510d49
--- /dev/null
+++ b/keyboards/planck/keymaps/jimmysjolund/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Jimmy Sjölund
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
+
diff --git a/keyboards/planck/keymaps/jimmysjolund/keymap.c b/keyboards/planck/keymaps/jimmysjolund/keymap.c
new file mode 100644
index 0000000000..6b89b99540
--- /dev/null
+++ b/keyboards/planck/keymaps/jimmysjolund/keymap.c
@@ -0,0 +1,367 @@
+/* Copyright 2015-2017 Jack Humbert
+ *
+ * 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 QMK_KEYBOARD_H
+#include "muse.h"
+
+
+enum planck_layers {
+  _QWERTY,
+  _COLEMAK,
+  _DVORAK,
+  _LOWER,
+  _RAISE,
+  _PLOVER,
+  _ADJUST
+};
+
+enum planck_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  PLOVER,
+  BACKLIT,
+  EXT_PLV
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty - Original
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+/* Qwerty - jimmysjolund 2021-09-22
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  | Ctrl | GUI  | Alt  |Lower |Raise |Enter |Space |AltGr | Down |  Up  |Enter |
+ * `-----------------------------------------------------------------------------------'
+ */
+
+[_QWERTY] = LAYOUT_planck_grid(
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    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_DEL, KC_LCTL, KC_LGUI, KC_LALT, LOWER,   RAISE,  KC_ENT,  KC_SPC,   KC_ALGR, KC_DOWN, KC_UP,   KC_ENT
+),
+
+/* Colemak Original
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+/* Colemak jimmysjolund
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Tab  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  | Ctrl | GUI  | Alt  |Lower |Raise |Enter |Space |AltGr | Down |  Up  |Enter |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_planck_grid(
+    KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    KC_TAB,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_DEL, KC_LCTL, KC_LGUI, KC_LALT, LOWER,   RAISE,   KC_ENT,  KC_SPC,  KC_ALGR, KC_DOWN,  KC_UP,   KC_ENT
+),
+
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT_planck_grid(
+    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
+    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+
+/* Plover layer (http://opensteno.org)
+ * ,-----------------------------------------------------------------------------------.
+ * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_PLOVER] = LAYOUT_planck_grid(
+    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
+    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid(
+    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+)
+
+};
+
+#ifdef AUDIO_ENABLE
+  float plover_song[][2]     = SONG(PLOVER_SOUND);
+  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        print("mode just switched to qwerty and this is a huge string\n");
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case COLEMAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK);
+      }
+      return false;
+      break;
+    case DVORAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_DVORAK);
+      }
+      return false;
+      break;
+    case BACKLIT:
+      if (record->event.pressed) {
+        register_code(KC_RSFT);
+        #ifdef BACKLIGHT_ENABLE
+          backlight_step();
+        #endif
+        #ifdef KEYBOARD_planck_rev5
+          PORTE &= ~(1<<6);
+        #endif
+      } else {
+        unregister_code(KC_RSFT);
+        #ifdef KEYBOARD_planck_rev5
+          PORTE |= (1<<6);
+        #endif
+      }
+      return false;
+      break;
+    case PLOVER:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+          PLAY_SONG(plover_song);
+        #endif
+        layer_off(_RAISE);
+        layer_off(_LOWER);
+        layer_off(_ADJUST);
+        layer_on(_PLOVER);
+        if (!eeconfig_is_enabled()) {
+            eeconfig_init();
+        }
+        keymap_config.raw = eeconfig_read_keymap();
+        keymap_config.nkro = 1;
+        eeconfig_update_keymap(keymap_config.raw);
+      }
+      return false;
+      break;
+    case EXT_PLV:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(plover_gb_song);
+        #endif
+        layer_off(_PLOVER);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if (muse_mode) {
+    if (IS_LAYER_ON(_RAISE)) {
+      if (clockwise) {
+        muse_offset++;
+      } else {
+        muse_offset--;
+      }
+    } else {
+      if (clockwise) {
+        muse_tempo+=1;
+      } else {
+        muse_tempo-=1;
+      }
+    }
+  } else {
+    if (clockwise) {
+      #ifdef MOUSEKEY_ENABLE
+        tap_code(KC_MS_WH_DOWN);
+      #else
+        tap_code(KC_PGDN);
+      #endif
+    } else {
+      #ifdef MOUSEKEY_ENABLE
+        tap_code(KC_MS_WH_UP);
+      #else
+        tap_code(KC_PGUP);
+      #endif
+    }
+  }
+    return false;
+}
+
+bool dip_update_user(uint8_t index, bool active) {
+  switch (index) {
+    case 0:
+      if (active) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(plover_song);
+        #endif
+        layer_on(_ADJUST);
+      } else {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(plover_gb_song);
+        #endif
+        layer_off(_ADJUST);
+      }
+      break;
+    case 1:
+      if (active) {
+        muse_mode = true;
+      } else {
+        muse_mode = false;
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+        #endif
+      }
+   }
+    return false;
+}
+
+void matrix_scan_user(void) {
+  #ifdef AUDIO_ENABLE
+    if (muse_mode) {
+      if (muse_counter == 0) {
+        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+        if (muse_note != last_muse_note) {
+          stop_note(compute_freq_for_midi_note(last_muse_note));
+          play_note(compute_freq_for_midi_note(muse_note), 0xF);
+          last_muse_note = muse_note;
+        }
+      }
+      muse_counter = (muse_counter + 1) % muse_tempo;
+    }
+  #endif
+}
+
+bool music_mask_user(uint16_t keycode) {
+  switch (keycode) {
+    case RAISE:
+    case LOWER:
+      return false;
+    default:
+      return true;
+  }
+}
diff --git a/keyboards/planck/keymaps/jimmysjolund/readme.md b/keyboards/planck/keymaps/jimmysjolund/readme.md
new file mode 100644
index 0000000000..de9680b498
--- /dev/null
+++ b/keyboards/planck/keymaps/jimmysjolund/readme.md
@@ -0,0 +1,2 @@
+# The Default Planck Layout
+
diff --git a/keyboards/planck/keymaps/jimmysjolund/rules.mk b/keyboards/planck/keymaps/jimmysjolund/rules.mk
new file mode 100644
index 0000000000..dcf16bef39
--- /dev/null
+++ b/keyboards/planck/keymaps/jimmysjolund/rules.mk
@@ -0,0 +1 @@
+SRC += muse.c
diff --git a/users/jonavin/jonavin.c b/users/jonavin/jonavin.c
index f53aa8664e..1a0760ea8f 100644
--- a/users/jonavin/jonavin.c
+++ b/users/jonavin/jonavin.c
@@ -256,7 +256,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 break;
             }
         }
-        return true;
+        return false;
     }
 #endif // ENCODER_ENABLE
 
@@ -266,7 +266,7 @@ __attribute__ ((weak))  bool process_record_keymap(uint16_t keycode, keyrecord_t
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_keymap(keycode, record)) { return false; }
-     switch (keycode) {
+    switch (keycode) {
     case KC_00:
         if (record->event.pressed) {
             // when keycode KC_00 is pressed
@@ -298,6 +298,34 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         } else  unregister_code16(keycode);
         break;
 #endif // RGB_MATRIX_ENABLE
+
+#ifdef EMOTICON_ENABLE
+    case EMO_SHRUG:
+        if (record->event.pressed)  SEND_STRING("`\\_(\"/)_/`");
+            else unregister_code16(keycode);
+        break;
+    case EMO_CONFUSE:
+        if (record->event.pressed)  SEND_STRING("(*_*)");
+            else unregister_code16(keycode);
+        break;
+    case EMO_TEARS:
+        if (record->event.pressed)  SEND_STRING("(T_T)");
+            else unregister_code16(keycode);
+        break;
+    case EMO_NERVOUS:
+        if (record->event.pressed)  SEND_STRING("(~_~;)");
+            else unregister_code16(keycode);
+        break;
+    case EMO_JOY:
+        if (record->event.pressed)  SEND_STRING("(^o^)");
+            else unregister_code16(keycode);
+        break;
+    case EMO_SAD:
+        if (record->event.pressed)  SEND_STRING(":'-(");
+            else unregister_code16(keycode);
+        break;
+    #endif // EMOTICON_ENABLE
+
     default:
         if (record->event.pressed) {
             #ifdef RGB_MATRIX_ENABLE
diff --git a/users/jonavin/jonavin.h b/users/jonavin/jonavin.h
index efe0301af3..feaf6b6a15 100644
--- a/users/jonavin/jonavin.h
+++ b/users/jonavin/jonavin.h
@@ -38,13 +38,23 @@ enum custom_user_keycodes {
   RGB_TOD,      // Timeout idle time down
   RGB_NITE,     // Turns off all rgb but allow rgb indicators to work
 
+  EMO_SHRUG,    // `\_("/)_/`
+  EMO_CONFUSE,  // (*_*)
+  EMO_SAD,      // :'-(
+  EMO_NERVOUS,  // (~_~;)
+  EMO_JOY,      // (^o^)
+  EMO_TEARS,    // (T_T)
+
   NEW_SAFE_RANGE  // new safe range for keymap level custom keycodes
 };
 
-#define KC_CAD	LALT(LCTL(KC_DEL))
+#define KC_CAD  LALT(LCTL(KC_DEL))
 #define KC_AF4	LALT(KC_F4)
 #define KC_TASK	LCTL(LSFT(KC_ESC))
-
+#define CT_PGUP RCTL(KC_PGUP)
+#define CT_PGDN RCTL(KC_PGDN)
+#define CT_HOME RCTL(KC_HOME)
+#define CT_END  RCTL(KC_END)
 
 #ifdef TD_LSFT_CAPSLOCK_ENABLE
     // Tap Dance Definitions
diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md
index c029796b4e..9fccb8c73c 100644
--- a/users/jonavin/readme.md
+++ b/users/jonavin/readme.md
@@ -14,62 +14,90 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 LAYERS:
-    0 = _BASE
-    1 = _FN1
-    2 = _LOWER
-    3 = _RAISE
+- 0 = _BASE
+- 1 = _FN1
+- 2 = _LOWER
+- 3 = _RAISE
 
 KEYCODES:
-    KC_CAD          Ctrl-Alt-Del	  
-    KC_AF4	        Alt-F4
-    KC_TASK	        Windows Task Manager (Ctrl-Shift-Esc) 
-    LSFT_CAPSLOCK   When LSFT_CAPSLOCK_ENABLE is defined, hold for Shift double tap for CAPSLOCK; otherwise, just Shift
-    KC_00           double zero "00"
-    KC_WINLCK       toggles LGui/Win key lock
-    RGB_TOI         Increase Timeout idle time threshold
-    RGB_TOD         Decrease Timeout idle time threshold
+- KC_CAD          Ctrl-Alt-Del	  
+- KC_AF4	      Alt-F4
+- KC_TASK	      Windows Task Manager (Ctrl-Shift-Esc) 
+- LSFT_CAPSLOCK   When LSFT_CAPSLOCK_ENABLE is defined, hold for Shift double tap for CAPSLOCK; otherwise, just Shift
+- KC_00           double zero "00"
+- KC_WINLCK       toggles LGui/Win key lock
+- RGB_TOI         Increase Timeout idle time threshold
+- RGB_TOD         Decrease Timeout idle time threshold
+- CT_PGUP         Ctrl-PgUp
+- CT_PGDN         Ctrl-PgDn
+- CT_HOME         Ctrl-HOme
+- CT_END          Ctrl-End
+- 
+ When EMOTICON_ENABLE = yes
+-   EMO_SHRUG       `\_("/)_/`
+-   EMO_CONFUSE     (*_*)
+-   EMD_TEARS       (T_T)
+-   EMO_NERVOUS     (~_~;)
+-   EMO_JOY         (^o^)
+
+
+AVAILABLE ENCODER ACTIONS:
+- void encoder_action_volume(bool clockwise);
+- void encoder_action_mediatrack(bool clockwise);
+- void encoder_action_navword(bool clockwise);
+- void encoder_action_navpage(bool clockwise);
+- 
+- uint8_t get_selected_layer(void);
+- void encoder_action_layerchange(bool clockwise);
+- 
+- void encoder_action_rgb_speed(bool clockwise);
+- void encoder_action_rgb_hue(bool clockwise);
+- void encoder_action_rgb_saturation(bool clockwise);
+- void encoder_action_rgb_brightness(bool clockwise);
+- void encoder_action_rgb_mode(bool clockwise);
+
 
 ENABLE FEATURES your keymap rules.mk
+---------------------------------------
 
 STARTUP_NUMLOCK_ON = yes
-    turns on NUMLOCK by default
+- turns on NUMLOCK by default
 
 ENCODER_DEFAULTACTIONS_ENABLE = yes
-    Enabled default encoder funtions
-    When enabled, use this in the keymap for an additional encoder processing 
-        bool encoder_update_keymap(uint8_t index, bool clockwise)
-  
-    OPTION: set ENCODER_DEFAULTACTIONS_INDEX to the encoder number if the encoder is not index 0
+- Enabled default encoder funtions
+- When enabled, use this in the keymap for an additional encoder processing 
+-   bool encoder_update_keymap(uint8_t index, bool clockwise)
   
+OPTION: set ENCODER_DEFAULTACTIONS_INDEX to the encoder number if the encoder is not index 0
+
 TD_LSFT_CAPSLOCK_ENABLE = yes
-    This will enable double tap on Left Shift to toggle CAPSLOCK
-        KC_LSFTCAPS to bind to left Shift to enable feature
-        KC_LSFTCAPSWIN does the same thing but will not turn on CAPS when Win Lkey is disabled
+- This will enable double tap on Left Shift to toggle CAPSLOCK
+-   KC_LSFTCAPS to bind to left Shift to enable feature
+-   KC_LSFTCAPSWIN does the same thing but will not turn on CAPS when Win Lkey is disabled
 
 IDLE_TIMEOUT_ENABLE = yes
-    Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
-    When enabled, use this in the keymap for an additional matrix processing     
-        void matrix_scan_keymap(void)
-    
-    Functions:
-        u16int_t get_timeout_threshold(void)            // returns the current timeout threshold
-        void timeout_update_threshold(bool increase)    // change threshold: true = increase, false = decrease     
-        void timeout_reset_timer(void)                  // resets timer (put in process_record_user if you override it)
-        void timeout_tick_timer(void)                   // registers time ticks (put in maxtrix_scan_user if you override it)
+- Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
+- When enabled, use this in the keymap for an additional matrix processing:  void matrix_scan_keymap(void)
+
+- Functions:
+-   u16int_t get_timeout_threshold(void)            // returns the current timeout threshold
+-   void timeout_update_threshold(bool increase)    // change threshold: true = increase, false = decrease     
+-   void timeout_reset_timer(void)                  // resets timer (put in process_record_user if you override it)
+-   void timeout_tick_timer(void)                   // registers time ticks (put in maxtrix_scan_user if you override it)
 
 Other Functions:
-    - activate_numlock(bool turn_on)                    // true = turn on NUM LOCK, false = off 
+- activate_numlock(bool turn_on)                    // true = turn on NUM LOCK, false = off 
 
 KEYMAP LEVEL ADDITIONAL PROCESSING FUNCTIONS
-    bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
-    void keyboard_post_init_keymap(void)
+- bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
+- void keyboard_post_init_keymap(void)
 
 LIST OF COMPATIBLE KEYMAPS
-    - gmmk/pro/ansi
-    - keebio/quefrency/rev3
-    - mechwild/mercutio
-    - mechwild/murphpad
-    - mechwild/OBE (*)
-    - nopunin10did/kastenwagen (*)
+- gmmk/pro/ansi
+- keebio/quefrency/rev3
+- mechwild/mercutio
+- mechwild/murphpad
+- mechwild/OBE
+- nopunin10did/kastenwagen (*)
 
     (*) coming soon
diff --git a/users/jonavin/rules.mk b/users/jonavin/rules.mk
index e2918d9e26..eb279f6290 100644
--- a/users/jonavin/rules.mk
+++ b/users/jonavin/rules.mk
@@ -14,3 +14,6 @@ endif
 ifeq ($(strip $(COLEMAK_LAYER_ENABLE)), yes)
     OPT_DEFS += -DCOLEMAK_LAYER_ENABLE
 endif
+ifeq ($(strip $(EMOTICON_ENABLE)), yes)
+    OPT_DEFS += -DEMOTICON_ENABLE
+endif