more non-colors and allow hyphens in urls