revamped custom keys and commands once again