Removing stray styles and using colour variables