From 1620fb411d73776afc4a145fe5735a8d87117b8d Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:58:09 +0100
Subject: [PATCH 1/2] Implementation of media queries

---
 .../docs/javafx/scene/doc-files/cssref.html   |  74 ++-
 .../javafx/scene/doc-files/media-feature.svg  | 176 +++++
 .../javafx/scene/doc-files/media-query.svg    |  94 +++
 .../sun/javafx/application/PlatformImpl.java  |   8 +-
 .../preferences/PlatformPreferences.java      |  14 +-
 .../property/NullCoalescingPropertyBase.java  |  74 +++
 .../com/sun/javafx/css/SimpleSelector.java    |  24 +-
 .../sun/javafx/css/media/MediaFeatures.java   | 100 +++
 .../javafx/css/media/MediaQueryParser.java    | 286 +++++++++
 .../css/media/MediaQuerySerializer.java       | 118 ++++
 .../expression/ConjunctionExpression.java     |  69 ++
 .../media/expression/ConstantExpression.java  |  45 ++
 .../expression/DisjunctionExpression.java     |  69 ++
 .../media/expression/FunctionExpression.java  |  73 +++
 .../media/expression/NegationExpression.java  |  50 ++
 .../sun/javafx/css/parser}/CssLexer.java      |  93 ++-
 .../sun/javafx/css/parser/TokenStream.java    | 114 ++++
 .../com/sun/javafx/scene/SceneHelper.java     |   9 +-
 .../javafx/scene/SceneMediaQueryContext.java} |  51 +-
 .../src/main/java/javafx/css/CssParser.java   | 121 +++-
 .../src/main/java/javafx/css/MediaQuery.java  |  56 ++
 .../java/javafx/css/MediaQueryContext.java    |  59 ++
 .../src/main/java/javafx/css/MediaRule.java   | 131 ++++
 .../src/main/java/javafx/css/Rule.java        |  44 +-
 .../src/main/java/javafx/css/Stylesheet.java  |   7 +-
 .../src/main/java/javafx/scene/Scene.java     | 188 ++++++
 .../shims/java/javafx/css/CssLexerShim.java   | 100 ---
 .../src/shims/java/javafx/css/RuleShim.java   |   4 +-
 modules/javafx.graphics/src/test/addExports   |   4 +
 .../preferences/PlatformPreferencesTest.java  |   3 +-
 .../NullCoalescingPropertyBaseTest.java       | 117 ++++
 .../css/media/MediaQuerySerializerTest.java   | 128 ++++
 .../sun/javafx/css/parser}/CssLexerTest.java  | 601 +++++++++---------
 .../javafx/css/CssParser_mediaQuery_Test.java | 294 +++++++++
 .../java/test/javafx/css/StylesheetTest.java  |  20 +
 35 files changed, 2904 insertions(+), 514 deletions(-)
 create mode 100644 modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/media-feature.svg
 create mode 100644 modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/media-query.svg
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/beans/property/NullCoalescingPropertyBase.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaFeatures.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaQueryParser.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaQuerySerializer.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/ConjunctionExpression.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/ConstantExpression.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/DisjunctionExpression.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/FunctionExpression.java
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/NegationExpression.java
 rename modules/javafx.graphics/src/main/java/{javafx/css => com/sun/javafx/css/parser}/CssLexer.java (94%)
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/css/parser/TokenStream.java
 rename modules/javafx.graphics/src/{shims/java/com/sun/javafx/css/parser/TokenShim.java => main/java/com/sun/javafx/scene/SceneMediaQueryContext.java} (51%)
 create mode 100644 modules/javafx.graphics/src/main/java/javafx/css/MediaQuery.java
 create mode 100644 modules/javafx.graphics/src/main/java/javafx/css/MediaQueryContext.java
 create mode 100644 modules/javafx.graphics/src/main/java/javafx/css/MediaRule.java
 delete mode 100644 modules/javafx.graphics/src/shims/java/javafx/css/CssLexerShim.java
 create mode 100644 modules/javafx.graphics/src/test/java/test/com/sun/javafx/beans/property/NullCoalescingPropertyBaseTest.java
 create mode 100644 modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/media/MediaQuerySerializerTest.java
 rename modules/javafx.graphics/src/test/java/test/{javafx/css => com/sun/javafx/css/parser}/CssLexerTest.java (50%)
 create mode 100644 modules/javafx.graphics/src/test/java/test/javafx/css/CssParser_mediaQuery_Test.java

diff --git a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
index 11ae849727b..90bddec4573 100644
--- a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
@@ -768,14 +768,16 @@ <h4>Example</h4>
     </p>
 
     <h3><a id="introatrules">&#64; Rules</a></h3>
+    <h4>@import</h4>
     <p>
         Beginning with JavaFX 8u20, the CSS
-        <a href="http://www.w3.org/TR/CSS21/cascade.html#at-import">@import</a> is also partially supported.
+        <a href="http://www.w3.org/TR/CSS21/cascade.html#at-import">@import</a> is partially supported.
         Only unconditional import is supported. In other words, the media&#8209;type qualifier is not supported.
         Also, the JavaFX CSS parser is non-compliant with regard to where an @import may appear within a stylesheet
         (see <a href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">At&#8209;rules</a>).
         Users are cautioned that this will be fixed in a future release. Adherence to the W3C standard is strongly advised.
     </p>
+    <h4>@font-face</h4>
     <p>Since JavaFX 8, the implementation partially supports the CSS3 syntax to load a font from a URL using the
     <a href="http://www.w3.org/TR/css3-fonts/#the-font-face-rule">@font&#8209;face</a> rule:</p>
     <textarea rows="8" cols="132">
@@ -815,6 +817,76 @@ <h3><a id="introatrules">&#64; Rules</a></h3>
     <p>Although the parser will parse the syntax, all @font&#8209;face descriptors are ignored except for
         the <code>src</code> descriptor. The <code>src</code> descriptor is expected to be a
         <a href="#typeurl" class="typelink">&lt;url&gt;</a>. The <code>format</code> hint is ignored.</p>
+    <h4>@media</h4>
+    <p>A media query is a method of testing certain aspects of the <a href="../../../javafx/scene/Scene.html">Scene</a>.
+        Media queries are independent of the contents of the scene graph, its styling, or any other internal aspect;
+        they’re only dependent on "external" configuration of the <code>Scene</code>.
+    <p>Several media queries can be combined into a comma-separated <strong>media query list</strong>.
+        A media query list evaluates to <code>true</code> if <em>any</em> of the media queries is <code>true</code>,
+        and evaluates to <code>false</code> only if <em>all</em> the media queries are <code>false</code>.
+        An empty media query list evaluates to <code>true</code>.
+        <figure style="margin: 0">
+            <img src="media-query.svg" width="210" alt="Media Query List">
+            <figcaption style="float: left; margin-top: 27px">
+                <span class="grammar">&lt;media-query-list&gt;:</span>
+            </figcaption>
+        </figure>
+    <p>A <strong>media query</strong> consists of one or more <strong>media features</strong>.
+        A media feature tests a single, specific feature of the <code>Scene</code>.
+        <figure style="margin: 0">
+            <img src="media-feature.svg" width="430" alt="Media Feature">
+            <figcaption style="float: left; margin-top: 16px">
+                <span class="grammar">&lt;media-feature&gt;:</span>
+            </figcaption>
+        </figure>
+    <p>Syntactically, media features resemble CSS properties: they consist of a feature name, a colon, and a value to
+        test for. Media features are always enclosed in parentheses. They may also be written in boolean form as just a
+        feature name. In this case, the media feature is evaluated in a <strong>boolean context</strong>. This is a
+        convenient shorthand for features that have a reasonable default value. A media feature that is evaluated in a
+        boolean context evaluates to <code>true</code> if it would be <code>true</code> for any value <em>other</em>
+        than the reasonable default value.
+    <p>For example, the <code>prefers-reduced-motion</code> media feature has a default value of <code>no-preference</code>.
+        When evaluated in a boolean context, the media feature evaluates to <code>false</code> if the user has indicated no
+        preference, and evaluates to <code>true</code> if the user has indicated the <code>reduce</code> preference.
+    <p>Media features can be combined using boolean algebra (<code>not</code>, <code>and</code>, <code>or</code>):
+    <ul>
+        <li>Any media feature can be negated by placing the <code>not</code> operator before it.
+        <li>Two or more media features can be chained together, such that the query is only true if <em>all</em> the
+            media features are true, by placing the <code>and</code> operator between them.
+        <li>Two or more media features can be chained together, such that the query is true if <em>any</em> of the
+            media features are true, by placing the <code>or</code> operator between them.
+        <li>Expressions can be grouped by wrapping them in parentheses.
+        <li>It is invalid to mix different boolean operators at the same "level" of a media query. For example,
+            <code>(prefers-color-scheme: dark) and (prefers-reduced-motion) or (prefers-reduced-transparency)</code>
+            is illegal, as it is unclear what was meant. In this case, parentheses must be used to group expressions.
+    </ul>
+    <table class="cssmisctable">
+        <caption>Available media features</caption>
+        <thead>
+            <tr>
+                <th>Media feature</th>
+                <th>Values</th>
+                <th>Boolean Context</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td class="value">prefers-color-scheme</td>
+                <td class="value">light | dark</td>
+                <td>not applicable</td>
+            </tr>
+        <tr>
+            <td class="value">prefers-reduced-motion</td>
+            <td class="value">no-preference | reduce</td>
+            <td>yes, <code>no-preference</code> evaluates as <code>false</code></td>
+        </tr>
+        <tr>
+            <td class="value">prefers-reduced-transparency</td>
+            <td class="value">no-preference | reduce</td>
+            <td>yes, <code>no-preference</code> evaluates as <code>false</code></td>
+        </tr>
+        </tbody>
+    </table>
     <h3><a id="introexamples">Examples</a></h3>
     <p>Consider the following simple JavaFX application: </p>
     <p class="example">Scene scene = new Scene(new Group()); <br>
diff --git a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/media-feature.svg b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/media-feature.svg
new file mode 100644
index 00000000000..729ca76c78f
--- /dev/null
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/media-feature.svg
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="92.604164mm"
+   height="19.843748mm"
+   viewBox="0 0 92.604164 19.843748"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1"
+     transform="translate(-15.875,-15.875001)">
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect11"
+       width="92.604164"
+       height="19.84375"
+       x="15.875"
+       y="15.875002" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 18.520833,18.520834 V 23.8125"
+       id="path1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 19.843749,18.520834 V 23.8125"
+       id="path2" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 18.520833,21.166667 h 5.291666"
+       id="path3" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect3"
+       width="4.791666"
+       height="4.791667"
+       x="24.0625"
+       y="18.770834"
+       ry="1.1979167" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect3-3"
+       width="4.7916636"
+       height="4.791667"
+       x="95.5"
+       y="18.770834"
+       ry="1.1979167" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:bold;font-size:2.82222px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="26.020889"
+       y="21.951246"
+       id="text3"><tspan
+         id="tspan3"
+         style="font-size:2.82222px;stroke-width:0.264583"
+         x="26.020889"
+         y="21.951246">(</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:bold;font-size:2.82222px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="97.458389"
+       y="21.951244"
+       id="text3-4"><tspan
+         id="tspan3-3"
+         style="font-size:2.82222px;stroke-width:0.264583"
+         x="97.458389"
+         y="21.951244">)</tspan></text>
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect3-0"
+       width="4.7916646"
+       height="4.791667"
+       x="59.78125"
+       y="18.770834"
+       ry="1.1979167" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:bold;font-size:2.82222px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="61.739639"
+       y="21.951244"
+       id="text3-8"><tspan
+         id="tspan3-8"
+         style="font-size:2.82222px;stroke-width:0.264583"
+         x="61.739639"
+         y="21.951244">:</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 29.104166,21.166667 h 5.291667"
+       id="path4" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect4"
+       width="20.666666"
+       height="4.791667"
+       x="34.645832"
+       y="18.770834" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect4-9"
+       width="20.666664"
+       height="4.791666"
+       x="51.84375"
+       y="28.031252" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect4-3"
+       width="20.666666"
+       height="4.791667"
+       x="69.041664"
+       y="18.770834" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:bold;font-size:2.82222px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="36.079296"
+       y="22.232056"
+       id="text3-1"><tspan
+         id="tspan3-6"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:sans-serif;stroke-width:0.264583"
+         x="36.079296"
+         y="22.232056">feature name</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:bold;font-size:2.82222px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="53.277214"
+       y="31.492472"
+       id="text3-1-1"><tspan
+         id="tspan3-6-8"
+         style="font-size:2.82222px;stroke-width:0.264583"
+         x="53.277214"
+         y="31.492472">feature name</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:bold;font-size:2.82222px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="70.475128"
+       y="22.232056"
+       id="text3-1-0"><tspan
+         id="tspan3-6-5"
+         style="font-size:2.82222px;stroke-width:0.264583"
+         x="70.475128"
+         y="22.232056">feature value</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 55.562497,21.166667 h 3.96875"
+       id="path5" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 64.822913,21.166667 h 3.96875"
+       id="path6" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 89.95833,21.166667 h 5.291666"
+       id="path7" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 100.54166,21.166667 h 5.29167"
+       id="path8" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 104.51041,18.520834 V 23.8125"
+       id="path9" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 105.83333,18.520834 V 23.8125"
+       id="path10" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 30.427083,21.166667 c 0,0 2.645833,0 2.645833,2.645833 v 3.96875 c 0,2.645834 2.645834,2.645833 2.645834,2.645833 -10e-7,1e-6 16.0075,0 16.0075,0"
+       id="path11" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 93.92708,21.166668 c 0,0 -2.645833,0 -2.645833,2.645833 v 3.96875 c 0,2.645834 -2.645834,2.645833 -2.645834,2.645833 10e-7,1e-6 -16.0075,0 -16.0075,0"
+       id="path11-8" />
+  </g>
+</svg>
diff --git a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/media-query.svg b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/media-query.svg
new file mode 100644
index 00000000000..8b0dd12b5f7
--- /dev/null
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/media-query.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="47.625mm"
+   height="21.166668mm"
+   viewBox="0 0 47.625 21.166668"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1"
+     transform="translate(-15.875,-44.979167)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 18.520833,50.270835 v 5.291666"
+       id="path1-8" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 19.843749,50.270835 v 5.291666"
+       id="path2-9" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 59.281248,50.270835 v 5.291666"
+       id="path1-8-9" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 60.604164,50.270835 v 5.291666"
+       id="path2-9-8" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 18.520834,52.916668 H 29.104167"
+       id="path3-1" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect3-4"
+       width="4.791666"
+       height="4.791667"
+       x="37.306248"
+       y="58.472919"
+       ry="1.1979167" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.82222px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="39.264637"
+       y="61.653336"
+       id="text3-0"><tspan
+         id="tspan3-83"
+         style="font-size:2.82222px;font-weight:bold;stroke-width:0.264583"
+         x="39.264637"
+         y="61.653336">,</tspan></text>
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect4-1"
+       width="20.666666"
+       height="4.791667"
+       x="29.354166"
+       y="50.520836" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.82222px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="31.223663"
+       y="53.900444"
+       id="text3-1-16"><tspan
+         id="tspan3-6-6"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:sans-serif;font-weight:bold;stroke-width:0.264583"
+         x="31.223663"
+         y="53.900444">media query</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 50.27083,52.916669 c 2e-6,-10e-7 2.645834,-10e-7 2.645833,2.645833 l -10e-7,2.645834 c -1e-6,2.645833 -2.645831,2.645833 -2.645833,2.645833 h -7.937497"
+       id="path12" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 29.104166,52.916669 c -2e-6,-10e-7 -2.645835,-10e-7 -2.645833,2.645833 1e-6,1.322916 1e-6,1.322917 0,2.645834 -2e-6,2.645833 2.645831,2.645833 2.645833,2.645833 h 7.937497"
+       id="path12-5" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 22.545616,52.916669 c 0,0 2.5898,-10e-7 2.5898,-2.645834 0,-2.645833 2.645834,-2.645833 2.645834,-2.645833 h 23.812497 c 0,0 2.645835,0 2.645833,2.645833 -2e-6,2.645833 2.645833,2.645834 2.645833,2.645834"
+       id="path13" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 50.27083,52.916669 H 60.854163"
+       id="path14" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect14"
+       width="47.625"
+       height="21.166666"
+       x="15.875"
+       y="44.979168" />
+  </g>
+</svg>
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java
index 19b69fefc03..529d1ba177d 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/PlatformImpl.java
@@ -912,13 +912,9 @@ private static boolean isSupportedImpl(ConditionalFeature feature) {
         }
     }
 
-    private static PlatformPreferences platformPreferences;
+    private static final PlatformPreferences platformPreferences = new PlatformPreferences();
 
     public static PlatformPreferences getPlatformPreferences() {
-        if (platformPreferences == null) {
-            throw new IllegalStateException("Toolkit not initialized");
-        }
-
         return platformPreferences;
     }
 
@@ -931,7 +927,7 @@ public static PlatformPreferences getPlatformPreferences() {
     public static void initPreferences(Map<String, Class<?>> platformKeys,
                                        Map<String, PreferenceMapping<?>> platformKeyMappings,
                                        Map<String, Object> preferences) {
-        platformPreferences = new PlatformPreferences(platformKeys, platformKeyMappings);
+        platformPreferences.initialize(platformKeys, platformKeyMappings);
         platformPreferences.update(preferences);
     }
 
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/preferences/PlatformPreferences.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/preferences/PlatformPreferences.java
index 286c56ad9aa..1094d9e803b 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/application/preferences/PlatformPreferences.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/application/preferences/PlatformPreferences.java
@@ -58,13 +58,13 @@ public final class PlatformPreferences extends AbstractMap<String, Object> imple
      * used to catch misuse of typed getters even if the preferences map doesn't contain
      * the preference mapping at runtime.
      */
-    private final Map<String, Class<?>> platformKeys;
+    private final Map<String, Class<?>> platformKeys = new HashMap<>();
 
     /**
      * Contains mappings from platform-specific keys to well-known keys, which are used
      * in the implementation of the property-based API in {@link PreferenceProperties}.
      */
-    private final Map<String, PreferenceMapping<?>> platformKeyMappings;
+    private final Map<String, PreferenceMapping<?>> platformKeyMappings = new HashMap<>();
 
     /**
      * Contains the current set of effective preferences, i.e. the set of preferences that
@@ -80,17 +80,17 @@ public final class PlatformPreferences extends AbstractMap<String, Object> imple
     private final List<MapChangeListener<? super String, Object>> mapChangeListeners = new CopyOnWriteArrayList<>();
 
     /**
-     * Initializes a new {@code PlatformPreferences} instance with the given platform-specific keys and key mappings.
+     * Initializes this {@code PlatformPreferences} instance with the given platform-specific keys and key mappings.
      *
      * @param platformKeys the platform-specific keys and the types of their values
      * @param platformKeyMappings the platform-specific key mappings
      * @throws NullPointerException if {@code platformKeys} or {@code platformKeyMappings} is {@code null} or
      *                              contains {@code null} keys or values
      */
-    public PlatformPreferences(Map<String, Class<?>> platformKeys,
-                               Map<String, PreferenceMapping<?>> platformKeyMappings) {
-        this.platformKeys = Map.copyOf(platformKeys);
-        this.platformKeyMappings = Map.copyOf(platformKeyMappings);
+    public void initialize(Map<String, Class<?>> platformKeys,
+                           Map<String, PreferenceMapping<?>> platformKeyMappings) {
+        this.platformKeys.putAll(platformKeys);
+        this.platformKeyMappings.putAll(platformKeyMappings);
     }
 
     @Override
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/beans/property/NullCoalescingPropertyBase.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/beans/property/NullCoalescingPropertyBase.java
new file mode 100644
index 00000000000..faaf86f7d38
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/beans/property/NullCoalescingPropertyBase.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.beans.property;
+
+import javafx.beans.property.ObjectPropertyBase;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.beans.value.WeakChangeListener;
+
+/**
+ * Base class for null-coalescing properties that evaluate to their local value if non-{@code null},
+ * or to their base value if the local value is {@code null}.
+ *
+ * @param <T> the value type
+ */
+public abstract class NullCoalescingPropertyBase<T> extends ObjectPropertyBase<T> {
+
+    private final ChangeListener<T> listener = (_, _, value) -> {
+        baseValue = value;
+        invalidated();
+        fireValueChangedEvent();
+    };
+
+    private T baseValue;
+    private T currentValue;
+
+    /**
+     * Initializes a new {@code NullCoalescingPropertyBase} with the specified base value.
+     *
+     * @param baseValue the base value
+     * @throws NullPointerException if {@code baseValue} is {@code null}
+     */
+    protected NullCoalescingPropertyBase(ObservableValue<T> baseValue) {
+        this.currentValue = this.baseValue = baseValue.getValue();
+        baseValue.addListener(new WeakChangeListener<>(listener));
+    }
+
+    @Override
+    public T get() {
+        T value = super.get();
+        return value != null ? value : baseValue;
+    }
+
+    @Override
+    protected void fireValueChangedEvent() {
+        if (currentValue != get()) {
+            currentValue = get();
+            super.fireValueChangedEvent();
+        }
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SimpleSelector.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SimpleSelector.java
index f5d0e264342..9935f6023ff 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SimpleSelector.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/SimpleSelector.java
@@ -25,13 +25,16 @@
 
 package com.sun.javafx.css;
 
+import com.sun.javafx.scene.SceneHelper;
+import javafx.css.MediaRule;
 import javafx.css.PseudoClass;
+import javafx.css.Rule;
 import javafx.css.Selector;
 import javafx.css.StyleClass;
 import javafx.css.Styleable;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.Node;
-
+import javafx.scene.Scene;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -275,6 +278,25 @@ private FixedCapacitySet<String> convertStyleClassNamesToSet(List<String> styleC
             }
         }
 
+        Rule rule = getRule();
+        MediaRule mediaRule = rule != null ? rule.getMediaRule() : null;
+
+        // If we have a media rule, evaluate it against the scene's media query context.
+        // If the media rule evaluates to false, the selector doesn't apply.
+        if (mediaRule != null) {
+            Node node = styleable instanceof Node n ? n : styleable.getStyleableNode();
+            if (node == null) {
+                return false;
+            }
+
+            Scene scene = node.getScene();
+            if (scene != null) {
+                return mediaRule.evaluate(SceneHelper.getMediaQueryContext(scene));
+            }
+
+            return false;
+        }
+
         return true;
     }
 
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaFeatures.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaFeatures.java
new file mode 100644
index 00000000000..6a959027859
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaFeatures.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.media;
+
+import com.sun.javafx.css.media.expression.FunctionExpression;
+import javafx.css.MediaQuery;
+import javafx.css.MediaQueryContext;
+import javafx.application.ColorScheme;
+import java.util.Locale;
+import java.util.function.Function;
+
+/**
+ * Contains the implementations of all supported media feature queries.
+ */
+final class MediaFeatures {
+
+    private MediaFeatures() {}
+
+    /**
+     * Returns a {@code MediaQuery} that evaluates the specified feature.
+     *
+     * @param featureName the name of the media feature
+     * @param featureValue the value of the media feature, or {@code null} to indicate no value
+     * @throws IllegalArgumentException if {@code featureName} or {@code featureValue} is invalid
+     * @return the {@code MediaQuery}
+     */
+    public static MediaQuery featureQueryExpression(String featureName, String featureValue) {
+        featureName = featureName.toLowerCase(Locale.ROOT).intern();
+
+        if (featureValue != null) {
+            featureValue = featureValue.toLowerCase(Locale.ROOT).intern();
+        }
+
+        return switch (featureName) {
+            case "prefers-color-scheme" -> new FunctionExpression<>(
+                featureName,
+                checkNotNullValue(featureName, featureValue),
+                MediaQueryContext::getColorScheme,
+                ColorScheme.valueOf(featureValue.toUpperCase(Locale.ROOT)));
+
+            case "prefers-reduced-motion" -> booleanReduceQueryExpression(
+                featureName, featureValue, MediaQueryContext::isReducedMotion);
+
+            case "prefers-reduced-transparency" -> booleanReduceQueryExpression(
+                featureName, featureValue, MediaQueryContext::isReducedTransparency);
+
+            default -> throw new IllegalArgumentException(
+                String.format("Unknown media feature <%s>", featureName));
+        };
+    }
+
+    private static MediaQuery booleanReduceQueryExpression(String featureName,
+                                                           String featureValue,
+                                                           Function<MediaQueryContext, Boolean> argument) {
+        return switch (featureValue) {
+            case "no-preference":
+                yield new FunctionExpression<>(featureName, featureValue, argument, false);
+
+            case "reduce": // fall through
+            case null:
+                yield new FunctionExpression<>(featureName, featureValue, argument, true);
+
+            default:
+                throw new IllegalArgumentException(
+                    String.format("Unknown value <%s> for media feature <%s>", featureValue, featureName));
+        };
+    }
+
+    private static String checkNotNullValue(String featureName, String featureValue) {
+        if (featureValue == null) {
+            throw new IllegalArgumentException(
+                String.format("Media feature <%s> cannot be evaluated in a boolean context", featureName));
+        }
+
+        return featureValue;
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaQueryParser.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaQueryParser.java
new file mode 100644
index 00000000000..52643c082e4
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaQueryParser.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.media;
+
+import javafx.css.MediaQuery;
+import com.sun.javafx.css.media.expression.ConjunctionExpression;
+import com.sun.javafx.css.media.expression.ConstantExpression;
+import com.sun.javafx.css.media.expression.DisjunctionExpression;
+import com.sun.javafx.css.media.expression.NegationExpression;
+import com.sun.javafx.css.parser.CssLexer;
+import com.sun.javafx.css.parser.TokenStream;
+import com.sun.javafx.css.parser.Token;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BiConsumer;
+import java.util.function.Predicate;
+
+/**
+ * Parser for the media query grammar.
+ * <p>
+ * This parser implements the subset of the grammar that is required for JavaFX CSS.
+ *
+ * @see <a href="https://www.w3.org/TR/mediaqueries-5/#mq-syntax">Media query syntax</a>
+ */
+public final class MediaQueryParser {
+
+    private final BiConsumer<Token, String> errorHandler;
+
+    /**
+     * Creates a new {@code MediaQueryParser} instance.
+     */
+    public MediaQueryParser(BiConsumer<Token, String> errorHandler) {
+        this.errorHandler = Objects.requireNonNull(errorHandler);
+    }
+
+    /**
+     * Parses a {@code media-query-list} production.
+     *
+     * <pre>{@code
+     *     <media-query-list> = <media-condition> [ , <media-condition> ]*
+     * }</pre>
+     *
+     * @param tokens the token stream
+     * @return the expression
+     */
+    public List<MediaQuery> parseMediaQueryList(List<Token> tokens) {
+        var stream = new TokenStream(tokens);
+        var expressions = new ArrayList<MediaQuery>();
+        boolean lastWasComma = false;
+
+        while (stream.consume() != null) {
+            switch (stream.current().getType()) {
+                case CssLexer.COMMA -> {
+                    if (lastWasComma || expressions.isEmpty()) {
+                        errorHandler.accept(stream.current(), "Unexpected token");
+                    }
+
+                    lastWasComma = true;
+                }
+
+                case CssLexer.IDENT, CssLexer.LPAREN -> {
+                    lastWasComma = false;
+                    stream.reconsume();
+                    MediaQuery expression = parseMediaCondition(stream);
+                    if (expression != null) {
+                        expressions.add(expression);
+                    } else {
+                        while (stream.consume(NOT_COMMA) != null) {
+                            // If the expression is null, this means that we have encountered a parse error.
+                            // Skip forward to the next comma and resume parsing with the next media query.
+                        }
+
+                        // Invalid expressions always evaluate to false.
+                        expressions.add(new ConstantExpression(false));
+                    }
+                }
+
+                default -> {
+                    errorHandler.accept(stream.current(), "Unexpected token");
+                    return expressions;
+                }
+            }
+        }
+
+        return expressions;
+    }
+
+    /**
+     * Parses a {@code media-condition} production.
+     *
+     * <pre>{@code
+     *     <media-condition> = <media-not> | <media-in-parens> [ <media-and>* | <media-or>* ]
+     *     <media-not> = not <media-in-parens>
+     * }</pre>
+     *
+     * @param tokens the token stream
+     * @return the expression
+     */
+    private MediaQuery parseMediaCondition(TokenStream tokens) {
+        // <media-not>
+        if (tokens.consume(NOT_KEYWORD) != null) {
+            MediaQuery mediaInParens = parseMediaInParens(tokens);
+            return mediaInParens != null ? new NegationExpression(mediaInParens) : null;
+        }
+
+        List<MediaQuery> expressions = new ArrayList<>();
+
+        // <media-in-parens>
+        MediaQuery expression = parseMediaInParens(tokens);
+        if (expression == null) {
+            return null;
+        }
+
+        expressions.add(expression);
+
+        // <media-and>*
+        if (!parseRepeatingMediaCondition(tokens, expressions, AND_KEYWORD, OR_KEYWORD)) {
+            return null;
+        }
+
+        if (expressions.size() >= 2) {
+            return ConjunctionExpression.of(expressions);
+        }
+
+        // <media-or>*
+        if (!parseRepeatingMediaCondition(tokens, expressions, OR_KEYWORD, AND_KEYWORD)) {
+            return null;
+        }
+
+        if (expressions.size() >= 2) {
+            return DisjunctionExpression.of(expressions);
+        }
+
+        return expressions.getFirst();
+    }
+
+    /**
+     * Parses a repeating {@code media-and} or {@code media-or} production.
+     *
+     * <pre>{@code
+     *     <media-and> = and <media-in-parens>
+     *     <media-or> = or <media-in-parens>
+     * }</pre>
+     *
+     * @param tokens the token stream
+     * @return {@code true} if ast least one {@code media-and} or {@code media-or} production was parsed
+     */
+    private boolean parseRepeatingMediaCondition(TokenStream tokens,
+                                                 List<MediaQuery> expressions,
+                                                 Predicate<Token> keyword,
+                                                 Predicate<Token> otherKeyword) {
+        while (tokens.consume(keyword) != null) {
+            MediaQuery expression = parseMediaInParens(tokens);
+            if (expression == null) {
+                return false;
+            }
+
+            expressions.add(expression);
+        }
+
+        if (expressions.size() >= 2) {
+            Token nextToken = tokens.peek();
+            if (nextToken != null && otherKeyword.test(nextToken)) {
+                errorHandler.accept(tokens.consume(), "Unexpected token");
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Parses a {@code media-in-parens} production.
+     *
+     * <pre>{@code
+     *     <media-in-parens> = ( <media-condition> ) | <media-feature>
+     * }</pre>
+     *
+     * @param tokens the token stream
+     * @return the expression
+     */
+    private MediaQuery parseMediaInParens(TokenStream tokens) {
+        // <media-feature>
+        if (tokens.peekMany(LPAREN, IDENT, RPAREN) || tokens.peekMany(LPAREN, IDENT, COLON)) {
+            return parseMediaFeature(tokens);
+        }
+
+        // ( <media-condition> )
+        if (tokens.consume(LPAREN) != null) {
+            MediaQuery expression = parseMediaCondition(tokens);
+
+            if (tokens.consume(RPAREN) == null) {
+                errorHandler.accept(tokens.consume(), "Expected RPAREN");
+                return null;
+            }
+
+            return expression;
+        }
+
+        errorHandler.accept(tokens.consume(), "Expected LPAREN");
+        return null;
+    }
+
+    /**
+     * Parses a {@code media-feature} production.
+     *
+     * <pre>{@code
+     *     <media-feature> = ( [ <mf-plain> | <mf-boolean> ] )
+     *     <mf-plain> = <ident> : <any>
+     *     <mf-boolean> = <ident>
+     * }</pre>
+     *
+     * @param tokens the token stream
+     * @return the expression
+     */
+    private MediaQuery parseMediaFeature(TokenStream tokens) {
+        if (tokens.consume(LPAREN) == null) {
+            errorHandler.accept(tokens.consume(), "Expected LPAREN");
+            return null;
+        }
+
+        Token featureName = tokens.consume(IDENT);
+        if (featureName == null) {
+            errorHandler.accept(tokens.consume(), "Expected IDENT");
+            return null;
+        }
+
+        Token featureValue = null;
+        if (tokens.consume(COLON) != null && (featureValue = tokens.consume()) == null) {
+            while (tokens.peek() != null) tokens.consume(); // Skip forward to the last token
+            errorHandler.accept(tokens.current(), "Expected token");
+            return null;
+        }
+
+        if (tokens.consume(RPAREN) == null) {
+            errorHandler.accept(tokens.consume(), "Expected RPAREN");
+            return null;
+        }
+
+        try {
+            return MediaFeatures.featureQueryExpression(
+                featureName.getText(),
+                featureValue != null ? featureValue.getText() : null);
+        } catch (IllegalArgumentException ex) {
+            errorHandler.accept(featureValue, ex.getMessage());
+            return null;
+        }
+    }
+
+    private static final Predicate<Token> IDENT = token -> token.getType() == CssLexer.IDENT;
+    private static final Predicate<Token> LPAREN = token -> token.getType() == CssLexer.LPAREN;
+    private static final Predicate<Token> RPAREN = token -> token.getType() == CssLexer.RPAREN;
+    private static final Predicate<Token> COLON = token -> token.getType() == CssLexer.COLON;
+    private static final Predicate<Token> NOT_COMMA = token -> token.getType() != CssLexer.COMMA;
+    private static final Predicate<Token> NOT_KEYWORD = token -> equalsIdentIgnoreCase(token, "not");
+    private static final Predicate<Token> AND_KEYWORD = token -> equalsIdentIgnoreCase(token, "and");
+    private static final Predicate<Token> OR_KEYWORD = token -> equalsIdentIgnoreCase(token, "or");
+
+    private static boolean equalsIdentIgnoreCase(Token token, String value) {
+        return token.getType() == CssLexer.IDENT && value.equalsIgnoreCase(token.getText());
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaQuerySerializer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaQuerySerializer.java
new file mode 100644
index 00000000000..6c1884b1680
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaQuerySerializer.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.media;
+
+import com.sun.javafx.css.media.expression.ConjunctionExpression;
+import com.sun.javafx.css.media.expression.ConstantExpression;
+import com.sun.javafx.css.media.expression.FunctionExpression;
+import com.sun.javafx.css.media.expression.NegationExpression;
+import com.sun.javafx.css.media.expression.DisjunctionExpression;
+import javafx.css.MediaQuery;
+import javafx.css.StyleConverter;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Serializes and deserializes a {@link MediaQuery} expression into and from a binary representation.
+ */
+public final class MediaQuerySerializer {
+
+    private MediaQuerySerializer() {}
+
+    /**
+     * The order of {@code QueryType} enum values is important!
+     * It is part of the binary serialization protocol for media query expressions.
+     */
+    private enum QueryType {
+        CONSTANT,
+        FUNCTION,
+        CONJUNCTION,
+        DISJUNCTION,
+        NEGATION;
+
+        static QueryType of(MediaQuery expression) {
+            return switch (expression) {
+                case ConstantExpression _ -> CONSTANT;
+                case FunctionExpression<?> _ -> FUNCTION;
+                case ConjunctionExpression _ -> CONJUNCTION;
+                case DisjunctionExpression _ -> DISJUNCTION;
+                case NegationExpression _ -> NEGATION;
+            };
+        }
+
+        static final QueryType[] VALUES = values();
+    }
+
+    public static void writeBinary(MediaQuery mediaQuery,
+                                   DataOutputStream os,
+                                   StyleConverter.StringStore stringStore) throws IOException {
+        os.writeByte(QueryType.of(mediaQuery).ordinal());
+
+        switch (mediaQuery) {
+            case ConstantExpression expr ->
+                os.writeBoolean(expr.value());
+
+            case FunctionExpression<?> expr -> {
+                os.writeInt(stringStore.addString(expr.featureName()));
+
+                if (expr.featureValue() != null) {
+                    os.writeInt(stringStore.addString(expr.featureValue()));
+                } else {
+                    os.writeInt(-1);
+                }
+            }
+
+            case NegationExpression expr ->
+                writeBinary(expr.expression(), os, stringStore);
+
+            case ConjunctionExpression expr -> {
+                writeBinary(expr.left(), os, stringStore);
+                writeBinary(expr.right(), os, stringStore);
+            }
+
+            case DisjunctionExpression expr -> {
+                writeBinary(expr.left(), os, stringStore);
+                writeBinary(expr.right(), os, stringStore);
+            }
+        }
+    }
+
+    public static MediaQuery readBinary(DataInputStream is, String[] strings) throws IOException {
+        return switch (QueryType.VALUES[is.readByte()]) {
+            case FUNCTION -> {
+                String featureName = strings[is.readInt()];
+                int featureValueIdx = is.readInt();
+                String featureValue = featureValueIdx >= 0 ? strings[featureValueIdx] : null;
+                yield MediaFeatures.featureQueryExpression(featureName, featureValue);
+            }
+            case CONSTANT -> new ConstantExpression(is.readBoolean());
+            case NEGATION -> new NegationExpression(readBinary(is, strings));
+            case CONJUNCTION -> new ConjunctionExpression(readBinary(is, strings), readBinary(is, strings));
+            case DISJUNCTION -> new DisjunctionExpression(readBinary(is, strings), readBinary(is, strings));
+        };
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/ConjunctionExpression.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/ConjunctionExpression.java
new file mode 100644
index 00000000000..32f5a8795b2
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/ConjunctionExpression.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.media.expression;
+
+import javafx.css.MediaQuery;
+import javafx.css.MediaQueryContext;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Logical conjunction of the specified expressions.
+ */
+public record ConjunctionExpression(MediaQuery left, MediaQuery right) implements MediaQuery {
+
+    public ConjunctionExpression {
+        Objects.requireNonNull(left, "left cannot be null");
+        Objects.requireNonNull(right, "right cannot be null");
+    }
+
+    /**
+     * Returns the conjunction of all specified expressions.
+     */
+    public static ConjunctionExpression of(List<MediaQuery> expressions) {
+        if (expressions.size() < 2) {
+            throw new IllegalArgumentException();
+        }
+
+        var result = new ConjunctionExpression(expressions.get(0), expressions.get(1));
+
+        for (int i = 2; i < expressions.size(); i++) {
+            result = new ConjunctionExpression(result, expressions.get(i));
+        }
+
+        return result;
+    }
+
+    @Override
+    public boolean evaluate(MediaQueryContext context) {
+        return left.evaluate(context) && right.evaluate(context);
+    }
+
+    @Override
+    public String toString() {
+        return "(" + left.toString() + " and " + right.toString() + ")";
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/ConstantExpression.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/ConstantExpression.java
new file mode 100644
index 00000000000..59b13807fd1
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/ConstantExpression.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.media.expression;
+
+import javafx.css.MediaQuery;
+import javafx.css.MediaQueryContext;
+
+/**
+ * Evaluates to a constant boolean value.
+ */
+public record ConstantExpression(boolean value) implements MediaQuery {
+
+    @Override
+    public boolean evaluate(MediaQueryContext context) {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "(" + value + ")";
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/DisjunctionExpression.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/DisjunctionExpression.java
new file mode 100644
index 00000000000..b79d069e053
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/DisjunctionExpression.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.media.expression;
+
+import javafx.css.MediaQuery;
+import javafx.css.MediaQueryContext;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Logical disjunction of the specified expressions.
+ */
+public record DisjunctionExpression(MediaQuery left, MediaQuery right) implements MediaQuery {
+
+    public DisjunctionExpression {
+        Objects.requireNonNull(left, "left cannot be null");
+        Objects.requireNonNull(right, "right cannot be null");
+    }
+
+    /**
+     * Returns the disjunction of all specified expressions.
+     */
+    public static DisjunctionExpression of(List<MediaQuery> expressions) {
+        if (expressions.size() < 2) {
+            throw new IllegalArgumentException();
+        }
+
+        var result = new DisjunctionExpression(expressions.get(0), expressions.get(1));
+
+        for (int i = 2; i < expressions.size(); i++) {
+            result = new DisjunctionExpression(result, expressions.get(i));
+        }
+
+        return result;
+    }
+
+    @Override
+    public boolean evaluate(MediaQueryContext context) {
+        return left.evaluate(context) || right.evaluate(context);
+    }
+
+    @Override
+    public String toString() {
+        return "(" + left.toString() + " or " + right.toString() + ")";
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/FunctionExpression.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/FunctionExpression.java
new file mode 100644
index 00000000000..a88b88c8007
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/FunctionExpression.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.media.expression;
+
+import javafx.css.MediaQuery;
+import javafx.css.MediaQueryContext;
+import java.util.Objects;
+import java.util.function.Function;
+
+/**
+ * Evaluates to {@code true} if the return value of the specified function is equal to {@code value}.
+ *
+ * @param featureName the feature name
+ * @param featureValue the feature value, or {@code null} to indicate a boolean context
+ * @param function the evaluation function
+ * @param value the expected return value of the function
+ */
+public record FunctionExpression<T>(String featureName,
+                                    String featureValue,
+                                    Function<MediaQueryContext, T> function,
+                                    T value) implements MediaQuery {
+
+    public FunctionExpression {
+        Objects.requireNonNull(featureName, "featureName cannot be null");
+        Objects.requireNonNull(function, "function cannot be null");
+    }
+
+    @Override
+    public boolean evaluate(MediaQueryContext context) {
+        return Objects.equals(function.apply(context), value);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof FunctionExpression<?> expr
+                && expr.featureName.equals(featureName)
+                && Objects.equals(expr.featureValue, featureValue)
+                && expr.value == value;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(featureName, featureValue, value);
+    }
+
+    @Override
+    public String toString() {
+        return "(" + (featureValue != null ? featureName + ": " + featureValue : featureName) + ")";
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/NegationExpression.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/NegationExpression.java
new file mode 100644
index 00000000000..7c73bb63076
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/expression/NegationExpression.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.media.expression;
+
+import javafx.css.MediaQuery;
+import javafx.css.MediaQueryContext;
+import java.util.Objects;
+
+/**
+ * Logical negation of the specified expression.
+ */
+public record NegationExpression(MediaQuery expression) implements MediaQuery {
+
+    public NegationExpression {
+        Objects.requireNonNull(expression, "expression cannot be null");
+    }
+
+    @Override
+    public boolean evaluate(MediaQueryContext context) {
+        return !expression.evaluate(context);
+    }
+
+    @Override
+    public String toString() {
+        return "not " + expression;
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/CssLexer.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/parser/CssLexer.java
similarity index 94%
rename from modules/javafx.graphics/src/main/java/javafx/css/CssLexer.java
rename to modules/javafx.graphics/src/main/java/com/sun/javafx/css/parser/CssLexer.java
index c841652fb9e..8c8f5de83c1 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/CssLexer.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/parser/CssLexer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,57 +23,52 @@
  * questions.
  */
 
-package javafx.css;
+package com.sun.javafx.css.parser;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.sun.javafx.css.parser.LexerState;
-import com.sun.javafx.css.parser.Recognizer;
-import com.sun.javafx.css.parser.Token;
-
-
-final class CssLexer {
-    final static int STRING = 10;
-    final static int IDENT = 11;
-    final static int FUNCTION = 12;
-    final static int NUMBER = 13;
-    final static int CM = 14;
-    final static int EMS = 15;
-    final static int EXS = 16;
-    final static int IN = 17;
-    final static int MM = 18;
-    final static int PC = 19;
-    final static int PT = 20;
-    final static int PX = 21;
-    final static int PERCENTAGE = 22;
-    final static int DEG = 23;
-    final static int GRAD = 24;
-    final static int RAD = 25;
-    final static int TURN = 26;
-    final static int GREATER = 27;
-    final static int LBRACE = 28;
-    final static int RBRACE = 29;
-    final static int SEMI = 30;
-    final static int COLON = 31;
-    final static int SOLIDUS = 32;
-    final static int STAR = 33;
-    final static int LPAREN = 34;
-    final static int RPAREN = 35;
-    final static int COMMA = 36;
-    final static int HASH = 37;
-    final static int DOT = 38;
-    final static int IMPORTANT_SYM = 39;
-    final static int WS = 40;
-    final static int NL = 41;
-    final static int FONT_FACE = 42;
-    final static int URL = 43;
-    final static int IMPORT = 44;
-    final static int SECONDS = 45;
-    final static int MS = 46;
-    final static int AT_KEYWORD = 47;
+public final class CssLexer {
+    public final static int STRING = 10;
+    public final static int IDENT = 11;
+    public final static int FUNCTION = 12;
+    public final static int NUMBER = 13;
+    public final static int CM = 14;
+    public final static int EMS = 15;
+    public final static int EXS = 16;
+    public final static int IN = 17;
+    public final static int MM = 18;
+    public final static int PC = 19;
+    public final static int PT = 20;
+    public final static int PX = 21;
+    public final static int PERCENTAGE = 22;
+    public final static int DEG = 23;
+    public final static int GRAD = 24;
+    public final static int RAD = 25;
+    public final static int TURN = 26;
+    public final static int GREATER = 27;
+    public final static int LBRACE = 28;
+    public final static int RBRACE = 29;
+    public final static int SEMI = 30;
+    public final static int COLON = 31;
+    public final static int SOLIDUS = 32;
+    public final static int STAR = 33;
+    public final static int LPAREN = 34;
+    public final static int RPAREN = 35;
+    public final static int COMMA = 36;
+    public final static int HASH = 37;
+    public final static int DOT = 38;
+    public final static int IMPORTANT_SYM = 39;
+    public final static int WS = 40;
+    public final static int NL = 41;
+    public final static int FONT_FACE = 42;
+    public final static int URL = 43;
+    public final static int IMPORT = 44;
+    public final static int SECONDS = 45;
+    public final static int MS = 46;
+    public final static int AT_KEYWORD = 47;
 
     private final Recognizer A = (c) -> c == 'a' || c == 'A';
     private final Recognizer B = (c) -> c == 'b' || c == 'B';
@@ -348,13 +343,13 @@ private Map<LexerState, LexerState[]> createStateMap() {
         return map;
     }
 
-    CssLexer() {
+    public CssLexer() {
         this.stateMap = createStateMap();
         this.text = new StringBuilder(64);
         this.currentState = initState;
     }
 
-    void setReader(Reader reader) {
+    public void setReader(Reader reader) {
         this.reader = reader;
         lastc = -1;
         pos = offset = 0;
@@ -746,7 +741,7 @@ private int readChar() throws IOException {
         return c;
     }
 
-    Token nextToken() {
+    public Token nextToken() {
 
         Token tok = null;
         if (token != null) {
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/parser/TokenStream.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/parser/TokenStream.java
new file mode 100644
index 00000000000..650ea206641
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/parser/TokenStream.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.css.parser;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+public final class TokenStream {
+
+    private final List<Token> source;
+    private final int size;
+    private int currentIndex = -1;
+    private Token currentItem;
+
+    public TokenStream(List<Token> source) {
+        this.source = source;
+        this.size = source.size();
+    }
+
+    public int size() {
+        return size;
+    }
+
+    public int index() {
+        return currentIndex;
+    }
+
+    public Token current() {
+        return currentItem;
+    }
+
+    public Token consume() {
+        if (currentIndex < size - 1) {
+            return currentItem = source.get(++currentIndex);
+        }
+
+        if (currentIndex < size) {
+            currentIndex++;
+        }
+
+        return null;
+    }
+
+    public Token consume(Predicate<Token> predicate) {
+        Token nextToken = consume();
+        if (nextToken != null && predicate.test(nextToken)) {
+            return nextToken;
+        }
+
+        reconsume();
+        return null;
+    }
+
+    public void reconsume() {
+        if (currentIndex > 0) {
+            currentItem = source.get(--currentIndex);
+        } else {
+            currentItem = null;
+            currentIndex = -1;
+        }
+    }
+
+    public Token peek() {
+        return currentIndex < size - 1 ? source.get(currentIndex + 1) : null;
+    }
+
+    /**
+     * Returns whether the next tokens in the stream satisfy the specified predicates.
+     */
+    @SafeVarargs
+    public final boolean peekMany(Predicate<Token>... predicates) {
+        int index = index();
+
+        try {
+            for (Predicate<Token> predicate : predicates) {
+                if (consume(predicate) == null) {
+                    return false;
+                }
+            }
+
+            return true;
+        } finally {
+            reset(index);
+        }
+    }
+
+    public void reset(int index) {
+        currentIndex = index;
+        currentItem = index >= 0 ? source.get(index) : null;
+    }
+}
\ No newline at end of file
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneHelper.java
index e2a44a1dce1..7e1d904027d 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneHelper.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 import com.sun.glass.ui.Accessible;
 import com.sun.javafx.tk.TKScene;
 import com.sun.javafx.util.Utils;
+import javafx.css.MediaQueryContext;
 import javafx.scene.Camera;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -102,6 +103,10 @@ public static Accessible getAccessible(Scene scene) {
         return sceneAccessor.getAccessible(scene);
     }
 
+    public static MediaQueryContext getMediaQueryContext(Scene scene) {
+        return sceneAccessor.getMediaQueryContext(scene);
+    }
+
     public static void setSceneAccessor(final SceneAccessor newAccessor) {
         if (sceneAccessor != null) {
             throw new IllegalStateException();
@@ -143,6 +148,8 @@ public interface SceneAccessor {
         void setTransientFocusContainer(Scene scene, Node node);
 
         Accessible getAccessible(Scene scene);
+
+        MediaQueryContext getMediaQueryContext(Scene scene);
     }
 
 }
diff --git a/modules/javafx.graphics/src/shims/java/com/sun/javafx/css/parser/TokenShim.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneMediaQueryContext.java
similarity index 51%
rename from modules/javafx.graphics/src/shims/java/com/sun/javafx/css/parser/TokenShim.java
rename to modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneMediaQueryContext.java
index 42f6bdc0d53..d3f6642b9d5 100644
--- a/modules/javafx.graphics/src/shims/java/com/sun/javafx/css/parser/TokenShim.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneMediaQueryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,47 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.sun.javafx.css.parser;
 
-public class TokenShim {
+package com.sun.javafx.scene;
 
-    public static final int EOF = Token.EOF;
-    public static final int INVALID = Token.INVALID;
-    public static final int SKIP = Token.SKIP;
+import javafx.application.ColorScheme;
+import javafx.css.MediaQueryContext;
+import javafx.scene.Scene;
+import java.util.Objects;
 
-    public final static TokenShim EOF_TOKEN = new TokenShim(Token.EOF_TOKEN);
-    public final static TokenShim INVALID_TOKEN = new TokenShim(Token.INVALID_TOKEN);
-    public final static TokenShim SKIP_TOKEN = new TokenShim(Token.SKIP_TOKEN);
+public final class SceneMediaQueryContext implements MediaQueryContext {
 
-    private final Token token;
+    private final Scene scene;
 
-    public TokenShim(int type, String text, int line, int offset) {
-        token = new Token(type, text, line, offset);
+    public SceneMediaQueryContext(Scene scene) {
+        this.scene = Objects.requireNonNull(scene);
     }
 
-    public TokenShim(int type, String text) {
-        token = new Token(type, text);
+    @Override
+    public ColorScheme getColorScheme() {
+        return scene.getColorScheme();
     }
 
-    public TokenShim(Token t) {
-        token = t;
+    @Override
+    public boolean isReducedMotion() {
+        return scene.isReducedMotion();
     }
 
-    public int getType() {
-        return token.getType();
+    @Override
+    public boolean isReducedTransparency() {
+        return scene.isReducedTransparency();
     }
-
-    public int getLine() {
-        return token.getLine();
-    }
-
-    public int getOffset() {
-        return token.getOffset();
-    }
-
-    public String getText() {
-        return token.getText();
-    }
-
-
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/CssParser.java b/modules/javafx.graphics/src/main/java/javafx/css/CssParser.java
index 274ffd973fc..95047258cd1 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/CssParser.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/CssParser.java
@@ -27,6 +27,7 @@
 
 import com.sun.javafx.css.Combinator;
 import com.sun.javafx.css.CompoundSelector;
+import com.sun.javafx.css.parser.CssLexer;
 import com.sun.javafx.css.FontFaceImpl;
 import com.sun.javafx.css.InterpolatorConverter;
 import com.sun.javafx.css.ParsedValueImpl;
@@ -34,6 +35,7 @@
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.css.TransitionDefinition;
 import com.sun.javafx.css.TransitionDefinitionConverter;
+import com.sun.javafx.css.media.MediaQueryParser;
 import com.sun.javafx.util.Utils;
 import javafx.animation.Interpolator;
 import javafx.css.converter.BooleanConverter;
@@ -288,6 +290,7 @@ public Stylesheet parseInlineStyle(final Styleable node) {
                 if (declarations != null && !declarations.isEmpty()) {
                     final Selector selector = Selector.getUniversalSelector();
                     final Rule rule = new Rule(
+                        null, // inline styles don't have media rules
                         Collections.singletonList(selector),
                         declarations
                     );
@@ -4152,6 +4155,8 @@ private Token nextToken(CssLexer lexer) {
     private static Stack<String> imports;
 
     private void parse(Stylesheet stylesheet, CssLexer lexer) {
+        MediaRule mediaRule = null;
+        int expectedRBraces = 0;
 
         // need to read the first token
         currentToken = nextToken(lexer);
@@ -4235,12 +4240,46 @@ private void parse(Stylesheet stylesheet, CssLexer lexer) {
 
                 continue;
 
+            } else if ("media".equals(keyword)) {
+                mediaRule = mediaRule(lexer, mediaRule);
+
+                if (currentToken != null) {
+                    if (currentToken.getType() == CssLexer.LBRACE) {
+                        expectedRBraces++;
+                    }
+
+                    currentToken = nextToken(lexer);
+                    break; // break out of the loop here, as we might encounter a selector next
+                }
+            } else {
+                // Skip the unexpected at-rule.
+                skipAtRule(lexer);
             }
         }
 
         while ((currentToken != null) &&
                (currentToken.getType() != Token.EOF)) {
 
+            if (currentToken.getType() == CssLexer.AT_KEYWORD) {
+                currentToken = lexer.nextToken();
+                String keyword = currentToken.getText().toLowerCase(Locale.ROOT);
+                if ("media".equals(keyword)) {
+                    mediaRule = mediaRule(lexer, mediaRule);
+
+                    if (currentToken != null) {
+                        if (currentToken.getType() == CssLexer.LBRACE) {
+                            expectedRBraces++;
+                        }
+
+                        currentToken = nextToken(lexer);
+                        continue;
+                    }
+                } else {
+                    // Skip the unexpected at-rule.
+                    skipAtRule(lexer);
+                }
+            }
+
             List<Selector> selectors = selectors(lexer);
             if (selectors == null) return;
 
@@ -4282,14 +4321,94 @@ private void parse(Stylesheet stylesheet, CssLexer lexer) {
                 return;
             }
 
-            stylesheet.getRules().add(new Rule(selectors, declarations));
+            stylesheet.getRules().add(new Rule(mediaRule, selectors, declarations));
 
             currentToken = nextToken(lexer);
 
+            while (expectedRBraces > 0) {
+                if (!consumeRBrace(lexer)) {
+                    return;
+                }
+
+                if (mediaRule != null) {
+                    mediaRule = mediaRule.getParent();
+                }
+
+                currentToken = nextToken(lexer);
+                expectedRBraces--;
+            }
         }
+
         currentToken = null;
     }
 
+    private void skipAtRule(CssLexer lexer) {
+        String msg = MessageFormat.format(
+            "Unexpected at-rule [{0,number,#},{1,number,#}]",
+            currentToken.getLine(), currentToken.getOffset());
+
+        ParseError error = createError(msg);
+        if (LOGGER.isLoggable(Level.WARNING)) {
+            LOGGER.warning(error.toString());
+        }
+
+        reportError(error);
+
+        while ((currentToken = lexer.nextToken()) != null
+                && currentToken.getType() != CssLexer.SEMI
+                && currentToken.getType() != CssLexer.RBRACE) {
+            // Skip forward to the next SEMI or RBRACE.
+        }
+    }
+
+    private boolean consumeRBrace(CssLexer lexer) {
+        if (currentToken == null || currentToken.getType() != CssLexer.RBRACE) {
+            int line = currentToken != null ? currentToken.getLine() : -1;
+            int pos = currentToken != null ? currentToken.getOffset() : -1;
+            String msg = String.format("Expected RBRACE at [%d,%d]", line, pos);
+            ParseError error = createError(msg);
+            if (LOGGER.isLoggable(Level.WARNING)) {
+                LOGGER.warning(error.toString());
+            }
+
+            reportError(error);
+            currentToken = null;
+            return false;
+        }
+
+        currentToken = lexer.nextToken();
+        return true;
+    }
+
+    private MediaRule mediaRule(CssLexer lexer, MediaRule mediaRule) {
+        // The media query expression contains all tokens (except for WS and NL) up to the
+        // next SEMI or LBRACE. We collect all of these tokens and hand them over to the
+        // special-purpose MediaQueryParser.
+        List<Token> mediaQueryTokens = new ArrayList<>();
+        while ((currentToken = lexer.nextToken()) != null
+                && currentToken.getType() != CssLexer.SEMI
+                && currentToken.getType() != CssLexer.LBRACE) {
+            if (currentToken.getType() != CssLexer.WS && currentToken.getType() != CssLexer.NL) {
+                mediaQueryTokens.add(currentToken);
+            }
+        }
+
+        var mediaQueryParser = new MediaQueryParser((token, errorMsg) -> {
+            String formattedErrorMsg = token != null
+                ? String.format("%s at [%d,%d]", errorMsg, token.getLine(), token.getOffset())
+                : errorMsg;
+
+            ParseError error = createError(formattedErrorMsg);
+            if (LOGGER.isLoggable(Level.WARNING)) {
+                LOGGER.warning(error.toString());
+            }
+
+            reportError(error);
+        });
+
+        return new MediaRule(mediaQueryParser.parseMediaQueryList(mediaQueryTokens), mediaRule);
+    }
+
     private FontFace fontFace(CssLexer lexer) {
         final Map<String,String> descriptors = new HashMap<>();
         final List<FontFaceImpl.FontFaceSrc> sources = new ArrayList<>();
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/MediaQuery.java b/modules/javafx.graphics/src/main/java/javafx/css/MediaQuery.java
new file mode 100644
index 00000000000..91e6966b8b5
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/javafx/css/MediaQuery.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javafx.css;
+
+import com.sun.javafx.css.media.expression.ConjunctionExpression;
+import com.sun.javafx.css.media.expression.ConstantExpression;
+import com.sun.javafx.css.media.expression.FunctionExpression;
+import com.sun.javafx.css.media.expression.NegationExpression;
+import com.sun.javafx.css.media.expression.DisjunctionExpression;
+
+/**
+ * {@code MediaQuery} is the runtime representation of a CSS media query expression.
+ * <p>
+ * It is evaluated against a context that provides the values that are referenced in the expression,
+ * and evaluates to either {@code true} or {@code false}.
+ *
+ * @since 24
+ */
+public sealed interface MediaQuery
+        permits ConstantExpression,
+                ConjunctionExpression,
+                DisjunctionExpression,
+                FunctionExpression,
+                NegationExpression {
+
+    /**
+     * Evaluates this media query against the provided context.
+     *
+     * @param context the evaluation context
+     * @return {@code true} if the media query matches, {@code false} otherwise
+     */
+    boolean evaluate(MediaQueryContext context);
+}
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/MediaQueryContext.java b/modules/javafx.graphics/src/main/java/javafx/css/MediaQueryContext.java
new file mode 100644
index 00000000000..b2d165639db
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/javafx/css/MediaQueryContext.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javafx.css;
+
+import com.sun.javafx.scene.SceneMediaQueryContext;
+import javafx.application.ColorScheme;
+
+/**
+ * A media query is evaluated against a {@code MediaQueryContext}, which provides the media feature
+ * values that can be referenced in a media query expression.
+ *
+ * @since 24
+ */
+public sealed interface MediaQueryContext permits SceneMediaQueryContext {
+
+    /**
+     * Provides the value for the {@code prefers-color-scheme} media feature.
+     *
+     * @return the color scheme
+     */
+    ColorScheme getColorScheme();
+
+    /**
+     * Provides the value for the {@code prefers-reduced-motion} media feature.
+     *
+     * @return {@code true} if the application should reduce motion
+     */
+    boolean isReducedMotion();
+
+    /**
+     * Provides the value for the {@code prefers-reduced-transparency} media feature.
+     *
+     * @return {@code true} if the application should reduce transparency
+     */
+    boolean isReducedTransparency();
+}
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/MediaRule.java b/modules/javafx.graphics/src/main/java/javafx/css/MediaRule.java
new file mode 100644
index 00000000000..802be944c58
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/javafx/css/MediaRule.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javafx.css;
+
+import com.sun.javafx.css.media.MediaQuerySerializer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * CSS media rules are @-rules that contain media queries. A media query tests aspects of the
+ * user agent (the JavaFX application), and is independent of the scene graph content.
+ *
+ * @since 24
+ */
+public final class MediaRule {
+
+    private final List<MediaQuery> queries;
+    private final MediaRule parent;
+    private final int hash;
+
+    MediaRule(List<MediaQuery> queries, MediaRule parent) {
+        this.queries = List.copyOf(queries);
+        this.parent = parent;
+        this.hash = queries.hashCode();
+    }
+
+    /**
+     * Returns the list of media queries.
+     *
+     * @return the list of media queries
+     */
+    public List<MediaQuery> getQueries() {
+        return queries;
+    }
+
+    /**
+     * Returns the parent media rule if this media rule is nested.
+     *
+     * @return the parent {@code MediaRule}, or {@code null}
+     */
+    public MediaRule getParent() {
+        return parent;
+    }
+
+    /**
+     * Evaluates whether any of the media queries is {@code true}.
+     *
+     * @param context the evaluation context
+     * @return {@code true} if any of the media queries is {@code true} of if the list is empty,
+     *         {@code false} otherwise
+     */
+    public boolean evaluate(MediaQueryContext context) {
+        if (parent != null && !parent.evaluate(context)) {
+            return false;
+        }
+
+        if (queries.isEmpty()) {
+            return true;
+        }
+
+        for (int i = 0, max = queries.size(); i < max; i++) {
+            if (queries.get(i).evaluate(context)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void writeBinary(DataOutputStream stream, StyleConverter.StringStore stringStore) throws IOException {
+        stream.writeInt(queries.size());
+
+        for (MediaQuery query : queries) {
+            MediaQuerySerializer.writeBinary(query, stream, stringStore);
+        }
+
+        stream.writeBoolean(parent != null);
+
+        if (parent != null) {
+            parent.writeBinary(stream, stringStore);
+        }
+    }
+
+    static MediaRule readBinary(DataInputStream stream, String[] strings) throws IOException {
+        int size = stream.readInt();
+        var queries = new MediaQuery[size];
+
+        for (int i = 0; i < size; i++) {
+            queries[i] = MediaQuerySerializer.readBinary(stream, strings);
+        }
+
+        boolean hasParent = stream.readBoolean();
+
+        return new MediaRule(List.of(queries), hasParent ? readBinary(stream, strings) : null);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof MediaRule rule && rule.getQueries().equals(queries);
+    }
+
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/Rule.java b/modules/javafx.graphics/src/main/java/javafx/css/Rule.java
index 6b99bb91569..24fd09a4483 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/Rule.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/Rule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -136,6 +136,18 @@ public final ObservableList<Selector> getSelectors() {
         return observables.getSelectors();
     }
 
+    private final MediaRule mediaRule;
+
+    /**
+     * Gets the {@code MediaRule} associated with this {@code Rule}.
+     *
+     * @return the {@code MediaRule} or {@code null}
+     * @since 24
+     */
+    public MediaRule getMediaRule() {
+        return mediaRule;
+    }
+
     private Stylesheet stylesheet;
 
     /**
@@ -169,12 +181,11 @@ public StyleOrigin getOrigin() {
         return stylesheet != null ? stylesheet.getOrigin() : null;
     }
 
-
-    Rule(List<Selector> selectors, List<Declaration> declarations) {
-
+    Rule(MediaRule mediaRule, List<Selector> selectors, List<Declaration> declarations) {
+        this.mediaRule = mediaRule;
         this.selectors = selectors;
         this.declarations = declarations;
-        serializedDecls = null;
+        this.serializedDecls = null;
         this.bssVersion = Stylesheet.BINARY_CSS_VERSION;
 
         int sMax = selectors != null ? selectors.size() : 0;
@@ -193,8 +204,8 @@ public StyleOrigin getOrigin() {
     private byte[] serializedDecls;
     private final int bssVersion;
 
-    private Rule(List<Selector> selectors, byte[] buf, int bssVersion) {
-
+    private Rule(MediaRule mediaRule, List<Selector> selectors, byte[] buf, int bssVersion) {
+        this.mediaRule = mediaRule;
         this.selectors = selectors;
         this.declarations = null;
         this.serializedDecls = buf;
@@ -327,6 +338,12 @@ private ObservableList<Declaration> getDeclarations() {
 
     final void writeBinary(DataOutputStream os, StyleConverter.StringStore stringStore)
             throws IOException {
+        if (mediaRule != null) {
+            os.writeBoolean(true); // flag to indicate whether we have a media rule
+            mediaRule.writeBinary(os, stringStore);
+        } else {
+            os.writeBoolean(false);
+        }
 
         final int nSelectors = this.selectors != null ? this.selectors.size() : 0;
         os.writeShort(nSelectors);
@@ -361,6 +378,15 @@ final void writeBinary(DataOutputStream os, StyleConverter.StringStore stringSto
     static Rule readBinary(int bssVersion, DataInputStream is, String[] strings)
             throws IOException
     {
+        MediaRule mediaRule = null;
+
+        if (bssVersion >= 7) {
+            boolean hasMediaRule = is.readBoolean();
+            if (hasMediaRule) {
+                mediaRule = MediaRule.readBinary(is, strings);
+            }
+        }
+
         short nSelectors = is.readShort();
         List<Selector> selectors = new ArrayList<>(nSelectors);
         for (int i = 0; i < nSelectors; i++) {
@@ -376,7 +402,7 @@ static Rule readBinary(int bssVersion, DataInputStream is, String[] strings)
                 declarations.add(d);
             }
 
-            return new Rule(selectors, declarations);
+            return new Rule(null, selectors, declarations);
         }
 
         // de-serialize decls into byte array
@@ -386,6 +412,6 @@ static Rule readBinary(int bssVersion, DataInputStream is, String[] strings)
         if (nBytes > 0) {
             is.readFully(buf);
         }
-        return new Rule(selectors, buf, bssVersion);
+        return new Rule(mediaRule, selectors, buf, bssVersion);
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/Stylesheet.java b/modules/javafx.graphics/src/main/java/javafx/css/Stylesheet.java
index 23839cdd841..aedb5261da0 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/Stylesheet.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/Stylesheet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,9 @@ public class Stylesheet {
      * binary stream changes. This number does not correlate with JavaFX versions.
      * Version 5: persist @font-face
      * Version 6: converter classes moved to public package
+     * Version 7: media queries
      */
-    final static int BINARY_CSS_VERSION = 6;
+    final static int BINARY_CSS_VERSION = 7;
 
     private final String url;
     /**
@@ -413,7 +414,7 @@ void importStylesheet(Stylesheet importedStylesheet) {
         for (Rule rule : rulesToImport) {
             List<Selector> selectors = rule.getSelectors();
             List<Declaration> declarations = rule.getUnobservedDeclarationList();
-            importedRules.add(new Rule(selectors, declarations));
+            importedRules.add(new Rule(rule.getMediaRule(), selectors, declarations));
         }
 
         rules.addAll(importedRules);
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index cd1097eac88..bfc0354ed63 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -27,6 +27,8 @@
 
 import com.sun.glass.ui.Application;
 import com.sun.glass.ui.Accessible;
+import com.sun.javafx.beans.property.NullCoalescingPropertyBase;
+import com.sun.javafx.scene.SceneMediaQueryContext;
 import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.util.Logging;
 import com.sun.javafx.util.Utils;
@@ -59,17 +61,20 @@
 
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
+import javafx.application.ColorScheme;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.beans.DefaultProperty;
 import javafx.beans.InvalidationListener;
 import javafx.beans.NamedArg;
 import javafx.beans.property.*;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 import javafx.css.CssMetaData;
+import javafx.css.MediaQueryContext;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.Stylesheet;
 import javafx.event.*;
@@ -174,6 +179,8 @@
 @DefaultProperty("root")
 public class Scene implements EventTarget {
 
+    private final MediaQueryContext mediaQueryContext = new SceneMediaQueryContext(this);
+
     private double widthSetByUser = -1.0;
     private double heightSetByUser = -1.0;
     private boolean sizeInitialized = false;
@@ -473,6 +480,11 @@ public void setTransientFocusContainer(Scene scene, Node node) {
                         public Accessible getAccessible(Scene scene) {
                             return scene.getAccessible();
                         }
+
+                        @Override
+                        public MediaQueryContext getMediaQueryContext(Scene scene) {
+                            return scene.mediaQueryContext;
+                        }
                     });
         }
 
@@ -1175,6 +1187,155 @@ public String getName() {
         return fill;
     }
 
+    /**
+     * Specifies whether the scene should prefer light text on dark backgrounds, or dark text
+     * on light backgrounds.
+     * <p>
+     * This is a <em>null-coalescing</em> property: if set to {@code null}, it evaluates to the
+     * value of {@link Platform.Preferences#colorSchemeProperty()}. Therefore, specifying a value
+     * for this property overrides the platform-provided value.
+     * <p>
+     * This property corresponds to the following CSS media feature:
+     * <table class="striped">
+     *     <caption>Media Feature</caption>
+     *     <tbody>
+     *         <tr><th>Name</th><td><code>prefers-color-scheme</code></td></tr>
+     *         <tr><th>For</th><td><code>@media</code></td></tr>
+     *         <tr><th>Value</th><td><code>light</code> | <code>dark</code></td></tr>
+     *         <tr><th>Boolean Context</th><td>no</td></tr>
+     *     </tbody>
+     * </table>
+     *
+     * @defaultValue {@link Platform.Preferences#getColorScheme()}
+     * @since 24
+     */
+    private final ObjectProperty<ColorScheme> colorScheme = new MediaProperty<>(
+            "colorScheme", PlatformImpl.getPlatformPreferences().colorSchemeProperty());
+
+    public final ObjectProperty<ColorScheme> colorSchemeProperty() {
+        return colorScheme;
+    }
+
+    public final ColorScheme getColorScheme() {
+        return colorScheme.get();
+    }
+
+    public final void setColorScheme(ColorScheme colorScheme) {
+        this.colorScheme.set(colorScheme);
+    }
+
+    private final ObjectProperty<Boolean> reducedMotion = new MediaProperty<>(
+            "reducedMotion", PlatformImpl.getPlatformPreferences().reducedMotionProperty());
+
+    /**
+     * Specifies whether the scene should minimize the amount of non-essential animations,
+     * reducing discomfort for users who experience motion sickness or vertigo.
+     * <p>
+     * This is a <em>null-coalescing</em> property: if set to {@code null}, it evaluates to the
+     * value of {@link Platform.Preferences#reducedMotionProperty()}. Therefore, specifying a
+     * value for this property overrides the platform-provided value.
+     * <p>
+     * This property corresponds to the following CSS media feature:
+     * <table class="striped">
+     *     <caption>Media Feature</caption>
+     *     <tbody>
+     *         <tr><th>Name</th><td><code>prefers-reduced-motion</code></td></tr>
+     *         <tr><th>For</th><td><code>@media</code></td></tr>
+     *         <tr><th>Value</th><td><code>no-preference</code> | <code>reduce</code></td></tr>
+     *         <tr><th>Boolean Context</th>
+     *             <td>yes, <code>no-preference</code> evaluates as <code>false</code></td>
+     *         </tr>
+     *     </tbody>
+     * </table>
+     *
+     * @return the {@code reducedMotion} property
+     * @defaultValue {@link Platform.Preferences#isReducedMotion()}
+     * @since 24
+     */
+    public final ObjectProperty<Boolean> reducedMotionProperty() {
+        return reducedMotion;
+    }
+
+    /**
+     * Gets the value of the {@code reducedMotion} property.
+     *
+     * @return the value of the {@code reducedMotion} property
+     * @see #reducedMotionProperty()
+     * @see #setReducedMotion(Boolean)
+     * @since 24
+     */
+    public final boolean isReducedMotion() {
+        return reducedMotion.get();
+    }
+
+    /**
+     * Sets the value of the {@code reducedMotion} property.
+     *
+     * @param value the value
+     * @see #reducedMotionProperty()
+     * @see #isReducedMotion()
+     * @since 24
+     */
+    public final void setReducedMotion(Boolean value) {
+        this.reducedMotion.set(value);
+    }
+
+    private final ObjectProperty<Boolean> reducedTransparency = new MediaProperty<>(
+            "reducedTransparency", PlatformImpl.getPlatformPreferences().reducedTransparencyProperty());
+
+    /**
+     * Specifies whether the scene should minimize the amount of transparent or translucent
+     * layer effects, which can help to increase contrast and readability for some users.
+     * <p>
+     * This is a <em>null-coalescing</em> property: if set to {@code null}, it evaluates to the
+     * value of {@link Platform.Preferences#reducedTransparencyProperty()}. Therefore, specifying
+     * a value for this property overrides the platform-provided value.
+     * <p>
+     * This property corresponds to the following CSS media feature:
+     * <table class="striped">
+     *     <caption>Media Feature</caption>
+     *     <tbody>
+     *         <tr><th>Name</th><td><code>prefers-reduced-transparency</code></td></tr>
+     *         <tr><th>For</th><td><code>@media</code></td></tr>
+     *         <tr><th>Value</th><td><code>no-preference</code> | <code>reduce</code></td></tr>
+     *         <tr><th>Boolean Context</th>
+     *             <td>yes, <code>no-preference</code> evaluates as <code>false</code></td>
+     *         </tr>
+     *     </tbody>
+     * </table>
+     *
+     * @return the {@code reducedTransparency} property
+     * @defaultValue {@link Platform.Preferences#isReducedTransparency()}
+     * @since 24
+     */
+    public final ObjectProperty<Boolean> reducedTransparencyProperty() {
+        return reducedTransparency;
+    }
+
+    /**
+     * Gets the value of the {@code reducedTransparency} property.
+     *
+     * @return the value of the {@code reducedTransparency} property
+     * @see #reducedTransparencyProperty()
+     * @see #setReducedTransparency(Boolean)
+     * @since 24
+     */
+    public final boolean isReducedTransparency() {
+        return reducedTransparency.get();
+    }
+
+    /**
+     * Sets the value of the {@code reducedTransparency} property.
+     *
+     * @param value the value
+     * @see #reducedTransparencyProperty()
+     * @see #isReducedTransparency()
+     * @since 24
+     */
+    public final void setReducedTransparency(Boolean value) {
+        this.reducedTransparency.set(value);
+    }
+
     /**
      * Defines the root {@code Node} of the scene graph.
      * If a {@code Group} is used as the root, the
@@ -6482,4 +6643,31 @@ Accessible getAccessible() {
         }
         return accessible;
     }
+
+    private class MediaProperty<T> extends NullCoalescingPropertyBase<T> {
+        private final String name;
+
+        MediaProperty(String name, ObservableValue<T> defaultValue) {
+            super(defaultValue);
+            this.name = name;
+        }
+
+        @Override
+        public Object getBean() {
+            return Scene.this;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        protected void invalidated() {
+            Node root = getRoot();
+            if (root != null) {
+                NodeHelper.reapplyCSS(root);
+            }
+        }
+    }
 }
diff --git a/modules/javafx.graphics/src/shims/java/javafx/css/CssLexerShim.java b/modules/javafx.graphics/src/shims/java/javafx/css/CssLexerShim.java
deleted file mode 100644
index 71501f921fa..00000000000
--- a/modules/javafx.graphics/src/shims/java/javafx/css/CssLexerShim.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javafx.css;
-
-import com.sun.javafx.css.parser.Token;
-import com.sun.javafx.css.parser.TokenShim;
-import java.io.Reader;
-
-public class CssLexerShim {
-
-    public final static int STRING = CssLexer.STRING;
-    public final static int IDENT = CssLexer.IDENT;
-    public final static int FUNCTION = CssLexer.FUNCTION;
-    public final static int NUMBER = CssLexer.NUMBER;
-    public final static int CM = CssLexer.CM;
-    public final static int EMS = CssLexer.EMS;
-    public final static int EXS = CssLexer.EXS;
-    public final static int IN = CssLexer.IN;
-    public final static int MM = CssLexer.MM;
-    public final static int PC = CssLexer.PC;
-    public final static int PT = CssLexer.PT;
-    public final static int PX = CssLexer.PX;
-    public final static int PERCENTAGE = CssLexer.PERCENTAGE;
-    public final static int DEG = CssLexer.DEG;
-    public final static int GRAD = CssLexer.GRAD;
-    public final static int RAD = CssLexer.RAD;
-    public final static int TURN = CssLexer.TURN;
-    public final static int GREATER = CssLexer.GREATER;
-    public final static int LBRACE = CssLexer.LBRACE;
-    public final static int RBRACE = CssLexer.RBRACE;
-    public final static int SEMI = CssLexer.SEMI;
-    public final static int COLON = CssLexer.COLON;
-    public final static int SOLIDUS = CssLexer.SOLIDUS;
-    public final static int STAR = CssLexer.STAR;
-    public final static int LPAREN = CssLexer.LPAREN;
-    public final static int RPAREN = CssLexer.RPAREN;
-    public final static int COMMA = CssLexer.COMMA;
-    public final static int HASH = CssLexer.HASH;
-    public final static int DOT = CssLexer.DOT;
-    public final static int IMPORTANT_SYM = CssLexer.IMPORTANT_SYM;
-    public final static int WS = CssLexer.WS;
-    public final static int NL = CssLexer.NL;
-    public final static int FONT_FACE = CssLexer.FONT_FACE;
-    public final static int URL = CssLexer.URL;
-    public final static int IMPORT = CssLexer.IMPORT;
-    public final static int SECONDS = CssLexer.SECONDS;
-    public final static int MS = CssLexer.MS;
-    public final static int AT_KEYWORD = CssLexer.AT_KEYWORD;
-
-
-    CssLexer lexer;
-
-    public CssLexerShim(CssLexer lexer) {
-        this.lexer = lexer;
-    }
-
-    public CssLexerShim() {
-        this.lexer = new CssLexer();
-    }
-
-    public TokenShim nextToken() {
-        Token t = this.lexer.nextToken();
-        return new TokenShim(t);
-    }
-
-    public void setReader(Reader reader) {
-        lexer.setReader(reader);
-    }
-
-    //------------
-
-    public static TokenShim nextToken(CssLexerShim l) {
-        Token t = l.lexer.nextToken();
-        return new TokenShim(t);
-    }
-
-
-}
diff --git a/modules/javafx.graphics/src/shims/java/javafx/css/RuleShim.java b/modules/javafx.graphics/src/shims/java/javafx/css/RuleShim.java
index ac972790a3f..cc8cdf2ac6b 100644
--- a/modules/javafx.graphics/src/shims/java/javafx/css/RuleShim.java
+++ b/modules/javafx.graphics/src/shims/java/javafx/css/RuleShim.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ public static void writeBinary(
     }
 
     public static Rule getRule(List<Selector> selectors, List<Declaration> declarations) {
-        return new Rule(selectors, declarations);
+        return new Rule(null, selectors, declarations);
     }
 
 }
diff --git a/modules/javafx.graphics/src/test/addExports b/modules/javafx.graphics/src/test/addExports
index 87cbf28492c..09e597693e1 100644
--- a/modules/javafx.graphics/src/test/addExports
+++ b/modules/javafx.graphics/src/test/addExports
@@ -8,7 +8,10 @@
 --add-exports javafx.graphics/com.sun.javafx.animation=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.application.preferences=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.beans.property=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.css=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.css.media=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.css.media.expression=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.css.parser=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
@@ -54,6 +57,7 @@
 --add-opens javafx.graphics/javafx.scene.robot=ALL-UNNAMED
 --add-opens javafx.graphics/javafx.scene.layout=ALL-UNNAMED
 --add-opens javafx.graphics/javafx.scene.paint=ALL-UNNAMED
+--add-opens javafx.graphics/javafx.stage=ALL-UNNAMED
 --add-opens java.desktop/javax.imageio=ALL-UNNAMED
 #
 # compile time additions
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/application/preferences/PlatformPreferencesTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/application/preferences/PlatformPreferencesTest.java
index 6eff27478ce..f56c9465478 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/application/preferences/PlatformPreferencesTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/application/preferences/PlatformPreferencesTest.java
@@ -53,7 +53,8 @@ public class PlatformPreferencesTest {
 
     @BeforeEach
     void setup() {
-        prefs = new PlatformPreferences(
+        prefs = new PlatformPreferences();
+        prefs.initialize(
             // Well-known platform keys and their associated type
             Map.of(
                 "test.anInt", Integer.class,
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/beans/property/NullCoalescingPropertyBaseTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/beans/property/NullCoalescingPropertyBaseTest.java
new file mode 100644
index 00000000000..5fd85789829
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/beans/property/NullCoalescingPropertyBaseTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.com.sun.javafx.beans.property;
+
+import com.sun.javafx.beans.property.NullCoalescingPropertyBase;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.value.ObservableValue;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class NullCoalescingPropertyBaseTest {
+
+    @Test
+    void nullEvaluatesToBaseValue() {
+        var base = new SimpleStringProperty("foo");
+        var property = new NullCoalescingPropertyImpl<>(base);
+        property.set(null);
+        assertEquals("foo", property.get());
+        assertEquals("foo", property.getValue());
+    }
+
+    @Test
+    void nonNullEvaluatesToLocalValue() {
+        var base = new SimpleStringProperty("foo");
+        var property = new NullCoalescingPropertyImpl<>(base);
+        property.set("bar");
+        assertEquals("bar", property.get());
+        assertEquals("bar", property.getValue());
+    }
+
+    @Test
+    void baseValueChangeIsVisible() {
+        var base = new SimpleStringProperty("foo");
+        var property = new NullCoalescingPropertyImpl<>(base);
+        property.set(null);
+        assertEquals("foo", property.get());
+        base.set("bar");
+        assertEquals("bar", property.get());
+    }
+
+    @Test
+    void propertiesCanBeChained() {
+        var base = new SimpleStringProperty("foo");
+        var property1 = new NullCoalescingPropertyImpl<>(base);
+        var property2 = new NullCoalescingPropertyImpl<>(property1);
+
+        property2.set(null);
+        assertEquals("foo", property2.get());
+
+        property1.set("bar");
+        assertEquals("bar", property2.get());
+
+        property2.set("baz");
+        assertEquals("baz", property2.get());
+    }
+
+    @Test
+    void bindingOverridesBaseValueIfNotNull() {
+        var base = new SimpleStringProperty("foo");
+        var property = new NullCoalescingPropertyImpl<>(base);
+        assertEquals("foo", property.get());
+
+        var bindSource = new SimpleStringProperty("bar");
+        property.bind(bindSource);
+        assertEquals("bar", property.get());
+
+        bindSource.set(null);
+        assertEquals("foo", property.get());
+    }
+
+    @Test
+    void changeEventObservableIsCorrectlyReported() {
+        var base = new SimpleStringProperty();
+        var property = new NullCoalescingPropertyImpl<>(base);
+        var trace = new ArrayList<>();
+        property.addListener(((observable, _, _) -> trace.add(observable)));
+        base.set("foo");
+        assertEquals(List.of(property), trace);
+        base.set("bar");
+        assertEquals(List.of(property, property), trace);
+    }
+
+    private static class NullCoalescingPropertyImpl<T> extends NullCoalescingPropertyBase<T> {
+        public NullCoalescingPropertyImpl(ObservableValue<T> baseValue) {
+            super(baseValue);
+        }
+
+        @Override public Object getBean() { return null; }
+        @Override public String getName() { return ""; }
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/media/MediaQuerySerializerTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/media/MediaQuerySerializerTest.java
new file mode 100644
index 00000000000..cf2653c620c
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/media/MediaQuerySerializerTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.com.sun.javafx.css.media;
+
+import com.sun.javafx.css.media.MediaQuerySerializer;
+import com.sun.javafx.css.media.expression.ConjunctionExpression;
+import com.sun.javafx.css.media.expression.ConstantExpression;
+import com.sun.javafx.css.media.expression.FunctionExpression;
+import com.sun.javafx.css.media.expression.NegationExpression;
+import com.sun.javafx.css.media.expression.DisjunctionExpression;
+import javafx.css.MediaQuery;
+import javafx.css.StyleConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class MediaQuerySerializerTest {
+
+    private StyleConverter.StringStore stringStore;
+
+    @BeforeEach
+    void setup() {
+        stringStore = new StyleConverter.StringStore();
+    }
+
+    @Test
+    void serializeConstantExpression() throws IOException {
+        var expected = new ConstantExpression(true);
+        var actual = deserialize(serialize(expected));
+        assertEquals(expected, actual);
+
+        expected = new ConstantExpression(false);
+        actual = deserialize(serialize(expected));
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void serializeFunctionExpression() throws IOException {
+        var expected = new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> null, true);
+        var actual = deserialize(serialize(expected));
+        assertEquals(expected, actual);
+
+        expected = new FunctionExpression<>("prefers-reduced-motion", null, _ -> null, true);
+        actual = deserialize(serialize(expected));
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void serializeNotExpression() throws IOException {
+        var expected = new NegationExpression(new ConstantExpression(true));
+        var actual = deserialize(serialize(expected));
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void serializeConjunctionExpression() throws IOException {
+        var expected = new ConjunctionExpression(new ConstantExpression(true), new ConstantExpression(false));
+        var actual = deserialize(serialize(expected));
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void serializeDisjunctionExpression() throws IOException {
+        var expected = new DisjunctionExpression(new ConstantExpression(true), new ConstantExpression(false));
+        var actual = deserialize(serialize(expected));
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void serializeComplexExpression() throws IOException {
+        var expected = new ConjunctionExpression(
+            new DisjunctionExpression(
+                new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> null, true),
+                new FunctionExpression<>("prefers-reduced-transparency", "no-preference", _ -> null, false)
+            ),
+            new ConjunctionExpression(
+                new NegationExpression(
+                    new FunctionExpression<>("prefers-reduced-motion", null, _ -> null, true)
+                ),
+                new ConstantExpression(true)
+            )
+        );
+
+        var actual = deserialize(serialize(expected));
+        assertEquals(expected, actual);
+    }
+
+    private byte[] serialize(MediaQuery mediaQuery) throws IOException {
+        var output = new ByteArrayOutputStream();
+        MediaQuerySerializer.writeBinary(mediaQuery, new DataOutputStream(output), stringStore);
+        return output.toByteArray();
+    }
+
+    private MediaQuery deserialize(byte[] data) throws IOException {
+        var input = new ByteArrayInputStream(data);
+        return MediaQuerySerializer.readBinary(
+            new DataInputStream(input), stringStore.strings.toArray(new String[0]));
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/CssLexerTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/parser/CssLexerTest.java
similarity index 50%
rename from modules/javafx.graphics/src/test/java/test/javafx/css/CssLexerTest.java
rename to modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/parser/CssLexerTest.java
index 05ca0c2059b..f062d400b57 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/CssLexerTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/parser/CssLexerTest.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package test.javafx.css;
+package test.com.sun.javafx.css.parser;
 
+import com.sun.javafx.css.parser.CssLexer;
 import com.sun.javafx.css.parser.Token;
-import com.sun.javafx.css.parser.TokenShim;
 
 import java.io.CharArrayReader;
 import java.io.Reader;
@@ -34,7 +34,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javafx.css.CssLexerShim;
 
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -45,7 +44,7 @@ public class CssLexerTest {
     public CssLexerTest() {
     }
 
-    private void checkTokens(List<TokenShim> resultTokens, TokenShim... expectedTokens) {
+    private void checkTokens(List<Token> resultTokens, Token... expectedTokens) {
 
         if (expectedTokens.length != resultTokens.size()) {
             fail(
@@ -56,8 +55,8 @@ private void checkTokens(List<TokenShim> resultTokens, TokenShim... expectedToke
         }
         for (int n = 0; n<expectedTokens.length; n++) {
 
-            final TokenShim result = resultTokens.get(n);
-            final TokenShim expected = expectedTokens[n];
+            final Token result = resultTokens.get(n);
+            final Token expected = expectedTokens[n];
 
             if (expected.getType() != result.getType()) {
                 fail(
@@ -80,15 +79,15 @@ private void checkTokens(List<TokenShim> resultTokens, TokenShim... expectedToke
         }
     }
 
-    List<TokenShim> getTokens(String string) {
+    List<Token> getTokens(String string) {
 
         Reader reader = new CharArrayReader(string.toCharArray());
-        final CssLexerShim lexer = new CssLexerShim();
+        final CssLexer lexer = new CssLexer();
         lexer.setReader(reader);
 
-        final List<TokenShim> tokens = new ArrayList<>();
+        final List<Token> tokens = new ArrayList<>();
 
-        TokenShim token = null;
+        Token token = null;
         do {
             token = lexer.nextToken();
             tokens.add(token);
@@ -99,107 +98,107 @@ List<TokenShim> getTokens(String string) {
 
     private void lexDigitsWithUnits(String units, int type) {
 
-        checkTokens(getTokens("123"+units), new TokenShim(type, "123"+units), TokenShim.EOF_TOKEN);
-        checkTokens(getTokens("123.45"+units), new TokenShim(type, "123.45"+units), TokenShim.EOF_TOKEN);
-        checkTokens(getTokens(".45"+units), new TokenShim(type, ".45"+units), TokenShim.EOF_TOKEN);
-        checkTokens(getTokens("-123"+units), new TokenShim(type, "-123"+units), TokenShim.EOF_TOKEN);
-        checkTokens(getTokens("-.45"+units), new TokenShim(type, "-.45"+units), TokenShim.EOF_TOKEN);
-        checkTokens(getTokens("+123"+units), new TokenShim(type, "+123"+units), TokenShim.EOF_TOKEN);
-        checkTokens(getTokens("+.45"+units), new TokenShim(type, "+.45"+units), TokenShim.EOF_TOKEN);
+        checkTokens(getTokens("123"+units), new Token(type, "123"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("123.45"+units), new Token(type, "123.45"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens(".45"+units), new Token(type, ".45"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("-123"+units), new Token(type, "-123"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("-.45"+units), new Token(type, "-.45"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("+123"+units), new Token(type, "+123"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("+.45"+units), new Token(type, "+.45"+units), Token.EOF_TOKEN);
     }
 
     @Test
     public void testLexValidDigits() {
-        lexDigitsWithUnits("", CssLexerShim.NUMBER);
+        lexDigitsWithUnits("", CssLexer.NUMBER);
     }
 
     @Test
     public void testLexValidDigitsWithCM() {
-        lexDigitsWithUnits("cm", CssLexerShim.CM);
+        lexDigitsWithUnits("cm", CssLexer.CM);
         // case should be ignored
-        lexDigitsWithUnits("cM", CssLexerShim.CM);
+        lexDigitsWithUnits("cM", CssLexer.CM);
     }
     @Test
     public void testLexValidDigitsWithDEG() {
-        lexDigitsWithUnits("deg", CssLexerShim.DEG);
+        lexDigitsWithUnits("deg", CssLexer.DEG);
         // case should be ignored
-        lexDigitsWithUnits("dEg", CssLexerShim.DEG);
+        lexDigitsWithUnits("dEg", CssLexer.DEG);
     }
     @Test
     public void testLexValidDigitsWithEM() {
-        lexDigitsWithUnits("em", CssLexerShim.EMS);
+        lexDigitsWithUnits("em", CssLexer.EMS);
         // case should be ignored
-        lexDigitsWithUnits("Em", CssLexerShim.EMS);
+        lexDigitsWithUnits("Em", CssLexer.EMS);
     }
     @Test
     public void testLexValidDigitsWithEX() {
-        lexDigitsWithUnits("ex", CssLexerShim.EXS);
+        lexDigitsWithUnits("ex", CssLexer.EXS);
         // case should be ignored
-        lexDigitsWithUnits("Ex", CssLexerShim.EXS);
+        lexDigitsWithUnits("Ex", CssLexer.EXS);
     }
     @Test
     public void testLexValidDigitsWithGRAD() {
-        lexDigitsWithUnits("grad", CssLexerShim.GRAD);
+        lexDigitsWithUnits("grad", CssLexer.GRAD);
         // case should be ignored
-        lexDigitsWithUnits("gRad", CssLexerShim.GRAD);
+        lexDigitsWithUnits("gRad", CssLexer.GRAD);
     }
     @Test
     public void testLexValidDigitsWithIN() {
-        lexDigitsWithUnits("in", CssLexerShim.IN);
+        lexDigitsWithUnits("in", CssLexer.IN);
         // case should be ignored
-        lexDigitsWithUnits("In", CssLexerShim.IN);
+        lexDigitsWithUnits("In", CssLexer.IN);
     }
     @Test
     public void testLexValidDigitsWithMM() {
-        lexDigitsWithUnits("mm", CssLexerShim.MM);
+        lexDigitsWithUnits("mm", CssLexer.MM);
         // case should be ignored
-        lexDigitsWithUnits("mM", CssLexerShim.MM);
+        lexDigitsWithUnits("mM", CssLexer.MM);
     }
     @Test
     public void testLexValidDigitsWithPC() {
-        lexDigitsWithUnits("pc", CssLexerShim.PC);
+        lexDigitsWithUnits("pc", CssLexer.PC);
         // case should be ignored
-        lexDigitsWithUnits("Pc", CssLexerShim.PC);
+        lexDigitsWithUnits("Pc", CssLexer.PC);
     }
     @Test
     public void testLexValidDigitsWithPT() {
-        lexDigitsWithUnits("pt", CssLexerShim.PT);
+        lexDigitsWithUnits("pt", CssLexer.PT);
         // case should be ignored
-        lexDigitsWithUnits("PT", CssLexerShim.PT);
+        lexDigitsWithUnits("PT", CssLexer.PT);
     }
     @Test
     public void testLexValidDigitsWithPX() {
-        lexDigitsWithUnits("px", CssLexerShim.PX);
+        lexDigitsWithUnits("px", CssLexer.PX);
         // case should be ignored
-        lexDigitsWithUnits("Px", CssLexerShim.PX);
+        lexDigitsWithUnits("Px", CssLexer.PX);
     }
     @Test
     public void testLexValidDigitsWithRAD() {
-        lexDigitsWithUnits("rad", CssLexerShim.RAD);
+        lexDigitsWithUnits("rad", CssLexer.RAD);
         // case should be ignored
-        lexDigitsWithUnits("RaD", CssLexerShim.RAD);
+        lexDigitsWithUnits("RaD", CssLexer.RAD);
     }
     @Test
     public void testLexValidDigitsWithTURN() {
-        lexDigitsWithUnits("turn", CssLexerShim.TURN);
+        lexDigitsWithUnits("turn", CssLexer.TURN);
         // case should be ignored
-        lexDigitsWithUnits("TurN", CssLexerShim.TURN);
+        lexDigitsWithUnits("TurN", CssLexer.TURN);
     }
     @Test
     public void testLexValidDigitsWithS() {
-        lexDigitsWithUnits("s", CssLexerShim.SECONDS);
+        lexDigitsWithUnits("s", CssLexer.SECONDS);
         // case should be ignored
-        lexDigitsWithUnits("S", CssLexerShim.SECONDS);
+        lexDigitsWithUnits("S", CssLexer.SECONDS);
     }
     @Test
     public void testLexValidDigitsWithMS() {
-        lexDigitsWithUnits("ms", CssLexerShim.MS);
+        lexDigitsWithUnits("ms", CssLexer.MS);
         // case should be ignored
-        lexDigitsWithUnits("mS", CssLexerShim.MS);
+        lexDigitsWithUnits("mS", CssLexer.MS);
     }
     @Test
     public void testLexValidDigitsWithPCT() {
-        lexDigitsWithUnits("%", CssLexerShim.PERCENTAGE);
+        lexDigitsWithUnits("%", CssLexer.PERCENTAGE);
     }
     @Test
     public void testLexValidDigitsWithBadUnits() {
@@ -209,94 +208,94 @@ public void testLexValidDigitsWithBadUnits() {
     public void textLexValidDigitsValidDigits() {
         checkTokens(
             getTokens("foo: 10pt; bar: 20%;"),
-            new TokenShim(CssLexerShim.IDENT, "foo"),
-            new TokenShim(CssLexerShim.COLON, ":"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.PT, "10pt"),
-            new TokenShim(CssLexerShim.SEMI, ";"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.IDENT, "bar"),
-            new TokenShim(CssLexerShim.COLON, ":"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.PERCENTAGE, "20%"),
-            new TokenShim(CssLexerShim.SEMI, ";"),
-            TokenShim.EOF_TOKEN
+            new Token(CssLexer.IDENT, "foo"),
+            new Token(CssLexer.COLON, ":"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.PT, "10pt"),
+            new Token(CssLexer.SEMI, ";"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.IDENT, "bar"),
+            new Token(CssLexer.COLON, ":"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.PERCENTAGE, "20%"),
+            new Token(CssLexer.SEMI, ";"),
+            Token.EOF_TOKEN
         );
     }
     @Test
     public void textLexInvalidDigitsValidDigits() {
         checkTokens(
             getTokens("foo: 10pz; bar: 20%;"),
-            new TokenShim(CssLexerShim.IDENT, "foo"),
-            new TokenShim(CssLexerShim.COLON, ":"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(Token.INVALID, "10pz"),
-            new TokenShim(CssLexerShim.SEMI, ";"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.IDENT, "bar"),
-            new TokenShim(CssLexerShim.COLON, ":"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.PERCENTAGE, "20%"),
-            new TokenShim(CssLexerShim.SEMI, ";"),
-            TokenShim.EOF_TOKEN
+            new Token(CssLexer.IDENT, "foo"),
+            new Token(CssLexer.COLON, ":"),
+            new Token(CssLexer.WS, " "),
+            new Token(Token.INVALID, "10pz"),
+            new Token(CssLexer.SEMI, ";"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.IDENT, "bar"),
+            new Token(CssLexer.COLON, ":"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.PERCENTAGE, "20%"),
+            new Token(CssLexer.SEMI, ";"),
+            Token.EOF_TOKEN
         );
     }
     @Test
     public void textLexValidDigitsBangImportant() {
         checkTokens(
             getTokens("foo: 10pt !important;"),
-            new TokenShim(CssLexerShim.IDENT, "foo"),
-            new TokenShim(CssLexerShim.COLON, ":"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.PT, "10pt"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.IMPORTANT_SYM, "!important"),
-            new TokenShim(CssLexerShim.SEMI, ";"),
-            TokenShim.EOF_TOKEN
+            new Token(CssLexer.IDENT, "foo"),
+            new Token(CssLexer.COLON, ":"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.PT, "10pt"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.IMPORTANT_SYM, "!important"),
+            new Token(CssLexer.SEMI, ";"),
+            Token.EOF_TOKEN
         );
     }
     @Test
     public void textLexInvalidDigitsBangImportant() {
         checkTokens(
             getTokens("foo: 10pz !important;"),
-            new TokenShim(CssLexerShim.IDENT, "foo"),
-            new TokenShim(CssLexerShim.COLON, ":"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(Token.INVALID, "10pz"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.IMPORTANT_SYM, "!important"),
-            new TokenShim(CssLexerShim.SEMI, ";"),
-            TokenShim.EOF_TOKEN
+            new Token(CssLexer.IDENT, "foo"),
+            new Token(CssLexer.COLON, ":"),
+            new Token(CssLexer.WS, " "),
+            new Token(Token.INVALID, "10pz"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.IMPORTANT_SYM, "!important"),
+            new Token(CssLexer.SEMI, ";"),
+            Token.EOF_TOKEN
         );
     }
     @Test
     public void textLexValidDigitsInSequence() {
         checkTokens(
             getTokens("-1 0px 1pt .5em;"),
-            new TokenShim(CssLexerShim.NUMBER, "-1"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.PX, "0px"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.PT, "1pt"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.EMS, ".5em"),
-            new TokenShim(CssLexerShim.SEMI, ";"),
-            TokenShim.EOF_TOKEN
+            new Token(CssLexer.NUMBER, "-1"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.PX, "0px"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.PT, "1pt"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.EMS, ".5em"),
+            new Token(CssLexer.SEMI, ";"),
+            Token.EOF_TOKEN
         );
     }
     @Test
     public void textLexInvalidDigitsInSequence() {
         checkTokens(
             getTokens("-1 0px 1pz .5em;"),
-            new TokenShim(CssLexerShim.NUMBER, "-1"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.PX, "0px"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(Token.INVALID, "1pz"),
-            new TokenShim(CssLexerShim.WS, " "),
-            new TokenShim(CssLexerShim.EMS, ".5em"),
-            new TokenShim(CssLexerShim.SEMI, ";"),
-            TokenShim.EOF_TOKEN
+            new Token(CssLexer.NUMBER, "-1"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.PX, "0px"),
+            new Token(CssLexer.WS, " "),
+            new Token(Token.INVALID, "1pz"),
+            new Token(CssLexer.WS, " "),
+            new Token(CssLexer.EMS, ".5em"),
+            new Token(CssLexer.SEMI, ";"),
+            Token.EOF_TOKEN
         );
     }
 
@@ -306,20 +305,20 @@ public void testTokenOffset() {
         String str =  "a: b;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 1, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 4),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 4),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -332,26 +331,26 @@ public void testTokenLineAndOffsetWithCR() {
         String str =  "a: b;\rc: d;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 1, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 4),
-            new TokenShim(CssLexerShim.NL,  "\\r", 1, 5),
-            new TokenShim(CssLexerShim.IDENT, "c", 2, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 2, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 2, 2),
-            new TokenShim(CssLexerShim.IDENT, "d", 2, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 2, 4),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 4),
+            new Token(CssLexer.NL,  "\\r", 1, 5),
+            new Token(CssLexer.IDENT, "c", 2, 0),
+            new Token(CssLexer.COLON, ":", 2, 1),
+            new Token(CssLexer.WS,    " ", 2, 2),
+            new Token(CssLexer.IDENT, "d", 2, 3),
+            new Token(CssLexer.SEMI,  ";", 2, 4),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -364,26 +363,26 @@ public void testTokenLineAndOffsetWithLF() {
         String str =  "a: b;\nc: d;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 1, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 4),
-            new TokenShim(CssLexerShim.NL,  "\\n", 1, 5),
-            new TokenShim(CssLexerShim.IDENT, "c", 2, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 2, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 2, 2),
-            new TokenShim(CssLexerShim.IDENT, "d", 2, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 2, 4),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 4),
+            new Token(CssLexer.NL,  "\\n", 1, 5),
+            new Token(CssLexer.IDENT, "c", 2, 0),
+            new Token(CssLexer.COLON, ":", 2, 1),
+            new Token(CssLexer.WS,    " ", 2, 2),
+            new Token(CssLexer.IDENT, "d", 2, 3),
+            new Token(CssLexer.SEMI,  ";", 2, 4),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -396,26 +395,26 @@ public void testTokenLineAndOffsetWithCRLF() {
         String str =  "a: b;\r\nc: d;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 1, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 4),
-            new TokenShim(CssLexerShim.NL,  "\\r\\n", 1, 5),
-            new TokenShim(CssLexerShim.IDENT, "c", 2, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 2, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 2, 2),
-            new TokenShim(CssLexerShim.IDENT, "d", 2, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 2, 4),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 4),
+            new Token(CssLexer.NL,  "\\r\\n", 1, 5),
+            new Token(CssLexer.IDENT, "c", 2, 0),
+            new Token(CssLexer.COLON, ":", 2, 1),
+            new Token(CssLexer.WS,    " ", 2, 2),
+            new Token(CssLexer.IDENT, "d", 2, 3),
+            new Token(CssLexer.SEMI,  ";", 2, 4),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -428,20 +427,20 @@ public void testTokenOffsetWithEmbeddedComment() {
         String str =  "a: /*comment*/b;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 1, 14),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 15),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 14),
+            new Token(CssLexer.SEMI,  ";", 1, 15),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -453,21 +452,21 @@ public void testTokenLineAndOffsetWithLeadingComment() {
         String str =  "/*comment*/\na: b;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.NL, "\\n", 1, 11),
-            new TokenShim(CssLexerShim.IDENT, "a", 2, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 2, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 2, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 2, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 2, 4),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.NL, "\\n", 1, 11),
+            new Token(CssLexer.IDENT, "a", 2, 0),
+            new Token(CssLexer.COLON, ":", 2, 1),
+            new Token(CssLexer.WS,    " ", 2, 2),
+            new Token(CssLexer.IDENT, "b", 2, 3),
+            new Token(CssLexer.SEMI,  ";", 2, 4),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -479,23 +478,23 @@ public void testTokenOffsetWithFunction() {
         String str =  "a: b(arg);";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 1, 3),
-            new TokenShim(CssLexerShim.LPAREN, "(", 1, 4),
-            new TokenShim(CssLexerShim.IDENT, "arg", 1, 5),
-            new TokenShim(CssLexerShim.RPAREN, ")", 1, 8),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 9),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.LPAREN, "(", 1, 4),
+            new Token(CssLexer.IDENT, "arg", 1, 5),
+            new Token(CssLexer.RPAREN, ")", 1, 8),
+            new Token(CssLexer.SEMI,  ";", 1, 9),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -507,20 +506,20 @@ public void testTokenOffsetWithHash() {
         String str =  "a: #012345;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.HASH, "#012345", 1, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 10),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.HASH, "#012345", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 10),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -532,20 +531,20 @@ public void testTokenOffsetWithDigits() {
         String str =  "a: 123.45;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.NUMBER, "123.45", 1, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 9),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.NUMBER, "123.45", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 9),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -557,22 +556,22 @@ public void testTokenOffsetWithBangImportant() {
         String str =  "a: b !important;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 1, 3),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 4),
-            new TokenShim(CssLexerShim.IMPORTANT_SYM, "!important", 1, 5),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 15),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.WS,    " ", 1, 4),
+            new Token(CssLexer.IMPORTANT_SYM, "!important", 1, 5),
+            new Token(CssLexer.SEMI,  ";", 1, 15),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -584,22 +583,22 @@ public void testTokenOffsetWithSkip() {
         String str =  "a: b !imporzant;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(CssLexerShim.IDENT, "b", 1, 3),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 4),
-            new TokenShim(Token.SKIP, "!imporz", 1, 5),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 15),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.WS,    " ", 1, 4),
+            new Token(Token.SKIP, "!imporz", 1, 5),
+            new Token(CssLexer.SEMI,  ";", 1, 15),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -611,20 +610,20 @@ public void testTokenOffsetWithInvalid() {
         String str =  "a: 1pz;";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.IDENT, "a", 1, 0),
-            new TokenShim(CssLexerShim.COLON, ":", 1, 1),
-            new TokenShim(CssLexerShim.WS,    " ", 1, 2),
-            new TokenShim(Token.INVALID, "1pz", 1, 3),
-            new TokenShim(CssLexerShim.SEMI,  ";", 1, 6),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(Token.INVALID, "1pz", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 6),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -637,33 +636,33 @@ public void testTokenLineAndOffsetMoreFully() {
         String str =  "/*comment*/\n*.foo#bar:baz {\n\ta: 1em;\n}";
         // [?][0] = line
         // [?][1] = offset
-        TokenShim[] expected = {
-            new TokenShim(CssLexerShim.NL,     "\\n",  1, 11),
-            new TokenShim(CssLexerShim.STAR,   "*",    2, 0),
-            new TokenShim(CssLexerShim.DOT,    ".",    2, 1),
-            new TokenShim(CssLexerShim.IDENT,  "foo",  2, 2),
-            new TokenShim(CssLexerShim.HASH,   "#bar", 2, 5),
-            new TokenShim(CssLexerShim.COLON,  ":",    2, 9),
-            new TokenShim(CssLexerShim.IDENT,  "baz",  2, 10),
-            new TokenShim(CssLexerShim.WS,     " ",    2, 13),
-            new TokenShim(CssLexerShim.LBRACE, "{",    2, 14),
-            new TokenShim(CssLexerShim.NL,     "\\n",  2, 15),
-            new TokenShim(CssLexerShim.WS,     "\t",   3, 0),
-            new TokenShim(CssLexerShim.IDENT,  "a",    3, 1),
-            new TokenShim(CssLexerShim.COLON,  ":",    3, 2),
-            new TokenShim(CssLexerShim.WS,     " ",    3, 3),
-            new TokenShim(CssLexerShim.EMS,    "1em",  3, 4),
-            new TokenShim(CssLexerShim.SEMI,   ";",    3, 7),
-            new TokenShim(CssLexerShim.NL,     "\\n",  3, 8),
-            new TokenShim(CssLexerShim.RBRACE, "}",    4, 0),
-            TokenShim.EOF_TOKEN
+        Token[] expected = {
+            new Token(CssLexer.NL,     "\\n",  1, 11),
+            new Token(CssLexer.STAR,   "*",    2, 0),
+            new Token(CssLexer.DOT,    ".",    2, 1),
+            new Token(CssLexer.IDENT,  "foo",  2, 2),
+            new Token(CssLexer.HASH,   "#bar", 2, 5),
+            new Token(CssLexer.COLON,  ":",    2, 9),
+            new Token(CssLexer.IDENT,  "baz",  2, 10),
+            new Token(CssLexer.WS,     " ",    2, 13),
+            new Token(CssLexer.LBRACE, "{",    2, 14),
+            new Token(CssLexer.NL,     "\\n",  2, 15),
+            new Token(CssLexer.WS,     "\t",   3, 0),
+            new Token(CssLexer.IDENT,  "a",    3, 1),
+            new Token(CssLexer.COLON,  ":",    3, 2),
+            new Token(CssLexer.WS,     " ",    3, 3),
+            new Token(CssLexer.EMS,    "1em",  3, 4),
+            new Token(CssLexer.SEMI,   ";",    3, 7),
+            new Token(CssLexer.NL,     "\\n",  3, 8),
+            new Token(CssLexer.RBRACE, "}",    4, 0),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -675,16 +674,16 @@ public void testScanUrl() {
         //             1           2               3        4
         //             01234567890101234567890123450123456780123456789
         String str =  "url(http://foo.bar.com/fonts/serif/fubar.ttf)";
-        TokenShim[] expected = new TokenShim[]{
-            new TokenShim(CssLexerShim.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
-            TokenShim.EOF_TOKEN
+        Token[] expected = new Token[]{
+            new Token(CssLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
+            Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -697,16 +696,16 @@ public void testScanUrlWithWhiteSpace() {
         //             1           2               3        4
         //             01234567890101234567890123450123456780123456789
         String str =  "url(    http://foo.bar.com/fonts/serif/fubar.ttf\t)";
-        TokenShim[] expected = new TokenShim[]{
-                new TokenShim(CssLexerShim.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
-                TokenShim.EOF_TOKEN
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -719,16 +718,16 @@ public void testScanQuotedUrlWithWhiteSpace() {
         //             1           2               3        4
         //             01234567890101234567890123450123456780123456789
         String str =  "url(    'http://foo.bar.com/fonts/serif/fubar.ttf'\t)";
-        TokenShim[] expected = new TokenShim[]{
-                new TokenShim(CssLexerShim.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
-                TokenShim.EOF_TOKEN
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -741,16 +740,16 @@ public void testScanQuotedUrl() {
         //             1           2               3        4
         //             01234567890101234567890123450123456780123456789
         String str =  "url(\"http://foo.bar.com/fonts/serif/fubar.ttf\")";
-        TokenShim[] expected = new TokenShim[]{
-                new TokenShim(CssLexerShim.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
-                TokenShim.EOF_TOKEN
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -763,16 +762,16 @@ public void testScanUrlWithEscapes() {
         //             1           2               3        4
         //             01234567890101234567890123450123456780123456789
         String str =  "url(http://foo.bar.com/fonts/true\\ type/fubar.ttf)";
-        TokenShim[] expected = new TokenShim[]{
-                new TokenShim(CssLexerShim.URL, "http://foo.bar.com/fonts/true type/fubar.ttf", 1, 0),
-                TokenShim.EOF_TOKEN
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/true type/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -785,16 +784,16 @@ public void testScanQuotedUrlWithEscapes() {
         //             1           2               3        4
         //             01234567890101234567890123450123456780123456789
         String str =  "url(\"http://foo.bar.com/fonts/true\\ type/fubar.ttf\")";
-        TokenShim[] expected = new TokenShim[]{
-                new TokenShim(CssLexerShim.URL, "http://foo.bar.com/fonts/true type/fubar.ttf", 1, 0),
-                TokenShim.EOF_TOKEN
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/true type/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -807,16 +806,16 @@ public void testScanUrlWithSyntaxError() {
         //             1           2               3        4
         //             01234567890101234567890123450123456780123456789
         String str =  "url(http://foo.bar.com/fonts/true'type/fubar.ttf)";
-        TokenShim[] expected = new TokenShim[]{
-                new TokenShim(Token.INVALID, "http://foo.bar.com/fonts/true", 1, 0),
-                TokenShim.EOF_TOKEN
+        Token[] expected = new Token[]{
+                new Token(Token.INVALID, "http://foo.bar.com/fonts/true", 1, 0),
+                Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
@@ -829,16 +828,16 @@ public void testScanQuotedUrlWithSyntaxError() {
         //             1           2               3        4
         //             01234567890101234567890123450123456780123456789
         String str =  "url('http://foo.bar.com/fonts/true\rtype/fubar.ttf')";
-        TokenShim[] expected = new TokenShim[]{
-                new TokenShim(Token.INVALID, "http://foo.bar.com/fonts/true", 2, 0),
-                TokenShim.EOF_TOKEN
+        Token[] expected = new Token[]{
+                new Token(Token.INVALID, "http://foo.bar.com/fonts/true", 2, 0),
+                Token.EOF_TOKEN
         };
 
-        List<TokenShim> tlist = getTokens(str);
+        List<Token> tlist = getTokens(str);
         checkTokens(tlist, expected);
 
         for(int n=0; n<tlist.size(); n++) {
-            TokenShim tok = tlist.get(n);
+            Token tok = tlist.get(n);
             assertEquals(expected[n].getLine(), tok.getLine(), "bad line. tok="+tok);
             assertEquals(expected[n].getOffset(), tok.getOffset(), "bad offset. tok="+tok);
         }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/CssParser_mediaQuery_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/css/CssParser_mediaQuery_Test.java
new file mode 100644
index 00000000000..d87de13a04a
--- /dev/null
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/CssParser_mediaQuery_Test.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.javafx.css;
+
+import com.sun.javafx.css.media.expression.ConjunctionExpression;
+import com.sun.javafx.css.media.expression.ConstantExpression;
+import com.sun.javafx.css.media.expression.DisjunctionExpression;
+import com.sun.javafx.css.media.expression.FunctionExpression;
+import javafx.application.ColorScheme;
+import javafx.css.CssParser;
+import javafx.css.Stylesheet;
+import org.junit.jupiter.api.Test;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class CssParser_mediaQuery_Test {
+
+    @Test
+    void parseSimpleMediaQuery() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-color-scheme: light) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(
+            new FunctionExpression<>("prefers-color-scheme", "light", _ -> null, ColorScheme.LIGHT),
+            mediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void parseNestedMediaQuery() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-reduced-motion: reduce) {
+                @media (prefers-color-scheme: light) {
+                    .foo { bar: baz; }
+                }
+            }
+            """);
+
+        var innerMediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        var outerMediaRule = innerMediaRule.getParent();
+        assertEquals(1, innerMediaRule.getQueries().size());
+        assertEquals(1, outerMediaRule.getQueries().size());
+        assertNull(outerMediaRule.getParent());
+        assertEquals(
+            new FunctionExpression<>("prefers-color-scheme", "light", _ -> null, ColorScheme.LIGHT),
+            innerMediaRule.getQueries().getFirst());
+        assertEquals(
+            new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> null, true),
+            outerMediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void parseMediaQueryList() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-color-scheme: dark),
+                   (prefers-reduced-motion),
+                   (prefers-reduced-transparency: no-preference) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(
+            List.of(
+                new FunctionExpression<>("prefers-color-scheme", "dark", _ -> null, ColorScheme.DARK),
+                new FunctionExpression<>("prefers-reduced-motion", null, _ -> null, true),
+                new FunctionExpression<>("prefers-reduced-transparency", "no-preference", _ -> null, false)
+            ),
+            mediaRule.getQueries());
+    }
+
+    @Test
+    void parseConjunction() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-color-scheme: light) and (prefers-reduced-motion: reduce) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(
+            List.of(new ConjunctionExpression(
+                new FunctionExpression<>("prefers-color-scheme", "light", _ -> null, ColorScheme.LIGHT),
+                new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> null, true)
+            )),
+            mediaRule.getQueries());
+    }
+
+    @Test
+    void parseMultiConjunction() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-color-scheme: light) and
+                   (prefers-reduced-motion: reduce) and
+                   (prefers-reduced-transparency: no-preference) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(
+            new ConjunctionExpression(
+                new ConjunctionExpression(
+                    new FunctionExpression<>("prefers-color-scheme", "light", _ -> null, ColorScheme.LIGHT),
+                    new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> false, true)),
+                new FunctionExpression<>("prefers-reduced-transparency", "no-preference", _ -> false, false)
+            ),
+            mediaRule.getQueries().getFirst()
+        );
+    }
+
+    @Test
+    void parseDisjunction() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-color-scheme: light) or (prefers-reduced-motion: reduce) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(
+            new DisjunctionExpression(
+                new FunctionExpression<>("prefers-color-scheme", "light", _ -> null, ColorScheme.LIGHT),
+                new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> null, true)
+            ),
+            mediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void parseMultiDisjunction() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-color-scheme: light) or
+                   (prefers-reduced-motion: reduce) or
+                   (prefers-reduced-transparency: no-preference) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(
+            new DisjunctionExpression(
+                new DisjunctionExpression(
+                    new FunctionExpression<>("prefers-color-scheme", "light", _ -> null, ColorScheme.LIGHT),
+                    new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> false, true)),
+                new FunctionExpression<>("prefers-reduced-transparency", "no-preference", _ -> false, false)
+            ),
+            mediaRule.getQueries().getFirst()
+        );
+    }
+
+    @Test
+    void disjunctionAndConjunctionCanNotBeCombined() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-color-scheme: light) or
+                   (prefers-reduced-motion: reduce) and
+                   (prefers-reduced-transparency: no-preference) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(new ConstantExpression(false), mediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void parsePrefersReducedMotion_booleanContext() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-reduced-motion) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(
+            new FunctionExpression<>("prefers-reduced-motion", null, _ -> null, true),
+            mediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void parsePrefersReducedTransparency_booleanContext() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-reduced-transparency) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(
+            new FunctionExpression<>("prefers-reduced-transparency", null, _ -> null, true),
+            mediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void emptyMediaQuery() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(0, mediaRule.getQueries().size());;
+    }
+
+    @Test
+    void emptyMediaQueryWithNotKeywordEvaluatesToFalse() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media not {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());;
+        assertEquals(new ConstantExpression(false), mediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void invalidMediaFeatureEvaluatesToFalse() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (invalid-media-feature) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(new ConstantExpression(false), mediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void invalidFeatureValueEvaluatesToFalse() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-reduced-motion: invalid-value) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(new ConstantExpression(false), mediaRule.getQueries().getFirst());
+    }
+
+    @Test
+    void parserRecoversWhenMediaQueryIsMalformed() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (#123foo=malformed-query), (prefers-reduced-motion: reduce) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(
+            List.of(
+                new ConstantExpression(false), // the malformed query evaluates to false
+                new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> null, true)
+            ),
+            mediaRule.getQueries());
+    }
+}
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java b/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
index 570e59f5efa..e06a2d3e391 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/StylesheetTest.java
@@ -27,6 +27,8 @@
 
 import com.sun.javafx.css.SimpleSelector;
 import com.sun.javafx.css.StyleManager;
+import com.sun.javafx.css.media.expression.FunctionExpression;
+import javafx.application.ColorScheme;
 import javafx.css.StyleConverter.StringStore;
 import javafx.css.converter.EnumConverter;
 import javafx.css.converter.StringConverter;
@@ -778,4 +780,22 @@ public void testStyleRevertsWhenDataURIStylesheetIsRemoved() {
         assertEquals(Color.BLUE, rect.getFill());
     }
 
+    @Test
+    void serializeStylesheetWithMediaRule() throws IOException {
+        byte[] data = convertCssTextToBinary("""
+            .rect { -fx-fill: blue; }
+            @media (prefers-color-scheme: dark) {
+                .rect { -fx-fill: red; }
+            }
+            """);
+
+        var stylesheet = Stylesheet.loadBinary(new ByteArrayInputStream(data));
+        assertEquals(2, stylesheet.getRules().size());
+        assertNull(stylesheet.getRules().get(0).getMediaRule());
+
+        var mediaRule = stylesheet.getRules().get(1).getMediaRule();
+        assertEquals(
+            new FunctionExpression<>("prefers-color-scheme", "dark", _ -> null, ColorScheme.DARK),
+            mediaRule.getQueries().getFirst());
+    }
 }

From 9374122e3ecb3b0ce328f968cfa3ded0ff85e7ef Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Tue, 3 Dec 2024 00:22:26 +0100
Subject: [PATCH 2/2] Add persistentScrollBars media feature

---
 .../docs/javafx/scene/doc-files/cssref.html   | 27 ++++----
 .../sun/javafx/css/media/MediaFeatures.java   | 36 +++++-----
 .../javafx/scene/SceneMediaQueryContext.java  |  5 ++
 .../java/javafx/css/MediaQueryContext.java    |  7 ++
 .../src/main/java/javafx/scene/Scene.java     | 66 ++++++++++++++++++-
 .../javafx/css/CssParser_mediaQuery_Test.java | 19 +++++-
 6 files changed, 127 insertions(+), 33 deletions(-)

diff --git a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
index 90bddec4573..f361d85b251 100644
--- a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
@@ -820,7 +820,7 @@ <h4>@font-face</h4>
     <h4>@media</h4>
     <p>A media query is a method of testing certain aspects of the <a href="../../../javafx/scene/Scene.html">Scene</a>.
         Media queries are independent of the contents of the scene graph, its styling, or any other internal aspect;
-        they’re only dependent on "external" configuration of the <code>Scene</code>.
+        they're only dependent on "external" configuration of the <code>Scene</code>.
     <p>Several media queries can be combined into a comma-separated <strong>media query list</strong>.
         A media query list evaluates to <code>true</code> if <em>any</em> of the media queries is <code>true</code>,
         and evaluates to <code>false</code> only if <em>all</em> the media queries are <code>false</code>.
@@ -875,16 +875,21 @@ <h4>@media</h4>
                 <td class="value">light | dark</td>
                 <td>not applicable</td>
             </tr>
-        <tr>
-            <td class="value">prefers-reduced-motion</td>
-            <td class="value">no-preference | reduce</td>
-            <td>yes, <code>no-preference</code> evaluates as <code>false</code></td>
-        </tr>
-        <tr>
-            <td class="value">prefers-reduced-transparency</td>
-            <td class="value">no-preference | reduce</td>
-            <td>yes, <code>no-preference</code> evaluates as <code>false</code></td>
-        </tr>
+            <tr>
+                <td class="value">prefers-reduced-motion</td>
+                <td class="value">no-preference | reduce</td>
+                <td><code>no-preference</code> evaluates as <code>false</code></td>
+            </tr>
+            <tr>
+                <td class="value">prefers-reduced-transparency</td>
+                <td class="value">no-preference | reduce</td>
+                <td><code>no-preference</code> evaluates as <code>false</code></td>
+            </tr>
+            <tr>
+                <td class="value">prefers-persistent-scrollbars</td>
+                <td class="value">no-preference | persistent</td>
+                <td><code>no-preference</code> evaluates as <code>false</code></td>
+            </tr>
         </tbody>
     </table>
     <h3><a id="introexamples">Examples</a></h3>
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaFeatures.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaFeatures.java
index 6a959027859..46504e6cbb2 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaFeatures.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/css/media/MediaFeatures.java
@@ -61,32 +61,34 @@ public static MediaQuery featureQueryExpression(String featureName, String featu
                 MediaQueryContext::getColorScheme,
                 ColorScheme.valueOf(featureValue.toUpperCase(Locale.ROOT)));
 
-            case "prefers-reduced-motion" -> booleanReduceQueryExpression(
-                featureName, featureValue, MediaQueryContext::isReducedMotion);
+            case "prefers-reduced-motion" -> booleanPreferenceExpression(
+                featureName, featureValue, "reduce", MediaQueryContext::isReducedMotion);
 
-            case "prefers-reduced-transparency" -> booleanReduceQueryExpression(
-                featureName, featureValue, MediaQueryContext::isReducedTransparency);
+            case "prefers-reduced-transparency" -> booleanPreferenceExpression(
+                featureName, featureValue, "reduce", MediaQueryContext::isReducedTransparency);
+
+            case "prefers-persistent-scrollbars" -> booleanPreferenceExpression(
+                featureName, featureValue, "persistent", MediaQueryContext::isPersistentScrollBars);
 
             default -> throw new IllegalArgumentException(
                 String.format("Unknown media feature <%s>", featureName));
         };
     }
 
-    private static MediaQuery booleanReduceQueryExpression(String featureName,
-                                                           String featureValue,
-                                                           Function<MediaQueryContext, Boolean> argument) {
-        return switch (featureValue) {
-            case "no-preference":
-                yield new FunctionExpression<>(featureName, featureValue, argument, false);
+    private static MediaQuery booleanPreferenceExpression(String featureName,
+                                                          String featureValue,
+                                                          String trueValue,
+                                                          Function<MediaQueryContext, Boolean> argument) {
+        if ("no-preference".equals(featureValue)) {
+            return new FunctionExpression<>(featureName, featureValue, argument, false);
+        }
 
-            case "reduce": // fall through
-            case null:
-                yield new FunctionExpression<>(featureName, featureValue, argument, true);
+        if (featureValue == null || trueValue.equals(featureValue)) {
+            return new FunctionExpression<>(featureName, featureValue, argument, true);
+        }
 
-            default:
-                throw new IllegalArgumentException(
-                    String.format("Unknown value <%s> for media feature <%s>", featureValue, featureName));
-        };
+        throw new IllegalArgumentException(
+            String.format("Unknown value <%s> for media feature <%s>", featureValue, featureName));
     }
 
     private static String checkNotNullValue(String featureName, String featureValue) {
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneMediaQueryContext.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneMediaQueryContext.java
index d3f6642b9d5..083c82d938f 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneMediaQueryContext.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/SceneMediaQueryContext.java
@@ -52,4 +52,9 @@ public boolean isReducedMotion() {
     public boolean isReducedTransparency() {
         return scene.isReducedTransparency();
     }
+
+    @Override
+    public boolean isPersistentScrollBars() {
+        return scene.isPersistentScrollBars();
+    }
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/css/MediaQueryContext.java b/modules/javafx.graphics/src/main/java/javafx/css/MediaQueryContext.java
index b2d165639db..0f28d1afbbe 100644
--- a/modules/javafx.graphics/src/main/java/javafx/css/MediaQueryContext.java
+++ b/modules/javafx.graphics/src/main/java/javafx/css/MediaQueryContext.java
@@ -56,4 +56,11 @@ public sealed interface MediaQueryContext permits SceneMediaQueryContext {
      * @return {@code true} if the application should reduce transparency
      */
     boolean isReducedTransparency();
+
+    /**
+     * Provides the value for the {@code prefers-persistent-scrollbars} media feature.
+     *
+     * @return {@code true} if the application should use persistent scroll bars
+     */
+    boolean isPersistentScrollBars();
 }
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index c13337b3133..3f38115a7c7 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -1202,7 +1202,7 @@ public String getName() {
      *         <tr><th>Name</th><td><code>prefers-color-scheme</code></td></tr>
      *         <tr><th>For</th><td><code>@media</code></td></tr>
      *         <tr><th>Value</th><td><code>light</code> | <code>dark</code></td></tr>
-     *         <tr><th>Boolean Context</th><td>no</td></tr>
+     *         <tr><th>Boolean Context</th><td>not applicable</td></tr>
      *     </tbody>
      * </table>
      *
@@ -1224,6 +1224,62 @@ public final void setColorScheme(ColorScheme colorScheme) {
         this.colorScheme.set(colorScheme);
     }
 
+    private final ObjectProperty<Boolean> persistentScrollBars = new MediaProperty<>(
+            "persistentScrollBars", PlatformImpl.getPlatformPreferences().persistentScrollBarsProperty());
+
+    /**
+     * Specifies whether applications should always show scroll bars. If set to {@code false}, applications
+     * may choose to hide scroll bars that are not actively used, or make them smaller or less noticeable.
+     * <p>
+     * This is a <em>null-coalescing</em> property: if set to {@code null}, it evaluates to the
+     * value of {@link Platform.Preferences#persistentScrollBarsProperty()}. Therefore, specifying
+     * a value for this property overrides the platform-provided value.
+     * <p>
+     * This property corresponds to the following CSS media feature:
+     * <table class="striped">
+     *     <caption>Media Feature</caption>
+     *     <tbody>
+     *         <tr><th>Name</th><td><code>prefers-persistent-scrollbars</code></td></tr>
+     *         <tr><th>For</th><td><code>@media</code></td></tr>
+     *         <tr><th>Value</th><td><code>no-preference</code> | <code>persistent</code></td></tr>
+     *         <tr><th>Boolean Context</th>
+     *             <td><code>no-preference</code> evaluates as <code>false</code></td>
+     *         </tr>
+     *     </tbody>
+     * </table>
+     *
+     * @return the {@code persistentScrollBars} property
+     * @defaultValue {@link Platform.Preferences#isPersistentScrollBars()}
+     * @since 24
+     */
+    public final ObjectProperty<Boolean> persistentScrollBarsProperty() {
+        return persistentScrollBars;
+    }
+
+    /**
+     * Gets the value of the {@code persistentScrollBars} property.
+     *
+     * @return the value of the {@code persistentScrollBars} property
+     * @see #persistentScrollBarsProperty()
+     * @see #setPersistentScrollBars(Boolean)
+     * @since 24
+     */
+    public final boolean isPersistentScrollBars() {
+        return persistentScrollBars.get();
+    }
+
+    /**
+     * Sets the value of the {@code persistentScrollBars} property.
+     *
+     * @param value the value
+     * @see #persistentScrollBarsProperty()
+     * @see #isPersistentScrollBars()
+     * @since 24
+     */
+    public final void setPersistentScrollBars(Boolean value) {
+        this.persistentScrollBars.set(value);
+    }
+
     private final ObjectProperty<Boolean> reducedMotion = new MediaProperty<>(
             "reducedMotion", PlatformImpl.getPlatformPreferences().reducedMotionProperty());
 
@@ -1243,7 +1299,7 @@ public final void setColorScheme(ColorScheme colorScheme) {
      *         <tr><th>For</th><td><code>@media</code></td></tr>
      *         <tr><th>Value</th><td><code>no-preference</code> | <code>reduce</code></td></tr>
      *         <tr><th>Boolean Context</th>
-     *             <td>yes, <code>no-preference</code> evaluates as <code>false</code></td>
+     *             <td><code>no-preference</code> evaluates as <code>false</code></td>
      *         </tr>
      *     </tbody>
      * </table>
@@ -1299,7 +1355,7 @@ public final void setReducedMotion(Boolean value) {
      *         <tr><th>For</th><td><code>@media</code></td></tr>
      *         <tr><th>Value</th><td><code>no-preference</code> | <code>reduce</code></td></tr>
      *         <tr><th>Boolean Context</th>
-     *             <td>yes, <code>no-preference</code> evaluates as <code>false</code></td>
+     *             <td><code>no-preference</code> evaluates as <code>false</code></td>
      *         </tr>
      *     </tbody>
      * </table>
@@ -6644,6 +6700,10 @@ Accessible getAccessible() {
         return accessible;
     }
 
+    /**
+     * Property implementation for media features that causes CSS to be re-applied when the property
+     * value is changed. This is required to re-evaluate media queries in stylesheets.
+     */
     private class MediaProperty<T> extends NullCoalescingPropertyBase<T> {
         private final String name;
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/CssParser_mediaQuery_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/css/CssParser_mediaQuery_Test.java
index d87de13a04a..de04cf7aa5f 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/css/CssParser_mediaQuery_Test.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/css/CssParser_mediaQuery_Test.java
@@ -161,7 +161,7 @@ void parseMultiDisjunction() {
         Stylesheet stylesheet = new CssParser().parse("""
             @media (prefers-color-scheme: light) or
                    (prefers-reduced-motion: reduce) or
-                   (prefers-reduced-transparency: no-preference) {
+                   (prefers-persistent-scrollbars: persistent) {
                 .foo { bar: baz; }
             }
             """);
@@ -173,7 +173,7 @@ void parseMultiDisjunction() {
                 new DisjunctionExpression(
                     new FunctionExpression<>("prefers-color-scheme", "light", _ -> null, ColorScheme.LIGHT),
                     new FunctionExpression<>("prefers-reduced-motion", "reduce", _ -> false, true)),
-                new FunctionExpression<>("prefers-reduced-transparency", "no-preference", _ -> false, false)
+                new FunctionExpression<>("prefers-persistent-scrollbars", "persistent", _ -> false, true)
             ),
             mediaRule.getQueries().getFirst()
         );
@@ -224,6 +224,21 @@ void parsePrefersReducedTransparency_booleanContext() {
             mediaRule.getQueries().getFirst());
     }
 
+    @Test
+    void parsePrefersPersistentScrollBars_booleanContext() {
+        Stylesheet stylesheet = new CssParser().parse("""
+            @media (prefers-persistent-scrollbars) {
+                .foo { bar: baz; }
+            }
+            """);
+
+        var mediaRule = stylesheet.getRules().getFirst().getMediaRule();
+        assertEquals(1, mediaRule.getQueries().size());
+        assertEquals(
+            new FunctionExpression<>("prefers-persistent-scrollbars", null, _ -> null, true),
+            mediaRule.getQueries().getFirst());
+    }
+
     @Test
     void emptyMediaQuery() {
         Stylesheet stylesheet = new CssParser().parse("""