Deal with color more elegantly