diff --git a/asciidoc/images/bullet.gif b/asciidoc/images/bullet.gif
deleted file mode 100644
index a1b174881..000000000
Binary files a/asciidoc/images/bullet.gif and /dev/null differ
diff --git a/asciidoc/images/closed.gif b/asciidoc/images/closed.gif
deleted file mode 100644
index 319fe8da1..000000000
Binary files a/asciidoc/images/closed.gif and /dev/null differ
diff --git a/asciidoc/images/discovery.gif b/asciidoc/images/discovery.gif
deleted file mode 100644
index ec6cca452..000000000
Binary files a/asciidoc/images/discovery.gif and /dev/null differ
diff --git a/asciidoc/images/grippie.png b/asciidoc/images/grippie.png
deleted file mode 100644
index d863dc75d..000000000
Binary files a/asciidoc/images/grippie.png and /dev/null differ
diff --git a/asciidoc/images/open.gif b/asciidoc/images/open.gif
deleted file mode 100644
index bd0be79ed..000000000
Binary files a/asciidoc/images/open.gif and /dev/null differ
diff --git a/asciidoc/images/warning.png b/asciidoc/images/warning.png
deleted file mode 100644
index 283cc7127..000000000
Binary files a/asciidoc/images/warning.png and /dev/null differ
diff --git a/asciidoc/images/warning.svg b/asciidoc/images/warning.svg
deleted file mode 100644
index dda19bcc1..000000000
--- a/asciidoc/images/warning.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-
-<!-- An SVG of a warning icon -->
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg>
\ No newline at end of file
diff --git a/asciidoc/style/style.css b/asciidoc/style/style.css
index cb834515f..aeedf0404 100644
--- a/asciidoc/style/style.css
+++ b/asciidoc/style/style.css
@@ -26,8 +26,8 @@ body  {
     margin: 8px auto;
     padding: 0;
     width: 98%;
-    color: #000;
-    background-color: #fff;
+    color: black;
+    background-color: white;
     border-radius: 5px;
     padding-top: 5px;
     padding-bottom: 5px;
@@ -37,15 +37,16 @@ body, p, td, li, ul, ol  {
     font-size: small;
 }
 h1, h2, h3, h4, h5, h6 {
-    color: #7a9438;font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+    color: #7a9438;
+    font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
 }
 h1 {
     color: #7a9438;
-    background-color: #fff;
+    background-color: white;
     background: none;
 }
 h2 {
-    color: #fff;
+    color: white;
     background-color: #7a9438;
     padding-left: 10px;
     font-size: 1.6em;
@@ -85,7 +86,7 @@ blockquote {
     font-size: 1.2em;
     line-height: 1.3em;
     font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
-  color: #696969;
+    color: dimgray;
 }
 pre {
     padding: 0.75em 1.5em;
@@ -94,7 +95,7 @@ pre {
     border: 1px solid #ddd;
 }
 code {
-    background-color: #EEE;
+    background-color: #eee;
 }
 dt {
     font-weight: bold;
@@ -122,27 +123,27 @@ li p {
 #navcontainer  {
     color: white;
     margin-left: 20px;
-    background-color:#7a9438;
+    background-color: #7a9438;
 }
 #navcontainer  a {
     color: white;
     text-decoration: none;
 }
 #nav {
-    background-color:#7a9438;
+    background-color: #7a9438;
 }
 #nav ul {
-    background-color:#7a9438;
+    background-color: #7a9438;
     border-top: 1px solid #7a9438;
     border-right: 1px solid #7a9438;
     border-bottom: 1px solid #7a9438;
     border-left: 0.75em solid #7a9438;
 }
 #nav li a {
-    color: #fff;
+    color: white;
 }
 #nav .title {
-    color: #fff;
+    color: white;
     background: #7a9438;
     border-top: 0;
     border-right: 0;
@@ -150,7 +151,7 @@ li p {
     border-left: 0;
 }
 #nav li li a {
-    background: #fff;
+    background: white;
     color: #7a9438;
     border-top: 0;
     border-right: 0;
@@ -161,7 +162,7 @@ li p {
     background: #9ebf47;
 }
 #top-menu {
-    background-color:#7a9438;
+    background-color: #7a9438;
     border-top: 3px solid #9ebf47;
     border-bottom: 3px solid #9ebf47;
 }
@@ -207,12 +208,12 @@ li p {
     font-weight: 700;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
-    color: #000;
+    color: black;
     background-color: #eee;
     font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
 }
 #content {
-    table-layout:fixed;
+    table-layout: fixed;
 }
 .block h2 {
     margin: 5px 0px 0px 0px;
@@ -220,13 +221,15 @@ li p {
     font-size: 1.2em;
     font-weight: 700;
     border-top-left-radius: 5px;
-    border-top-right-radius: 5px;color: #000;
+    border-top-right-radius: 5px;
+    color: black;
     background-color: #eee;
 }
 .block .content {
     border-bottom-right-radius: 5px;
     border-bottom-left-radius: 5px;
-    margin-bottom: 10px;background-color: #fff;
+    margin-bottom: 10px;
+    background-color: white;
     border: 1px solid #eee;
 }
 #main {
@@ -254,20 +257,20 @@ table.tableblock {
     margin-bottom: 10px;
 }
 table.tableblock thead {
-    background-color: #DEE4CD;
-    border: 1px solid #7A9437;
+    background-color: #dee4cd;
+    border: 1px solid #7a9437;
 }
 table.tableblock th {
     font-family: monospace;
-    border: 1px solid #7A9437;
+    border: 1px solid #7a9437;
     padding: 5px;
 }
 table.tableblock tbody {
-    background-color: #FFFFFF;
-    border: 1px solid #7A9437;
+    background-color: white;
+    border: 1px solid #7a9437;
 }
 table.tableblock td {
-    border: 1px dotted #7A9437;
+    border: 1px dotted #7a9437;
     padding: 5px;
 }
 table.tableblock td p:last-child {
@@ -281,49 +284,52 @@ table.tableblock .valign-middle {
 }
 .note {
     padding: 15px;
-    border-style:solid;
-    border-width:1px;
-    border-color: #F0D88D;
-    background-color: #FCFCCA;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #f0d88d;
+    background-color: #fcfcca;
     margin: 10px;
 }
 .note .title {
-    display:none;
+    display: none;
 }
 .warning:before {
-    content: url(../images/warning.svg)
+    font-size: 1.25rem;
+    color: red;
+    margin: 10px;
+    content: '\0026A0';
 }
 .warning {
-    border-style:solid;
-    border-width:1px;
-    border-color: #F0D88D;
-    background-color: #FCFCCA;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #f0d88d;
+    background-color: #fcfcca;
     margin: 10px;
 }
 .warning .title {
-    display:none;
+    display: none;
 }
 #treemenu {
     padding-left: 10px;
 }
+.treeview .hitarea {
+    cursor: pointer;
+}
 .treeview ul {
     margin: 0;
     padding: 0;
 }
 .treeview li {
-    background: white url(../images/bullet.gif) no-repeat left center;
+    background: white url('data:image/svg+xml;utf-8,<svg version="1.1" width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="6" fill="%237a9438"/></svg>') no-repeat left center;
     list-style-type: none;
     padding-left: 22px;
     margin-bottom: 3px;
 }
 .treeview li.submenu {
-    background: white url(../images/closed.gif) no-repeat left 1px;
-}
-.treeview .hitarea {
-    cursor: pointer;
+    background: white url('data:image/svg+xml;utf-8,<svg version="1.1" width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><polygon points="2,2 14,2 8,14" fill="%237a9438"/></svg>') no-repeat left 1px;
 }
 .treeview li.collapsable, .treeview li.open {
-    background: white url(../images/open.gif) no-repeat left 1px;
+    background: white url('data:image/svg+xml;utf-8,<svg version="1.1" width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><polygon points="2,2 2,14 14,8" fill="%237a9438"/></svg>') no-repeat left 1px;
 }
 .treeview ul.closed {
     display: none;
@@ -342,5 +348,5 @@ table.tableblock .valign-middle {
     color: #7a9438;
 }
 #book {
-    background-color: #FFFFFF;
+    background-color: white;
 }
diff --git a/build-release.xml b/build-release.xml
index e2b887e25..56aa76b63 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -124,6 +124,7 @@
         <echo file="${output.dir}/myrepository-content.txt">[ivy@apache:/]$ find ${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace -type f -print${line.separator}</echo>
         <echo file="${output.dir}/myrepository-content.txt" append="true">${myrepository.content}</echo>
         <delete dir="${tutorial.build.dir}"/>
+        <echo>NB! This tutorial fails deliberately!</echo>
         <run-tutorial antfile="${tutorial.src.dir}/build-a-ivy-repository/build.xml" target="maven2-deps" output="${output.dir}/install-deps.txt" failonerror="false"/>
         <pathconvert property="myrepository.content.deps" pathsep="${line.separator}">
             <fileset dir="${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate"/>
@@ -170,7 +171,7 @@
     </target>
 
     <target name="init-asciidoctor-extensions" depends="init-ivy" unless="skip.doc">
-        <ivy:cachepath pathid="asciidoctorj.path" organisation="org.asciidoctor" module="asciidoctorj" revision="1.5.6" inline="true"/>
+        <ivy:cachepath pathid="asciidoctorj.path" organisation="org.asciidoctor" module="asciidoctorj" revision="1.5.6" conf="default" inline="true"/>
         <mkdir dir="${build.dir}/asciidoc-extensions/classes"/>
         <javac srcdir="${doc.src.dir}/templates/extensions/src" destdir="${build.dir}/asciidoc-extensions/classes"
                debug="true" includeantruntime="no" classpathref="asciidoctorj.path"/>
@@ -184,12 +185,12 @@
     <target name="init-asciidoctor" depends="init-asciidoctor-extensions" unless="skip.doc">
         <mkdir dir="${build.dir}/asciidoc-lib/jars" />
         <mkdir dir="${build.dir}/asciidoc-lib/classes" />
-        <ivy:retrieve organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.4" inline="true" pattern="${build.dir}/asciidoc-lib/jars/[artifact].[ext]" conf="default" />
+        <ivy:retrieve organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.4" conf="default" inline="true" pattern="${build.dir}/asciidoc-lib/jars/[artifact].[ext]" conf="default" />
         <unzip src="${build.dir}/asciidoc-lib/jars/asciidoctor-ant.jar" dest="${build.dir}/asciidoc-lib/classes" />
         <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml">
             <classpath>
-                <pathelement location="${build.dir}/asciidoc-extensions/classes" />
-                <pathelement location="${build.dir}/asciidoc-lib/classes" />
+                <pathelement location="${build.dir}/asciidoc-extensions/classes"/>
+                <pathelement location="${build.dir}/asciidoc-lib/classes"/>
             </classpath>
         </taskdef>
     </target>
@@ -208,14 +209,14 @@
             <attribute key="basedir" value="${doc.src.dir}"/>
             <attribute key="imagesdir" value=""/>
             <attribute key="version" value="${build.version}"/>
-            <inlineMacroProcessor blockName="jira" className="org.apache.ivy.asciidoc.JiraMacro" />
+            <inlineMacroProcessor blockName="jira" className="org.apache.ivy.asciidoc.JiraMacro"/>
         </asciidoctor:convert>
     </target>
 
     <target name="generate-book-adoc" depends="default-version,copy-doc-files" unless="skip.doc">
         <scriptdef name="generate-book-adoc" language="javascript">
-            <attribute name="jsontocfile" />
-            <attribute name="destFile" />
+            <attribute name="jsontocfile"/>
+            <attribute name="destFile"/>
             <![CDATA[
                 var tocfile = self.getProject().resolveFile(attributes.get("jsontocfile"))
                 r = new java.io.BufferedReader(new java.io.FileReader(tocfile));
@@ -253,15 +254,15 @@
                 out.close();
             ]]>
         </scriptdef>
-        <mkdir dir="${build.dir}/book" />
-        <generate-book-adoc jsontocfile="${doc.src.dir}/toc.json" destFile="${build.dir}/book/book.adoc" />
+        <mkdir dir="${build.dir}/book"/>
+        <generate-book-adoc jsontocfile="${doc.src.dir}/toc.json" destFile="${build.dir}/book/book.adoc"/>
     </target>
 
     <target name="generate-book" depends="generate-book-adoc,init-asciidoctor">
         <asciidoctor:convert sourceDirectory="${build.dir}/book" outputDirectory="${doc.build.dir}" backend="xhtml5"
                              templateDir="${doc.src.dir}/templates/book" sourceHighlighter="highlightjs" doctype="book">
-            <attribute key="version" value="${build.version}" />
-            <inlineMacroProcessor blockName="jira" className="org.apache.ivy.asciidoc.JiraMacro" />
+            <attribute key="version" value="${build.version}"/>
+            <inlineMacroProcessor blockName="jira" className="org.apache.ivy.asciidoc.JiraMacro"/>
         </asciidoctor:convert>
     </target>