move all theme-related things into theme