Merge from master from kenwheeler
scrollbar color