move images
remove theme support
update templates