diff --git a/draculad/keymap.c b/draculad/keymap.c
index fa26231..67bdfd0 100644
--- a/draculad/keymap.c
+++ b/draculad/keymap.c
@@ -318,17 +318,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-          // Mappings for 1st Encoder          // Mappings for 2nd Encoder
-    [0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN),  ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  }, // Mapping for Base layer
-    [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),  ENCODER_CCW_CW(RGB_SAD, RGB_SAI)  }, // Mapping for Layer 1
-    [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),  ENCODER_CCW_CW(RGB_SPD, RGB_SPI)  }, // Mapping for Layer 2
-    [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) }, // Mapping for Layer 3
-    [4] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) }, // Mapping for Layer 3
-    [5] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) }, // Mapping for Layer 3
-    [6] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) }, // Mapping for Layer 3
-
-    // You can add more layers here if you need them, or you can also delete lines for layers you are not using
-};
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 2) {
+      if(clockwise) {
+        tap_code(KC_PGUP);
+      }
+      else{
+        tap_code(KC_PGDN);
+      }
+    }
+    else if (index == 3  ) {
+        // Page up/Page down
+        if (clockwise) {
+          tap_code(KC_WH_U);
+        } else {
+          tap_code(KC_WH_D);
+        }
+    }
+    return true;
+}
 #endif
diff --git a/draculad/rules.mk b/draculad/rules.mk
index 1f58278..870edb7 100644
--- a/draculad/rules.mk
+++ b/draculad/rules.mk
@@ -2,7 +2,6 @@ OLED_ENABLE = yes
 OS_DETECTION_ENABLE = yes
 MOUSEKEY_ENABLE = yes
 ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
 
 AUTO_SHIFT_ENABLE = yes