changing colour scheme to beige-based
resolving merge conflicts