[Autofill] Thematic changes