Shifted colours to resource file and added percentages.