Cleaned up colouring code
Added missing test cases
Pylinted the hell of it a bit more