diff --git a/assets/vendors/imagesloaded.pkgd.min.js b/assets/vendors/imagesloaded.pkgd.min.js
new file mode 100644
index 0000000..e443a77
--- /dev/null
+++ b/assets/vendors/imagesloaded.pkgd.min.js
@@ -0,0 +1,7 @@
+/*!
+ * imagesLoaded PACKAGED v4.1.4
+ * JavaScript is all like "You images are done yet or what?"
+ * MIT License
+ */
+
+!function(e,t){"function"==typeof define&&define.amd?define("ev-emitter/ev-emitter",t):"object"==typeof module&&module.exports?module.exports=t():e.EvEmitter=t()}("undefined"!=typeof window?window:this,function(){function e(){}var t=e.prototype;return t.on=function(e,t){if(e&&t){var i=this._events=this._events||{},n=i[e]=i[e]||[];return n.indexOf(t)==-1&&n.push(t),this}},t.once=function(e,t){if(e&&t){this.on(e,t);var i=this._onceEvents=this._onceEvents||{},n=i[e]=i[e]||{};return n[t]=!0,this}},t.off=function(e,t){var i=this._events&&this._events[e];if(i&&i.length){var n=i.indexOf(t);return n!=-1&&i.splice(n,1),this}},t.emitEvent=function(e,t){var i=this._events&&this._events[e];if(i&&i.length){i=i.slice(0),t=t||[];for(var n=this._onceEvents&&this._onceEvents[e],o=0;o<i.length;o++){var r=i[o],s=n&&n[r];s&&(this.off(e,r),delete n[r]),r.apply(this,t)}return this}},t.allOff=function(){delete this._events,delete this._onceEvents},e}),function(e,t){"use strict";"function"==typeof define&&define.amd?define(["ev-emitter/ev-emitter"],function(i){return t(e,i)}):"object"==typeof module&&module.exports?module.exports=t(e,require("ev-emitter")):e.imagesLoaded=t(e,e.EvEmitter)}("undefined"!=typeof window?window:this,function(e,t){function i(e,t){for(var i in t)e[i]=t[i];return e}function n(e){if(Array.isArray(e))return e;var t="object"==typeof e&&"number"==typeof e.length;return t?d.call(e):[e]}function o(e,t,r){if(!(this instanceof o))return new o(e,t,r);var s=e;return"string"==typeof e&&(s=document.querySelectorAll(e)),s?(this.elements=n(s),this.options=i({},this.options),"function"==typeof t?r=t:i(this.options,t),r&&this.on("always",r),this.getImages(),h&&(this.jqDeferred=new h.Deferred),void setTimeout(this.check.bind(this))):void a.error("Bad element for imagesLoaded "+(s||e))}function r(e){this.img=e}function s(e,t){this.url=e,this.element=t,this.img=new Image}var h=e.jQuery,a=e.console,d=Array.prototype.slice;o.prototype=Object.create(t.prototype),o.prototype.options={},o.prototype.getImages=function(){this.images=[],this.elements.forEach(this.addElementImages,this)},o.prototype.addElementImages=function(e){"IMG"==e.nodeName&&this.addImage(e),this.options.background===!0&&this.addElementBackgroundImages(e);var t=e.nodeType;if(t&&u[t]){for(var i=e.querySelectorAll("img"),n=0;n<i.length;n++){var o=i[n];this.addImage(o)}if("string"==typeof this.options.background){var r=e.querySelectorAll(this.options.background);for(n=0;n<r.length;n++){var s=r[n];this.addElementBackgroundImages(s)}}}};var u={1:!0,9:!0,11:!0};return o.prototype.addElementBackgroundImages=function(e){var t=getComputedStyle(e);if(t)for(var i=/url\((['"])?(.*?)\1\)/gi,n=i.exec(t.backgroundImage);null!==n;){var o=n&&n[2];o&&this.addBackground(o,e),n=i.exec(t.backgroundImage)}},o.prototype.addImage=function(e){var t=new r(e);this.images.push(t)},o.prototype.addBackground=function(e,t){var i=new s(e,t);this.images.push(i)},o.prototype.check=function(){function e(e,i,n){setTimeout(function(){t.progress(e,i,n)})}var t=this;return this.progressedCount=0,this.hasAnyBroken=!1,this.images.length?void this.images.forEach(function(t){t.once("progress",e),t.check()}):void this.complete()},o.prototype.progress=function(e,t,i){this.progressedCount++,this.hasAnyBroken=this.hasAnyBroken||!e.isLoaded,this.emitEvent("progress",[this,e,t]),this.jqDeferred&&this.jqDeferred.notify&&this.jqDeferred.notify(this,e),this.progressedCount==this.images.length&&this.complete(),this.options.debug&&a&&a.log("progress: "+i,e,t)},o.prototype.complete=function(){var e=this.hasAnyBroken?"fail":"done";if(this.isComplete=!0,this.emitEvent(e,[this]),this.emitEvent("always",[this]),this.jqDeferred){var t=this.hasAnyBroken?"reject":"resolve";this.jqDeferred[t](this)}},r.prototype=Object.create(t.prototype),r.prototype.check=function(){var e=this.getIsImageComplete();return e?void this.confirm(0!==this.img.naturalWidth,"naturalWidth"):(this.proxyImage=new Image,this.proxyImage.addEventListener("load",this),this.proxyImage.addEventListener("error",this),this.img.addEventListener("load",this),this.img.addEventListener("error",this),void(this.proxyImage.src=this.img.src))},r.prototype.getIsImageComplete=function(){return this.img.complete&&this.img.naturalWidth},r.prototype.confirm=function(e,t){this.isLoaded=e,this.emitEvent("progress",[this,this.img,t])},r.prototype.handleEvent=function(e){var t="on"+e.type;this[t]&&this[t](e)},r.prototype.onload=function(){this.confirm(!0,"onload"),this.unbindEvents()},r.prototype.onerror=function(){this.confirm(!1,"onerror"),this.unbindEvents()},r.prototype.unbindEvents=function(){this.proxyImage.removeEventListener("load",this),this.proxyImage.removeEventListener("error",this),this.img.removeEventListener("load",this),this.img.removeEventListener("error",this)},s.prototype=Object.create(r.prototype),s.prototype.check=function(){this.img.addEventListener("load",this),this.img.addEventListener("error",this),this.img.src=this.url;var e=this.getIsImageComplete();e&&(this.confirm(0!==this.img.naturalWidth,"naturalWidth"),this.unbindEvents())},s.prototype.unbindEvents=function(){this.img.removeEventListener("load",this),this.img.removeEventListener("error",this)},s.prototype.confirm=function(e,t){this.isLoaded=e,this.emitEvent("progress",[this,this.element,t])},o.makeJQueryPlugin=function(t){t=t||e.jQuery,t&&(h=t,h.fn.imagesLoaded=function(e,t){var i=new o(this,e,t);return i.jqDeferred.promise(h(this))})},o.makeJQueryPlugin(),o});
\ No newline at end of file
diff --git a/site/blueprints/pages/xmlsitemap.yml b/site/blueprints/pages/xmlsitemap.yml
deleted file mode 120000
index 57274e0..0000000
--- a/site/blueprints/pages/xmlsitemap.yml
+++ /dev/null
@@ -1 +0,0 @@
-../../../modules/kirby-template-sitemap/blueprints/xmlsitemap.yml
\ No newline at end of file
diff --git a/site/blueprints/pages/xmlsitemap.yml b/site/blueprints/pages/xmlsitemap.yml
new file mode 100644
index 0000000..046a025
--- /dev/null
+++ b/site/blueprints/pages/xmlsitemap.yml
@@ -0,0 +1,37 @@
+title: XML Sitemap
+
+options:
+  changeStatus: false
+  changeTempate: false
+  changeSlug: false
+  delete: false
+  changeTitle: false
+
+
+columns:
+  main:
+    width: 2/3
+    sections:
+
+      content:
+        type: fields
+        fields:
+          info:
+            type: info
+            text: >
+              This site generates a html-base sitemap (a human readable one).
+              <br>
+              You should probably set some of the following options in the config.php
+              <br>
+              <pre>c::set('smap_ignoreSite', array(...));</pre>
+              <pre>c::set('smap_ignoreTemplate', array(...));</pre>
+
+              For more information see the readme.
+
+  sidebar:
+    width: 1/3
+    sections:
+
+      pages: false
+
+      files: false
diff --git a/site/snippets/base/html-end.php b/site/snippets/base/html-end.php
index 8d6b7ab..b17f5a6 100644
--- a/site/snippets/base/html-end.php
+++ b/site/snippets/base/html-end.php
@@ -44,14 +44,19 @@ echo js('assets/vendors/bootstrap/js/dist/carousel.js');
   </style>
 
   <?php echo js('assets/vendors/masonry/dist/masonry.pkgd.min.js');?>
+  <?php echo js('assets/vendors/imagesloaded.pkgd.min.js');?>
 
   <script type="text/javascript" nonce="nRfqpuKWNuYyUAFPTr6WVNZk9">
-    $('#masonry').masonry({
-      isFitWidth: true,
+    var $grid = $('#masonry').masonry({
+      fitWidth: true,
       columnWidth: <?php echo c::get('plg_masonry.width') ?>,
       gutter: 10,
       itemSelector: '.masonryitem'
     });
+    // layout Masonry after each image loads
+    $grid.imagesLoaded().progress( function() {
+      $grid.masonry('layout');
+    });
   </script>
 
   <?php echo js('assets/vendors/swipebox/src/js/jquery.swipebox.min.js');?>
diff --git a/site/templates/xmlsitemap.php b/site/templates/xmlsitemap.php
deleted file mode 120000
index 2c42bd4..0000000
--- a/site/templates/xmlsitemap.php
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/kirby-template-sitemap/templates/xmlsitemap.php
\ No newline at end of file
diff --git a/site/templates/xmlsitemap.php b/site/templates/xmlsitemap.php
new file mode 100755
index 0000000..0d24dc0
--- /dev/null
+++ b/site/templates/xmlsitemap.php
@@ -0,0 +1,54 @@
+<?php
+// -------------------------------------------
+// kirby template FOR all
+// Title:  xmlsitemap
+// deltas: none - base template
+
+// better sitemap for sites containing onepagers:
+// exclude pages from sitemap by intended Template (content file name)
+// so You can exclude the templates, that are only for blueprints or for selecting snippets.
+
+// copyright: Jannik Beyerstedt | http://jannikbeyerstedt.de | code@jannikbeyerstedt.de
+// license: http://www.gnu.org/licenses/gpl-3.0.txt GPLv3 License
+
+// usage:
+// see the readme.md contained in the repository
+
+// version: 1.2.1 (14.10.2016)
+// changelog:
+// v1.1.0: set ignore arrays in config
+// v1.2.0: exclude invisible pages
+// v1.2.1: new option to switch exclusion of invisible pages at root level
+// -------------------------------------------
+
+$ignore         = c::get('smap_ignoreSite');
+$ignoreTemplate = c::get('smap_ignoreTemplate');
+$ignoreShowInvisibleAtRoot = c::get('smap_showHiddenPagesAtRootLevel', false);
+
+// send the right header
+header('Content-type: text/xml; charset="utf-8"');
+
+// echo the doctype
+echo '<?xml version="1.0" encoding="utf-8"?>';
+
+?>
+
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<?php foreach($pages->index() as $p):
+  if($ignore !== null && in_array($p->uri(), $ignore)) continue;
+  if($ignoreTemplate !== null && in_array($p->intendedTemplate(), $ignoreTemplate) ) continue;
+  if($ignoreShowInvisibleAtRoot) {
+    // only ignore invisible pages, which are deeper than root level
+    if($p->isUnlisted() && $p->depth() > 1) continue;
+  } else {
+    // ignore all invisible pages
+    if($p->isUnlisted() && $p->isHomePage() === false) continue;
+  }
+?>
+  <url>
+    <loc><?php echo html($p->url()) ?></loc>
+    <lastmod><?php echo $p->modified('c') ?></lastmod>
+    <priority><?php echo ($p->isHomePage()) ? 1 : number_format(0.5/$p->depth(), 1) ?></priority>
+  </url>
+<?php endforeach ?>
+</urlset>