Added ls and cli colouring, and tweaked ls and ll options