Improve consistency of CSS3 package and default CSS syntax

Author: jwortmann

Brackets Dark.sublime-color-scheme

@@ -326,7 +326,7 @@
         },
         {
             "name": "CSS unit keyword",
-            "scope": "constant.numeric.css keyword.other.unit.css",
+            "scope": "keyword.other.unit.css",
             "foreground": "var(green)"
         },
         {
@@ -359,6 +359,22 @@
             "scope": "entity.name.tag.wildcard.css",
             "foreground": "var(textcolor)"
         },
+        // CSS specific rules >> https://packagecontrol.io/packages/CSS3
+        {
+            "name": "CSS pseudo-class/pseudo-element",
+            "scope": "entity.other.attribute-name.pseudo-class.css, entity.other.attribute-name.pseudo-element.css",
+            "foreground": "var(textcolor)"
+        },
+        {
+            "name": "CSS unquoted font name",
+            "scope": "meta.property-value.font-family.css string.unquoted.identifier.css",
+            "foreground": "var(textcolor)"
+        },
+        {
+            "name": "CSS variable",
+            "scope": "support.type.property-name.custom.css",
+            "foreground": "var(textcolor)"
+        },
         // D specific rules
         {
             "name": "D numeric base prefix",
@@ -1015,11 +1031,6 @@
             "scope": "entity.other.attribute-name.attribute.scss",
             "foreground": "var(blue)"
         },
-        {
-            "name": "SCSS pseudo-class/pseudo-element",
-            "scope": "source.scss entity.other.attribute-name.pseudo-class.css, source.scss entity.other.attribute-name.pseudo-element.css",
-            "foreground": "var(textcolor)"
-        },
         {
             "name": "SCSS property value",
             "scope": "support.constant.property-value.scss, support.constant.font-name.scss",

Brackets Light.sublime-color-scheme

@@ -326,7 +326,7 @@
         },
         {
             "name": "CSS unit keyword",
-            "scope": "constant.numeric.css keyword.other.unit.css",
+            "scope": "keyword.other.unit.css",
             "foreground": "var(green)"
         },
         {
@@ -359,6 +359,22 @@
             "scope": "entity.name.tag.wildcard.css",
             "foreground": "var(textcolor)"
         },
+        // CSS specific rules >> https://packagecontrol.io/packages/CSS3
+        {
+            "name": "CSS pseudo-class/pseudo-element",
+            "scope": "entity.other.attribute-name.pseudo-class.css, entity.other.attribute-name.pseudo-element.css",
+            "foreground": "var(textcolor)"
+        },
+        {
+            "name": "CSS unquoted font name",
+            "scope": "meta.property-value.font-family.css string.unquoted.identifier.css",
+            "foreground": "var(textcolor)"
+        },
+        {
+            "name": "CSS variable",
+            "scope": "support.type.property-name.custom.css",
+            "foreground": "var(textcolor)"
+        },
         // D specific rules
         {
             "name": "D numeric base prefix",
@@ -1015,11 +1031,6 @@
             "scope": "entity.other.attribute-name.attribute.scss",
             "foreground": "var(blue)"
         },
-        {
-            "name": "SCSS pseudo-class/pseudo-element",
-            "scope": "source.scss entity.other.attribute-name.pseudo-class.css, source.scss entity.other.attribute-name.pseudo-element.css",
-            "foreground": "var(textcolor)"
-        },
         {
             "name": "SCSS property value",
             "scope": "support.constant.property-value.scss, support.constant.font-name.scss",