diff --git a/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/config.h b/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/config.h
index ec062cf45..809a59ea7 100644
--- a/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/config.h
@@ -24,16 +24,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_RGB_TEST
-#    define RGBLIGHT_EFFECT_ALTERNATING
-#    define RGBLIGHT_EFFECT_TWINKLE
+// NOTE: Reduce usage of Pro Micro Capacity.
+// #    define RGBLIGHT_EFFECT_SNAKE
+// #    define RGBLIGHT_EFFECT_KNIGHT
+// #    define RGBLIGHT_EFFECT_CHRISTMAS
+// #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+// #    define RGBLIGHT_EFFECT_RGB_TEST
+// #    define RGBLIGHT_EFFECT_ALTERNATING
+// #    define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
 #define TAP_CODE_DELAY 5
 
-#define POINTING_DEVICE_AUTO_MOUSE_ENABLE
-#define AUTO_MOUSE_DEFAULT_LAYER 1
+// ref. https://mazcon.hatenablog.com/entry/2023/11/10/080000
+#define TAPPING_TERM 180 // msec
+#define DYNAMIC_KEYMAP_LAYER_COUNT 7 // number of layers
+#define KEYBALL_CPI_DEFAULT 1100 // mouse speed (default: 500)
+#define KEYBALL_SCROLL_DIV_DEFAULT 5 // scroll speed (default: 4)
+#define POINTING_DEVICE_AUTO_MOUSE_ENABLE // enable auto mouse
+#define AUTO_MOUSE_DEFAULT_LAYER 6 // switch mouse layer number
+#define AUTO_MOUSE_TIME 500 // time to return to original layer after mouse stops (ms)
diff --git a/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/keymap.c b/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/keymap.c
index ebc396758..d17e3d254 100644
--- a/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/keymap.c
+++ b/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/keymap.c
@@ -50,6 +50,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_RMOD , RGB_HUD  , RGB_SAD  , RGB_VAD  , SCRL_DVD ,                            CPI_D1K  , CPI_D100 , CPI_I100 , CPI_I1K  , KBC_SAVE ,
     QK_BOOT  , KBC_RST  , _______  , _______  , _______  , _______  ,      _______  , _______  , _______  , _______  , KBC_RST  , QK_BOOT
   ),
+
+  [4] = LAYOUT_universal(
+    RGB_TOG  , AML_TO   , AML_I50  , AML_D50  , _______  ,                            _______  , _______  , SSNP_HOR , SSNP_VRT , SSNP_FRE ,
+    RGB_MOD  , RGB_HUI  , RGB_SAI  , RGB_VAI  , SCRL_DVI ,                            _______  , _______  , _______  , _______  , _______  ,
+    RGB_RMOD , RGB_HUD  , RGB_SAD  , RGB_VAD  , SCRL_DVD ,                            CPI_D1K  , CPI_D100 , CPI_I100 , CPI_I1K  , KBC_SAVE ,
+    QK_BOOT  , KBC_RST  , _______  , _______  , _______  , _______  ,      _______  , _______  , _______  , _______  , KBC_RST  , QK_BOOT
+  ),
+
+  [5] = LAYOUT_universal(
+    RGB_TOG  , AML_TO   , AML_I50  , AML_D50  , _______  ,                            _______  , _______  , SSNP_HOR , SSNP_VRT , SSNP_FRE ,
+    RGB_MOD  , RGB_HUI  , RGB_SAI  , RGB_VAI  , SCRL_DVI ,                            _______  , _______  , _______  , _______  , _______  ,
+    RGB_RMOD , RGB_HUD  , RGB_SAD  , RGB_VAD  , SCRL_DVD ,                            CPI_D1K  , CPI_D100 , CPI_I100 , CPI_I1K  , KBC_SAVE ,
+    QK_BOOT  , KBC_RST  , _______  , _______  , _______  , _______  ,      _______  , _______  , _______  , _______  , KBC_RST  , QK_BOOT
+  ),
+
+  [6] = LAYOUT_universal(
+    RGB_TOG  , AML_TO   , AML_I50  , AML_D50  , _______  ,                            _______  , _______  , SSNP_HOR , SSNP_VRT , SSNP_FRE ,
+    RGB_MOD  , RGB_HUI  , RGB_SAI  , RGB_VAI  , SCRL_DVI ,                            _______  , _______  , _______  , _______  , _______  ,
+    RGB_RMOD , RGB_HUD  , RGB_SAD  , RGB_VAD  , SCRL_DVD ,                            CPI_D1K  , CPI_D100 , CPI_I100 , CPI_I1K  , KBC_SAVE ,
+    QK_BOOT  , KBC_RST  , _______  , _______  , _______  , _______  ,      _______  , _______  , _______  , _______  , KBC_RST  , QK_BOOT
+  ),
 };
 // clang-format on
 
diff --git a/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/rules.mk b/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/rules.mk
index 5746ccd28..d80df3fa4 100644
--- a/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/rules.mk
+++ b/qmk_firmware/keyboards/keyball/keyball39/keymaps/civitaspo/rules.mk
@@ -1,3 +1,5 @@
 RGBLIGHT_ENABLE = yes
 
 OLED_ENABLE = yes
+
+VIA_ENABLE = yes