diff --git a/source/input_macros.h b/source/input_macros.h
new file mode 100644
index 0000000..0f6d25b
--- /dev/null
+++ b/source/input_macros.h
@@ -0,0 +1,24 @@
+#ifndef INPUT_MACROS_H
+#define INPUT_MACROS_H
+
+#include <wiiuse/wpad.h>
+
+// Input definitions table
+// TODO: GameCube controller support
+//	Macro name		Classic Controller		Wii Remote
+#define INPUT_BUTTON_HOME	(WPAD_CLASSIC_BUTTON_HOME	|| WPAD_BUTTON_HOME	)
+
+#define INPUT_BUTTON_PLUS	(WPAD_CLASSIC_BUTTON_PLUS	|| WPAD_BUTTON_PLUS	)
+#define INPUT_BUTTON_MINUS	(WPAD_CLASSIC_BUTTON_MINUS	|| WPAD_BUTTON_MINUS	)
+
+#define INPUT_BUTTON_A		(WPAD_CLASSIC_BUTTON_Y		|| WPAD_BUTTON_A	)
+#define INPUT_BUTTON_B		(WPAD_CLASSIC_BUTTON_B		|| WPAD_BUTTON_B	)
+#define INPUT_BUTTON_X		(WPAD_CLASSIC_BUTTON_X		|| WPAD_BUTTON_1	)
+#define INPUT_BUTTON_Y		(WPAD_CLASSIC_BUTTON_A		|| WPAD_BUTTON_2	)
+
+#define INPUT_BUTTON_UP		(WPAD_CLASSIC_BUTTON_UP		|| WPAD_BUTTON_UP	)
+#define INPUT_BUTTON_DOWN	(WPAD_CLASSIC_BUTTON_DOWN	|| WPAD_BUTTON_DOWN	)
+#define INPUT_BUTTON_LEFT	(WPAD_CLASSIC_BUTTON_LEFT	|| WPAD_BUTTON_LEFT	)
+#define INPUT_BUTTON_RIGHT	(WPAD_CLASSIC_BUTTON_RIGHT	|| WPAD_BUTTON_RIGHT	)
+
+#endif // INPUT_MACROS_H
diff --git a/source/main.c b/source/main.c
index b7478b9..03e1abb 100644
--- a/source/main.c
+++ b/source/main.c
@@ -3,11 +3,12 @@
 #include <gccore.h>
 #include <network.h>
 #include <wiiuse/wpad.h>
-
+#include <jansson.h>
 #include <stdbool.h>
 
 #include "sandia/sandia.h"
-#include <jansson.h>
+
+#include "input_macros.h"
 
 // Uncomment if this is a development build
 //#include "debug.h"
@@ -133,8 +134,8 @@ int main(int argc, char **argv) {
 
 		u32 pressed = WPAD_ButtonsDown(0);
 
-		if ( pressed & WPAD_BUTTON_HOME ) {
-			logprint(0, "HOME pressed, quitting!");
+		if ( pressed && INPUT_BUTTON_HOME ) {
+			logprint(0, "HOME pressed, quitting!\n");
 			exit(0);
 		}