theme: merge upstream updates