Change colour scheme and refactor magic number