Refactor, support for more Colorcodes, Bugfixes