Fix wrong selection of theme when removing choser

If theme chooser is removed from the site but the user
still has an entry in local storage, displaying any but
the default theme was failing.
Merge remote-tracking branch 'upstream/master' into prismjs