diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc
index 91e38dda22b..98aaa17a1b9 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc
@@ -19,7 +19,7 @@
 
 To start Jetty on the default port of 8080, run the following command:
 
-[source, shell]
+[source, screen]
 ....
 > cd $JETTY_HOME
 > java -jar start.jar
@@ -41,7 +41,7 @@ Instead, see how to link:#creating-jetty-base[create a Jetty Base] below.
 
 Within the standard jetty distribution there is the `demo-base` directory, which demonstrates the recommended way to run Jetty in a directory separately from $JETTY_HOME:
 
-[source, shell]
+[source, screen]
 ....
 > cd $JETTY_HOME/demo-base/
 > java -jar $JETTY_HOME/start.jar
@@ -77,7 +77,7 @@ ____
 
 You can see the configuration of the demo-base by using the following commands:
 
-[source, shell]
+[source, screen]
 ....
 > cd $JETTY_HOME/demo-base/
 > java -jar $JETTY_HOME/start.jar --list-modules
@@ -100,7 +100,7 @@ jetty.base::
 
 The `jetty.home` and `jetty.base` properties may be explicitly set on the command line, or they can be inferred from the environment if used with commands like:
 
-[source, shell]
+[source, screen]
 ....
 > cd $JETTY_BASE
 > java -jar $JETTY_HOME/start.jar
@@ -108,7 +108,7 @@ The `jetty.home` and `jetty.base` properties may be explicitly set on the comman
 
 The following commands: create a new base directory; enables a HTTP connector and the web application deployer; copies a demo webapp to be deployed:
 
-[source, shell]
+[source, screen]
 ....
 > JETTY_BASE=/tmp/mybase
 > mkdir $JETTY_BASE
@@ -145,7 +145,7 @@ INFO: Base directory was modified
 
 You can configure Jetty to run on a different port by setting the `jetty.http.port` Property on the command line:
 
-[source, shell]
+[source, screen]
 ....
 > cd $JETTY_BASE
 > java -jar $JETTY_HOME/start.jar jetty.http.port=8081
@@ -173,7 +173,7 @@ ____
 
 To add the HTTPS connector to a jetty configuration, the https module can be activated by the following command:
 
-[source, shell]
+[source, screen]
 ....
 > java -jar $JETTY_HOME/start.jar --add-to-startd=https,http2
 [...]
@@ -201,7 +201,7 @@ ____
 
 You can configure the SSL connector to run on a different port by setting the `jetty.ssl.port` property on the command line:
 
-[source, shell]
+[source, screen]
 ....
 > cd $JETTY_BASE
 > java -jar $JETTY_HOME/start.jar jetty.ssl.port=8444
@@ -216,7 +216,7 @@ If you used --add-to-start command, then you can edit this property in the start
 The job of the `start.jar` is to interpret the command line, `start.ini` and `start.d` to build a Java classpath and list of properties and configuration files to pass to the main class of the Jetty XML configuration mechanism. 
 The `start.jar` mechanism has many options which are documented in the xref:startup[] administration section and you can see them in summary by using the command:
 
-[source, shell]
+[source, screen]
 ....
 > java -jar $JETTY_HOME/start.jar --help
 ....
diff --git a/jetty-documentation/src/main/docbkx-stylesheet/html/docbook.xsl b/jetty-documentation/src/main/docbkx-stylesheet/html/docbook.xsl
index 871fae85171..9f7c11eb2e1 100644
--- a/jetty-documentation/src/main/docbkx-stylesheet/html/docbook.xsl
+++ b/jetty-documentation/src/main/docbkx-stylesheet/html/docbook.xsl
@@ -157,7 +157,7 @@ xmlns:date="http://exslt.org/dates-and-times"
       </h5>
       <p>
  private support for your internal/customer projects ... custom extensions and distributions ... versioned snapshots for indefinite support ...
- scalability guidance for your apps and Ajax/Comet projects ... development services from 1 day to full product delivery
+ scalability guidance for your apps and Ajax/Comet projects ... development services for sponsored feature development
       </p>
    </div>
 
@@ -220,45 +220,29 @@ xmlns:date="http://exslt.org/dates-and-times"
     </script>
   </xsl:template>
 
-
-  <xsl:template match="d:screen">
-    <xsl:element name="div">
-      <xsl:attribute name="class">screenexample</xsl:attribute>
-      <xsl:element name="pre">
-        <xsl:attribute name="class">screen</xsl:attribute>
-        <!--<xsl:value-of select="text()"/>-->
-        <xsl:apply-templates/>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-
  <!-- 
    - synxtax highlighting 
    -->
   <xsl:template match="d:programlisting">
-    <pre>
-      <code>
-        <xsl:value-of select="text()"/>
-      </code>
-    </pre>
-    <!--
-
-      <xsl:variable name="startinglinenumber">
-        <xsl:choose>
-          <xsl:when test="@startinglinenumber">; first-line: <xsl:value-of select="@startinglinenumber"/></xsl:when>
-          <xsl:otherwise></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="linenumbering">
-        <xsl:choose>
-          <xsl:when test="@linenumbering='unnumbered'">; gutter: false</xsl:when>
-          <xsl:otherwise></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="brushstyle">;toolbar: false<xsl:copy-of select="$highlight"/><xsl:copy-of select="$startinglinenumber"/><xsl:copy-of select="$linenumbering"/></xsl:variable>
-    -->
+    <xsl:choose>
+      <xsl:when test="@language = 'screen'">
+      <xsl:element name="div">
+        <xsl:attribute name="class">screenexample</xsl:attribute>
+        <xsl:element name="pre">
+          <xsl:attribute name="class">screen</xsl:attribute>
+            <xsl:value-of select="text()"/>
+          <xsl:apply-templates/>
+        </xsl:element>
+      </xsl:element>
+      </xsl:when>
+      <xsl:otherwise>
+        <pre>
+          <code>
+            <xsl:value-of select="text()"/>
+          </code>
+        </pre>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>