Update layout

12 files changed, 67 insertions, 192 deletions

diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json
deleted file mode 100644
index 814e1cc2aa..0000000000
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[{x:3.5,c:"#eeeeee",a:7},"",{x:10.5},""],
-[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
-[{y:-0.875,x:5.5},"","",{x:4.5},"",""],
-[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
-[{y:-0.375,x:3.5,a:5,fa:[0,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nUP",{x:10.5,a:7,fa:[2]},"UP"],
-[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
-[{y:-0.875,x:5.5},"",{h:1.5},"",{x:4.5,h:1.5},"",""],
-[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
-[{y:-0.375,x:3.5,a:5,fa:[2,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nDOWN",{x:10.5,a:7},"DOWN"],
-[{y:-0.875,x:2.5,a:5,fa:[2,1,0,0,0,0,2]},"\nmouse\n\n\n\n\nLEFT",{x:1,fa:[2,2,0,0,0,0,2]},"\nmouse\n\n\n\n\nRIGHT",{x:8.5,a:7},"LEFT",{x:1},"RIGHT"],
-[{y:-0.875,x:5.5},"",{x:6.5},""],
-[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
-[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""],
-[{y:-0.75,x:3.5},"",{x:10.5},""],
-[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
-[{y:-0.875,x:5.5},"",{x:6.5},""],
-[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
-[{y:-0.375,x:3.5,a:5,fa:[2,1,0,0,0,0,2]},"\nclick\n\n\n\n\nLEFT",{x:10.5,a:7},""],
-[{y:-0.875,x:2.5},"",{x:1,a:5},"\nclick\n\n\n\n\nRIGHT",{x:8.5,a:7},"",{x:1},""],
-[{y:-0.75,x:0.5},"","",{x:14.5},"",""],
-[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""],
-[{h:2},"",{h:2},"",""],
-[{x:2},""],
-[{r:-30,rx:13,y:-1,x:-3},"",""],
-[{x:-3},"",{h:2},"",{h:2},""],
-[{x:-3},""]
-
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png
deleted file mode 100644
index e2e5779b5a..0000000000
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/arrw.png
+++ /dev/null
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json
deleted file mode 100644
index 9e6fc37338..0000000000
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[{x:3.5,c:"#eeeeee",a:5,fa:[5,7,0,0,0,0,0]},"#\n3",{x:10.5},"*\n8"],
-[{y:-0.875,x:2.5},"@\n2",{x:1},"$\n4",{x:8.5},"&\n7",{x:1},"(\n9"],
-[{y:-0.875,x:5.5},"%\n5",{a:7},"",{x:4.5},"",{a:5},"^\n6"],
-[{y:-0.875,w:1.5},"~\n`","!\n1",{x:14.5},")\n0",{w:1.5},"+\n="],
-[{y:-0.375,x:3.5,c:"#cccccc",a:7,fa:[7]},"D",{x:10.5},"R"],
-[{y:-0.875,x:2.5,c:"#eeeeee"},"W",{x:1,c:"#cccccc"},"F",{x:8.5,c:"#eeeeee"},"U",{x:1,c:"#cccccc"},"L"],
-[{y:-0.875,x:5.5},"K",{c:"#eeeeee",a:5,fa:[5,0,0,0,0,0,7],h:1.5},"|\n\n\n\n\n\n\\",{x:4.5,h:1.5},"?\n\n\n\n\n\n/",{c:"#cccccc",a:7,fa:[7]},"J"],
-[{y:-0.875,c:"#eeeeee",fa:[2],w:1.5},"TAB",{fa:[7]},"Q",{x:14.5,c:"#cccccc",a:5,fa:[5,7,0,0,0,0,0]},":\n;",{c:"#eeeeee",w:1.5},"_\n-"],
-[{y:-0.375,x:3.5,c:"#cccccc",a:7,fa:[7]},"E",{x:10.5},"I"],
-[{y:-0.875,x:2.5,c:"#eeeeee"},"S",{x:1,c:"#cccccc"},"T",{x:8.5},"N",{x:1},"O"],
-[{y:-0.875,x:5.5,c:"#eeeeee"},"G",{x:6.5,c:"#cccccc"},"Y"],
-[{y:-0.875,c:"#eeeeee",a:5,fa:[7,2,0,0,0,0,2],w:1.5},"\nESC\n\n\n\n\nCTRL",{a:7},"A",{x:14.5,c:"#cccccc"},"H",{c:"#eeeeee",fa:[2],w:1.5},"ENTER"],
-[{y:-0.625,x:6.5,a:5,fa:[5,0,0,0,0,0,7],h:1.5},"{\n\n\n\n\n\n[",{x:4.5,h:1.5},"}\n\n\n\n\n\n]"],
-[{y:-0.75,x:3.5,a:7,fa:[7]},"C",{x:10.5,a:5,fa:[5,7,0,0,0,0,0]},"<\n,"],
-[{y:-0.875,x:2.5,a:7,fa:[7]},"X",{x:1},"V",{x:8.5},"M",{x:1,a:5,fa:[5,7,0,0,0,0,0]},">\n."],
-[{y:-0.875,x:5.5,a:7,fa:[7]},"B",{x:6.5,c:"#cccccc"},"P"],
-[{y:-0.875,c:"#eeeeee",fa:[2],w:1.5},"SHIFT",{fa:[7]},"Z",{x:14.5,a:5,fa:[5,7,0,0,0,0,0]},"?\n/",{a:7,fa:[2],w:1.5},"SHIFT"],
-[{y:-0.375,x:3.5},"ALT",{x:10.5},"ALT"],
-[{y:-0.875,x:2.5},"",{x:1},"CMD",{x:8.5},"CTRL",{x:1},""],
-[{y:-0.75,x:0.5,f:3},"L2","",{x:14.5},"",""],
-[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"VOL-","MUTE"],
-[{h:2},"BS",{h:2},"ESC","VOL+"],
-[{x:2},"~L1"],
-[{r:-30,rx:13,y:-1,x:-3},"PLAY","NEXT"],
-[{x:-3},"PREV",{a:5,fa:[5,0,0,0,0,0,7],h:2},"\"\n\n\n\n\n\n'",{a:7,fa:[2],h:2},"SPACE"],
-[{x:-3},"~L3"]
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png
deleted file mode 100644
index 0b8539cfac..0000000000
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/base.png
+++ /dev/null
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json
deleted file mode 100644
index 5c3f0b8a20..0000000000
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[{x:3.5,c:"#eeeeee",a:7},"",{x:10.5},""],
-[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
-[{y:-0.875,x:5.5},"","",{x:4.5},"",""],
-[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
-[{y:-0.375,x:3.5,fa:[7]},"3",{x:10.5},"8"],
-[{y:-0.875,x:2.5},"2",{x:1},"4",{x:8.5},"7",{x:1},"9"],
-[{y:-0.875,x:5.5},"5",{h:1.5},"",{x:4.5,h:1.5},"","6"],
-[{y:-0.875,w:1.5},"","1",{x:14.5},"0",{w:1.5},""],
-[{y:-0.375,x:3.5},"E",{x:10.5},"I"],
-[{y:-0.875,x:2.5},"W",{x:1},"R",{x:8.5},"U",{x:1},"O"],
-[{y:-0.875,x:5.5},"T",{x:6.5},"Y"],
-[{y:-0.875,w:1.5},"","Q",{x:14.5},"P",{w:1.5},"["],
-[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""],
-[{y:-0.75,x:3.5},"D",{x:10.5},"K"],
-[{y:-0.875,x:2.5},"S",{x:1},"F",{x:8.5},"J",{x:1},"L"],
-[{y:-0.875,x:5.5},"G",{x:6.5},"H"],
-[{y:-0.875,w:1.5},"","A",{x:14.5},";",{w:1.5},"'"],
-[{y:-0.375,x:3.5},"",{x:10.5},""],
-[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""],
-[{y:-0.75,x:0.5},"","",{x:14.5},"",""],
-[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""],
-[{h:2},"C",{h:2},"V",""],
-[{x:2},""],
-[{r:-30,rx:13,y:-1,x:-3},"",""],
-[{x:-3},"",{h:2},"N",{h:2},"M"],
-[{x:-3},""]
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png
deleted file mode 100644
index f8d38204fc..0000000000
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/plvr.png
+++ /dev/null
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json
deleted file mode 100644
index ccd1d74e4b..0000000000
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[{x:3.5,c:"#eeeeee",a:7,fa:[7]},"F3",{x:10.5},"F8"],
-[{y:-0.875,x:2.5},"F2",{x:1},"F4",{x:8.5},"F7",{x:1},"F9"],
-[{y:-0.875,x:5.5},"F5","",{x:4.5},"","F6"],
-[{y:-0.875,w:1.5},"","F1",{x:14.5},"F10",{w:1.5},"F11"],
-[{y:-0.375,x:3.5},"{",{x:10.5},"8"],
-[{y:-0.875,x:2.5},"@",{x:1},"}",{x:8.5},"7",{x:1},"9"],
-[{y:-0.875,x:5.5},"|",{h:1.5},"",{x:4.5,h:1.5},"",{fa:[2]},"UP"],
-[{y:-0.875,w:1.5},"",{fa:[7]},"!",{x:14.5},"*",{w:1.5},"F12"],
-[{y:-0.375,x:3.5},"(",{x:10.5},"5"],
-[{y:-0.875,x:2.5},"$",{x:1},")",{x:8.5},"4",{x:1},"6"],
-[{y:-0.875,x:5.5},"`",{x:6.5,fa:[2]},"DOWN"],
-[{y:-0.875,w:1.5},"",{fa:[7]},"#",{x:14.5},"+",{w:1.5},""],
-[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""],
-[{y:-0.75,x:3.5},"[",{x:10.5},"2"],
-[{y:-0.875,x:2.5},"^",{x:1},"]",{x:8.5},"1",{x:1},"3"],
-[{y:-0.875,x:5.5},"~",{x:6.5},"&"],
-[{y:-0.875,w:1.5},"","%",{x:14.5},"\\",{w:1.5},""],
-[{y:-0.375,x:3.5},"",{x:10.5},"."],
-[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},"0"],
-[{y:-0.75,x:0.5},"","",{x:14.5},"=",""],
-[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""],
-[{h:2},"",{h:2},"",""],
-[{x:2},""],
-[{r:-30,rx:13,y:-1,x:-3},"",""],
-[{x:-3},"",{h:2},"",{h:2},""],
-[{x:-3},""]
-
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png
deleted file mode 100644
index 83dc2242ba..0000000000
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keyboard-layout-editor/symb.png
+++ /dev/null
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c
index 150d0f6443..173fc4ecd5 100644
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c
@@ -9,53 +9,46 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = KEYMAP(
-    //
-    KC_TILD,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
-    KC_TAB,        KC_Q,    KC_W,    KC_D,    KC_F,    KC_K,    KC_BSLS,
+    KC_GRV,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_F14,
+    KC_TAB,        KC_Q,    KC_W,    KC_D,    KC_F,    KC_K,    TG(PLVR),
     CTL_T(KC_ESC), KC_A,    KC_S,    KC_E,    KC_T,    KC_G,
     KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,
-    TG(PLVR),      KC_TRNS, KC_TRNS, KC_LALT, KC_LGUI,
+    KC_F1,         KC_F2,   KC_F3,   KC_LALT, KC_LGUI,
     /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    KC_VOLD, KC_MUTE,
     /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_VOLU,
-    /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    KC_BSPC, KC_ESC,  KC_FN1,
+    /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    KC_BSPC, CTL_T(KC_ESC), KC_FN1,
     //
-    /*-*/          KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
-    /*-*/          KC_SLSH, KC_J,    KC_U,    KC_R,    KC_L,    KC_SCLN, KC_MINS,
-    /*-*/          /*-*/    KC_Y,    KC_N,    KC_I,    KC_O,    KC_H,    KC_ENT,
-    /*-*/          KC_RBRC, KC_P,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    /*-*/          /*-*/    /*-*/    KC_RCTL, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS,
+    /*-*/          KC_F15,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_EQL,
+    /*-*/          KC_BSLS, KC_J,    KC_U,    KC_R,    KC_L,    KC_SCLN,       KC_MINS,
+    /*-*/          /*-*/    KC_Y,    KC_N,    KC_I,    KC_O,    KC_H,          KC_ENT,
+    /*-*/          KC_RBRC, KC_P,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,       KC_RSFT,
+    /*-*/          /*-*/    /*-*/    KC_RGUI, KC_RALT, KC_F4,   KC_F5,         KC_F6,
     KC_MPLY,       KC_MNXT,
     KC_MPRV,
     KC_FN3,        KC_QUOT, KC_SPC
-    //
   ),
-  //
   [SYMB] = KEYMAP(
-    //
-    KC_TRNS,       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
-    KC_TRNS,       KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
-    KC_TRNS,       KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,
-    KC_TRNS,       KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS,
+    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
+    KC_TRNS,       KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,
+    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS,
     /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,
     /*-*/          /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS, KC_TRNS,
     //
-    /*-*/          KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-    /*-*/          KC_TRNS, KC_UP,   KC_7,    KC_8,    KC_9,    KC_ASTR, KC_F12,
-    /*-*/          /*-*/    KC_DOWN, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-    /*-*/          KC_TRNS, KC_AMPR, KC_1,    KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-    /*-*/          /*-*/    /*-*/    KC_TRNS, KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
+    /*-*/          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,
+    /*-*/          KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_TRNS,
+    /*-*/          /*-*/    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,       KC_TRNS,
+    /*-*/          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,
+    /*-*/          /*-*/    /*-*/    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,
     KC_TRNS,       KC_TRNS,
     KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_TRNS
-    //
   ),
-  //
   [PLVR] = KEYMAP(
-    //
-    KC_NO,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-    KC_NO,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_NO,
+    KC_NO,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
+    KC_NO,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS,
     KC_NO,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
     KC_NO,         KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_NO,
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_NO,   KC_NO,
@@ -63,37 +56,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,
     /*-*/          /*-*/    /*-*/    /*-*/    KC_C,    KC_V,    KC_NO,
     //
-    /*-*/          KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-    /*-*/          KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
-    /*-*/          /*-*/    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    /*-*/          KC_NO,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    /*-*/          /*-*/    /*-*/    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_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_NO,
+    /*-*/          /*-*/    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,          KC_LBRC,
+    /*-*/          KC_NO,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,       KC_QUOT,
+    /*-*/          /*-*/    /*-*/    KC_NO,   KC_NO,   KC_NO,   KC_NO,         KC_NO,
     KC_TRNS,       KC_TRNS,
     KC_TRNS,
     KC_NO,         KC_N,    KC_M
-    //
   ),
-  //
   [ARRW] = KEYMAP(
-    //
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS,       KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,       KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS,       KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS,
     /*-*/          /*-*/    /*-*/    /*-*/    /*-*/    /*-*/    KC_TRNS,
     /*-*/          /*-*/    /*-*/    /*-*/    KC_TRNS, KC_TRNS, KC_TRNS,
     //
-    /*-*/          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    /*-*/          KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,
-    /*-*/          /*-*/    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,
-    /*-*/          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    /*-*/          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,
+    /*-*/          KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,       KC_TRNS,
+    /*-*/          /*-*/    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,       KC_TRNS,
+    /*-*/          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,
     /*-*/          /*-*/    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS,       KC_TRNS,
     KC_TRNS,
     KC_TRNS,       KC_TRNS, KC_TRNS
-    //
   ),
 };
 
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md
index 8b03e3323f..0777de4713 100644
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md
+++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md
@@ -3,16 +3,18 @@
 There are four layers:
 
 - **BASE** is [Norman layout](https://normanlayout.info/).
-- **PLVR** is optimized for [Plover](http://www.openstenoproject.org).
 - **SYMB** for numbers and symbols.
+- **PLVR** is optimized for [Plover](http://www.openstenoproject.org).
 - **ARRW** for navigation.
 
+[![keyboard-layout](romanzolotarev-norman-plover-osx.png)]()
+
 ## Switching
 
-- Tap `~L1` to toggle **SYMB**.
-- Tap `~L3` to toggle **ARRW**.
-- Hold `~L1` (or `~L3`) to activate **SYMB** (or **ARRW**) while holding.
-- Tap `L2` to toggle **PLVR**.
+- Tap `SYMB` to toggle **SYMB**.
+- Tap `ARRW` to toggle **ARRW**.
+- Hold `SYMB` (or `ARRW`) to activate **SYMB** (or **ARRW**) while holding.
+- Tap `PLVR` to toggle **PLVR**.
 
 ## LEDs
 
@@ -20,6 +22,14 @@ There are four layers:
 - Green: PLVR is on.
 - Blue: ARRW is on.
 
+## Functional Keys
+
+- Tap `F1` to mute microphone via [Shush](http://mizage.com/shush/).
+- Tap `F2` to copy screenshot to the clipboard.
+- Hold `SHIFT` and tap `F2` to save screenshot as a file.
+- Tap `F3`, `F4`, `F5`, `F6` to resize a window via [Divvy](http://mizage.com/divvy/).
+- Tap `F14`, `F15` to adjust display brightness.
+
 ## CTRL/ESC
 
 Both of those keys are frequently used in Vim.
@@ -31,21 +41,3 @@ Both of those keys are frequently used in Vim.
 
 - While in **BASE** hold left `SHIFT` and right `SHIRT` and then tap `N`.
 - Then you can activate **PLVR** and use ErgoDox EZ for steno.
-
-## Layers
-
-BASE
-
-![base](keyboard-layout-editor/base.png)
-
-SYMB
-
-![symb](keyboard-layout-editor/symb.png)
-
-PLVR
-
-![plvr](keyboard-layout-editor/plvr.png)
-
-ARRW
-
-![arrw](keyboard-layout-editor/arrw.png)
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex
index eeb0eb9351..b5eded6e66 100644
--- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex
+++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex
@@ -12,42 +12,42 @@
 :1000B0006B0E7D0D6B0EC20DE50D6B0E3A0E4D0EE7

 :1000C0002F112F115E115E11A111DF11F813F8131A

 :1000D000F811F813F912F912CC13F813F813E3130B

-:1000E0000000F0A1F0A2F0A335022B002971E1007D

-:1000F000025400001E00140004001D000100C10095

-:100100001F001A0016001B00010029002000070034

+:1000E0000000F0A1F0A2F0A335002B002971E1007F

+:1000F0003A0000001E00140004001D003B00C10077

+:100100001F001A0016001B003C0029712000070088

 :1001100008000600E2002A0021000900170019006B

-:10012000E300AA0022000E000A0005000000A9005A

-:100130000100310000002F000000A800010038007D

+:10012000E300A90022000E000A0005000000AA005A

+:100130006900025400002F000000A8006A0031008E

 :10014000000030000000AE0023000D001C00130072

-:100150000000AB002400180011001000E400AC0007

+:100150000000AB002400180011001000E700AC0004

 :10016000250015000C003600E6002C0026000F00CC

-:100170001200370001003400270033000B00380064

-:100180000100C3002E002D002800E5000100000042

-:100190000100010001000100010000003A001E0200

-:1001A00020022202010001003B001F022102230263

-:1001B000010001003C002F0226022F000100010077

-:1001C0003D00300227023000010001003E003102F4

-:1001D00035003502000001000100010000000100AF

+:10017000120037003D003400270033000B00380028

+:100180003E00C3002E002D002800E5003F000000C7

+:1001900001000100010001000100000001001E003B

+:1001A0001E0201000100010001001F001F020100EA

+:1001B00001000100010020002002010001000100F7

+:1001C00001002100210201000100010001002200C4

+:1001D00022020100000001000100010000000100F6

 :1001E000000001000100010000000100000001000A

-:1001F0003F00520051002402000001004000240092

-:1002000021001E00010001004100250022001F0006

-:1002100037000100420026002300200027000100D3

-:10022000430025022E0231002E000100440045004B

+:1001F000010023002302010000000100010024008F

+:100200002402010001000100010025002502010077

+:10021000010001000100260026020100010001008A

+:100220000100270027020100010001000100010078

 :1002300001000100010000000000000000000000BB

 :100240000100000000001E00140004000100000076

 :1002500000001F001A001600010019000000200015

 :10026000080007000000060000002100150009003A

 :10027000000001000000220017000A000000010039

-:10028000000000000000000000000100000000006D

+:10028000010001000000000000000100010000006A

 :100290000000000000000100000023001C000B0013

 :1002A000000001000000240018000D000000010003

 :1002B000000025000C000E000000100000002600C9

 :1002C00012000F000000110000002700130033008F

 :1002D00000000000000000002F00340000000000BB

 :1002E0000100010001000100010000000100010007

-:1002F000010001000100010001000100F200010005

-:10030000010001000100F000F1000100F400010013

-:1003100001000100F3000100F500010001000100EF

+:1002F00001000100010001000100F400F200010012

+:10030000010001000100F000F10001000100010006

+:100310000100F500F30001000100010001000100EF

 :1003200001000100000001000100010000000100C7

 :1003300000000100010001000000010000000100B8

 :1003400001000100010001000000010001000100A6

diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
new file mode 100644
index 0000000000..10b0752be5
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png