Working version of theme switch