All control highlights are drawn correctly now :)