Added nosp remote/fixed theme chooser