CLSN-1680 add switch button color and popver to themes