Added theme switch, testing on server