minor update
ignore theme.css
merge