Revert "fixed highlight groups"

This reverts commit 186deda5d979b1e5543d0fa0f8012e87754a1cca.
Revert "Revert "fixed highlight groups""

This reverts commit 2d095d4a22ff01f9389825c9c1d425cb6bbd0df6.
fixed highlight groups again