[UPDATE] More color tweeks