More selection color fixes