diff --git a/layouts/community/ergodox/audax_osx_neo2/keymap.c b/layouts/community/ergodox/audax_osx_neo2/keymap.c
index 5f49e19d20..213b192168 100644
--- a/layouts/community/ergodox/audax_osx_neo2/keymap.c
+++ b/layouts/community/ergodox/audax_osx_neo2/keymap.c
@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,--------------------------------------------------.           ,--------------------------------------------------.
    * |  ESC   |  1/° |  2/§ |  3/  |  4/» |  5/« | MPLAY|           | MNEXT|  6/$ |  7/€ |  8/„ |  9/“ |  0/” |  -/—   |
    * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-   * |  TAB   |   X  |   V  |   L  |   C  |   W  | LCTL |           | RCTL |   K  |   H  |   G  |   F  |   Q  |   Y    |
+   * |  TAB   |   X  |   V  |   L  |   C  |   W  | FKEYS|           | RCTL |   K  |   H  |   G  |   F  |   Q  |   Y    |
    * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
    * |  NEO_3 | CTL/U| ALT/I| LGU/A|   E  |   O  |------|           |------|   S  |   N  |   R  |   T  |   D  |   ß    |
    * |--------+------+------+------+------+------| LALT |           | RALT |------+------+------+------+------+--------|
@@ -122,13 +122,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                 ,------|------|------|       |------+------+------.
    *                                 |      |      | Ins  |       |A(G(Home))|NEO_4/|      |
    *                                 | Space|Delete|------|       |------| Enter|Space |
-   *                                 |      |      | FKEYS|       | FKEYS|      |      |
+   *                                 |      |      | LCTL |       | FKEYS|      |      |
    *                                 `--------------------'       `--------------------'
    */
   [NEO_1] = LAYOUT_ergodox(
     // left hand side - main
     KC_ESC,           NEO2_1,                   NEO2_2,                   NEO2_3,                   NEO2_4,           NEO2_5,           KC_MPLY,
-    KC_TAB,           KC_X,                     KC_V,                     KC_L,                     KC_C,             KC_W,             KC_LCTL,
+    KC_TAB,           KC_X,                     KC_V,                     KC_L,                     KC_C,             KC_W,             MO(FKEYS),
     NEO2_LMOD3,       LCTL_T(KC_U),             LALT_T(KC_I),             LGUI_T(KC_A),             KC_E,             KC_O,             /* --- */
     KC_LSFT,          NEO2_UE,                  NEO2_OE,                  NEO2_AE,                  KC_P,             KC_Z,             KC_LALT,
     KC_HOME,          KC_PGUP,                  KC_PGDN,                  KC_END,                   LSFT(LGUI(KC_A)),          /* --- */         /* --- */
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // left hand side - thumb cluster
     /* --- */         LGUI(KC_TAB),    LGUI(LSFT(KC_TAB)),
     /* KC_SPACE */     /* KC_BSPC */   KC_INS,
-    KC_SPACE,          KC_BSPC,        MO(FKEYS),
+    KC_SPACE,          KC_BSPC,        KC_LCTL,
 
     // right hand side - main
     KC_MNXT,          NEO2_6,           NEO2_7,           NEO2_8,           NEO2_9,           NEO2_0,           NEO2_MINUS,
@@ -389,13 +389,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* FKEYS: Function keys
    *
    * ,--------------------------------------------------.           ,--------------------------------------------------.
-   * |  Prev  |  F1  |  F2  |  F3  |  F4  |  F5  |  F11 |           |  F12 |  F6  |  F7  |  F8  |  F9  |  F10 |  VolUp |
+   * |  Prev  |  F1  |  F2  |  F3  |  F4  |  F5  |  F11 |           |  F12 |  F6  |  F7  |  F8  |  F9  |  F10 |        |
    * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-   * |  Play  |      |      |      |      |      |      |           |      |      |      |      |      |      |  VolDn |
+   * |  Play  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
    * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-   * |  Next  |      |      |      |      |      |------|           |------|      |      |      |      |      |  Mute  |
+   * |  Next  |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
    * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-   * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+   * |        |      |      |      |      |      |      |           |      |      |      |      |VolDn | Mute |  VolUp |
    * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
    *   |      |      |      |      |      |                                       |      |      |      |      |      |
    *   `----------------------------------'                                       `----------------------------------'
@@ -421,10 +421,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,                _______,            _______,
 
     // right hand side - main
-    KC_F12,                 KC_F6,              KC_F7,              KC_F8,                KC_F9,              KC_F10,             KC_AUDIO_VOL_UP,
-    _______,                _______,            _______,            _______,              _______,            _______,            KC_AUDIO_VOL_DOWN,
-    /* --- */               _______,            _______,            _______,              _______,            _______,            KC_AUDIO_MUTE,
+    KC_F12,                 KC_F6,              KC_F7,              KC_F8,                KC_F9,              KC_F10,             _______,
     _______,                _______,            _______,            _______,              _______,            _______,            _______,
+    /* --- */               _______,            _______,            _______,              _______,            _______,            _______,
+    _______,                _______,            _______,            _______,              KC_AUDIO_VOL_DOWN,  KC_AUDIO_MUTE,      KC_AUDIO_VOL_UP,
     /* --- */               /* --- */           _______,            _______,              _______,            _______,            _______,
 
     // right hand side - thumb cluster