Color and border tweaks