Adding ColorButton entity; another fix for keyboard input