Tidying up colours, start of possible links bit
Merge branch 'design-20131017'

* design-20131017:
  Tidying up colours, start of possible links bit