add white text switch
fixed css merge conflicts