Merge branch 'jk/color-and-pager'