Added colour schemes & extra rules