Fix terminal colours
More updates to colours and line numbering