* fix circular dependencies

* move to static methods to fix imports

* remove default import from terminal highlight