Part 1 of theme work - text colours and the background colour can now be defined using a theme
Merge remote-tracking branch 'origin/master'