Be able to select the theme when using the default theme. Also not using the default theme when logged in