Basic file colouring.
Some layout changes.
Extracting drawing strategy.