Improve keywords
Improve color of `org-macro'

The white-on-orange was unreadable when used in conjunction with hl-line-mode.