Added a slight border around colors to help with the lite ones; Added a dark selector for the white colors