diff --git a/Syntaxes/CSS.plist b/Syntaxes/CSS.plist
index 04e3564..4da0761 100644
--- a/Syntaxes/CSS.plist
+++ b/Syntaxes/CSS.plist
@@ -256,18 +256,32 @@
 					<key>comment</key>
 					<string>http://www.w3.org/TR/CSS21/syndata.html#value-def-color</string>
 					<key>match</key>
-					<string>\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b</string>
+					<string>(?i)(?&lt;![\\w-])(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)(?![\\w-])</string>
 					<key>name</key>
 					<string>support.constant.color.w3c-standard-color-name.css</string>
 				</dict>
 				<dict>
 					<key>comment</key>
-					<string>These colours are mostly recognised but will not validate. ref: http://www.w3schools.com/css/css_colornames.asp</string>
+					<string>http://www.w3.org/TR/css3-color/#svg-color</string>
 					<key>match</key>
-					<string>\b(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato|turquoise|violet|wheat|whitesmoke|yellowgreen)\b</string>
+					<string>(?xi)(?&lt;![\\w-])(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|rebeccapurple|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato|transparent|turquoise|violet|wheat|whitesmoke|yellowgreen)(?![\\w-])</string>
 					<key>name</key>
-					<string>invalid.deprecated.color.w3c-non-standard-color-name.css</string>
+					<string>support.constant.color.w3c-extended-color-name.css</string>
 				</dict>
+				<dict>
+					<key>match</key>
+					<string>(?i)(?&lt;![\\w-])currentColor(?![\\w-])</string>
+					<key>name</key>
+					<string>support.constant.color.current.css</string>
+				</dict>
+				<dict>
+					<key>comment</key>
+					<string>Deprecated colors in CSS3: http://www.w3.org/TR/css3-color/#css2-system</string>
+					<key>match</key>
+					<string>\b(ActiveBorder|ActiveCaption|AppWorkspace|Background|ButtonFace|ButtonHighlight|ButtonShadow|ButtonText|CaptionText|GrayText|Highlight|HighlightText|InactiveBorder|InactiveCaption|InactiveCaptionText|InfoBackground|InfoText|Menu|MenuText|Scrollbar|ThreeDDarkShadow|ThreeDFace|ThreeDHighlight|ThreeDLightShadow|ThreeDShadow|Window|WindowFrame|WindowText)\b</string>
+					<key>name</key>
+					<string>invalid.deprecated.color.system.css</string>
+                </dict>
 				<dict>
 					<key>begin</key>
 					<string>(hsla?|rgba?)\s*(\()</string>
diff --git a/Tests/tests.css b/Tests/tests.css
index 04f5734..03edcdb 100644
--- a/Tests/tests.css
+++ b/Tests/tests.css
@@ -18,7 +18,7 @@ time, mark, audio, video {
 .color-defs {
     color: #aaa;
     color: #abcdef;
-    color: red;
+    color: red, rebeccapurple, currentColor, ThreeDFace;
     color: rgb(123,255,201);
     color: rgba(123,255,201,0.5);
     color: rgba(123,255,201,.5);