Improve handling of named styles and named colors