fix control theme switcher CSS issue
Merge branch '2.1'