diff --git a/browser/themes/winstripe/browser-aero.css b/browser/themes/winstripe/browser-aero.css
index 9346f1704f5..b8b30708116 100644
--- a/browser/themes/winstripe/browser-aero.css
+++ b/browser/themes/winstripe/browser-aero.css
@@ -37,7 +37,7 @@
   }
 }
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   #navigator-toolbox > toolbar:not(:-moz-lwtheme),
   #browser-bottombox:not(:-moz-lwtheme) {
     background-color: @customToolbarColor@;
@@ -82,7 +82,7 @@
   }
 }
 
-@media all and (-moz-windows-compositor) {
+@media (-moz-windows-compositor) {
   /* These should be hidden w/ glass enabled. Windows draws its own buttons. */
   .titlebar-button {
     display: none;
@@ -348,7 +348,7 @@
 }
 
 /* ::::: splitmenu highlight style that imitates Windows 7 start menu ::::: */
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   .splitmenu-menuitem,
   .splitmenu-menu {
     -moz-appearance: none;
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
index ce4445c8243..124cd358038 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -165,14 +165,14 @@
   margin: 0 0 2px;
 }
 
-@media all and (-moz-windows-classic) {
+@media (-moz-windows-classic) {
   #appmenu-button {
     margin-bottom: 1px;
   }
 }
 
 %ifndef WINSTRIPE_AERO
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   #main-window[sizemode="normal"] #appmenu-button {
     margin-bottom: 5px;
   }
@@ -315,7 +315,7 @@
   -moz-border-end: 1px solid ThreeDShadow;
 }
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   #appmenu-popup {
     -moz-appearance: none;
     background: white;
@@ -483,7 +483,7 @@
   -moz-appearance: -moz-window-titlebar-maximized;
 }
 
-@media all and (-moz-windows-classic) {
+@media (-moz-windows-classic) {
   #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container {
     margin-top: 4px;
   }
@@ -1214,7 +1214,7 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-padding-end: 2px;
 }
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   #urlbar,
   .searchbar-textbox {
     @navbarTextboxCustomBorder@
@@ -1712,7 +1712,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   margin: 16px 0 -2px;
 }
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   .panel-promo-box {
     margin: 8px -16px -16px;
     padding: 8px 16px;
@@ -1795,7 +1795,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 %ifndef WINSTRIPE_AERO
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   #main-window[sizemode=normal] #TabsToolbar {
     padding-left: 2px;
     padding-right: 2px;
@@ -1827,7 +1827,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 %ifndef WINSTRIPE_AERO
-@media all and (-moz-windows-theme: luna-blue) {
+@media (-moz-windows-theme: luna-blue) {
   .tabbrowser-tab,
   .tabs-newtab-button {
     background-image: @toolbarShadowOnTab@,
@@ -1956,7 +1956,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
 
-@media all and (-moz-touch-enabled) {
+@media (-moz-touch-enabled) {
   .tabbrowser-arrowscrollbox > .scrollbutton-up,
   .tabbrowser-arrowscrollbox > .scrollbutton-down,
   #TabsToolbar .toolbarbutton-1 {
diff --git a/browser/themes/winstripe/places/organizer-aero.css b/browser/themes/winstripe/places/organizer-aero.css
index 0070f9094ce..70f455f74ee 100644
--- a/browser/themes/winstripe/places/organizer-aero.css
+++ b/browser/themes/winstripe/places/organizer-aero.css
@@ -21,7 +21,7 @@
   }
 }
 
-@media all and (-moz-windows-compositor) {
+@media (-moz-windows-compositor) {
   #placesToolbox {
     border-top: none;
   }
@@ -31,7 +31,7 @@
   }
 }
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   #placesView,
   #searchModifiers,
   #infoPane,
diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css b/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
index 1a6bc1a8bba..90b00ba4ebb 100644
--- a/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
@@ -66,7 +66,7 @@
   min-height: 41px;
 }
 
-@media all and (max-width: 600px) {
+@media (max-width: 600px) {
   .global-warning-text {
     display: none;
   }
@@ -206,7 +206,7 @@
 }
 
 /* Maximize the size of the viewport when the window is small */
-@media all and (max-width: 800px) {
+@media (max-width: 800px) {
   .category-name {
     display: none;
   }
diff --git a/toolkit/themes/pinstripe/mozapps/extensions/extensions.css b/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
index a9ecb721f33..bd2a45bc3aa 100644
--- a/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
@@ -73,7 +73,7 @@
   border-bottom: 1px solid rgba(50, 65, 92, 0.4);
 }
 
-@media all and (max-width: 600px) {
+@media (max-width: 600px) {
   .global-warning-text {
     display: none;
   }
@@ -239,7 +239,7 @@
 }
 
 /* Maximize the size of the viewport when the window is small */
-@media all and (max-width: 800px) {
+@media (max-width: 800px) {
   .category-name {
     display: none;
   }
diff --git a/toolkit/themes/winstripe/global/inContentUI.css b/toolkit/themes/winstripe/global/inContentUI.css
index e7157849b18..4326a8c92dd 100644
--- a/toolkit/themes/winstripe/global/inContentUI.css
+++ b/toolkit/themes/winstripe/global/inContentUI.css
@@ -61,7 +61,7 @@ html|html {
 }
 
 %ifdef WINSTRIPE_AERO
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   *|*:root {
     color: #000;
     background-color: #CCD9EA;
@@ -72,7 +72,7 @@ html|html {
   }
 }
 
-@media all and (-moz-windows-compositor) {
+@media (-moz-windows-compositor) {
   *|*:root {
     color: #000;
     /* Blame shorlander for this monstrosity. */
@@ -117,7 +117,7 @@ html|html {
 }
 
 %ifdef WINSTRIPE_AERO
-@media all and (-moz-windows-compositor) {
+@media (-moz-windows-compositor) {
   /* Buttons */
   *|button,
   menulist,
diff --git a/toolkit/themes/winstripe/global/menu-aero.css b/toolkit/themes/winstripe/global/menu-aero.css
index db0470ef9f0..0d5161da42a 100644
--- a/toolkit/themes/winstripe/global/menu-aero.css
+++ b/toolkit/themes/winstripe/global/menu-aero.css
@@ -1,6 +1,6 @@
 %include menu.css
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   menubar > menu:-moz-lwtheme {
     -moz-appearance: menuitem;
   }
diff --git a/toolkit/themes/winstripe/global/menu.css b/toolkit/themes/winstripe/global/menu.css
index 765de71bd4e..f809afb9892 100644
--- a/toolkit/themes/winstripe/global/menu.css
+++ b/toolkit/themes/winstripe/global/menu.css
@@ -69,7 +69,7 @@ menuitem[_moz-menuactive="true"][disabled="true"],
   text-shadow: none;
 }
 
-@media all and (-moz-windows-classic) {
+@media (-moz-windows-classic) {
   menu[disabled="true"],
   menubar > menu[disabled="true"][_moz-menuactive="true"],
   menuitem[disabled="true"],
diff --git a/toolkit/themes/winstripe/global/notification.css b/toolkit/themes/winstripe/global/notification.css
index b69ff63c514..a7ee79d4e28 100644
--- a/toolkit/themes/winstripe/global/notification.css
+++ b/toolkit/themes/winstripe/global/notification.css
@@ -70,7 +70,7 @@ notification[type="critical"] .messageImage {
 %ifdef XP_WIN
 /*
 XXX: apply styles to all themes until bug 509642 is fixed
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
 */
   .popup-notification-menubutton[type="menu-button"] {
     -moz-appearance: none;
diff --git a/toolkit/themes/winstripe/global/popup.css b/toolkit/themes/winstripe/global/popup.css
index 502c126776c..0be8ebf4f73 100644
--- a/toolkit/themes/winstripe/global/popup.css
+++ b/toolkit/themes/winstripe/global/popup.css
@@ -131,7 +131,7 @@ panel[type="arrow"] {
 %endif
 
 %ifdef XP_WIN
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   panel[type="arrow"][side="top"],
   panel[type="arrow"][side="bottom"] {
     margin-left: -25px;
diff --git a/toolkit/themes/winstripe/global/toolbarbutton-aero.css b/toolkit/themes/winstripe/global/toolbarbutton-aero.css
index 5506288da35..a702ca307e9 100644
--- a/toolkit/themes/winstripe/global/toolbarbutton-aero.css
+++ b/toolkit/themes/winstripe/global/toolbarbutton-aero.css
@@ -1,6 +1,6 @@
 %include toolbarbutton.css
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
     color: inherit;
     text-shadow: inherit;
diff --git a/toolkit/themes/winstripe/global/toolbarbutton.css b/toolkit/themes/winstripe/global/toolbarbutton.css
index 2cbb0f6d623..4ae6b9230c5 100644
--- a/toolkit/themes/winstripe/global/toolbarbutton.css
+++ b/toolkit/themes/winstripe/global/toolbarbutton.css
@@ -96,7 +96,7 @@ toolbarbutton[disabled="true"] {
   text-shadow: none;
 }
 
-@media all and (-moz-windows-classic) {
+@media (-moz-windows-classic) {
   toolbarbutton[disabled="true"] {
     color: ThreeDShadow;
     text-shadow: 1px 1px ThreeDHighlight;
@@ -113,7 +113,7 @@ toolbarbutton[checked="true"]:not([disabled="true"]) {
   color: ButtonText;
 }
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   toolbarbutton:-moz-lwtheme {
     text-shadow: none;
   }
diff --git a/toolkit/themes/winstripe/mozapps/downloads/downloads-aero.css b/toolkit/themes/winstripe/mozapps/downloads/downloads-aero.css
index d668d4b82ad..ab439890e7e 100644
--- a/toolkit/themes/winstripe/mozapps/downloads/downloads-aero.css
+++ b/toolkit/themes/winstripe/mozapps/downloads/downloads-aero.css
@@ -1,6 +1,6 @@
 %include downloads.css
 
-@media all and (-moz-windows-compositor) {
+@media (-moz-windows-compositor) {
   #downloadManager {
     -moz-appearance: -moz-win-glass;
     background: transparent;
diff --git a/toolkit/themes/winstripe/mozapps/extensions/about.css b/toolkit/themes/winstripe/mozapps/extensions/about.css
index 42c59adddfb..059be87c62c 100644
--- a/toolkit/themes/winstripe/mozapps/extensions/about.css
+++ b/toolkit/themes/winstripe/mozapps/extensions/about.css
@@ -10,7 +10,7 @@
   color: -moz-DialogText;
 }
 
-@media all and (-moz-windows-compositor) {
+@media (-moz-windows-compositor) {
   #genericAbout {
     -moz-appearance: -moz-win-glass;
     background: transparent;
diff --git a/toolkit/themes/winstripe/mozapps/extensions/extensions.css b/toolkit/themes/winstripe/mozapps/extensions/extensions.css
index 500b32cb2a4..97422742b1e 100644
--- a/toolkit/themes/winstripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/winstripe/mozapps/extensions/extensions.css
@@ -87,7 +87,7 @@
   border-bottom: 1px solid #CAD4E0;  
 }
 
-@media all and (max-width: 600px) {
+@media (max-width: 600px) {
   .global-warning-text {
     display: none;
   }
@@ -251,7 +251,7 @@
 }
 
 /* Maximize the size of the viewport when the window is small */
-@media all and (max-width: 800px) {
+@media (max-width: 800px) {
   .category-name {
     display: none;
   }
@@ -319,7 +319,7 @@
   margin: 0;
 }
 
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   #header-search {
     -moz-appearance: none;
     border: 1px solid rgba(0, 0, 0, 0.32);
diff --git a/toolkit/themes/winstripe/mozapps/extensions/selectAddons.css b/toolkit/themes/winstripe/mozapps/extensions/selectAddons.css
index 7c22b38ae9c..cd260a57190 100644
--- a/toolkit/themes/winstripe/mozapps/extensions/selectAddons.css
+++ b/toolkit/themes/winstripe/mozapps/extensions/selectAddons.css
@@ -207,7 +207,7 @@
 }
 
 %ifdef WINSTRIPE_AERO
-@media all and (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
   #footer {
     background-color: #f1f5fb;
     box-shadow: 0px 1px 2px rgb(204,214,234) inset;