Improve some things
Add terminal support, screenshot, more highlights
Merge branch 'term'

* term:
  Add terminal support, screenshot, more highlights