Merge "Add colors for keyboard"