Fixed issues with keypad and colors