huge update to theme