Add highlighting of the trailing sign and more