changed file naming
renamed more files, changed colours to highlights