craft highlight and fixed more wonky transitions