fixed hightlight and added more subjects to the categories