possible fix of themes` interactions
Merge vichan