New colour scheme + Few fixes