Refactor
Modern colors
Bugfix