change theme
change config
Merge branch 'new-theme'