diff --git a/data/plugins/language_css.lua b/data/plugins/language_css.lua
index 9e78cde5..a127dfac 100644
--- a/data/plugins/language_css.lua
+++ b/data/plugins/language_css.lua
@@ -7,15 +7,40 @@ syntax.add {
   block_comment = { "/*", "*/" },
   patterns = {
     { pattern = "\\.",                type = "normal"   },
-    { pattern = "//.*",               type = "comment"  },
     { pattern = { "/%*", "%*/" },     type = "comment"  },
     { pattern = { '"', '"', '\\' },   type = "string"   },
     { pattern = { "'", "'", '\\' },   type = "string"   },
     { pattern = "[%a][%w-]*%s*%f[:]", type = "keyword"  },
     { pattern = "#%x%x%x%x%x%x%f[%W]",type = "string"   },
     { pattern = "#%x%x%x%f[%W]",      type = "string"   },
-    { pattern = "-?%d+[%d%.]*p[xt]",  type = "number"   },
+    { pattern = "-?%d+[%d%.]*p[xtc]", type = "number"   },
     { pattern = "-?%d+[%d%.]*deg",    type = "number"   },
+    { pattern = "-?%d+[%d%.]*cm",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*mm",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*in",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*r?ic",   type = "number"   },
+    { pattern = "-?%d+[%d%.]*r?cap",  type = "number"   },
+    { pattern = "-?%d+[%d%.]*r?em",   type = "number"   },
+    { pattern = "-?%d+[%d%.]*r?lh",   type = "number"   },
+    { pattern = "-?%d+[%d%.]*r?ch",   type = "number"   },
+    { pattern = "-?%d+[%d%.]*r?ex",   type = "number"   },
+    { pattern = "-?%d+[%d%.]*m?s",    type = "number"   },
+    { pattern = "-?%d+[%d%.]*hz",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*Hz",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*vw",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*vh",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*vmin",   type = "number"   },
+    { pattern = "-?%d+[%d%.]*vmax",   type = "number"   },
+    { pattern = "-?%d+[%d%.]*vb",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*vi",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*%%",     type = "number"   },
+    { pattern = "-?%d+[%d%.]*Q",      type = "number"   },
+    { pattern = "-?%d+[%d%.]*cqw",    type = "number"   },
+    { pattern = "-?%d+[%d%.]*cqh",    type = "number"   },
+    { pattern = "-?%d+[%d%.]*cqi",    type = "number"   },
+    { pattern = "-?%d+[%d%.]*cqb",    type = "number"   },
+    { pattern = "-?%d+[%d%.]*cqmin",  type = "number"   },
+    { pattern = "-?%d+[%d%.]*cqmax",  type = "number"   },
     { pattern = "-?%d+[%d%.]*",       type = "number"   },
     { pattern = "[%a_][%w_]*",        type = "symbol"   },
     { pattern = "#[%a][%w_-]*",       type = "keyword2" },