Add missing color options (sync with WeeChat)
Add emphasis color code
Merge branch 'master' into ja-barr/alerts