- if (c.keys[i].equals("font") && c.uris[i] != null) c.vals[i] = c.uris[i] + "." + c.vals[i];
- if (c.keys[i].equals("preapply")) {
+ else if (c.keys[i].equals("font") && c.uris[i] != null) c.vals[i] = c.uris[i] + "." + c.vals[i];
+ else if (c.keys[i].equals("fill") && c.uris[i] != null && !c.vals[i].startsWith("#")
+ && SVG.colors.get(c.vals[i]) == null) c.vals[i] = c.uris[i] + "." + c.vals[i];
+ else if (c.keys[i].equals("preapply")) {