diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.c b/keyboards/atlantis/ak81_ve/ak81_ve.c
index fcf279ed46..2426d70fe8 100644
--- a/keyboards/atlantis/ak81_ve/ak81_ve.c
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.c
@@ -40,8 +40,8 @@ led_config_t g_led_config = { {
   4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
   4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
   4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 
-  4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-  4, 4, 4, 1, 1, 4, 1, 1, 1, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
 } };
 #endif
@@ -52,9 +52,30 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
         return false;
     }
     if (clockwise) {
-        tap_code(KC_VOLD);
-    } else {
-        tap_code(KC_VOLU);
+        switch (get_highest_layer(layer_state)) {
+          case 0:
+            tap_code(KC_VOLU);
+            break;
+          case 1:
+            rgb_matrix_step();
+            break;
+          default:
+            tap_code(KC_VOLU);
+            break;
+        }
+      }
+    else {
+        switch (get_highest_layer(layer_state)) {
+          case 0:
+            tap_code(KC_VOLD);
+            break;
+          case 1:
+            rgb_matrix_step_reverse();
+            break;
+          default:
+            tap_code(KC_VOLD);
+            break;
+        }
     }
     return true;
 }
diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.h b/keyboards/atlantis/ak81_ve/ak81_ve.h
index c43f477c0a..d295320689 100644
--- a/keyboards/atlantis/ak81_ve/ak81_ve.h
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.h
@@ -16,7 +16,6 @@
 
 #pragma once
 #include "quantum.h"
-#include "encoder_actions.h"
 
 #define LAYOUT( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008,       K010, K011, K012, K013, K014, \
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 44507c47f7..1b6050f9ac 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -35,12 +35,12 @@
 #define UNUSED_PINS
 
 /* Encoder pins */
-#define ENCODERS_PAD_A { B0 }
-#define ENCODERS_PAD_B { E6 }
+#define ENCODERS_PAD_A { E6 }
+#define ENCODERS_PAD_B { B0 }
 #define ENCODER_RESOLUTION 4
 #define ENCODERS 1
-#define ENCODERS_CCW_KEY { { 3, 5 } } // Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 4, 5 } } // Note:  array is { col, row )
+#define ENCODERS_CCW_KEY { { 4, 5 } } // Note:  array is { col, row )
+#define ENCODERS_CW_KEY  { { 3, 5 } } // Note:  array is { col, row )
 
 /* LED pins */
 #define LED_CAPS_LOCK_PIN D4