More tunning to my color scheme