fix conflict during bundle
update themes :tada: