Fix highlight of special keys and clean up highlight of line numbers