diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000.c b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000.c
index c97f53f..dd38315 100644
--- a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000.c
+++ b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000.c
@@ -79,6 +79,9 @@ void setup_ace1000_keymap(void)
 
   // assign the CLRSCR output to the virtual CLRSCR output, configure to produce a long pulse when activated
   asdf_virtual_assign(ACE1000_VIRTUAL_CLR_SCR, ACE1000_CLR_SCR_OUT, V_PULSE_LONG, !ACE1000_CLR_SCR_ACTIVE_VALUE);
+
+  // turn on caps lock
+  asdf_modifier_capslock_activate();
 }
 
 
diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000.h b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000.h
index 9bea2e5..5552c5e 100644
--- a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000.h
+++ b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000.h
@@ -58,7 +58,7 @@
 #define ACE1000_POWER_LED_INIT_VALUE 1
 
 #define ACE1000_CAPS_LED PHYSICAL_LED3
-#define ACE1000_CAPS_LED_INIT_VALUE 1
+#define ACE1000_CAPS_LED_INIT_VALUE 0
 
 #define ACE1000_ID_MESSAGE_HOOK ASDF_HOOK_USER_10
 #define APPLESOFT_KEYBOARD_TEST_HOOK ASDF_HOOK_USER_9
diff --git a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c
index 6840f7a..74c0a3b 100644
--- a/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c
+++ b/firmware/asdf/src/Keymaps/asdf_keymap_ace1000_add_map.c
@@ -93,8 +93,8 @@ const FLASH ace1000_keycode_matrix_t ace1000_ctrl_matrix = {
 };
 
 static const ace1000_keycode_matrix_t *ace1000_maps[] = {
-  [ACE1000_CAPS_MAP] = &ace1000_plain_matrix,
-  [ACE1000_PLAIN_MAP] = &ace1000_caps_matrix,
+  [ACE1000_CAPS_MAP] = &ace1000_caps_matrix,
+  [ACE1000_PLAIN_MAP] = &ace1000_plain_matrix,
   [ACE1000_SHIFT_MAP] = &ace1000_shift_matrix,
   [ACE1000_CTRL_MAP] = &ace1000_ctrl_matrix,
 };