Merge "Dark theme resets when new user is created"