Cleanup before merging theme