Themes fixed

The same as the themes branch but on the new base. Hopefully fixes the problem with the theme change on restart.