* Fix highlighting groups
* Fix the infinite loop of signal-slots