Reorganise files and move colours into variables.
Merge pull request #1 from garymardell/buttons

Reorganise files and move colours into variables.