change theme
update gitignore
fix conflict