Updated files from Master and edited colors