update theme
merge