v1 improved themes again