add full color-theme compatibility