diff --git a/keyboard/planck/keymaps/keymap_audax.c b/keyboard/planck/keymaps/keymap_audax.c
index 1ef46c1b95..1c9d5f86c1 100644
--- a/keyboard/planck/keymaps/keymap_audax.c
+++ b/keyboard/planck/keymaps/keymap_audax.c
@@ -5,46 +5,44 @@
 #include "backlight.h"
 #include "keymap_extras/keymap_neo2.h"
 #include "keymap_extras/keymap_german.h"
+#include "keymap_common.h"
+#include "timer.h"
+#include "action.h"
+#include "action_util.h"
+
+// Max duration that counts as a tap (ms)
+#ifndef TAPPING_TERM
+#define TAPPING_TERM 200
+#endif
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
 #define _NE 0
-#define _QW 1
-#define _LW 2
-#define _RS 3
+#define _RS 1
+
+#define NEO_L1_Y 1
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_NE] = { /* Neo 2 Soft */
-  {KC_TAB,  NEO_X,   NEO_V,   NEO_L,   NEO_C,   NEO_W,   NEO_K,   NEO_H,   NEO_G,   NEO_F,   NEO_Q,   KC_BSPC},
-  {NEO_L1_L,NEO_U,   NEO_I,   NEO_A,   NEO_E,   NEO_O,   NEO_S,   NEO_N,   NEO_R,   NEO_T,   NEO_D,   NEO_Y},
-  {KC_LSFT, NEO_UE,  NEO_OE,  NEO_AE,  NEO_P,   NEO_Z,   NEO_B,   NEO_M,   KC_COMM, KC_DOT,  NEO_J,   KC_RSFT},
-  {KC_LCTL, KC_LALT, KC_LGUI, KC_ESC,  MO(_LW), KC_SPC,  KC_ENT,  NEO_L2_L,MO(_RS), NEO_L1_R,KC_PGDN, KC_PGUP}
-},
-[_QW] = { /* Qwertz */
-  {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_SCLN, KC_QUOT},
-  {KC_LSFT, DE_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
-  {M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
+  {MEH_T(KC_TAB),NEO_X,   NEO_V,           NEO_L,   NEO_C,   NEO_W,        NEO_K,        NEO_H,   NEO_G,   NEO_F,   NEO_Q,   KC_BSPC},
+  {NEO_L1_L,     NEO_U,   NEO_I,           NEO_A,   NEO_E,   NEO_O,        NEO_S,        NEO_N,   NEO_R,   NEO_T,   NEO_D,   F(1)},
+  {KC_LSFT,      NEO_UE,  NEO_OE,          NEO_AE,  NEO_P,   NEO_Z,        NEO_B,        NEO_M,   KC_COMM, KC_DOT,  NEO_J,   SFT_T(KC_ESC)},
+  {KC_LCTL,      KC_LALT, KC_LSFT|KC_LGUI, KC_ESC,  NEO_L1_R,GUI_T(KC_SPC),CTL_T(KC_ENT),NEO_L2_L,F(0),    KC_PGUP, KC_PGDN, RESET}
 },
 [_RS] = { /* RAISE */
-  {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    NEO_SS},
-  {KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
-  {KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_NE), DF(_QW), DF(_RS), RESET,   KC_TRNS},
-  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY}
-},
-[_LW] = { /* LOWER */
-  {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL},
-  {KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
-  {KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_NE), DF(_QW), DF(_LW), RESET,   KC_TRNS},
-  {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY}
+  {KC_GRV,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,         KC_7,    KC_8,    KC_9,    KC_0,    NEO_SS},
+  {KC_TRNS,      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,        KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
+  {KC_TRNS,      KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,       KC_F12,       DF(_NE), KC_TRNS, DF(_RS), RESET,   KC_TRNS},
+  {KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,      KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY}
 }
 };
 
 
 const uint16_t PROGMEM fn_actions[] = {
-
+  [0] = ACTION_LAYER_TAP_TOGGLE(_RS),
+  [1] = ACTION_FUNCTION_TAP(NEO_L1_Y)
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
@@ -59,6 +57,27 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             unregister_code(KC_RSFT);
           }
         break;
+	return MACRO_NONE;
       }
-    return MACRO_NONE;
 };
+
+
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  switch (id) {
+    case NEO_L1_Y:
+    if (record->event.pressed) {
+	register_code(NEO_L1_R);
+    } else {
+	unregister_code(NEO_L1_R);
+	if (record->tap.count != 0) {
+	    register_code(NEO_Y);
+	    add_key(NEO_Y);
+	    send_keyboard_report();
+	    del_key(NEO_Y);
+	    send_keyboard_report();
+	}
+    }
+  break;
+  }
+}