relocate files and tweak theme compatibility