Rebuild theme
Rebuild theme resources and merge