Patched to work! (Except Keybind) :(

Signed-off-by: King Lemming <kinglemming@gmail.com>