Restructure a bit to not override selection colors