Move a bunch of stuff to the theme