Some key/colors updates