diff --git a/CHANGES.md b/CHANGES.md
index c1494bd3d..41559e0b1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -96,8 +96,14 @@
 -   pat autofocus: Instead of calling autofocus for each element call it only once.
 -   pat autofocus: Register event handler only once.
 -   pat-checklist: For global de/select buttons, do not change any other checkboxes than the ones the de/select button belongs to.
--   pat-inject: Fix documentation about special target ``self`` and demo that behavior.
--   pat-autosubmit: Fix demo to show configuration on individual inputs.
+-   Documentation fixes:
+    -   pat-inject: Fix documentation about special target ``self`` and demo that behavior.
+    -   pat-autosubmit: Fix demo to show configuration on individual inputs.
+    -   pat-clone demo: Remove unstyled tooltip/clone demo
+    -   pat date picker demo: Use current date for min/max example.
+    -   pat depends demo: Remove unused sections.
+    -   pat expandable tree demo: Extend the demo with more levels and folders.
+    -   pat scroll demo: Remove debug page.
 
 
 ## 3.0.0-dev - unreleased
diff --git a/src/pat/clone/index.html b/src/pat/clone/index.html
index b4268f9c6..7bb14ebf4 100644
--- a/src/pat/clone/index.html
+++ b/src/pat/clone/index.html
@@ -81,80 +81,5 @@
             </fieldset>
         </form>
 
-        <p>
-            Open
-            <a
-                class="pat-tooltip"
-                data-pat-tooltip="ajax ; trigger: click ; closing: close-button"
-                href="#tooltip-content"
-                >a tooltip with a clone in it</a
-            >.
-        </p>
-
-        <div id="tooltip-content" hidden>
-            <form
-                action=""
-                class="pat-validation"
-                data-pat-validation="disable-selector: #submit"
-                novalidate
-            >
-                <h3>List of family members</h3>
-                <div
-                    class="pat-clone"
-                    data-pat-clone="template: #clone-template-tooltip; trigger-element: .clone-trigger-tooltip; max: 5"
-                >
-                    <!-- First visible instance and also template -->
-                    <fieldset class="clone">
-                        <legend>Family member 1</legend>
-                        <input
-                            name="name-1"
-                            size="20"
-                            type="text"
-                            placeholder="Name"
-                            required="required"
-                        />
-                        <input
-                            name="date-1"
-                            type="date"
-                            placeholder="birthdate"
-                        />
-                        <button
-                            type="button"
-                            class="pat-button remove-clone icon-trash"
-                        >
-                            Remove
-                        </button>
-                    </fieldset>
-                    <fieldset id="clone-template-tooltip" hidden>
-                        <legend>Family member #{1}</legend>
-                        <input
-                            name="name-#{1}"
-                            size="20"
-                            type="text"
-                            placeholder="Name"
-                            required="required"
-                        />
-                        <input
-                            name="date-#{1}"
-                            type="date"
-                            placeholder="birthdate"
-                        />
-                        <button
-                            type="button"
-                            class="pat-button remove-clone icon-trash"
-                        >
-                            Remove
-                        </button>
-                    </fieldset>
-                </div>
-                <!-- Clone trigger -->
-                <button type="button" class="pat-button clone-trigger-tooltip">
-                    Add an extra family member
-                </button>
-                <button class="pat-button" id="submit" type="submit">
-                    submit
-                </button>
-            </form>
-        </div>
     </body>
 </html>
diff --git a/src/pat/date-picker/index.html b/src/pat/date-picker/index.html
index 20480afe6..a513a66b1 100644
--- a/src/pat/date-picker/index.html
+++ b/src/pat/date-picker/index.html
@@ -44,14 +44,26 @@
                     /> </label
                 ><br />
                 <label
-                    >Specifying the "min" and "max" attributes.
+                    >Specifying the "min" and "max" attributes. <small>+/- 2 months from today</small>
                     <input
-                        class="pat-date-picker"
+                        class="pat-date-picker demo-minmax"
                         min="2015-01-01"
                         max="2015-12-31"
                         type="date"
                     /> </label
                 ><br />
+                <script charset="utf-8">
+                  var date_arithmetics = function (addsub) {
+                    return new Date(
+                      new Date().setMonth(
+                        new Date().getMonth() + addsub
+                      )
+                    ).toISOString().split("T")[0];
+                  }
+                  var input_minmax = document.querySelector(".demo-minmax");
+                  input_minmax.setAttribute("min", date_arithmetics(-2));
+                  input_minmax.setAttribute("max", date_arithmetics(+2));
+                </script>
                 <label
                     >Show the week number.
                     <input
diff --git a/src/pat/depends/index.html b/src/pat/depends/index.html
index 2ace5b01d..8a93d08a4 100644
--- a/src/pat/depends/index.html
+++ b/src/pat/depends/index.html
@@ -13,9 +13,6 @@
     <body>
       <div id="pat-depends-demo">
         <form action="#">
-            <fieldset class="pat-button-bar">
-                <button type="reset" class="pat-button">Reset</button>
-            </fieldset>
             <fieldset class="horizontal">
                 <fieldset class="group pat-checklist radio">
                     <legend>Flavour</legend>
@@ -97,9 +94,5 @@
             Bad, but <em>extremely</em> tasty!
         </p>
       </div>
-
-      <h2>Open a form in a modal</h2>
-      <a href="./index.html#pat-depends-demo" class="pat-modal">Open form</a>.
-
     </body>
 </html>
diff --git a/src/pat/expandable-tree/index.html b/src/pat/expandable-tree/index.html
index d6c5f6d08..39ded226c 100644
--- a/src/pat/expandable-tree/index.html
+++ b/src/pat/expandable-tree/index.html
@@ -12,29 +12,49 @@
     </head>
     <body>
         <ul class="pat-expandable">
-            <li class="folder">Folder name</li>
+            <li class="folder">Folder 1</li>
             <li class="folder open">
-                Folder name
+                Folder 2
                 <ul>
-                    <li class="document"><a href="#">Document name</a></li>
+                    <li class="document"><a href="#">Document 2.1</a></li>
                     <li class="folder closed">
-                        Folder name
+                        Folder 2.1
                         <ul>
                             <li class="document">
-                                <a href="#">Document name</a>
+                                <a href="#">Document 2.1.1</a>
                             </li>
                         </ul>
                     </li>
-                    <li class="document"><a href="#">Document name</a></li>
-                    <li class="document"><a href="#">Document name</a></li>
-                    <li class="document"><a href="#">Document name</a></li>
-                    <li class="document"><a href="#">Document name</a></li>
-                    <li class="document"><a href="#">Document name</a></li>
+                    <li class="document"><a href="#">Document 2.2</a></li>
+                    <li class="document"><a href="#">Document 2.3</a></li>
                 </ul>
             </li>
-            <li class="folder">Folder name</li>
-            <li class="folder">Folder name</li>
-            <li class="folder">Folder name</li>
+            <li class="folder">Folder 3</li>
+            <li class="folder">
+                      Folder 4
+                      <ul>
+                          <li class="document"><a href="#">Document 4.1</a></li>
+                          <li class="folder">
+                              Folder 4.1
+                              <ul>
+                                  <li class="folder">
+                                      Folder 4.1.1
+                                      <ul>
+                                          <li class="document">
+                                              <a href="#">Document 4.1.1.1</a>
+                                          </li>
+                                      </ul>
+                                  </li>
+                                  <li class="document">
+                                      <a href="#">Document 4.1.1</a>
+                                  </li>
+                              </ul>
+                          </li>
+                          <li class="document"><a href="#">Document 4.1.2</a></li>
+                      </ul>
+                  </li>
+            </li>
+            <li class="folder">Folder 5</li>
         </ul>
     </body>
 </html>
diff --git a/src/pat/scroll/debug.html b/src/pat/scroll/debug.html
deleted file mode 100644
index b411acc6c..000000000
--- a/src/pat/scroll/debug.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>Scroll demo</title>
-        <link rel="stylesheet" href="/style/common.css" type="text/css" />
-        <script
-            src="/dist/bundle.js"
-            type="text/javascript"
-            charset="utf-8"
-        ></script>
-        <style>
-            .current {
-                background-color: beige;
-            }
-            .defunct:after {
-                content: " [defunct]";
-                color: orange;
-            }
-            .weird {
-                font-weight: bold;
-                color: red;
-            }
-            .weird:after {
-                content: " [weird!]";
-            }
-            .high {
-                height: 100px;
-                background-color: #ddd;
-            }
-            article {
-                width: 70%;
-                height: 25em;
-                overflow: auto;
-                position: absolute;
-                top: 50px;
-                right: 0;
-                border: solid blue 1px;
-                padding: 5px;
-            }
-            aside {
-                width: 29%;
-                position: fixed;
-                top: 5em;
-                left: 1em;
-            }
-            .wrapper {
-                position: relative;
-                border: dotted red 1px;
-                padding: 5px;
-            }
-        </style>
-    </head>
-    <body>
-        <article class="pat-rich" id="scrollable">
-            <h1>Some more</h1>
-            <p class="high">A lot of stuff above top</p>
-            <h2>.. and more</h2>
-            <div class="wrapper">
-                <p class="high">A lot of stuff above top</p>
-                <p id="top">
-                    <a href="#top" class="pat-scroll">Top</a> |
-                    <a href="#p1" class="pat-scroll">001</a> |
-                    <a href="#p2" class="pat-scroll">002</a> |
-                    <a href="#p3" class="pat-scroll">003</a> |
-                    <a href="#bottom" class="pat-scroll">Bottom</a>
-                </p>
-                <section id="p1">
-                    <h3>1</h3>
-                    <p>
-                        From fairest creatures we desire increase,<br />
-                        That thereby beauty's rose might never die,<br />
-                        But as the riper should by time decease,<br />
-                        His tender heir might bear his memory:<br />
-                        But thou contracted to thine own bright eyes,<br />
-                        Feed'st thy light's flame with self-substantial fuel,<br />
-                        Making a famine where abundance lies,<br />
-                        Thy self thy foe, to thy sweet self too cruel:<br />
-                        Thou that art now the world's fresh ornament,<br />
-                        And only herald to the gaudy spring,<br />
-                        Within thine own bud buriest thy content,<br />
-                        And tender churl mak'st waste in niggarding:<br />
-                        Pity the world, or else this glutton be,<br />
-                        To eat the world's due, by the grave and thee.
-                    </p>
-                    <p id="p1-nav">
-                        <a href="#top" class="pat-scroll">Back to top</a> |
-                        <a href="#p1" class="pat-scroll">001</a> |
-                        <a href="#p2" class="pat-scroll">002</a> |
-                        <a href="#p3" class="pat-scroll">003</a> |
-                        <a href="#bottom" class="pat-scroll">Bottom</a>
-                    </p>
-                </section>
-                <section id="p2">
-                    <h3>2</h3>
-                    <p>
-                        When forty winters shall besiege thy brow,<br />
-                        And dig deep trenches in thy beauty's field,<br />
-                        Thy youth's proud livery so gazed on now,<br />
-                        Will be a tattered weed of small worth held:<br />
-                        Then being asked, where all thy beauty lies,<br />
-                        Where all the treasure of thy lusty days;<br />
-                        To say within thine own deep sunken eyes,<br />
-                        Were an all-eating shame, and thriftless praise.<br />
-                        How much more praise deserved thy beauty's use,<br />
-                        If thou couldst answer 'This fair child of mine<br />
-                        Shall sum my count, and make my old excuse'<br />
-                        Proving his beauty by succession thine.<br />
-                        This were to be new made when thou art old,<br />
-                        And see thy blood warm when thou feel'st it cold.
-                    </p>
-                    <p id="p2-nav">
-                        <a href="#top" class="pat-scroll">Back to top</a> |
-                        <a href="#p1" class="pat-scroll">001</a> |
-                        <a href="#p2" class="pat-scroll">002</a> |
-                        <a href="#p3" class="pat-scroll">003</a> |
-                        <a href="#bottom" class="pat-scroll">Bottom</a>
-                    </p>
-                </section>
-                <section id="p3">
-                    <h3>3</h3>
-                    <p>
-                        Look in thy glass and tell the face thou viewest,<br />
-                        Now is the time that face should form another,<br />
-                        Whose fresh repair if now thou not renewest,<br />
-                        Thou dost beguile the world, unbless some mother.<br />
-                        For where is she so fair whose uneared womb<br />
-                        Disdains the tillage of thy husbandry?<br />
-                        Or who is he so fond will be the tomb,<br />
-                        Of his self-love to stop posterity?<br />
-                        Thou art thy mother's glass and she in thee<br />
-                        Calls back the lovely April of her prime,<br />
-                        So thou through windows of thine age shalt see,<br />
-                        Despite of wrinkles this thy golden time.<br />
-                        But if thou live remembered not to be,<br />
-                        Die single and thine image dies with thee.
-                    </p>
-                    <p id="p3-nav"></p>
-                </section>
-                <p id="bottom">
-                    <a href="#top" class="pat-scroll">Back to top</a> |
-                    <a href="#p1" class="pat-scroll">001</a> |
-                    <a href="#p2" class="pat-scroll">002</a> |
-                    <a href="#p3" class="pat-scroll">003</a> |
-                    <a href="#bottom" class="pat-scroll">Bottom</a> |
-                    <a
-                        href="#bottom"
-                        class="pat-scroll"
-                        data-pat-scroll="trigger: auto"
-                        >Bottom autoscroll</a
-                    >
-                </p>
-                <p class="high">some extra stuff</p>
-                <p class="high">some extra stuff</p>
-                <p class="high">some extra stuff</p>
-            </div>
-            <!-- /wrapper -->
-        </article>
-        <aside>
-            <h2>Scroll navigation</h2>
-            <ol class="mainnav" id="demo-main-nav">
-                <li><a href="#top" class="pat-scroll">Top</a></li>
-                <li>
-                    <a href="#p1" class="pat-scroll"
-                        >Shakespeare's Sonnet 001</a
-                    >
-                </li>
-                <li>
-                    <a href="#p2" class="pat-scroll"
-                        >Shakespeare's Sonnet 002</a
-                    >
-                </li>
-                <li>
-                    <a href="#p3" class="pat-scroll"
-                        >Shakespeare's Sonnet 003</a
-                    >
-                </li>
-                <li><a href="#bottom" class="pat-scroll">Bottom</a></li>
-            </ol>
-            <h2>Fragment navigation</h2>
-            <ol class="fragnav" id="demo-frag-nav">
-                <li><a href="#top">Top</a></li>
-                <li><a href="#p1">Shakespeare's Sonnet 001</a></li>
-                <li><a href="#p2">Shakespeare's Sonnet 002</a></li>
-                <li><a href="#p3">Shakespeare's Sonnet 003</a></li>
-                <li><a href="#bottom">Bottom</a></li>
-            </ol>
-            <h2>Injection</h2>
-            <ol class="fragnav" id="demo-frag-nav">
-                <li>
-                    <a
-                        href="#p1"
-                        class="pat-inject"
-                        data-pat-inject="source: #p1; target: #p1-nav::element::after && source: #bottom; target: #bottom"
-                        >Shakespeare's Sonnet 001</a
-                    >
-                </li>
-                <li>
-                    <a
-                        href="#p2"
-                        class="pat-inject"
-                        data-pat-inject="source: #p2; target: #p2-nav::element::after && source: #bottom; target: #bottom"
-                        >Shakespeare's Sonnet 002</a
-                    >
-                </li>
-                <li>
-                    <a
-                        href="#p3"
-                        class="pat-inject"
-                        data-pat-inject="source: #p3; target: #p3-nav::element::after && source: #bottom; target: #bottom"
-                        >Shakespeare's Sonnet 003</a
-                    >
-                </li>
-            </ol>
-            <p>
-                The injection links duplicate the targeted section content,
-                changing the length of the scrollable, then also re-inject the
-                bottom auto-scroll link, which should trigger a re-auto-scroll.
-                Clicking these links multiple times demonstrates the "see-saw"
-                effect.
-            </p>
-        </aside>
-    </body>
-</html>
diff --git a/src/pat/scroll/index.html b/src/pat/scroll/index.html
index 7d7bdfb4c..661007498 100644
--- a/src/pat/scroll/index.html
+++ b/src/pat/scroll/index.html
@@ -14,21 +14,12 @@
         .current {
             background-color: beige;
         }
-        #debug {
-            float: right;
-        }
-        #debug a {
-            color: #999;
-        }
-        #scrollable {
-        }
     </style>
     <body>
         <article style="height: 100px">
             <p>Some filler</p>
         </article>
         <article class="pat-rich" id="scrollable">
-            <p id="debug"><a href="debug.html">(debug page)</a></p>
             <ol class="mainnav" id="demo-main-nav">
                 <li>
                     <a href="#p1" class="pat-scroll"