Updated theme switch