Smarter git status grepping and moved the highlighting into que, where it belongs