diff --git a/right/src/config/parse_keymap.c b/right/src/config/parse_keymap.c
index 63290b0..7b2ebfd 100644
--- a/right/src/config/parse_keymap.c
+++ b/right/src/config/parse_keymap.c
@@ -90,43 +90,43 @@ static void parseMouseAction(key_action_t *keyAction, serialized_buffer_t *buffe
 
     keyAction->type = KeyActionType_Mouse;
     switch (mouseAction) {
-    case 0: // leftClick
+    case SerializedMouseAction_LeftClick:
         keyAction->mouse.buttonActions |= MouseButton_Left;
         break;
-    case 1: // middleClick
+    case SerializedMouseAction_MiddleClick:
         keyAction->mouse.buttonActions |= MouseButton_Middle;
         break;
-    case 2: // rightClick
+    case SerializedMouseAction_RightClick:
         keyAction->mouse.buttonActions |= MouseButton_Right;
         break;
-    case 3: // moveUp
+    case SerializedMouseAction_MoveUp:
         keyAction->mouse.moveActions |= MouseMove_Up;
         break;
-    case 4: // moveDown
+    case SerializedMouseAction_MoveDown:
         keyAction->mouse.moveActions |= MouseMove_Down;
         break;
-    case 5: // moveLeft
+    case SerializedMouseAction_MoveLeft:
         keyAction->mouse.moveActions |= MouseMove_Left;
         break;
-    case 6: // moveRight
+    case SerializedMouseAction_MoveRight:
         keyAction->mouse.moveActions |= MouseMove_Right;
         break;
-    case 7: // scrollUp
+    case SerializedMouseAction_ScrollUp:
         keyAction->mouse.scrollActions |= MouseScroll_Up;
         break;
-    case 8: // scrollDown
+    case SerializedMouseAction_ScrollDown:
         keyAction->mouse.scrollActions |= MouseScroll_Down;
         break;
-    case 9: // scrollLeft
+    case SerializedMouseAction_ScrollLeft:
         keyAction->mouse.scrollActions |= MouseScroll_Left;
         break;
-    case 10: // scrollRight
+    case SerializedMouseAction_ScrollRight:
         keyAction->mouse.scrollActions |= MouseScroll_Right;
         break;
-    case 11: // accelerate
+    case SerializedMouseAction_Accelerate:
         keyAction->mouse.moveActions |= MouseMove_Accelerate;
         break;
-    case 12: // decelerate
+    case SerializedMouseAction_Decelerate:
         keyAction->mouse.moveActions |= MouseMove_Decelerate;
         break;
     }
diff --git a/right/src/config/parse_keymap.h b/right/src/config/parse_keymap.h
index 4d479d2..2e7d199 100644
--- a/right/src/config/parse_keymap.h
+++ b/right/src/config/parse_keymap.h
@@ -15,13 +15,6 @@
 
 // Typedefs:
 
-    typedef enum {
-        SerializedKeystrokeType_Basic,
-        SerializedKeystrokeType_ShortMedia,
-        SerializedKeystrokeType_LongMedia,
-        SerializedKeystrokeType_System,
-    } serialized_keystroke_type_t;
-
     typedef enum {
         SerializedKeyActionType_None = 0,
         SerializedKeyActionType_KeyStroke = 1,
@@ -32,6 +25,29 @@
         SerializedKeyActionType_PlayMacro
     } serialized_key_action_type_t;
 
+    typedef enum {
+        SerializedKeystrokeType_Basic,
+        SerializedKeystrokeType_ShortMedia,
+        SerializedKeystrokeType_LongMedia,
+        SerializedKeystrokeType_System,
+    } serialized_keystroke_type_t;
+
+    typedef enum {
+        SerializedMouseAction_LeftClick,
+        SerializedMouseAction_MiddleClick,
+        SerializedMouseAction_RightClick,
+        SerializedMouseAction_MoveUp,
+        SerializedMouseAction_MoveDown,
+        SerializedMouseAction_MoveLeft,
+        SerializedMouseAction_MoveRight,
+        SerializedMouseAction_ScrollUp,
+        SerializedMouseAction_ScrollDown,
+        SerializedMouseAction_ScrollLeft,
+        SerializedMouseAction_ScrollRight,
+        SerializedMouseAction_Accelerate,
+        SerializedMouseAction_Decelerate,
+    } serialized_mouse_action_t;
+
     typedef struct {
         uint8_t *buffer;
         uint16_t offset;