Updated most files, changed colours