Putting the theme back in