Made some changes after r-gaia-cs's suggestions. Most fixes pertain to highlighting modes into little boxes for better viewing on github.