refactored variables; added some new colours