--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -179,45 +179,16 @@ exports.CSS_PROPERTIES = {
   },
   "-moz-appearance": {
     "isInherited": false,
     "subproperties": [
       "-moz-appearance"
     ],
     "supports": [],
     "values": [
-      "-moz-gtk-info-bar",
-      "-moz-mac-active-source-list-selection",
-      "-moz-mac-disclosure-button-closed",
-      "-moz-mac-disclosure-button-open",
-      "-moz-mac-fullscreen-button",
-      "-moz-mac-help-button",
-      "-moz-mac-source-list",
-      "-moz-mac-source-list-selection",
-      "-moz-mac-vibrancy-dark",
-      "-moz-mac-vibrancy-light",
-      "-moz-mac-vibrant-titlebar-dark",
-      "-moz-mac-vibrant-titlebar-light",
-      "-moz-win-borderless-glass",
-      "-moz-win-browsertabbar-toolbox",
-      "-moz-win-communications-toolbox",
-      "-moz-win-exclude-glass",
-      "-moz-win-glass",
-      "-moz-win-media-toolbox",
-      "-moz-window-button-box",
-      "-moz-window-button-box-maximized",
-      "-moz-window-button-close",
-      "-moz-window-button-maximize",
-      "-moz-window-button-minimize",
-      "-moz-window-button-restore",
-      "-moz-window-frame-bottom",
-      "-moz-window-frame-left",
-      "-moz-window-frame-right",
-      "-moz-window-titlebar",
-      "-moz-window-titlebar-maximized",
       "button",
       "button-arrow-down",
       "button-arrow-next",
       "button-arrow-previous",
       "button-arrow-up",
       "button-bevel",
       "button-focus",
       "caret",
@@ -445,27 +416,16 @@ exports.CSS_PROPERTIES = {
       "border-image-slice",
       "border-image-source",
       "border-image-width"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "auto",
       "fill",
       "inherit",
       "initial",
       "linear-gradient",
       "none",
       "radial-gradient",
       "repeat",
@@ -1352,19 +1312,16 @@ exports.CSS_PROPERTIES = {
   },
   "-moz-user-select": {
     "isInherited": false,
     "subproperties": [
       "-moz-user-select"
     ],
     "supports": [],
     "values": [
-      "-moz-all",
-      "-moz-none",
-      "-moz-text",
       "all",
       "auto",
       "element",
       "elements",
       "inherit",
       "initial",
       "none",
       "text",
@@ -1722,27 +1679,16 @@ exports.CSS_PROPERTIES = {
       "border-image-slice",
       "border-image-source",
       "border-image-width"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "auto",
       "fill",
       "inherit",
       "initial",
       "linear-gradient",
       "none",
       "radial-gradient",
       "repeat",
@@ -1946,38 +1892,30 @@ exports.CSS_PROPERTIES = {
     "isInherited": false,
     "subproperties": [
       "flex-grow",
       "flex-shrink",
       "flex-basis"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "content",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "-webkit-flex-basis": {
     "isInherited": false,
     "subproperties": [
       "flex-basis"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "content",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "-webkit-flex-direction": {
@@ -2093,27 +2031,16 @@ exports.CSS_PROPERTIES = {
       "mask-position-y",
       "mask-size",
       "mask-image"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "add",
       "alpha",
       "auto",
       "border-box",
       "bottom",
       "center",
       "contain",
       "content-box",
@@ -2187,27 +2114,16 @@ exports.CSS_PROPERTIES = {
     "isInherited": false,
     "subproperties": [
       "mask-image"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "inherit",
       "initial",
       "linear-gradient",
       "none",
       "radial-gradient",
       "repeating-linear-gradient",
       "repeating-radial-gradient",
       "unset",
@@ -2611,19 +2527,16 @@ exports.CSS_PROPERTIES = {
   },
   "-webkit-user-select": {
     "isInherited": false,
     "subproperties": [
       "-moz-user-select"
     ],
     "supports": [],
     "values": [
-      "-moz-all",
-      "-moz-none",
-      "-moz-text",
       "all",
       "auto",
       "element",
       "elements",
       "inherit",
       "initial",
       "none",
       "text",
@@ -3224,27 +3137,16 @@ exports.CSS_PROPERTIES = {
       "background-clip"
     ],
     "supports": [
       2,
       4
     ],
     "values": [
       "COLOR",
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "auto",
       "border-box",
       "bottom",
       "center",
       "contain",
       "content-box",
       "cover",
       "currentColor",
@@ -3362,27 +3264,16 @@ exports.CSS_PROPERTIES = {
     "isInherited": false,
     "subproperties": [
       "background-image"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "inherit",
       "initial",
       "linear-gradient",
       "none",
       "radial-gradient",
       "repeating-linear-gradient",
       "repeating-radial-gradient",
       "unset",
@@ -3487,20 +3378,16 @@ exports.CSS_PROPERTIES = {
   },
   "block-size": {
     "isInherited": false,
     "subproperties": [
       "block-size"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "border": {
     "isInherited": false,
@@ -3904,27 +3791,16 @@ exports.CSS_PROPERTIES = {
       "border-image-slice",
       "border-image-source",
       "border-image-width"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "auto",
       "fill",
       "inherit",
       "initial",
       "linear-gradient",
       "none",
       "radial-gradient",
       "repeat",
@@ -3982,27 +3858,16 @@ exports.CSS_PROPERTIES = {
     "isInherited": false,
     "subproperties": [
       "border-image-source"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "inherit",
       "initial",
       "linear-gradient",
       "none",
       "radial-gradient",
       "repeating-linear-gradient",
       "repeating-radial-gradient",
       "unset",
@@ -4989,17 +4854,16 @@ exports.CSS_PROPERTIES = {
   },
   "content": {
     "isInherited": false,
     "subproperties": [
       "content"
     ],
     "supports": [],
     "values": [
-      "-moz-alt-content",
       "attr",
       "close-quote",
       "counter",
       "counters",
       "inherit",
       "initial",
       "no-close-quote",
       "no-open-quote",
@@ -5038,20 +4902,16 @@ exports.CSS_PROPERTIES = {
   },
   "cursor": {
     "isInherited": true,
     "subproperties": [
       "cursor"
     ],
     "supports": [],
     "values": [
-      "-moz-grab",
-      "-moz-grabbing",
-      "-moz-zoom-in",
-      "-moz-zoom-out",
       "alias",
       "all-scroll",
       "auto",
       "cell",
       "col-resize",
       "context-menu",
       "copy",
       "crosshair",
@@ -5105,31 +4965,16 @@ exports.CSS_PROPERTIES = {
   },
   "display": {
     "isInherited": false,
     "subproperties": [
       "display"
     ],
     "supports": [],
     "values": [
-      "-moz-box",
-      "-moz-deck",
-      "-moz-grid",
-      "-moz-grid-group",
-      "-moz-grid-line",
-      "-moz-groupbox",
-      "-moz-inline-box",
-      "-moz-inline-grid",
-      "-moz-inline-stack",
-      "-moz-popup",
-      "-moz-stack",
-      "-webkit-box",
-      "-webkit-flex",
-      "-webkit-inline-box",
-      "-webkit-inline-flex",
       "block",
       "contents",
       "flex",
       "flow-root",
       "grid",
       "inherit",
       "initial",
       "inline",
@@ -5275,38 +5120,30 @@ exports.CSS_PROPERTIES = {
     "isInherited": false,
     "subproperties": [
       "flex-grow",
       "flex-shrink",
       "flex-basis"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "content",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "flex-basis": {
     "isInherited": false,
     "subproperties": [
       "flex-basis"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "content",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "flex-direction": {
@@ -5453,26 +5290,16 @@ exports.CSS_PROPERTIES = {
       "font-variant-numeric",
       "font-variant-position",
       "font-language-override",
       "font-feature-settings",
       "font-variation-settings"
     ],
     "supports": [],
     "values": [
-      "-moz-button",
-      "-moz-desktop",
-      "-moz-dialog",
-      "-moz-document",
-      "-moz-field",
-      "-moz-info",
-      "-moz-list",
-      "-moz-pull-down-menu",
-      "-moz-window",
-      "-moz-workspace",
       "all-petite-caps",
       "all-small-caps",
       "bold",
       "bolder",
       "caption",
       "condensed",
       "expanded",
       "extra-condensed",
@@ -6159,20 +5986,16 @@ exports.CSS_PROPERTIES = {
   },
   "height": {
     "isInherited": false,
     "subproperties": [
       "height"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "hyphens": {
     "isInherited": true,
@@ -6205,17 +6028,16 @@ exports.CSS_PROPERTIES = {
   },
   "image-rendering": {
     "isInherited": true,
     "subproperties": [
       "image-rendering"
     ],
     "supports": [],
     "values": [
-      "-moz-crisp-edges",
       "auto",
       "inherit",
       "initial",
       "optimizequality",
       "optimizespeed",
       "unset"
     ]
   },
@@ -6238,20 +6060,16 @@ exports.CSS_PROPERTIES = {
   },
   "inline-size": {
     "isInherited": false,
     "subproperties": [
       "inline-size"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "isolation": {
     "isInherited": false,
@@ -6400,17 +6218,16 @@ exports.CSS_PROPERTIES = {
   },
   "line-height": {
     "isInherited": true,
     "subproperties": [
       "line-height"
     ],
     "supports": [],
     "values": [
-      "-moz-block-height",
       "inherit",
       "initial",
       "normal",
       "unset"
     ]
   },
   "list-style": {
     "isInherited": true,
@@ -6773,27 +6590,16 @@ exports.CSS_PROPERTIES = {
       "mask-position-y",
       "mask-size",
       "mask-image"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "add",
       "alpha",
       "auto",
       "border-box",
       "bottom",
       "center",
       "contain",
       "content-box",
@@ -6867,27 +6673,16 @@ exports.CSS_PROPERTIES = {
     "isInherited": false,
     "subproperties": [
       "mask-image"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "inherit",
       "initial",
       "linear-gradient",
       "none",
       "radial-gradient",
       "repeating-linear-gradient",
       "repeating-radial-gradient",
       "unset",
@@ -7024,139 +6819,107 @@ exports.CSS_PROPERTIES = {
   },
   "max-block-size": {
     "isInherited": false,
     "subproperties": [
       "max-block-size"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "inherit",
       "initial",
       "none",
       "unset"
     ]
   },
   "max-height": {
     "isInherited": false,
     "subproperties": [
       "max-height"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "inherit",
       "initial",
       "none",
       "unset"
     ]
   },
   "max-inline-size": {
     "isInherited": false,
     "subproperties": [
       "max-inline-size"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "inherit",
       "initial",
       "none",
       "unset"
     ]
   },
   "max-width": {
     "isInherited": false,
     "subproperties": [
       "max-width"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "inherit",
       "initial",
       "none",
       "unset"
     ]
   },
   "min-block-size": {
     "isInherited": false,
     "subproperties": [
       "min-block-size"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "min-height": {
     "isInherited": false,
     "subproperties": [
       "min-height"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "min-inline-size": {
     "isInherited": false,
     "subproperties": [
       "min-inline-size"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "min-width": {
     "isInherited": false,
     "subproperties": [
       "min-width"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "mix-blend-mode": {
     "isInherited": false,
@@ -7407,17 +7170,16 @@ exports.CSS_PROPERTIES = {
   "overflow": {
     "isInherited": false,
     "subproperties": [
       "overflow-x",
       "overflow-y"
     ],
     "supports": [],
     "values": [
-      "-moz-hidden-unscrollable",
       "auto",
       "hidden",
       "inherit",
       "initial",
       "scroll",
       "unset",
       "visible"
     ]
@@ -7438,34 +7200,32 @@ exports.CSS_PROPERTIES = {
   },
   "overflow-x": {
     "isInherited": false,
     "subproperties": [
       "overflow-x"
     ],
     "supports": [],
     "values": [
-      "-moz-hidden-unscrollable",
       "auto",
       "hidden",
       "inherit",
       "initial",
       "scroll",
       "unset",
       "visible"
     ]
   },
   "overflow-y": {
     "isInherited": false,
     "subproperties": [
       "overflow-y"
     ],
     "supports": [],
     "values": [
-      "-moz-hidden-unscrollable",
       "auto",
       "hidden",
       "inherit",
       "initial",
       "scroll",
       "unset",
       "visible"
     ]
@@ -8082,27 +7842,16 @@ exports.CSS_PROPERTIES = {
     "isInherited": false,
     "subproperties": [
       "shape-outside"
     ],
     "supports": [
       4
     ],
     "values": [
-      "-moz-element",
-      "-moz-image-rect",
-      "-moz-linear-gradient",
-      "-moz-radial-gradient",
-      "-moz-repeating-linear-gradient",
-      "-moz-repeating-radial-gradient",
-      "-webkit-gradient",
-      "-webkit-linear-gradient",
-      "-webkit-radial-gradient",
-      "-webkit-repeating-linear-gradient",
-      "-webkit-repeating-radial-gradient",
       "border-box",
       "circle",
       "content-box",
       "ellipse",
       "inherit",
       "initial",
       "inset",
       "linear-gradient",
@@ -8303,19 +8052,16 @@ exports.CSS_PROPERTIES = {
   },
   "text-align": {
     "isInherited": true,
     "subproperties": [
       "text-align"
     ],
     "supports": [],
     "values": [
-      "-moz-center",
-      "-moz-left",
-      "-moz-right",
       "center",
       "end",
       "inherit",
       "initial",
       "justify",
       "left",
       "match-parent",
       "right",
@@ -8378,17 +8124,16 @@ exports.CSS_PROPERTIES = {
       "text-decoration-style",
       "text-decoration-color"
     ],
     "supports": [
       2
     ],
     "values": [
       "COLOR",
-      "-moz-none",
       "blink",
       "currentColor",
       "dashed",
       "dotted",
       "double",
       "hsl",
       "hsla",
       "inherit",
@@ -8445,17 +8190,16 @@ exports.CSS_PROPERTIES = {
   },
   "text-decoration-style": {
     "isInherited": false,
     "subproperties": [
       "text-decoration-style"
     ],
     "supports": [],
     "values": [
-      "-moz-none",
       "dashed",
       "dotted",
       "double",
       "inherit",
       "initial",
       "solid",
       "unset",
       "wavy"
@@ -8899,17 +8643,16 @@ exports.CSS_PROPERTIES = {
   },
   "vertical-align": {
     "isInherited": false,
     "subproperties": [
       "vertical-align"
     ],
     "supports": [],
     "values": [
-      "-moz-middle-with-baseline",
       "baseline",
       "bottom",
       "inherit",
       "initial",
       "middle",
       "sub",
       "super",
       "text-bottom",
@@ -8935,17 +8678,16 @@ exports.CSS_PROPERTIES = {
   },
   "white-space": {
     "isInherited": true,
     "subproperties": [
       "white-space"
     ],
     "supports": [],
     "values": [
-      "-moz-pre-space",
       "inherit",
       "initial",
       "normal",
       "nowrap",
       "pre",
       "pre-line",
       "pre-wrap",
       "unset"
@@ -8953,20 +8695,16 @@ exports.CSS_PROPERTIES = {
   },
   "width": {
     "isInherited": false,
     "subproperties": [
       "width"
     ],
     "supports": [],
     "values": [
-      "-moz-available",
-      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
       "auto",
       "inherit",
       "initial",
       "unset"
     ]
   },
   "will-change": {
     "isInherited": false,

--- a/layout/inspector/tests/test_bug877690.html
+++ b/layout/inspector/tests/test_bug877690.html
@@ -30,43 +30,34 @@ function testValues(values, expected) {
   }
   return true;
 }
 
 function do_test() {
   var allColors = [ "COLOR", "currentColor", "transparent", "rgb", "rgba", "hsl", "hsla" ];
   var allGradients = [
     "linear-gradient",
-    "-webkit-linear-gradient",
-    "-moz-linear-gradient",
     "repeating-linear-gradient",
-    "-webkit-repeating-linear-gradient",
-    "-moz-repeating-linear-gradient",
     "radial-gradient",
-    "-webkit-radial-gradient",
-    "-moz-radial-gradient",
     "repeating-radial-gradient",
-    "-webkit-repeating-radial-gradient",
-    "-moz-repeating-radial-gradient",
-    "-webkit-gradient",
   ];
 
   // test a property with keywords and colors
   var prop = "color";
   var values = InspectorUtils.getCSSValuesForProperty(prop);
   var expected = [ "initial", "inherit", "unset", ...allColors ];
   ok(testValues(values, expected), "property color's values.");
 
   // test a shorthand property
   var prop = "background";
   var values = InspectorUtils.getCSSValuesForProperty(prop);
   var expected = [ "auto", "initial", "inherit", "unset", ...allColors, "no-repeat", "repeat",
       "repeat-x", "repeat-y", "space", "round", "fixed", "scroll", "local", "center", "top", "bottom", "left", "right",
       "border-box", "padding-box", "content-box", "text", "contain",
-      "cover", "none", "-moz-element", "-moz-image-rect", "url", ...allGradients ];
+      "cover", "none", "url", ...allGradients ];
   ok(testValues(values, expected), "property background values.");
 
   var prop = "border";
   var values = InspectorUtils.getCSSValuesForProperty(prop);
   var expected = [ "initial", "unset", "dashed", "dotted", "double",
       "groove", "hidden", "inherit", "inset", "medium", "none", "outset", "ridge",
       "solid", "thick", "thin", ...allColors ]
   ok(testValues(values, expected), "property border values.");
@@ -84,22 +75,18 @@ function do_test() {
   var expected = [ "initial", "inherit", "unset" ];
   ok(testValues(values, expected), "property padding-bottom's values.");
 
   // test proprety
   var prop = "display";
   var values = InspectorUtils.getCSSValuesForProperty(prop);
   var expected = [ "initial", "inherit", "unset", "none", "inline", "block", "inline-block", "list-item",
       "table", "inline-table", "table-row-group", "table-header-group", "table-footer-group", "table-row",
-      "table-column-group", "table-column", "table-cell", "table-caption", "-moz-box", "-moz-inline-box",
-      "-moz-grid", "-moz-inline-grid", "-moz-grid-group", "-moz-grid-line", "-moz-stack", "-moz-inline-stack",
-      "-moz-deck", "-moz-popup", "-moz-groupbox",
-      "flex", "inline-flex", "-webkit-box", "-webkit-inline-box",
-      "-webkit-flex", "-webkit-inline-flex",
-      "grid", "inline-grid",
+      "table-column-group", "table-column", "table-cell", "table-caption",
+      "flex", "inline-flex", "grid", "inline-grid",
       "ruby", "ruby-base", "ruby-base-container", "ruby-text", "ruby-text-container",
       "contents", "flow-root" ];
   ok(testValues(values, expected), "property display's values.");
 
   // test property
   var prop = "float";
   var values = InspectorUtils.getCSSValuesForProperty(prop);
   var expected = [ "initial", "inherit", "unset", "none", "left", "right", "inline-start", "inline-end" ];
@@ -134,18 +121,17 @@ function do_test() {
   catch(e) {
     // test passed
   }
 
   // test border-image property, for bug 973345
   var prop = "border-image";
   var values = InspectorUtils.getCSSValuesForProperty(prop);
   var expected = [ "auto", "inherit", "initial", "unset", "repeat", "stretch",
-                   "-moz-element", "-moz-image-rect", "url", ...allGradients,
-                   "fill", "none", "round", "space" ];
+                   "url", ...allGradients, "fill", "none", "round", "space" ];
   ok(testValues(values, expected), "property border-image's values.");
 
   var prop = "background-size"
   var values = InspectorUtils.getCSSValuesForProperty(prop);
   var expected = [ "auto", "inherit", "initial", "unset", "contain", "cover" ];
   ok(testValues(values, expected), "property background-size's values.");
 
   // Regression test for bug 1255401.
@@ -198,18 +184,17 @@ function do_test() {
 
   var expected = [ "inherit", "initial", "unset", "auto", "rect" ];
   var values = InspectorUtils.getCSSValuesForProperty("clip");
   ok(testValues(values, expected), "property clip's values");
 
   // Regression test for bug 1255380.
   var expected = [ "normal", "none", "url", "counter", "counters",
                    "attr", "open-quote", "close-quote", "no-open-quote",
-                   "no-close-quote", "inherit", "initial", "unset",
-                   "-moz-alt-content" ];
+                   "no-close-quote", "inherit", "initial", "unset" ];
   var values = InspectorUtils.getCSSValuesForProperty("content");
   ok(testValues(values, expected), "property counter's values");
 
   // Regression test for bug 1255369.
   var expected = ["none", "decimal", "decimal-leading-zero", "arabic-indic", "armenian",
                   "upper-armenian", "lower-armenian", "bengali", "cambodian", "khmer",
                   "cjk-decimal", "devanagari", "georgian", "gujarati", "gurmukhi", "hebrew",
                   "kannada", "lao", "malayalam", "mongolian", "myanmar", "oriya", "persian",

--- a/servo/components/style/values/specified/image.rs
+++ b/servo/components/style/values/specified/image.rs
@@ -51,28 +51,19 @@ pub type Gradient =
 
 impl SpecifiedValueInfo for Gradient {
     const SUPPORTED_TYPES: u8 = CssType::GRADIENT;
 
     fn collect_completion_keywords(f: KeywordsCollectFn) {
         // This list here should keep sync with that in Gradient::parse.
         f(&[
           "linear-gradient",
-          "-webkit-linear-gradient",
-          "-moz-linear-gradient",
           "repeating-linear-gradient",
-          "-webkit-repeating-linear-gradient",
-          "-moz-repeating-linear-gradient",
           "radial-gradient",
-          "-webkit-radial-gradient",
-          "-moz-radial-gradient",
           "repeating-radial-gradient",
-          "-webkit-repeating-radial-gradient",
-          "-moz-repeating-radial-gradient",
-          "-webkit-gradient",
         ]);
     }
 }
 
 /// A specified gradient kind.
 #[cfg(not(feature = "gecko"))]
 pub type GradientKind =
     generic::GradientKind<LineDirection, Length, LengthOrPercentage, Position, Angle>;

--- a/servo/components/style_derive/specified_value_info.rs
+++ b/servo/components/style_derive/specified_value_info.rs
@@ -77,16 +77,18 @@ pub fn derive(mut input: DeriveInput) ->
     }
 
     let info_attrs = cg::parse_input_attrs::<ValueInfoInputAttrs>(&input);
     if let Some(other_values) = info_attrs.other_values {
         for value in other_values.split(",") {
             values.push(value.to_string());
         }
     }
+    // Don't include prefixied values for completion.
+    values.retain(|v| !v.starts_with("-moz-") && !v.starts_with("-webkit-"));
 
     let mut types_value = quote!(0);
     types_value.append_all(types.iter().map(|ty| quote! {
         | <#ty as ::style_traits::SpecifiedValueInfo>::SUPPORTED_TYPES
     }));
 
     let mut nested_collects = quote!();
     nested_collects.append_all(types.iter().map(|ty| quote! {

--- a/servo/components/style_traits/cursor.rs
+++ b/servo/components/style_traits/cursor.rs
@@ -57,17 +57,16 @@ macro_rules! define_cursor {
                 }
             }
         }
 
         impl SpecifiedValueInfo for CursorKind {
             fn collect_completion_keywords(f: KeywordsCollectFn) {
                 f(&[
                     $($c_css,)+
-                    $($g_css,)+
                 ]);
             }
         }
     }
 }
 
 define_cursor! {
     common properties = [