Css fix
Fix theme switching
Merge remote-tracking branch 'origin/V2' into gh-pages