diff --git a/mozilla/content/html/content/src/nsHTMLAtomList.h b/mozilla/content/html/content/src/nsHTMLAtomList.h
index 4ae14913802..42d23005e6f 100644
--- a/mozilla/content/html/content/src/nsHTMLAtomList.h
+++ b/mozilla/content/html/content/src/nsHTMLAtomList.h
@@ -96,9 +96,9 @@ HTML_ATOM(bottompadding, "bottompadding")
 HTML_ATOM(br, "br")
 HTML_ATOM(b, "b")
 HTML_ATOM(button, "button")
-HTML_ATOM(buttonContentPseudo, ":button-content")
+HTML_ATOM(buttonContentPseudo, ":-moz-button-content")
 HTML_ATOM(caption, "caption")
-HTML_ATOM(cellContentPseudo, ":cell-content")
+HTML_ATOM(cellContentPseudo, ":-moz-cell-content")
 HTML_ATOM(cellpadding, "cellpadding")
 HTML_ATOM(cellspacing, "cellspacing")
 HTML_ATOM(ch, "ch")
@@ -120,7 +120,6 @@ HTML_ATOM(colgroup, "colgroup")
 HTML_ATOM(cols, "cols")
 HTML_ATOM(colspan, "colspan")
 HTML_ATOM(combobox, "combobox")
-HTML_ATOM(columnPseudo, ":body-column")
 HTML_ATOM(compact, "compact")
 HTML_ATOM(content, "content")
 HTML_ATOM(coords, "coords")
@@ -146,7 +145,7 @@ HTML_ATOM(encoding, "encoding")
 HTML_ATOM(enctype, "enctype")
 HTML_ATOM(face, "face")
 HTML_ATOM(fieldset, "fieldset")
-HTML_ATOM(fieldsetContentPseudo, ":fieldset-content")
+HTML_ATOM(fieldsetContentPseudo, ":-moz-fieldset-content")
 HTML_ATOM(firstLetterPseudo, ":first-letter")
 HTML_ATOM(firstLinePseudo, ":first-line")
 HTML_ATOM(font, "font")
@@ -156,7 +155,7 @@ HTML_ATOM(form, "form")
 HTML_ATOM(frame, "frame")
 HTML_ATOM(frameborder, "frameborder")
 HTML_ATOM(frameset, "frameset")
-HTML_ATOM(framesetBlankPseudo, ":frameset-blank")
+HTML_ATOM(framesetBlankPseudo, ":-moz-frameset-blank")
 HTML_ATOM(gutter, "gutter")
 HTML_ATOM(h1, "h1")
 HTML_ATOM(h2, "h2")
@@ -174,14 +173,13 @@ HTML_ATOM(headerWindowTarget, "window-target")
 HTML_ATOM(headers, "headers")
 HTML_ATOM(height, "height")
 HTML_ATOM(hidden, "hidden")
-HTML_ATOM(horizontalFramesetBorderPseudo, ":hframeset-border")
+HTML_ATOM(horizontalFramesetBorderPseudo, ":-moz-hframeset-border")
 HTML_ATOM(hr, "hr")
 HTML_ATOM(href, "href")
 HTML_ATOM(hreflang, "hreflang")
 HTML_ATOM(hspace, "hspace")
 HTML_ATOM(html, "html")
 HTML_ATOM(httpEquiv, "http-equiv")
-HTML_ATOM(ibPseudo, ":ib-pseudo")
 HTML_ATOM(i, "i")
 HTML_ATOM(id, "id")
 HTML_ATOM(iframe, "iframe")
@@ -192,7 +190,6 @@ HTML_ATOM(input, "input")
 HTML_ATOM(isindex, "isindex")
 HTML_ATOM(ismap, "ismap")
 HTML_ATOM(label, "label")
-HTML_ATOM(labelContentPseudo, ":label-content")
 HTML_ATOM(lang, "lang")
 HTML_ATOM(layer, "layer")
 HTML_ATOM(layout, "layout")
@@ -202,7 +199,6 @@ HTML_ATOM(left, "left")
 HTML_ATOM(leftmargin, "leftmargin")
 HTML_ATOM(leftpadding, "leftpadding")
 HTML_ATOM(legend, "legend")
-HTML_ATOM(legendContentPseudo, ":legend-content")
 HTML_ATOM(length, "length")
 HTML_ATOM(longdesc, "longdesc")
 HTML_ATOM(map, "map")
@@ -272,13 +268,13 @@ HTML_ATOM(summary, "summary")
 HTML_ATOM(suppress, "suppress")
 HTML_ATOM(tabindex, "tabindex")
 HTML_ATOM(table, "table")
-HTML_ATOM(tablePseudo, ":table")
-HTML_ATOM(tableCellPseudo, ":table-cell")
-HTML_ATOM(tableColGroupPseudo, ":table-column-group")
-HTML_ATOM(tableColPseudo, ":table-column")
-HTML_ATOM(tableOuterPseudo, ":table-outer")
-HTML_ATOM(tableRowGroupPseudo, ":table-row-group")
-HTML_ATOM(tableRowPseudo, ":table-row")
+HTML_ATOM(tablePseudo, ":-moz-table")
+HTML_ATOM(tableCellPseudo, ":-moz-table-cell")
+HTML_ATOM(tableColGroupPseudo, ":-moz-table-column-group")
+HTML_ATOM(tableColPseudo, ":-moz-table-column")
+HTML_ATOM(tableOuterPseudo, ":-moz-table-outer")
+HTML_ATOM(tableRowGroupPseudo, ":-moz-table-row-group")
+HTML_ATOM(tableRowPseudo, ":-moz-table-row")
 HTML_ATOM(tabstop, "tabstop")
 HTML_ATOM(target, "target")
 HTML_ATOM(tbody, "tbody")
@@ -304,14 +300,14 @@ HTML_ATOM(valuetype, "valuetype")
 HTML_ATOM(variable, "variable")
 HTML_ATOM(vcard_name, "vcard_name")
 HTML_ATOM(version, "version")
-HTML_ATOM(verticalFramesetBorderPseudo, ":vframeset-border")
+HTML_ATOM(verticalFramesetBorderPseudo, ":-moz-vframeset-border")
 HTML_ATOM(visibility, "visibility")
 HTML_ATOM(vlink, "vlink")
 HTML_ATOM(vspace, "vspace")
 HTML_ATOM(wbr, "wbr")
 HTML_ATOM(width, "width")
 HTML_ATOM(wrap, "wrap")
-HTML_ATOM(wrappedFramePseudo, ":wrapped-frame")
+HTML_ATOM(wrappedFramePseudo, ":-moz-wrapped-frame")
 HTML_ATOM(zindex, "zindex")
 HTML_ATOM(z_index, "z-index")
 
diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp
index e3fb58e8749..3e185b76cf6 100644
--- a/mozilla/content/html/style/src/nsCSSParser.cpp
+++ b/mozilla/content/html/style/src/nsCSSParser.cpp
@@ -1546,7 +1546,6 @@ static PRBool IsPseudoClass(const nsIAtom* aAtom)
                 (nsCSSAtoms::checkedPseudo == aAtom) ||
                 (nsCSSAtoms::disabledPseudo == aAtom) ||
                 (nsCSSAtoms::dragOverPseudo == aAtom) ||
-                (nsCSSAtoms::dragPseudo == aAtom) ||
                 (nsCSSAtoms::enabledPseudo == aAtom) ||
                 (nsCSSAtoms::emptyPseudo == aAtom) ||
                 (nsCSSAtoms::firstChildPseudo == aAtom) ||
diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
index aeb399462ca..2c4e9647cab 100644
--- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
@@ -3373,7 +3373,6 @@ inline PRBool IsEventPseudo(nsIAtom* aAtom)
 {
   return PRBool ((nsCSSAtoms::activePseudo == aAtom)   || 
                  (nsCSSAtoms::dragOverPseudo == aAtom) || 
-//               (nsCSSAtoms::dragPseudo == aAtom)     ||   XXX not real yet
                  (nsCSSAtoms::focusPseudo == aAtom)    || 
                  (nsCSSAtoms::hoverPseudo == aAtom)); 
                  // XXX selected, enabled, disabled, selection?
diff --git a/mozilla/content/shared/public/nsCSSAtomList.h b/mozilla/content/shared/public/nsCSSAtomList.h
index 78b03221176..beff67e26a5 100644
--- a/mozilla/content/shared/public/nsCSSAtomList.h
+++ b/mozilla/content/shared/public/nsCSSAtomList.h
@@ -66,8 +66,7 @@ CSS_ATOM(buttonLabelPseudo, ":-moz-buttonlabel")
 CSS_ATOM(checkedPseudo, ":checked")
 
 CSS_ATOM(disabledPseudo, ":disabled")
-CSS_ATOM(dragOverPseudo, ":drag-over")
-CSS_ATOM(dragPseudo, ":drag")
+CSS_ATOM(dragOverPseudo, ":-moz-drag-over")
 
 CSS_ATOM(emptyPseudo, ":empty")
 
@@ -84,16 +83,12 @@ CSS_ATOM(hoverPseudo, ":hover")
 CSS_ATOM(langPseudo, ":lang")
 CSS_ATOM(linkPseudo, ":link")
 
-CSS_ATOM(menuPseudo, ":menu")
-
 CSS_ATOM(notPseudo, ":not")
 
 CSS_ATOM(rootPseudo, ":root")
 
 CSS_ATOM(xblBoundElementPseudo, ":-moz-bound-element")
 
-CSS_ATOM(selectionPseudo, ":selection")
-
 CSS_ATOM(universalSelector, "*")
 
 CSS_ATOM(visitedPseudo, ":visited")
diff --git a/mozilla/content/shared/public/nsCSSPropList.h b/mozilla/content/shared/public/nsCSSPropList.h
index 77e8553a0d1..9f83ac2ab01 100644
--- a/mozilla/content/shared/public/nsCSSPropList.h
+++ b/mozilla/content/shared/public/nsCSSPropList.h
@@ -143,8 +143,8 @@ CSS_PROP(-x-clip-right, clip_right, REFLOW) // XXX bug 3935
 CSS_PROP(-x-clip-top, clip_top, REFLOW) // XXX bug 3935
 CSS_PROP(color, color, VISUAL)
 CSS_PROP(content, content, FRAMECHANGE)
-CSS_PROP(counter-increment, counter_increment, REFLOW)
-CSS_PROP(counter-reset, counter_reset, REFLOW)
+CSS_PROP(-moz-counter-increment, counter_increment, REFLOW) // XXX bug 137285
+CSS_PROP(-moz-counter-reset, counter_reset, REFLOW) // XXX bug 137285
 CSS_PROP(cue, cue, AURAL)
 CSS_PROP(cue-after, cue_after, AURAL)
 CSS_PROP(cue-before, cue_before, AURAL)
diff --git a/mozilla/content/shared/public/nsHTMLAtomList.h b/mozilla/content/shared/public/nsHTMLAtomList.h
index 4ae14913802..42d23005e6f 100644
--- a/mozilla/content/shared/public/nsHTMLAtomList.h
+++ b/mozilla/content/shared/public/nsHTMLAtomList.h
@@ -96,9 +96,9 @@ HTML_ATOM(bottompadding, "bottompadding")
 HTML_ATOM(br, "br")
 HTML_ATOM(b, "b")
 HTML_ATOM(button, "button")
-HTML_ATOM(buttonContentPseudo, ":button-content")
+HTML_ATOM(buttonContentPseudo, ":-moz-button-content")
 HTML_ATOM(caption, "caption")
-HTML_ATOM(cellContentPseudo, ":cell-content")
+HTML_ATOM(cellContentPseudo, ":-moz-cell-content")
 HTML_ATOM(cellpadding, "cellpadding")
 HTML_ATOM(cellspacing, "cellspacing")
 HTML_ATOM(ch, "ch")
@@ -120,7 +120,6 @@ HTML_ATOM(colgroup, "colgroup")
 HTML_ATOM(cols, "cols")
 HTML_ATOM(colspan, "colspan")
 HTML_ATOM(combobox, "combobox")
-HTML_ATOM(columnPseudo, ":body-column")
 HTML_ATOM(compact, "compact")
 HTML_ATOM(content, "content")
 HTML_ATOM(coords, "coords")
@@ -146,7 +145,7 @@ HTML_ATOM(encoding, "encoding")
 HTML_ATOM(enctype, "enctype")
 HTML_ATOM(face, "face")
 HTML_ATOM(fieldset, "fieldset")
-HTML_ATOM(fieldsetContentPseudo, ":fieldset-content")
+HTML_ATOM(fieldsetContentPseudo, ":-moz-fieldset-content")
 HTML_ATOM(firstLetterPseudo, ":first-letter")
 HTML_ATOM(firstLinePseudo, ":first-line")
 HTML_ATOM(font, "font")
@@ -156,7 +155,7 @@ HTML_ATOM(form, "form")
 HTML_ATOM(frame, "frame")
 HTML_ATOM(frameborder, "frameborder")
 HTML_ATOM(frameset, "frameset")
-HTML_ATOM(framesetBlankPseudo, ":frameset-blank")
+HTML_ATOM(framesetBlankPseudo, ":-moz-frameset-blank")
 HTML_ATOM(gutter, "gutter")
 HTML_ATOM(h1, "h1")
 HTML_ATOM(h2, "h2")
@@ -174,14 +173,13 @@ HTML_ATOM(headerWindowTarget, "window-target")
 HTML_ATOM(headers, "headers")
 HTML_ATOM(height, "height")
 HTML_ATOM(hidden, "hidden")
-HTML_ATOM(horizontalFramesetBorderPseudo, ":hframeset-border")
+HTML_ATOM(horizontalFramesetBorderPseudo, ":-moz-hframeset-border")
 HTML_ATOM(hr, "hr")
 HTML_ATOM(href, "href")
 HTML_ATOM(hreflang, "hreflang")
 HTML_ATOM(hspace, "hspace")
 HTML_ATOM(html, "html")
 HTML_ATOM(httpEquiv, "http-equiv")
-HTML_ATOM(ibPseudo, ":ib-pseudo")
 HTML_ATOM(i, "i")
 HTML_ATOM(id, "id")
 HTML_ATOM(iframe, "iframe")
@@ -192,7 +190,6 @@ HTML_ATOM(input, "input")
 HTML_ATOM(isindex, "isindex")
 HTML_ATOM(ismap, "ismap")
 HTML_ATOM(label, "label")
-HTML_ATOM(labelContentPseudo, ":label-content")
 HTML_ATOM(lang, "lang")
 HTML_ATOM(layer, "layer")
 HTML_ATOM(layout, "layout")
@@ -202,7 +199,6 @@ HTML_ATOM(left, "left")
 HTML_ATOM(leftmargin, "leftmargin")
 HTML_ATOM(leftpadding, "leftpadding")
 HTML_ATOM(legend, "legend")
-HTML_ATOM(legendContentPseudo, ":legend-content")
 HTML_ATOM(length, "length")
 HTML_ATOM(longdesc, "longdesc")
 HTML_ATOM(map, "map")
@@ -272,13 +268,13 @@ HTML_ATOM(summary, "summary")
 HTML_ATOM(suppress, "suppress")
 HTML_ATOM(tabindex, "tabindex")
 HTML_ATOM(table, "table")
-HTML_ATOM(tablePseudo, ":table")
-HTML_ATOM(tableCellPseudo, ":table-cell")
-HTML_ATOM(tableColGroupPseudo, ":table-column-group")
-HTML_ATOM(tableColPseudo, ":table-column")
-HTML_ATOM(tableOuterPseudo, ":table-outer")
-HTML_ATOM(tableRowGroupPseudo, ":table-row-group")
-HTML_ATOM(tableRowPseudo, ":table-row")
+HTML_ATOM(tablePseudo, ":-moz-table")
+HTML_ATOM(tableCellPseudo, ":-moz-table-cell")
+HTML_ATOM(tableColGroupPseudo, ":-moz-table-column-group")
+HTML_ATOM(tableColPseudo, ":-moz-table-column")
+HTML_ATOM(tableOuterPseudo, ":-moz-table-outer")
+HTML_ATOM(tableRowGroupPseudo, ":-moz-table-row-group")
+HTML_ATOM(tableRowPseudo, ":-moz-table-row")
 HTML_ATOM(tabstop, "tabstop")
 HTML_ATOM(target, "target")
 HTML_ATOM(tbody, "tbody")
@@ -304,14 +300,14 @@ HTML_ATOM(valuetype, "valuetype")
 HTML_ATOM(variable, "variable")
 HTML_ATOM(vcard_name, "vcard_name")
 HTML_ATOM(version, "version")
-HTML_ATOM(verticalFramesetBorderPseudo, ":vframeset-border")
+HTML_ATOM(verticalFramesetBorderPseudo, ":-moz-vframeset-border")
 HTML_ATOM(visibility, "visibility")
 HTML_ATOM(vlink, "vlink")
 HTML_ATOM(vspace, "vspace")
 HTML_ATOM(wbr, "wbr")
 HTML_ATOM(width, "width")
 HTML_ATOM(wrap, "wrap")
-HTML_ATOM(wrappedFramePseudo, ":wrapped-frame")
+HTML_ATOM(wrappedFramePseudo, ":-moz-wrapped-frame")
 HTML_ATOM(zindex, "zindex")
 HTML_ATOM(z_index, "z-index")
 
diff --git a/mozilla/content/shared/public/nsLayoutAtomList.h b/mozilla/content/shared/public/nsLayoutAtomList.h
index 3fb7ad63517..eec15f68874 100644
--- a/mozilla/content/shared/public/nsLayoutAtomList.h
+++ b/mozilla/content/shared/public/nsLayoutAtomList.h
@@ -84,7 +84,7 @@ LAYOUT_ATOM(overflowList, "Overflow-list")
 LAYOUT_ATOM(popupList, "Popup-list")
 
   // Alphabetical list of pseudo tag names for non-element content
-LAYOUT_ATOM(canvasPseudo, ":canvas")
+LAYOUT_ATOM(canvasPseudo, ":-moz-canvas")
 LAYOUT_ATOM(commentTagName, "__moz_comment")
 LAYOUT_ATOM(dummyOptionPseudo, ":-moz-dummy-option")
 LAYOUT_ATOM(textTagName, "__moz_text")
@@ -93,9 +93,9 @@ LAYOUT_ATOM(pagePseudo, ":-moz-page")
 LAYOUT_ATOM(pageContentPseudo, ":-moz-pagecontent")
 LAYOUT_ATOM(pageSequencePseudo, ":-moz-page-sequence")
 LAYOUT_ATOM(processingInstructionTagName, "__moz_pi")
-LAYOUT_ATOM(scrolledContentPseudo, ":scrolled-content")
-LAYOUT_ATOM(viewportPseudo, ":viewport")
-LAYOUT_ATOM(viewportScrollPseudo, ":viewport-scroll")
+LAYOUT_ATOM(scrolledContentPseudo, ":-moz-scrolled-content")
+LAYOUT_ATOM(viewportPseudo, ":-moz-viewport")
+LAYOUT_ATOM(viewportScrollPseudo, ":-moz-viewport-scroll")
 LAYOUT_ATOM(selectScrolledContentPseudo, ":-moz-select-scrolled-content")
 
   // Alphabetical list of frame types
diff --git a/mozilla/layout/base/nsLayoutAtomList.h b/mozilla/layout/base/nsLayoutAtomList.h
index 3fb7ad63517..eec15f68874 100644
--- a/mozilla/layout/base/nsLayoutAtomList.h
+++ b/mozilla/layout/base/nsLayoutAtomList.h
@@ -84,7 +84,7 @@ LAYOUT_ATOM(overflowList, "Overflow-list")
 LAYOUT_ATOM(popupList, "Popup-list")
 
   // Alphabetical list of pseudo tag names for non-element content
-LAYOUT_ATOM(canvasPseudo, ":canvas")
+LAYOUT_ATOM(canvasPseudo, ":-moz-canvas")
 LAYOUT_ATOM(commentTagName, "__moz_comment")
 LAYOUT_ATOM(dummyOptionPseudo, ":-moz-dummy-option")
 LAYOUT_ATOM(textTagName, "__moz_text")
@@ -93,9 +93,9 @@ LAYOUT_ATOM(pagePseudo, ":-moz-page")
 LAYOUT_ATOM(pageContentPseudo, ":-moz-pagecontent")
 LAYOUT_ATOM(pageSequencePseudo, ":-moz-page-sequence")
 LAYOUT_ATOM(processingInstructionTagName, "__moz_pi")
-LAYOUT_ATOM(scrolledContentPseudo, ":scrolled-content")
-LAYOUT_ATOM(viewportPseudo, ":viewport")
-LAYOUT_ATOM(viewportScrollPseudo, ":viewport-scroll")
+LAYOUT_ATOM(scrolledContentPseudo, ":-moz-scrolled-content")
+LAYOUT_ATOM(viewportPseudo, ":-moz-viewport")
+LAYOUT_ATOM(viewportScrollPseudo, ":-moz-viewport-scroll")
 LAYOUT_ATOM(selectScrolledContentPseudo, ":-moz-select-scrolled-content")
 
   // Alphabetical list of frame types
diff --git a/mozilla/layout/forms/resources/content/xbl-forms.css b/mozilla/layout/forms/resources/content/xbl-forms.css
index 4f752b959e1..6d80639ba4c 100644
--- a/mozilla/layout/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/forms/resources/content/xbl-forms.css
@@ -159,7 +159,7 @@ input[type="file"] > input[type="button"] {
  * The following rules are copied from forms.css, for widgets that aren't yet
  * defined in XBL.
  */
-*|*:fieldset-content {
+*|*:-moz-fieldset-content {
   display: block;
 }
 
diff --git a/mozilla/layout/html/document/src/forms.css b/mozilla/layout/html/document/src/forms.css
index 8757d1c1a1f..8a8e34f465f 100644
--- a/mozilla/layout/html/document/src/forms.css
+++ b/mozilla/layout/html/document/src/forms.css
@@ -42,7 +42,7 @@
 @namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
 @namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-*|*:fieldset-content {
+*|*:-moz-fieldset-content {
   display: block;
 }
 
@@ -369,7 +369,7 @@ input[type="submit"] {
   -moz-binding: none;
 }
 
-*|*:button-content {
+*|*:-moz-button-content {
   display: block;
   text-align: center;
 }
diff --git a/mozilla/layout/html/document/src/html.css b/mozilla/layout/html/document/src/html.css
index 88a067b9835..078df404eb8 100644
--- a/mozilla/layout/html/document/src/html.css
+++ b/mozilla/layout/html/document/src/html.css
@@ -39,7 +39,7 @@
 
 /* blocks */
 
-html, div, map, dt, isindex, *|*:-moz-anonymous-block, *|*:cell-content {
+html, div, map, dt, isindex, *|*:-moz-anonymous-block, *|*:-moz-cell-content {
   display: block;
 }
 
@@ -154,7 +154,7 @@ table {
   -moz-box-sizing: border-box;
 }
 
-*|*:table {
+*|*:-moz-table {
   display: table;
   -moz-box-sizing: border-box; /* XXX do we really want this? */
 }
@@ -172,7 +172,7 @@ table[rules] {
   border-collapse: collapse;
 }
 
-*|*:table-outer {
+*|*:-moz-table-outer {
   display: table;
   margin: 0;
   border: none;
@@ -224,11 +224,11 @@ tr {
   vertical-align: inherit;
 }
 
-*|*:table-row {
+*|*:-moz-table-row {
   display: table-row;
 }
 
-col, *|*:table-column {
+col, *|*:-moz-table-column {
   display: table-column;
   border: inherit;
   width: inherit;
@@ -237,7 +237,7 @@ col, *|*:table-column {
   border: inherit;
 }
 
-colgroup, *|*:table-column-group {
+colgroup, *|*:-moz-table-column-group {
   display: table-column-group;
 }
 
@@ -256,7 +256,7 @@ tfoot {
   vertical-align: middle;
 }
 
-*|*:table-row-group {
+*|*:-moz-table-row-group {
   display: table-row-group;
 }
 
@@ -274,7 +274,7 @@ th {
   padding: 1px;
 }
 
-*|*:table-cell {
+*|*:-moz-table-cell {
   display: table-cell;
   padding: 1px;
   white-space: inherit;
@@ -356,7 +356,7 @@ ul, menu, dir {
   list-style-type: disc;
   margin: 1em 0;
   padding-left: 40px;
-  counter-reset: -html-counter 0;
+  -moz-counter-reset: -html-counter 0;
 }
 
 ol {
@@ -364,7 +364,7 @@ ol {
   list-style-type: decimal;
   margin: 1em 0;
   padding-left: 40px;
-  counter-reset: -html-counter 0;
+  -moz-counter-reset: -html-counter 0;
 }
 
 li {
@@ -484,12 +484,12 @@ noembed, noscript, param {
 
 /* magic */
 
-*|*:viewport, *|*:viewport-scroll, *|*:canvas {
+*|*:-moz-viewport, *|*:-moz-viewport-scroll, *|*:-moz-canvas {
   display: block;
   background-color: inherit;
 }
 
-*|*:scrolled-content { 
+*|*:-moz-scrolled-content { 
   /* e.g., text inputs, select boxes */
   background: inherit;
   padding: inherit;
@@ -497,7 +497,7 @@ noembed, noscript, param {
   -moz-box-orient: inherit;
 }
 
-*|*:wrapped-frame {
+*|*:-moz-wrapped-frame {
   display: inherit;
 }
 
@@ -544,7 +544,7 @@ noembed, noscript, param {
     cursor: default !important;
   }
 
-  *|*:viewport, *|*:viewport-scroll, *|*:canvas {
+  *|*:-moz-viewport, *|*:-moz-viewport-scroll, *|*:-moz-canvas {
     background-color: #737373 !important;
   }
 
diff --git a/mozilla/layout/html/forms/resources/content/xbl-forms.css b/mozilla/layout/html/forms/resources/content/xbl-forms.css
index 4f752b959e1..6d80639ba4c 100644
--- a/mozilla/layout/html/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/html/forms/resources/content/xbl-forms.css
@@ -159,7 +159,7 @@ input[type="file"] > input[type="button"] {
  * The following rules are copied from forms.css, for widgets that aren't yet
  * defined in XBL.
  */
-*|*:fieldset-content {
+*|*:-moz-fieldset-content {
   display: block;
 }
 
diff --git a/mozilla/layout/style/forms.css b/mozilla/layout/style/forms.css
index 8757d1c1a1f..8a8e34f465f 100644
--- a/mozilla/layout/style/forms.css
+++ b/mozilla/layout/style/forms.css
@@ -42,7 +42,7 @@
 @namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
 @namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-*|*:fieldset-content {
+*|*:-moz-fieldset-content {
   display: block;
 }
 
@@ -369,7 +369,7 @@ input[type="submit"] {
   -moz-binding: none;
 }
 
-*|*:button-content {
+*|*:-moz-button-content {
   display: block;
   text-align: center;
 }
diff --git a/mozilla/layout/style/html.css b/mozilla/layout/style/html.css
index 88a067b9835..078df404eb8 100644
--- a/mozilla/layout/style/html.css
+++ b/mozilla/layout/style/html.css
@@ -39,7 +39,7 @@
 
 /* blocks */
 
-html, div, map, dt, isindex, *|*:-moz-anonymous-block, *|*:cell-content {
+html, div, map, dt, isindex, *|*:-moz-anonymous-block, *|*:-moz-cell-content {
   display: block;
 }
 
@@ -154,7 +154,7 @@ table {
   -moz-box-sizing: border-box;
 }
 
-*|*:table {
+*|*:-moz-table {
   display: table;
   -moz-box-sizing: border-box; /* XXX do we really want this? */
 }
@@ -172,7 +172,7 @@ table[rules] {
   border-collapse: collapse;
 }
 
-*|*:table-outer {
+*|*:-moz-table-outer {
   display: table;
   margin: 0;
   border: none;
@@ -224,11 +224,11 @@ tr {
   vertical-align: inherit;
 }
 
-*|*:table-row {
+*|*:-moz-table-row {
   display: table-row;
 }
 
-col, *|*:table-column {
+col, *|*:-moz-table-column {
   display: table-column;
   border: inherit;
   width: inherit;
@@ -237,7 +237,7 @@ col, *|*:table-column {
   border: inherit;
 }
 
-colgroup, *|*:table-column-group {
+colgroup, *|*:-moz-table-column-group {
   display: table-column-group;
 }
 
@@ -256,7 +256,7 @@ tfoot {
   vertical-align: middle;
 }
 
-*|*:table-row-group {
+*|*:-moz-table-row-group {
   display: table-row-group;
 }
 
@@ -274,7 +274,7 @@ th {
   padding: 1px;
 }
 
-*|*:table-cell {
+*|*:-moz-table-cell {
   display: table-cell;
   padding: 1px;
   white-space: inherit;
@@ -356,7 +356,7 @@ ul, menu, dir {
   list-style-type: disc;
   margin: 1em 0;
   padding-left: 40px;
-  counter-reset: -html-counter 0;
+  -moz-counter-reset: -html-counter 0;
 }
 
 ol {
@@ -364,7 +364,7 @@ ol {
   list-style-type: decimal;
   margin: 1em 0;
   padding-left: 40px;
-  counter-reset: -html-counter 0;
+  -moz-counter-reset: -html-counter 0;
 }
 
 li {
@@ -484,12 +484,12 @@ noembed, noscript, param {
 
 /* magic */
 
-*|*:viewport, *|*:viewport-scroll, *|*:canvas {
+*|*:-moz-viewport, *|*:-moz-viewport-scroll, *|*:-moz-canvas {
   display: block;
   background-color: inherit;
 }
 
-*|*:scrolled-content { 
+*|*:-moz-scrolled-content { 
   /* e.g., text inputs, select boxes */
   background: inherit;
   padding: inherit;
@@ -497,7 +497,7 @@ noembed, noscript, param {
   -moz-box-orient: inherit;
 }
 
-*|*:wrapped-frame {
+*|*:-moz-wrapped-frame {
   display: inherit;
 }
 
@@ -544,7 +544,7 @@ noembed, noscript, param {
     cursor: default !important;
   }
 
-  *|*:viewport, *|*:viewport-scroll, *|*:canvas {
+  *|*:-moz-viewport, *|*:-moz-viewport-scroll, *|*:-moz-canvas {
     background-color: #737373 !important;
   }
 
diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp
index e3fb58e8749..3e185b76cf6 100644
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@@ -1546,7 +1546,6 @@ static PRBool IsPseudoClass(const nsIAtom* aAtom)
                 (nsCSSAtoms::checkedPseudo == aAtom) ||
                 (nsCSSAtoms::disabledPseudo == aAtom) ||
                 (nsCSSAtoms::dragOverPseudo == aAtom) ||
-                (nsCSSAtoms::dragPseudo == aAtom) ||
                 (nsCSSAtoms::enabledPseudo == aAtom) ||
                 (nsCSSAtoms::emptyPseudo == aAtom) ||
                 (nsCSSAtoms::firstChildPseudo == aAtom) ||
diff --git a/mozilla/layout/style/nsCSSPropList.h b/mozilla/layout/style/nsCSSPropList.h
index 77e8553a0d1..9f83ac2ab01 100644
--- a/mozilla/layout/style/nsCSSPropList.h
+++ b/mozilla/layout/style/nsCSSPropList.h
@@ -143,8 +143,8 @@ CSS_PROP(-x-clip-right, clip_right, REFLOW) // XXX bug 3935
 CSS_PROP(-x-clip-top, clip_top, REFLOW) // XXX bug 3935
 CSS_PROP(color, color, VISUAL)
 CSS_PROP(content, content, FRAMECHANGE)
-CSS_PROP(counter-increment, counter_increment, REFLOW)
-CSS_PROP(counter-reset, counter_reset, REFLOW)
+CSS_PROP(-moz-counter-increment, counter_increment, REFLOW) // XXX bug 137285
+CSS_PROP(-moz-counter-reset, counter_reset, REFLOW) // XXX bug 137285
 CSS_PROP(cue, cue, AURAL)
 CSS_PROP(cue-after, cue_after, AURAL)
 CSS_PROP(cue-before, cue_before, AURAL)
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index aeb399462ca..2c4e9647cab 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -3373,7 +3373,6 @@ inline PRBool IsEventPseudo(nsIAtom* aAtom)
 {
   return PRBool ((nsCSSAtoms::activePseudo == aAtom)   || 
                  (nsCSSAtoms::dragOverPseudo == aAtom) || 
-//               (nsCSSAtoms::dragPseudo == aAtom)     ||   XXX not real yet
                  (nsCSSAtoms::focusPseudo == aAtom)    || 
                  (nsCSSAtoms::hoverPseudo == aAtom)); 
                  // XXX selected, enabled, disabled, selection?