1 files changed, 12 insertions, 12 deletions

diff --git a/qmk/keyboards/sofle_choc/keymaps/custom/keycodes.c b/qmk/keyboards/sofle_choc/keymaps/custom/keycodes.c
index 4fba73c..a3099e4 100644
--- a/qmk/keyboards/sofle_choc/keymaps/custom/keycodes.c
+++ b/qmk/keyboards/sofle_choc/keymaps/custom/keycodes.c
@@ -1,12 +1,11 @@
 #include QMK_KEYBOARD_H
-#include "keymap_bepo.h"
 #include "keycodes.h"
 
 uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case KEY_E:
+        case KEY_F:
             return 230;
-        case KEY_W:
+        case KEY_LOK:
         case TD_ENTER:
             return 2 * TAPPING_TERM;
         default:
@@ -36,28 +35,29 @@ bool keycodes_process_record(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case KC_ESC:
     case AL_ENT:
-      if (layer_state_is(LAYER_SYMBOLS) && !record->event.pressed) {
+      if (!record->event.pressed && \
+          (layer_state_is(LAYER_KEYPAD) || layer_state_is(LAYER_ARROW) )) {
           // Remove the layer the key is released.
           layer_clear();
       }
       return true;
     // If a key where released just before, consider we are typing some text
     // and not starting a new sequence
-    case KEY_E:
+    case KEY_F:
       if (record->event.pressed && timer_elapsed32(key_timer) < TAPPING_TERM) {
           if (is_caps_word_on()) {
               add_oneshot_mods(MOD_MASK_SHIFT);
           }
-          register_code(BP_E);
+          register_code(KC_F);
           return false;
       }
       return true;
-    case KEY_T:
+    case KEY_J:
       if (record->event.pressed && timer_elapsed32(key_timer) < TAPPING_TERM) {
           if (is_caps_word_on()) {
               add_oneshot_mods(MOD_MASK_SHIFT);
           }
-          register_code(BP_T);
+          register_code(KC_J);
           return false;
       }
       return true;
@@ -65,21 +65,21 @@ bool keycodes_process_record(uint16_t keycode, keyrecord_t *record) {
     // Override the key APP when hold into AltGR + Layer 1 when hold
     case KEY_APP:
       if (!record->tap.count && record->event.pressed) {
-          layer_on(1);
+          layer_on(LAYER_ARROW);
           register_code(KC_RIGHT_ALT);
           return false;
       } else if (!record->tap.count && !record->event.pressed) {
           unregister_code(KC_RIGHT_ALT);
-          layer_off(1);
+          layer_off(LAYER_ARROW);
           return false;
       }
 
     case KC_LGUI:
         if (record->event.pressed) {
-          layer_on(1);
+          layer_on(LAYER_ARROW);
         }
         else {
-          layer_off(1);
+          layer_off(LAYER_ARROW);
         }
         return true;