move them into into theme-setup