Fix hilite and cleaned assets