Commit before drastic layout and colour changes