Merge from ben (Update Xdefaults to chnage colors)