diff --git a/lib/system b/lib/system
index b7d8a48..5bc1c6c 160000
--- a/lib/system
+++ b/lib/system
@@ -1 +1 @@
-Subproject commit b7d8a48710fa4211dff705166a28b809261bda75
+Subproject commit 5bc1c6cd11273562427f3f097d300b6cad32a453
diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc
index e341322..055f428 100644
--- a/mojotrollz/page/autoload.inc
+++ b/mojotrollz/page/autoload.inc
@@ -6,5 +6,4 @@ require_once dirname(__FILE__).'/default_impressum/autoload.inc';
 require_once dirname(__FILE__).'/default_login/autoload.inc';
 require_once dirname(__FILE__).'/default_serverlist/autoload.inc';
 require_once dirname(__FILE__).'/default_beta/autoload.inc';
-require_once dirname(__FILE__).'/default_article/autoload.inc';
-require_once dirname(__FILE__).'/default_item/autoload.inc';
\ No newline at end of file
+require_once dirname(__FILE__).'/default_article/autoload.inc';
\ No newline at end of file
diff --git a/mojotrollz/page/default_item/css/default_item.scss b/mojotrollz/page/default_article/css/default_item.scss
similarity index 99%
rename from mojotrollz/page/default_item/css/default_item.scss
rename to mojotrollz/page/default_article/css/default_item.scss
index 7d72ca7..d601465 100644
--- a/mojotrollz/page/default_item/css/default_item.scss
+++ b/mojotrollz/page/default_article/css/default_item.scss
@@ -40,6 +40,7 @@ $flavour: #FFD100;
   position: relative;
   margin: 2px 2px;
 
+  box-sizing: content-box;
   box-shadow:
     -1px -1px 1px $shadow,
     -1px 1px 1px $shadow,
diff --git a/mojotrollz/page/default_article/default_article.php b/mojotrollz/page/default_article/default_article.php
index 4a06f7f..7fdc547 100644
--- a/mojotrollz/page/default_article/default_article.php
+++ b/mojotrollz/page/default_article/default_article.php
@@ -3,7 +3,12 @@ class default_article extends \SYSTEM\PAGE\Page {
     var $id = null;
     public function __construct($id) {
         $this->id = $id;}
-
+    public static function js(){
+        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_article/js/handlebars-v4.0.5.js'),
+                        \SYSTEM\WEBPATH(new PPAGE(),'default_article/js/default_article.js'));}
+    public static function scss(){
+        return array(   \SYSTEM\SERVERPATH(new PPAGE(),'default_article/css/default_item.scss'));}
+        
     public function html(){
         $element = array('text' => \SYSTEM\PAGE\text::get($this->id));
         $element = array_merge($element,\SYSTEM\PAGE\text::tag('time'));
diff --git a/mojotrollz/page/default_item/js/default_item.js b/mojotrollz/page/default_article/js/default_article.js
similarity index 99%
rename from mojotrollz/page/default_item/js/default_item.js
rename to mojotrollz/page/default_article/js/default_article.js
index 73f3bcd..a8ed772 100644
--- a/mojotrollz/page/default_item/js/default_item.js
+++ b/mojotrollz/page/default_article/js/default_article.js
@@ -1,5 +1,5 @@
-
-var items = {
+function init_article(){
+    var items = {
   
   "hearthstone": {
       
@@ -498,4 +498,5 @@ $body.on("mouseout.wow", ".wow-item" , function(e) {
 
   }
 
-};*/
\ No newline at end of file
+};*/
+}
\ No newline at end of file
diff --git a/mojotrollz/page/default_item/js/handlebars-v4.0.5.js b/mojotrollz/page/default_article/js/handlebars-v4.0.5.js
similarity index 100%
rename from mojotrollz/page/default_item/js/handlebars-v4.0.5.js
rename to mojotrollz/page/default_article/js/handlebars-v4.0.5.js
diff --git a/mojotrollz/page/default_article/tpl/article.tpl b/mojotrollz/page/default_article/tpl/article.tpl
index 31c232e..0ac91a0 100644
--- a/mojotrollz/page/default_article/tpl/article.tpl
+++ b/mojotrollz/page/default_article/tpl/article.tpl
@@ -5,4 +5,109 @@
     <br>
     <button class="btn btn-primary" onclick="system.back();">zurück</button>
     <br>
-</div>
\ No newline at end of file
+    <i class="wow-icon" data-item-id="hearthstone"></i>
+</div>
+
+<script id="wow-item-template" type="text/x-handlebars-template">
+
+  <aside class="wow-item hidden" data-quality="{{ quality }}">
+    <header class="wow-item__header">
+      <p class="header__title">{{ name }}</p>
+      {{#if binds}}<p class="header__binds">Binds {{ binds }}</p>{{/if}}
+      {{#if unique}}
+        <p class="header__unique">Unique</p>
+      {{/if}}
+    </header>
+    <section class="wow-item__type">
+      <p class="type__slot">{{slot}}</p>
+      <p class="type__item">{{type}}</p>
+    </section>
+    <section class="wow-item__stats">
+      
+      {{#if damage}}
+      <p class="stats__damage-armor"><span class="value">{{ damage.min }} - {{damage.max}}</span> Damage</p>
+      <p class="stats__speed">Speed <span class="value">{{ speed damage.speed }}</span></p>
+      <p class="stats__dps">(<span class="value">{{ dps damage }}</span> damage per second)</p>
+      {{/if}}
+      
+      {{#if armor}}
+      <p class="stats__armor">{{ armor }} Armor</p>
+      {{/if}}
+      
+      <div class="stats__list">
+        {{#each stats}}
+        <p class="stats__{{ type }} stats__list-item">+{{ value }} {{ stat }}</p>
+        {{/each}}
+      </div>
+      
+    </section>
+    
+    {{#if enchantments}}
+    <section class="wow-item__enchantments">
+      
+      {{#each enchantments.enchants}}
+      <p class="enchantments__enchant">{{ description }}</p>
+      {{/each}}
+      
+      <div class="enchantments__sockets">
+        
+        {{#each enchantments.sockets }}
+        <p class="enchantments__socket socket--{{ color }}">{{ color }} socket</p>
+        {{/each}}
+
+        {{#if enchantments.socketBonus}}
+        <p class="enchantments__socket-bonus">Socket Bonus: {{ enchantments.socketBonus }}</p>
+        {{/if}}
+        
+      </div>
+      
+    </section>
+    {{/if}}
+    
+    <section class="wow-item__info">
+      
+      {{#if durability}}
+      <p class="info__durability">Durability: {{ durability }} / {{ durability }}</p>
+      {{/if}}
+      
+      {{#each chanceOnHit}}
+      <p class="info__chance-on-hit">Chance on hit: {{ description }}</p>
+      {{/each}}
+      
+      {{#if classes}}
+      <p class="info__class-requirement">Classes: <span class="value">{{ classes classes }}</span></p>
+      {{/if}}
+      
+      {{#if level}}
+      <p class="info__level-requirement">Requires Level {{ level }}</p>
+      {{/if}}
+      
+      {{#if ilevel}}
+      <p class="info__item-level">Item Level {{ ilevel }}</p>
+      {{/if}}
+      
+    </section>
+    
+    {{#if bonuses}}
+    <section class="wow-item__bonuses">
+      {{#each bonuses}}
+      <p class="bonuses__bonus">{{ description }}</p>
+      {{/each}}
+    </section>
+    {{/if}}
+    
+    <section class="wow-item__info">
+
+      {{#if tradelevel }}
+      <p class="info__trade-level">Requires {{ tradelevel.trade }} ({{ tradelevel.level }})</p>
+      {{/if}}
+
+      {{#if flavour }}
+      <p class="info__flavour-text">"{{ flavour }}"</p>
+      {{/if}}
+      
+    </section>
+    
+  </aside>
+  
+</script>
\ No newline at end of file
diff --git a/mojotrollz/page/default_item/autoload.inc b/mojotrollz/page/default_item/autoload.inc
deleted file mode 100644
index e2c9da4..0000000
--- a/mojotrollz/page/default_item/autoload.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__));
\ No newline at end of file
diff --git a/mojotrollz/page/default_item/default_item.php b/mojotrollz/page/default_item/default_item.php
deleted file mode 100644
index fa6aefe..0000000
--- a/mojotrollz/page/default_item/default_item.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-class default_item extends \SYSTEM\PAGE\Page {
-    public static function js(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_item/js/default_item.js'));}
-    public static function css(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_item/css/default_item.scss'));}
-    public function html(){
-        $vars = array();
-        $vars['css'] = \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_item/css/default_item.scss'));
-        $vars['js'] =   \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()).
-                        \SYSTEM\HTML\html::script(\SYSTEM\WEBPATH(new PPAGE(),'default_item/js/handlebars-v4.0.5.js')).
-                        \SYSTEM\HTML\html::script(\SYSTEM\WEBPATH(new PPAGE(),'default_item/js/default_item.js'));
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_item/tpl/default_item.tpl'),$vars);
-    }
-}
diff --git a/mojotrollz/page/default_item/tpl/default_item.tpl b/mojotrollz/page/default_item/tpl/default_item.tpl
deleted file mode 100644
index 8e5dcb7..0000000
--- a/mojotrollz/page/default_item/tpl/default_item.tpl
+++ /dev/null
@@ -1,180 +0,0 @@
-<head>
-    ${css}
-</head>
-<boddy>
-<header class="page">
-  <h2>Warcraft Tooltips</h2>
-  <h3>with css, handlebars and some jQuery</h3>
-</header>
-
-<div class="bag">
-  
-  <header>Backpack</header> 
-  
-  <i class="wow-icon"
-     data-item-id="hearthstone">
-  </i>
-  
-  <i class="wow-icon" 
-     data-item-id="shiny-red-apple">
-  </i>
-  
-  <i class="wow-icon" 
-     data-item-id="melon-juice">
-  </i>
-  
-  <i class="wow-icon" 
-     data-item-id="red-linen-shirt">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="medicine-staff-of-the-monkey">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="hoggers-trousers">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="deepdive-helmet">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="hanzo-sword">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="boots-of-the-petrified-forest">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="the-2-ring">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="dragonwrath-tarecgosas-rest">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="green-hills-of-stranglethorn-11">
-  </i>
-
-  <i class="wow-icon" 
-     data-item-id="hopeglow-spaulders">
-  </i>
-  
-</div>
-
-
-
-
-
-
-
-
-
-<script id="wow-item-template" type="text/x-handlebars-template">
-
-  <aside class="wow-item hidden" data-quality="{{ quality }}">
-    <header class="wow-item__header">
-      <p class="header__title">{{ name }}</p>
-      {{#if binds}}<p class="header__binds">Binds {{ binds }}</p>{{/if}}
-      {{#if unique}}
-        <p class="header__unique">Unique</p>
-      {{/if}}
-    </header>
-    <section class="wow-item__type">
-      <p class="type__slot">{{slot}}</p>
-      <p class="type__item">{{type}}</p>
-    </section>
-    <section class="wow-item__stats">
-      
-      {{#if damage}}
-      <p class="stats__damage-armor"><span class="value">{{ damage.min }} - {{damage.max}}</span> Damage</p>
-      <p class="stats__speed">Speed <span class="value">{{ speed damage.speed }}</span></p>
-      <p class="stats__dps">(<span class="value">{{ dps damage }}</span> damage per second)</p>
-      {{/if}}
-      
-      {{#if armor}}
-      <p class="stats__armor">{{ armor }} Armor</p>
-      {{/if}}
-      
-      <div class="stats__list">
-        {{#each stats}}
-        <p class="stats__{{ type }} stats__list-item">+{{ value }} {{ stat }}</p>
-        {{/each}}
-      </div>
-      
-    </section>
-    
-    {{#if enchantments}}
-    <section class="wow-item__enchantments">
-      
-      {{#each enchantments.enchants}}
-      <p class="enchantments__enchant">{{ description }}</p>
-      {{/each}}
-      
-      <div class="enchantments__sockets">
-        
-        {{#each enchantments.sockets }}
-        <p class="enchantments__socket socket--{{ color }}">{{ color }} socket</p>
-        {{/each}}
-
-        {{#if enchantments.socketBonus}}
-        <p class="enchantments__socket-bonus">Socket Bonus: {{ enchantments.socketBonus }}</p>
-        {{/if}}
-        
-      </div>
-      
-    </section>
-    {{/if}}
-    
-    <section class="wow-item__info">
-      
-      {{#if durability}}
-      <p class="info__durability">Durability: {{ durability }} / {{ durability }}</p>
-      {{/if}}
-      
-      {{#each chanceOnHit}}
-      <p class="info__chance-on-hit">Chance on hit: {{ description }}</p>
-      {{/each}}
-      
-      {{#if classes}}
-      <p class="info__class-requirement">Classes: <span class="value">{{ classes classes }}</span></p>
-      {{/if}}
-      
-      {{#if level}}
-      <p class="info__level-requirement">Requires Level {{ level }}</p>
-      {{/if}}
-      
-      {{#if ilevel}}
-      <p class="info__item-level">Item Level {{ ilevel }}</p>
-      {{/if}}
-      
-    </section>
-    
-    {{#if bonuses}}
-    <section class="wow-item__bonuses">
-      {{#each bonuses}}
-      <p class="bonuses__bonus">{{ description }}</p>
-      {{/each}}
-    </section>
-    {{/if}}
-    
-    <section class="wow-item__info">
-
-      {{#if tradelevel }}
-      <p class="info__trade-level">Requires {{ tradelevel.trade }} ({{ tradelevel.level }})</p>
-      {{/if}}
-
-      {{#if flavour }}
-      <p class="info__flavour-text">"{{ flavour }}"</p>
-      {{/if}}
-      
-    </section>
-    
-  </aside>
-  
-</script>
-${js}
-</boddy>
\ No newline at end of file
diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php
index 31011b6..be57ce3 100644
--- a/mojotrollz/page/page_mojotrollz.php
+++ b/mojotrollz/page/page_mojotrollz.php
@@ -27,7 +27,4 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
         
     public static function page_article($id){
         return (new default_article($id))->html();}
-        
-    public static function page_item(){
-        return (new default_item())->html();}
 }
\ No newline at end of file