diff --git a/source/code/hippie/global.js b/source/code/hippie/global.js
index ef61ad7..0b05906 100644
--- a/source/code/hippie/global.js
+++ b/source/code/hippie/global.js
@@ -1,3 +1,3 @@
 // Setup
 // -----------------------------------------------------------------------------
-// setup();
+setup();
diff --git a/source/screens/demo/basics.njk b/source/screens/demo/basics.njk
index 566d527..8206a8c 100644
--- a/source/screens/demo/basics.njk
+++ b/source/screens/demo/basics.njk
@@ -872,11 +872,6 @@ tags:
 
 {% block script %}
   {{ super() }}
-  {# <script src="{{ pageBase }}js/{{hippie.jsFile}}.min.js" type="text/javascript"></script> #}
-  <!-- build:js js/main.concat.min.js -->
-  <script src="{{ pageBase }}js/variables.js"></script>
-  <script src="{{ pageBase }}js/functions.js"></script>
-  <script src="{{ pageBase }}js/global.js"></script>
   <script>
     assetsLoaded = true;
     logPerf('Assets loaded.', assetsLoaded);
diff --git a/source/screens/demo/components.njk b/source/screens/demo/components.njk
index 795e41f..b1f6ed3 100644
--- a/source/screens/demo/components.njk
+++ b/source/screens/demo/components.njk
@@ -189,19 +189,6 @@ tags:
 {% block script %}
   {{ super() }}
   <script src="{{ pageBase }}vendor/jq-sticky-anything.min.js"></script>
-  {# <script src="{{ pageBase }}js/{{hippie.jsFile}}.min.js" type="text/javascript"></script> #}
-  <!-- build:js js/main.concat.min.js -->
-  <script src="{{ pageBase }}js/variables.js"></script>
-  <script src="{{ pageBase }}js/functions.js"></script>
-  <script src="{{ pageBase }}js/global.js"></script>
   {{ log.asset(true) }}
   {{ log.log('Assets loaded.', assetsLoaded) }}
-  <script>
-    // Page specific
-    // ------------------------------------------------------------------------------
-    $(document).ready(function () {
-      // jq-sticky-anything
-      $('#js_demo_fix').stickThis({pushup: '#js_demo_stop'});
-    });
-  </script>
 {% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/card.njk b/source/screens/demo/examples/card.njk
index 353fed9..ee7011a 100644
--- a/source/screens/demo/examples/card.njk
+++ b/source/screens/demo/examples/card.njk
@@ -59,11 +59,6 @@ tags:
 
 {% block script %}
   {{ super() }}
-  {# <script src="{{ pageBase }}js/{{hippie.jsFile}}.min.js" type="text/javascript"></script> #}
-  <!-- build:js js/main.concat.min.js -->
-  <script src="{{ pageBase }}js/variables.js"></script>
-  <script src="{{ pageBase }}js/functions.js"></script>
-  <script src="{{ pageBase }}js/global.js"></script>
   <script>
     $(document).ready(function () {
       // composeMail('.card_address', 'neues', 'interaktionsweise', 'de', '', '');
diff --git a/source/screens/demo/index.njk b/source/screens/demo/index.njk
index 7037dce..16ecac9 100644
--- a/source/screens/demo/index.njk
+++ b/source/screens/demo/index.njk
@@ -72,11 +72,6 @@ tags:
 
 {% block script %}
   {{ super() }}
-  {# <script src="{{ pageBase }}js/{{ hippie.jsFile }}.min.js"></script> #}
-  <!-- build:js js/main.concat.min.js -->
-  <script src="{{ pageBase }}js/variables.js"></script>
-  <script src="{{ pageBase }}js/functions.js"></script>
-  <script src="{{ pageBase }}js/global.js"></script>
   <script>
     assetsLoaded = true;
     logPerf('BODY        :: Assets loaded, running page specific script...');
@@ -84,7 +79,6 @@ tags:
     // ------------------------------------------------------------------------------
     $(document).ready(function () {
       logPerf('EVENT       :: jQuery \'ready\' event fired.');
-      setup();
     });
     logPerf('Application ready... not.');
   </script>
diff --git a/source/screens/demo/introduction.njk b/source/screens/demo/introduction.njk
index 3d82d76..792967e 100644
--- a/source/screens/demo/introduction.njk
+++ b/source/screens/demo/introduction.njk
@@ -32,11 +32,6 @@ tags:
 
 {% block script %}
   {{ super() }}
-  {# <script src="{{ pageBase }}js/{{hippie.jsFile}}.min.js" type="text/javascript"></script> #}
-  <!-- build:js js/main.concat.min.js -->
-  <script src="{{ pageBase }}js/variables.js"></script>
-  <script src="{{ pageBase }}js/functions.js"></script>
-  <script src="{{ pageBase }}js/global.js"></script>
   <script>
     assetsLoaded = true;
     logPerf('Assets loaded.', assetsLoaded);
diff --git a/source/screens/demo/layouts.njk b/source/screens/demo/layouts.njk
index 2683443..82d97e1 100644
--- a/source/screens/demo/layouts.njk
+++ b/source/screens/demo/layouts.njk
@@ -322,11 +322,6 @@ tags:
 {% block script %}
   {{ super() }}
   <script src="{{ pageBase }}vendor/jq-sticky-anything.min.js" type="text/javascript"></script>
-  {# <script src="{{ pageBase }}js/{{hippie.jsFile}}.min.js" type="text/javascript"></script> #}
-  <!-- build:js js/main.concat.min.js -->
-  <script src="{{ pageBase }}js/variables.js"></script>
-  <script src="{{ pageBase }}js/functions.js"></script>
-  <script src="{{ pageBase }}js/global.js"></script>
   {{ log.asset(true) }}
   {{ log.log('Assets loaded.', assetsLoaded) }}
   <script>
diff --git a/source/templates/demo/_main.njk b/source/templates/demo/_main.njk
index c0d545d..10bde89 100644
--- a/source/templates/demo/_main.njk
+++ b/source/templates/demo/_main.njk
@@ -8,19 +8,14 @@
 
 {% block links %}
   {{ super() }}
-{% if hippie.legacyMode %}
-  <!--[if lte IE 9]> <script src="https://cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv.min.js"></script> <![endif]-->
-  <!--[if lte IE 9]> <script src="https://cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script> <![endif]-->
-  <!--Local alternative: <script src="./code/html5shiv.min.js"></script>-->
-  <!--Only use one of the above!-->
-{% endif %}
+  {% if hippie.legacyMode %}
+    <!--[if lte IE 9]> <script src="https://cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv.min.js"></script> <![endif]-->
+    <!--[if lte IE 9]> <script src="https://cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script> <![endif]-->
+    <!--Local alternative: <script src="./code/html5shiv.min.js"></script>-->
+    <!--Only use one of the above!-->
+  {% endif %}
 
   <!-- <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,500,500italic,700' rel='stylesheet' type='text/css'> -->
   <link rel="stylesheet" type="text/css" media="all" href="{{ pageBase }}css/demo.css"/>
   <!-- <link rel="stylesheet" type="text/css" media="print" href="{{ pageBase }}css/print.css"/> -->
 {% endblock %}
-
-{% block script %}
-  {{ super() }}
-  <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
-{% endblock %}
diff --git a/source/templates/hippie/_default.njk b/source/templates/hippie/_default.njk
index 2fcbcd1..8756e7f 100644
--- a/source/templates/hippie/_default.njk
+++ b/source/templates/hippie/_default.njk
@@ -1,5 +1,7 @@
 <!-- default.template -->
-{% import "hippie/macros/_log.njk" as log %}
+{# {% if hippie.debugMode %} #}
+  {% import "hippie/macros/_log.njk" as log %}
+{# {% endif %} #}
 
 <!DOCTYPE html>
 <html lang="de" class="{{ pageClass }}" id="{{ pageId }}">
diff --git a/source/templates/hippie/_main.njk b/source/templates/hippie/_main.njk
index 9a76aad..b7d305a 100644
--- a/source/templates/hippie/_main.njk
+++ b/source/templates/hippie/_main.njk
@@ -41,6 +41,13 @@
 
     {% block script %}
       {{ log.log('BODY        :: Loading script assets...') }}
+      {# <script src="{{ pageBase }}js/{{hippie.jsFile}}.min.js" type="text/javascript"></script> #}
+      <!-- build:js js/main.concat.min.js -->
+      {# // TODO: Remove dependecy to jQuery; at least maek it optional #}
+      <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+      <script src="{{ pageBase }}js/variables.js"></script>
+      <script src="{{ pageBase }}js/functions.js"></script>
+      <script src="{{ pageBase }}js/global.js"></script>
     {% endblock %}
 
     {{ log.log('BODY end    :: Page script might still be loading.') }}