moved stuff around that belongs to the theme