Fixes for color scheme of Joystick