diff --git a/KeyboardioFirmware.ino b/KeyboardioFirmware.ino
index 47376923..acb2a44f 100644
--- a/KeyboardioFirmware.ino
+++ b/KeyboardioFirmware.ino
@@ -17,6 +17,8 @@
 #include "digitalWriteFast.h"
 #include <Wire.h>
 #include "KeyboardioSX1509.h"
+#include "HID-Project.h"
+
 
 
 
@@ -143,7 +145,7 @@ void scan_matrix()
   TS("Releasing keys not being pressed")
   release_keys_not_being_pressed();
   TS("Sending key report");
-  Keyboard.sendCurrentReport();
+  Keyboard.sendReport();
   TS("clearing internal key report")
   reset_key_report();
   handle_mouse_movement(x, y);
@@ -402,7 +404,7 @@ void reset_key_report()
 void handle_synthetic_key_press(byte switchState, Key mappedKey) {
   if (mappedKey.flags & IS_CONSUMER) {
     if (key_toggled_on (switchState)) {
-      Keyboard.consumerControl(mappedKey.rawKey);
+      ConsumerControl.press(mappedKey.rawKey);
     }
   }
   
@@ -415,7 +417,7 @@ void handle_synthetic_key_press(byte switchState, Key mappedKey) {
   }
   else if (mappedKey.flags & IS_SYSCTL) {
     if (key_toggled_on (switchState)) {
-      Keyboard.systemControl(mappedKey.rawKey);
+      SystemControl.press(mappedKey.rawKey);
     }
   }
   else  if (mappedKey.flags & IS_MACRO) {
diff --git a/key_defs.h b/key_defs.h
index 188f638d..3b35174c 100644
--- a/key_defs.h
+++ b/key_defs.h
@@ -1,3 +1,5 @@
+#include "HIDTables.h"
+#include "HIDAliases.h"
 typedef struct {
   byte flags;
   byte rawKey;
@@ -87,337 +89,174 @@ typedef struct {
 
 
 
-#define Key_powerDown (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_POWER_DOWN }
-#define Key_sleep (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_SLEEP }
-#define Key_wakeup (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_WAKEUP }
-#define Key_coldRestart (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_COLD_RESTART }
-#define Key_warmRestart (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_WARM_RESTART }
-#define Key_dock (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_DOCK }
-#define Key_undock (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_UNDOCK }
-#define Key_speakerMute (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_SPEAKER_MUTE }
-#define Key_hibernate (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_HIBERNATE }
-#define Key_displayInvert (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_DISPLAY_INVERT }
-#define Key_displayInternal (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_DISPLAY_INTERNAL }
-#define Key_displayExternal (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_DISPLAY_EXTERNAL }
-#define Key_displayBoth (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_DISPLAY_BOTH }
-#define Key_displayDual (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_DISPLAY_DUAL }
-#define Key_displayToggle (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_DISPLAY_TOGGLE_INT_EXT
-#define Key_displaySwap (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,SYSTEM_CONTROL_DISPLAY_SWAP }
+#define Key_powerDown (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_POWER_DOWN }
+#define Key_sleep (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_SLEEP }
+#define Key_wakeup (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_WAKEUP }
+#define Key_coldRestart (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_COLD_RESTART }
+#define Key_warmRestart (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_WARM_RESTART }
+#define Key_dock (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_DOCK }
+#define Key_undock (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_UNDOCK }
+#define Key_speakerMute (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_SPEAKER_MUTE }
+#define Key_hibernate (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_HIBERNATE }
+#define Key_displayInvert (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_DISPLAY_INVERT }
+#define Key_displayInternal (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_DISPLAY_INTERNAL }
+#define Key_displayExternal (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_DISPLAY_EXTERNAL }
+#define Key_displayBoth (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_DISPLAY_BOTH }
+#define Key_displayDual (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_DISPLAY_DUAL }
+#define Key_displayToggle (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_DISPLAY_TOGGLE_INT_EXT
+#define Key_displaySwap (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_SYSCTL,HID_SYSTEM_DISPLAY_SWAP }
 
 
-#define Key_volumeMute (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_VOLUME_MUTE}
-#define Key_volumeUp (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_VOLUME_UP}
-#define Key_volumeDown (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_VOLUME_DOWN}
-#define Key_playPause (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_PLAY_PAUSE}
-#define Key_stop (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_STOP}
-#define Key_prevTrack (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_PREV_TRACK}
-#define Key_nextTrack (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_NEXT_TRACK}
-#define Key_Eject (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_EJECT}
+#define Key_volumeMute (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, HID_CONSUMER_VOLUME_MUTE}
+#define Key_volumeUp (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, HID_CONSUMER_VOLUME_INCREMENT }
+#define Key_volumeDown (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, HID_CONSUMER_VOLUME_DECREMENT }
+#define Key_playPause (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, HID_CONSUMER_PLAY_SLASH_PAUSE}
+#define Key_stop (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, HID_CONSUMER_STOP}
+#define Key_prevTrack (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, HID_CONSUMER_SCAN_PREVIOUS_TRACK}
+#define Key_nextTrack (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, HID_CONSUMER_SCAN_NEXT_TRACK}
+#define Key_Eject (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, HID_CONSUMER_EJECT}
 
 //#define Key_Cut (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_AC_CUT }
 //#define Key_Copy (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_AC_COPY}
 //#define Key_Paste (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_AC_PASTE}
 //#define Key_Undo (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_AC_UNDO }
 
-#define Key_LCtrl (Key){ KEY_FLAGS, KEY_LEFT_CTRL }
-#define KEY_LEFT_CTRL 0x80
-#define Key_LCtrl (Key){ KEY_FLAGS, KEY_LEFT_CTRL }
-#define KEY_LEFT_SHIFT 0x81
-#define Key_LShift (Key){ KEY_FLAGS, KEY_LEFT_SHIFT }
-#define KEY_LEFT_ALT 0x82
-#define Key_LAlt (Key){ KEY_FLAGS, KEY_LEFT_ALT }
-#define KEY_LEFT_GUI 0x83
-#define Key_LGUI (Key){ KEY_FLAGS, KEY_LEFT_GUI }
-#define KEY_RIGHT_CTRL 0x84
-#define Key_RCtrl (Key){ KEY_FLAGS, KEY_RIGHT_CTRL }
-#define KEY_RIGHT_SHIFT 0x85
-#define Key_RShift (Key){ KEY_FLAGS, KEY_RIGHT_SHIFT }
-#define KEY_RIGHT_ALT 0x86
-#define Key_RAlt (Key){ KEY_FLAGS, KEY_RIGHT_ALT }
-#define KEY_RIGHT_GUI 0x87
-#define Key_RGUI (Key){ KEY_FLAGS, KEY_RIGHT_GUI }
-
-#define KEY_UP_ARROW 0xDA
-#define Key_UpArrow (Key){ KEY_FLAGS, KEY_UP_ARROW }
-#define KEY_DOWN_ARROW 0xD9
-#define Key_DnArrow (Key){ KEY_FLAGS, KEY_DOWN_ARROW }
-#define KEY_LEFT_ARROW 0xD8
-#define Key_LArrow (Key){ KEY_FLAGS, KEY_LEFT_ARROW }
-#define KEY_RIGHT_ARROW 0xD7
-#define Key_RArrow (Key){ KEY_FLAGS, KEY_RIGHT_ARROW }
-#define KEY_RETURN 0xB0
+#define Key_LCtrl (Key){ KEY_FLAGS, HID_KEYBOARD_LEFT_CONTROL }
+#define Key_LShift (Key){ KEY_FLAGS, HID_KEYBOARD_LEFT_SHIFT }
+#define Key_LAlt (Key){ KEY_FLAGS, HID_KEYBOARD_LEFT_ALT }
+#define Key_LGUI (Key){ KEY_FLAGS, HID_KEYBOARD_LEFT_GUI }
+#define Key_RCtrl (Key){ KEY_FLAGS, HID_KEYBOARD_RIGHT_CONTROL }
+#define Key_RShift (Key){ KEY_FLAGS, HID_KEYBOARD_RIGHT_SHIFT }
+#define Key_RAlt (Key){ KEY_FLAGS, HID_KEYBOARD_RIGHT_ALT }
+#define Key_RGUI (Key){ KEY_FLAGS, HID_KEYBOARD_RIGHT_GUI }
+
+#define Key_UpArrow (Key){ KEY_FLAGS, HID_KEYBOARD_UP_ARROW }
+#define Key_DnArrow (Key){ KEY_FLAGS, HID_KEYBOARD_DOWN_ARROW }
+#define Key_LArrow (Key){ KEY_FLAGS, HID_KEYBOARD_LEFT_ARROW  }
+#define Key_RArrow (Key){ KEY_FLAGS, HID_KEYBOARD_RIGHT_ARROW}
 #define Key_Return (Key){ KEY_FLAGS, KEY_RETURN }
-#define KEY_ESC 0xB1
 #define Key_Esc (Key){ KEY_FLAGS, KEY_ESC }
-#define KEY_BACKSPACE 0xB2
 #define Key_Backspace (Key){ KEY_FLAGS, KEY_BACKSPACE }
-#define KEY_TAB 0xB3
 #define Key_Tab (Key){ KEY_FLAGS, KEY_TAB }
-#define KEY_INSERT 0xD1
 #define Key_Insert (Key){ KEY_FLAGS, KEY_INSERT }
-#define KEY_DELETE 0xD4
-#define Key_Delete (Key){ KEY_FLAGS, KEY_DELETE }
-#define KEY_PAGE_UP 0xD3
-#define Key_PageUp (Key){ KEY_FLAGS, KEY_PAGE_UP }
-#define KEY_PAGE_DOWN 0xD6
-#define Key_PageDn (Key){ KEY_FLAGS, KEY_PAGE_DOWN }
-#define KEY_HOME 0xD2
+#define Key_Delete (Key){ KEY_FLAGS, HID_KEYBOARD_DELETE }
+#define Key_PageUp (Key){ KEY_FLAGS, KEY_PGUP }
+#define Key_PageDn (Key){ KEY_FLAGS, KEY_PGDN }
 #define Key_Home (Key){ KEY_FLAGS, KEY_HOME }
-#define KEY_END 0xD5
 #define Key_End (Key){ KEY_FLAGS, KEY_END }
 
 
-#define KEY_CAPS_LOCK 0xC1
 #define Key_CapsLock (Key){ KEY_FLAGS, KEY_CAPS_LOCK }
-#define KEY_F1 0xC2
 #define Key_F1 (Key){ KEY_FLAGS, KEY_F1 }
-#define KEY_F2 0xC3
 #define Key_F2 (Key){ KEY_FLAGS, KEY_F2 }
-#define KEY_F3 0xC4
 #define Key_F3 (Key){ KEY_FLAGS, KEY_F3 }
-#define KEY_F4 0xC5
 #define Key_F4 (Key){ KEY_FLAGS, KEY_F4 }
-#define KEY_F5 0xC6
 #define Key_F5 (Key){ KEY_FLAGS, KEY_F5 }
-#define KEY_F6 0xC7
 #define Key_F6 (Key){ KEY_FLAGS, KEY_F6 }
-#define KEY_F7 0xC8
 #define Key_F7 (Key){ KEY_FLAGS, KEY_F7 }
-#define KEY_F8 0xC9
 #define Key_F8 (Key){ KEY_FLAGS, KEY_F8 }
-#define KEY_F9 0xCA
 #define Key_F9 (Key){ KEY_FLAGS, KEY_F9 }
-#define KEY_F10 0xCB
 #define Key_F10 (Key){ KEY_FLAGS, KEY_F10 }
-#define KEY_F11 0xCC
 #define Key_F11 (Key){ KEY_FLAGS, KEY_F11 }
-#define KEY_F12 0xCD
 #define Key_F12 (Key){ KEY_FLAGS, KEY_F12 }
 
 
 
-#define KEY_0 '0'
 #define Key_0 (Key){ KEY_FLAGS, KEY_0 }
-#define KEY_1 '1'
 #define Key_1 (Key){ KEY_FLAGS, KEY_1 }
-#define KEY_2 '2'
 #define Key_2 (Key){ KEY_FLAGS, KEY_2 }
-#define KEY_3 '3'
 #define Key_3 (Key){ KEY_FLAGS, KEY_3 }
-#define KEY_4 '4'
 #define Key_4 (Key){ KEY_FLAGS, KEY_4 }
-#define KEY_5 '5'
 #define Key_5 (Key){ KEY_FLAGS, KEY_5 }
-#define KEY_6 '6'
 #define Key_6 (Key){ KEY_FLAGS, KEY_6 }
-#define KEY_7 '7'
 #define Key_7 (Key){ KEY_FLAGS, KEY_7 }
-#define KEY_8 '8'
 #define Key_8 (Key){ KEY_FLAGS, KEY_8 }
-#define KEY_9 '9'
 #define Key_9 (Key){ KEY_FLAGS, KEY_9 }
-#define KEY_A 'a'
 #define Key_A (Key){ KEY_FLAGS, KEY_A }
-#define KEY_B 'b'
 #define Key_B (Key){ KEY_FLAGS, KEY_B }
-#define KEY_C 'c'
 #define Key_C (Key){ KEY_FLAGS, KEY_C }
-#define KEY_D 'd'
 #define Key_D (Key){ KEY_FLAGS, KEY_D }
-#define KEY_E 'e'
 #define Key_E (Key){ KEY_FLAGS, KEY_E }
-#define KEY_F 'f'
 #define Key_F (Key){ KEY_FLAGS, KEY_F }
-#define KEY_G 'g'
 #define Key_G (Key){ KEY_FLAGS, KEY_G }
-#define KEY_H 'h'
 #define Key_H (Key){ KEY_FLAGS, KEY_H }
-#define KEY_I 'i'
 #define Key_I (Key){ KEY_FLAGS, KEY_I }
-#define KEY_J 'j'
 #define Key_J (Key){ KEY_FLAGS, KEY_J }
-#define KEY_K 'k'
 #define Key_K (Key){ KEY_FLAGS, KEY_K }
-#define KEY_L 'l'
 #define Key_L (Key){ KEY_FLAGS, KEY_L }
-#define KEY_M 'm'
 #define Key_M (Key){ KEY_FLAGS, KEY_M }
-#define KEY_N 'n'
 #define Key_N (Key){ KEY_FLAGS, KEY_N }
-#define KEY_O 'o'
 #define Key_O (Key){ KEY_FLAGS, KEY_O }
-#define KEY_P 'p'
 #define Key_P (Key){ KEY_FLAGS, KEY_P }
-#define KEY_Q 'q'
 #define Key_Q (Key){ KEY_FLAGS, KEY_Q }
-#define KEY_R 'r'
 #define Key_R (Key){ KEY_FLAGS, KEY_R }
-#define KEY_S 's'
 #define Key_S (Key){ KEY_FLAGS, KEY_S }
-#define KEY_T 't'
 #define Key_T (Key){ KEY_FLAGS, KEY_T }
-#define KEY_U 'u'
 #define Key_U (Key){ KEY_FLAGS, KEY_U }
-#define KEY_V 'v'
 #define Key_V (Key){ KEY_FLAGS, KEY_V }
-#define KEY_W 'w'
 #define Key_W (Key){ KEY_FLAGS, KEY_W }
-#define KEY_X 'x'
 #define Key_X (Key){ KEY_FLAGS, KEY_X }
-#define KEY_Y 'y'
 #define Key_Y (Key){ KEY_FLAGS, KEY_Y }
-#define KEY_Z 'z'
 #define Key_Z (Key){ KEY_FLAGS, KEY_Z }
 
-#define KEY_BACKTICK '`'
-#define Key_Backtick (Key){ KEY_FLAGS, KEY_BACKTICK }
-#define KEY_MINUS '-'
+#define Key_Backtick (Key){ KEY_FLAGS, KEY_GRAVE }
 #define Key_Minus (Key){ KEY_FLAGS, KEY_MINUS }
-#define KEY_EQUALS '='
 #define Key_Equals (Key){ KEY_FLAGS, KEY_EQUALS }
-#define KEY_LEFT_BRACKET '['
 #define Key_LBracket (Key){ KEY_FLAGS, KEY_LEFT_BRACKET }
-#define KEY_RIGHT_BRACKET ']'
 #define Key_RBracket (Key){ KEY_FLAGS, KEY_RIGHT_BRACKET }
-#define KEY_BACKSLASH '\\'
 #define Key_Backslash (Key){ KEY_FLAGS, KEY_BACKSLASH }
-#define KEY_PIPE '|'
-#define Key_Pipe (Key){ KEY_FLAGS, KEY_PIPE }
-
-#define KEY_LEFT_SQUARE_BRACKET '['
-#define Key_LSquareBracket (Key){ KEY_FLAGS, KEY_LEFT_SQUARE_BRACKET }
-#define KEY_RIGHT_SQUARE_BRACKET ']'
-#define Key_RSquareBracket (Key){ KEY_FLAGS, KEY_RIGHT_SQUARE_BRACKET }
-#define KEY_LEFT_CURLY_BRACKET '{'
-#define Key_LCurlyBracket (Key){ KEY_FLAGS, KEY_LEFT_CURLY_BRACKET }
-#define KEY_RIGHT_CURLY_BRACKET '}'
-#define Key_RCurlyBracket (Key){ KEY_FLAGS, KEY_RIGHT_CURLY_BRACKET }
-
-#define KEY_SEMICOLON ';'
+#define Key_Pipe (Key){ KEY_FLAGS|SHIFT_HELD, HID_KEYBOARD_BACKSLASH_AND_PIPE }
+#define Key_LSquareBracket (Key){ KEY_FLAGS, KEY_L_BRACKET }
+#define Key_RSquareBracket (Key){ KEY_FLAGS, KEY_R_BRACKET }
+#define Key_LCurlyBracket (Key){ KEY_FLAGS|SHIFT_HELD, KEY_L_BRACKET }
+#define Key_RCurlyBracket (Key){ KEY_FLAGS|SHIFT_HELD, KEY_R_BRACKET }
 #define Key_Semicolon (Key){ KEY_FLAGS, KEY_SEMICOLON }
-#define KEY_QUOTE '\''
 #define Key_Quote (Key){ KEY_FLAGS, KEY_QUOTE }
-#define KEY_COMMA ','
 #define Key_Comma (Key){ KEY_FLAGS, KEY_COMMA }
-#define KEY_PERIOD '.'
 #define Key_Period (Key){ KEY_FLAGS, KEY_PERIOD }
-#define KEY_SPACE ' '
 #define Key_Space (Key){ KEY_FLAGS, KEY_SPACE }
-#define KEY_SLASH '/'
 #define Key_Slash (Key){ KEY_FLAGS, KEY_SLASH }
 
-
 #define Key_LEFT_PAREN (Key) { KEY_FLAGS|SHIFT_HELD, KEY_9 }
 #define Key_RIGHT_PAREN (Key){ KEY_FLAGS|SHIFT_HELD, KEY_0 }
 
 
-#define KEY_KEYPAD_CLEAR 0xDB
-#define Key_KeypadClear (Key){ KEY_FLAGS, KEY_KEYPAD_CLEAR }
-#define KEY_KEYPAD_SLASH 0xDC
-#define Key_KeypadSlash (Key){ KEY_FLAGS, KEY_KEYPAD_SLASH }
-#define KEY_KEYPAD_MULTIPLY 0xDD
-#define Key_KeypadMultiply (Key){ KEY_FLAGS, KEY_KEYPAD_MULTIPLY }
-#define KEY_KEYPAD_MINUS 0xDE
-#define Key_KeypadMinus (Key){ KEY_FLAGS, KEY_KEYPAD_MINUS }
-#define KEY_KEYPAD_PLUS 0xDF
-#define Key_KeypadPlus (Key){ KEY_FLAGS, KEY_KEYPAD_PLUS }
-#define KEY_ENTER 0xe0
-#define Key_Enter (Key){ KEY_FLAGS, KEY_ENTER }
-#define KEY_KEYPAD_1 0xe1
-#define Key_Keypad1 (Key){ KEY_FLAGS, KEY_KEYPAD_1 }
-#define KEY_KEYPAD_2 0xe2
-#define Key_Keypad2 (Key){ KEY_FLAGS, KEY_KEYPAD_2 }
-#define KEY_KEYPAD_3 0xe3
-#define Key_Keypad3 (Key){ KEY_FLAGS, KEY_KEYPAD_3 }
-#define KEY_KEYPAD_4 0xe4
-#define Key_Keypad4 (Key){ KEY_FLAGS, KEY_KEYPAD_4 }
-#define KEY_KEYPAD_5 0xe5
-#define Key_Keypad5 (Key){ KEY_FLAGS, KEY_KEYPAD_5 }
-#define KEY_KEYPAD_6 0xe6
-#define Key_Keypad6 (Key){ KEY_FLAGS, KEY_KEYPAD_6 }
-#define KEY_KEYPAD_7 0xe7
-#define Key_Keypad7 (Key){ KEY_FLAGS, KEY_KEYPAD_7 }
-#define KEY_KEYPAD_8 0xe8
-#define Key_Keypad8 (Key){ KEY_FLAGS, KEY_KEYPAD_8 }
-#define KEY_KEYPAD_9 0xe9
-#define Key_Keypad9 (Key){ KEY_FLAGS, KEY_KEYPAD_9 }
-#define KEY_KEYPAD_0 0xea
-#define Key_Keypad0 (Key){ KEY_FLAGS, KEY_KEYPAD_0 }
-#define KEY_KEYPAD_DOT 0xeb
-#define Key_KeypadDot (Key){ KEY_FLAGS, KEY_KEYPAD_DOT }
-#define KEY_DANISH_DOLLAR 0xec
+#define Key_KeypadClear (Key){ KEY_FLAGS, HID_KEYPAD_CLEAR }
+#define Key_KeypadSlash (Key){ KEY_FLAGS, HID_KEYPAD_DIVIDE }
+#define Key_KeypadMultiply (Key){ KEY_FLAGS, HID_KEYPAD_MULTIPLY }
+#define Key_KeypadMinus (Key){ KEY_FLAGS, HID_KEYPAD_SUBTRACT }
+#define Key_KeypadPlus (Key){ KEY_FLAGS, HID_KEYPAD_ADD }
+#define Key_Enter (Key){ KEY_FLAGS, HID_KEYBOARD_ENTER }
+#define Key_Keypad1 (Key){ KEY_FLAGS, HID_KEYPAD_1_AND_END }
+#define Key_Keypad2 (Key){ KEY_FLAGS, HID_KEYPAD_2_AND_DOWN_ARROW}
+#define Key_Keypad3 (Key){ KEY_FLAGS, HID_KEYPAD_3_AND_PAGE_DOWN}
+#define Key_Keypad4 (Key){ KEY_FLAGS, HID_KEYPAD_4_AND_LEFT_ARROW }
+#define Key_Keypad5 (Key){ KEY_FLAGS, HID_KEYPAD_5 }
+#define Key_Keypad6 (Key){ KEY_FLAGS, HID_KEYPAD_6_AND_RIGHT_ARROW }
+#define Key_Keypad7 (Key){ KEY_FLAGS, HID_KEYPAD_7_AND_HOME }
+#define Key_Keypad8 (Key){ KEY_FLAGS, HID_KEYPAD_8_AND_UP_ARROW }
+#define Key_Keypad9 (Key){ KEY_FLAGS, HID_KEYPAD_9_AND_PAGE_UP }
+#define Key_Keypad0 (Key){ KEY_FLAGS, HID_KEYPAD_0_AND_INSERT }
+#define Key_KeypadDot (Key){ KEY_FLAGS, HID_KEYPAD_PERIOD_AND_DELETE }
 #define Key_DanishDollar (Key){ KEY_FLAGS, KEY_DANISH_DOLLAR }
-#define KEY_PC_APPLCIATION 0xed
 #define Key_PcApplciation (Key){ KEY_FLAGS, KEY_PC_APPLCIATION }
-#define KEY_F13 0xF0
 #define Key_F13 (Key){ KEY_FLAGS, KEY_F13 }
-#define KEY_F16 0xF3
 #define Key_F16 (Key){ KEY_FLAGS, KEY_F16 }
-#define KEY_F17 0xF4
 #define Key_F17 (Key){ KEY_FLAGS, KEY_F17 }
-#define KEY_F18 0xF5
 #define Key_F18 (Key){ KEY_FLAGS, KEY_F18 }
-#define KEY_F19 0xF6
 #define Key_F19 (Key){ KEY_FLAGS, KEY_F19 }
-
-#define KEY_HELP 0xfb
 #define Key_Help (Key){ KEY_FLAGS, KEY_HELP }
 #define KEY_BACKLIGHT_DOWN 0xF1
-#define Key_BacklightDn (Key){ KEY_FLAGS, KEY_BACKLIGHT_DOWN }
 #define KEY_BACKLIGHT_UP 0xF2
+#define Key_BacklightDn (Key){ KEY_FLAGS, KEY_BACKLIGHT_DOWN }
 #define Key_BacklightUp (Key){ KEY_FLAGS, KEY_BACKLIGHT_UP }
-#define NO_KEY false
 #define KEY_RIGHT_FN2 0xfe
 #define Key_RFN2 (Key){ KEY_FLAGS, KEY_RIGHT_FN2 }
 #define KEY_LEFT_FN2 0xff
 #define Key_LFN2 (Key){ KEY_FLAGS, KEY_LEFT_FN2 }
 
-#define KEY_UNDO    0x7a
 #define Key_Undo (Key){ KEY_FLAGS, KEY_UNDO }
 
-/*
-
- These keycodes don't seem to map to unique keypresses. we can use them for meta-keys
-#define KEY_WTF 0xF7
-#define Key_Wtf (Key){ KEY_FLAGS, KEY_WTF }
-
-#define Key_Xxxx (Key){ KEY_FLAGS, xxxx }
-#define xxxxx 0xFE
-#define Key_Xxxxx (Key){ KEY_FLAGS, xxxxx }
-#define KEY_ 0xB4
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xB5
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xB6
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xB7
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xB8
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xB9
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xBA
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xBB
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xBC
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xBD
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xBE
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_ 0xBF
-#define Key_ (Key){ KEY_FLAGS, KEY_ }
-#define KEY_F13_ALSO 0xC0
-#define Key_F13_also (Key){ KEY_FLAGS, KEY_F13_ALSO }
-#define KEY_SLASH_ALSO 0xCE
-#define Key_Slash_also (Key){ KEY_FLAGS, KEY_SLASH_ALSO }
-#define KEY_BACKLIGHT_DOWN_ALSO 0xCF
-#define Key_Backlight_down_also (Key){ KEY_FLAGS, KEY_BACKLIGHT_DOWN_ALSO }
-#define KEY_BACKLIGHT_UP_ALSO 0xD0
-#define Key_Backlight_up_also (Key){ KEY_FLAGS, KEY_BACKLIGHT_UP_ALSO }
- */
-
 
 #define META_NEXT_KEYMAP_MOMENTARY 0xFF
 #define Key_Keymap0 (Key){ KEY_FLAGS | SWITCH_TO_KEYMAP , KEYMAP_0 }
diff --git a/mouse_movement.cpp b/mouse_movement.cpp
index 1ef9f4f2..1b691683 100644
--- a/mouse_movement.cpp
+++ b/mouse_movement.cpp
@@ -6,11 +6,12 @@
 #include "key_defs.h"
 #include "mouse_movement.h"
 #include "debouncing.h"
+#include "HID-Project.h"
 
 void _warp_jump(long left, long top, long height, long width) {
     long x_center = left + width/2;
     long y_center = top + height/2;
-                Mouse.moveAbsolute(x_center,y_center);
+                AbsoluteMouse.moveTo(x_center,y_center);
 }