Fix mascot and theme saving