lots of changes to the theme