Cleaning code a bit

Cleaned code a bit, changed GFX_ macros to INPUT_