Index: src/hid_cfg_input.h
===================================================================
--- src/hid_cfg_input.h	(revision 1501)
+++ src/hid_cfg_input.h	(revision 1502)
@@ -5,15 +5,12 @@
 #include <genht/htip.h>
 #include "hid_cfg.h"
 
-#warning TODO:
-/* For compatibility; TODO: REMOVE */
-#define M_Mod(n)  (1u<<(n+1))
-
 #define M_Mod0(n)  (1u<<(n))
 typedef enum {
 	M_Shift   = M_Mod0(0),
 	M_Ctrl    = M_Mod0(1),
 	M_Alt     = M_Mod0(2),
+	M_Mod1    = M_Alt,
 	/* M_Mod(3) is M_Mod0(4) */
 	/* M_Mod(4) is M_Mod0(5) */
 	M_Release = M_Mod0(6), /* there might be a random number of modkeys, but hopefully not this many */
@@ -24,6 +21,7 @@
 	MB_UP     = M_Mod0(10), /* scroll wheel */
 	MB_DOWN   = M_Mod0(11)  /* scroll wheel */
 } hid_cfg_mod_t;
+#undef M_Mod0
 
 #define MB_ANY (MB_LEFT | MB_MIDDLE | MB_RIGHT | MB_UP | MB_DOWN)
 #define M_ANY  (M_Release-1)
Index: src_plugins/hid_gtk/gui.h
===================================================================
--- src_plugins/hid_gtk/gui.h	(revision 1501)
+++ src_plugins/hid_gtk/gui.h	(revision 1502)
@@ -176,11 +176,11 @@
 	NONE_PRESSED = 0,
 	SHIFT_PRESSED = M_Shift,
 	CONTROL_PRESSED = M_Ctrl,
-	MOD1_PRESSED = M_Mod(1),
+	MOD1_PRESSED = M_Mod1,
 	SHIFT_CONTROL_PRESSED = M_Shift | M_Ctrl,
-	SHIFT_MOD1_PRESSED = M_Shift | M_Mod(1),
-	CONTROL_MOD1_PRESSED = M_Ctrl | M_Mod(1),
-	SHIFT_CONTROL_MOD1_PRESSED = M_Shift | M_Ctrl | M_Mod(1),
+	SHIFT_MOD1_PRESSED = M_Shift | M_Mod1,
+	CONTROL_MOD1_PRESSED = M_Ctrl | M_Mod1,
+	SHIFT_CONTROL_MOD1_PRESSED = M_Shift | M_Ctrl | M_Mod1,
 } ModifierKeysState;
 
 typedef enum {