diff --git a/OSBindings/Qt/keyboard.cpp b/OSBindings/Qt/keyboard.cpp
index 24ddba8d4..3d190befa 100644
--- a/OSBindings/Qt/keyboard.cpp
+++ b/OSBindings/Qt/keyboard.cpp
@@ -48,72 +48,73 @@ KeyboardMapper::KeyboardMapper() {
 		Inputs::Keyboard::Key destination;
 	};
 
+	using Key = Inputs::Keyboard::Key;
 	constexpr DesiredMapping mappings[] = {
 	{XK_Escape, Escape},
-	{XK_F1, F1},	{XK_F2, F2},	{XK_F3, F3},	{XK_F4, F4},	{XK_F5, F5},
-	{XK_F6, F6},	{XK_F7, F7},	{XK_F8, F8},	{XK_F9, F9},	{XK_F10, F10},
-	{XK_F11, F11},	{XK_F12, F12},
-	{XK_Sys_Req, PrintScreen},
-	{XK_Scroll_Lock, ScrollLock},
-	{XK_Pause, Pause},
+	{XK_F1, Key::F1},	{XK_F2, Key::F2},	{XK_F3, Key::F3},	{XK_F4, Key::F4},	{XK_F5, Key::F5},
+	{XK_F6, Key::F6},	{XK_F7, Key::F7},	{XK_F8, Key::F8},	{XK_F9, Key::F9},	{XK_F10, Key::F10},
+	{XK_F11, Key::F11},	{XK_F12, Key::F12},
+	{XK_Sys_Req, Key::PrintScreen},
+	{XK_Scroll_Lock, Key::ScrollLock},
+	{XK_Pause, Key::Pause},
 
-	{XK_grave, BackTick},
-	{XK_1, k1},	{XK_2, k2},	{XK_3, k3},	{XK_4, k4},	{XK_5, k5},
-	{XK_6, k6},	{XK_7, k7},	{XK_8, k8},	{XK_9, k9},	{XK_0, k0},
-	{XK_minus, Hyphen},
-	{XK_equal, Equals},
-	{XK_BackSpace, Backspace},
+	{XK_grave, Key::BackTick},
+	{XK_1, Key::k1},	{XK_2, Key::k2},	{XK_3, Key::k3},	{XK_4, Key::k4},	{XK_5, Key::k5},
+	{XK_6, Key::k6},	{XK_7, Key::k7},	{XK_8, Key::k8},	{XK_9, Key::k9},	{XK_0, Key::k0},
+	{XK_minus, Key::Hyphen},
+	{XK_equal, Key::Equals},
+	{XK_BackSpace, Key::Backspace},
 
-	{XK_Tab, Tab},
-	{XK_Q, Q},	{XK_W, W},	{XK_E, E},	{XK_R, R},	{XK_T, T},
-	{XK_Y, Y},	{XK_U, U},	{XK_I, I},	{XK_O, O},	{XK_P, P},
-	{XK_bracketleft, OpenSquareBracket},
-	{XK_bracketright, CloseSquareBracket},
-	{XK_backslash, Backslash},
+	{XK_Tab, Key::Tab},
+	{XK_Q, Key::Q},	{XK_W, Key::W},	{XK_E, Key::E},	{XK_R, Key::R},	{XK_T, Key::T},
+	{XK_Y, Key::Y},	{XK_U, Key::U},	{XK_I, Key::I},	{XK_O, Key::O},	{XK_P, Key::P},
+	{XK_bracketleft, Key::OpenSquareBracket},
+	{XK_bracketright, Key::CloseSquareBracket},
+	{XK_backslash, Key::Backslash},
 
-	{XK_Caps_Lock, CapsLock},
-	{XK_A, A},	{XK_S, S},	{XK_D, D},	{XK_F, F},	{XK_G, G},
-	{XK_H, H},	{XK_J, J},	{XK_K, K},	{XK_L, L},
-	{XK_semicolon, Semicolon},
-	{XK_apostrophe, Quote},
-	{XK_Return, Enter},
+	{XK_Caps_Lock, Key::CapsLock},
+	{XK_A, Key::A},	{XK_S, Key::S},	{XK_D, Key::D},	{XK_F, Key::F},	{XK_G, Key::G},
+	{XK_H, Key::H},	{XK_J, Key::J},	{XK_K, Key::K},	{XK_L, Key::L},
+	{XK_semicolon, Key::Semicolon},
+	{XK_apostrophe, Key::Quote},
+	{XK_Return, Key::Enter},
 
-	{XK_Shift_L, LeftShift},
-	{XK_Z, Z},	{XK_X, X},	{XK_C, C},	{XK_V, V},
-	{XK_B, B},	{XK_N, N},	{XK_M, M},
-	{XK_comma, Comma},
-	{XK_period, FullStop},
-	{XK_slash, ForwardSlash},
-	{XK_Shift_R, RightShift},
+	{XK_Shift_L, Key::LeftShift},
+	{XK_Z, Key::Z},	{XK_X, Key::X},	{XK_C, Key::C},	{XK_V, Key::V},
+	{XK_B, Key::B},	{XK_N, Key::N},	{XK_M, Key::M},
+	{XK_comma, Key::Comma},
+	{XK_period, Key::FullStop},
+	{XK_slash, Key::ForwardSlash},
+	{XK_Shift_R, Key::RightShift},
 
-	{XK_Control_L, LeftControl},
-	{XK_Control_R, RightControl},
-	{XK_Alt_L, LeftOption},
-	{XK_Alt_R, RightOption},
-	{XK_Meta_L, LeftMeta},
-	{XK_Meta_R, RightMeta},
-	{XK_space, Space},
+	{XK_Control_L, Key::LeftControl},
+	{XK_Control_R, Key::RightControl},
+	{XK_Alt_L, Key::LeftOption},
+	{XK_Alt_R, Key::RightOption},
+	{XK_Meta_L, Key::LeftMeta},
+	{XK_Meta_R, Key::RightMeta},
+	{XK_space, Key::Space},
 
-	{XK_Left, Left},	{XK_Right, Right},	{XK_Up, Up},	{XK_Down, Down},
+	{XK_Left, Key::Left},	{XK_Right, Key::Right},	{XK_Up, Key::Up},	{XK_Down, Key::Down},
 
-	{XK_Insert, Insert},
-	{XK_Delete, Delete},
-	{XK_Home, Home},
-	{XK_End, End},
+	{XK_Insert, Key::Insert},
+	{XK_Delete, Key::Delete},
+	{XK_Home, Key::Home},
+	{XK_End, Key::End},
 
-	{XK_Num_Lock, NumLock},
+	{XK_Num_Lock, Key::NumLock},
 
-	{XK_KP_Divide, KeypadSlash},
-	{XK_KP_Multiply, KeypadAsterisk},
-	{XK_KP_Delete, KeypadDelete},
-	{XK_KP_7, Keypad7},	{XK_KP_8, Keypad8},	{XK_KP_9, Keypad9},	{XK_KP_Add, KeypadPlus},
-	{XK_KP_4, Keypad4},	{XK_KP_5, Keypad5},	{XK_KP_6, Keypad6},	{XK_KP_Subtract, KeypadMinus},
-	{XK_KP_1, Keypad1},	{XK_KP_2, Keypad2},	{XK_KP_3, Keypad3},	{XK_KP_Enter, KeypadEnter},
-	{XK_KP_0, Keypad0},
-	{XK_KP_Decimal, KeypadDecimalPoint},
-	{XK_KP_Equal, KeypadEquals},
+	{XK_KP_Divide, Key::KeypadSlash},
+	{XK_KP_Multiply, Key::KeypadAsterisk},
+	{XK_KP_Delete, Key::KeypadDelete},
+	{XK_KP_7, Key::Keypad7},	{XK_KP_8, Key::Keypad8},	{XK_KP_9, Key::Keypad9},	{XK_KP_Add, Key::KeypadPlus},
+	{XK_KP_4, Key::Keypad4},	{XK_KP_5, Key::Keypad5},	{XK_KP_6, Key::Keypad6},	{XK_KP_Subtract, Key::KeypadMinus},
+	{XK_KP_1, Key::Keypad1},	{XK_KP_2, Key::Keypad2},	{XK_KP_3, Key::Keypad3},	{XK_KP_Enter, Key::KeypadEnter},
+	{XK_KP_0, Key::Keypad0},
+	{XK_KP_Decimal, Key::KeypadDecimalPoint},
+	{XK_KP_Equal, Key::KeypadEquals},
 
-	{XK_Help, Help},
+	{XK_Help, Key::Help},
 
 	{0}
 	};