Implement some improvements on signs and highlighting