diff --git a/lib/system b/lib/system
index 5e9bb34..c7b4191 160000
--- a/lib/system
+++ b/lib/system
@@ -1 +1 @@
-Subproject commit 5e9bb34d0e7494b7beee926113863493c2ecce74
+Subproject commit c7b419164cf958c206568f77c0220ac19ca978b7
diff --git a/mojotrollz/page/default_article/default_article.php b/mojotrollz/page/default_article/default_article.php
index 7fdc547..c07bcdb 100644
--- a/mojotrollz/page/default_article/default_article.php
+++ b/mojotrollz/page/default_article/default_article.php
@@ -4,14 +4,14 @@ class default_article extends \SYSTEM\PAGE\Page {
     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'));}
+        return array(   new PPAGE('default_article/js/handlebars-v4.0.5.js'),
+                        new PPAGE('default_article/js/default_article.js'));}
     public static function scss(){
-        return array(   \SYSTEM\SERVERPATH(new PPAGE(),'default_article/css/default_item.scss'));}
+        return array(   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'));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_article/tpl/article.tpl'), $element);
+        return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_article/tpl/article.tpl'))->SERVERPATH(), $element);
     }
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_beta/default_beta.php b/mojotrollz/page/default_beta/default_beta.php
index 93a6c93..c965d1f 100644
--- a/mojotrollz/page/default_beta/default_beta.php
+++ b/mojotrollz/page/default_beta/default_beta.php
@@ -8,16 +8,16 @@ class default_beta extends \SYSTEM\PAGE\Page {
             $vars = array();
             $vars['invalid_key'] = ($this->key && !\SYSTEM\SECURITY\Security::isLoggedIn()) ? '<p><font color="red">Your key is invalid or already in use!</font></p>' : '';
             $vars['beta_area'] =    \SYSTEM\SECURITY\Security::isLoggedIn() ?
-                                    \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_loggedin.tpl'), array('email' => \SYSTEM\SECURITY\Security::getUser()->email,'username' => \SYSTEM\SECURITY\Security::getUser()->username)) :
-                                    \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_loggedout.tpl'));
+                                    \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedin.tpl'))->SERVERPATH(), array('email' => \SYSTEM\SECURITY\Security::getUser()->email,'username' => \SYSTEM\SECURITY\Security::getUser()->username)) :
+                                    \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedout.tpl'))->SERVERPATH());
             $vars = array_merge($vars,\SYSTEM\PAGE\text::tag('mojotrollz'));
-            return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta.tpl'), $vars);
+            return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta.tpl'))->SERVERPATH(), $vars);
         }
         $vars['key'] = $this->key;
         $vars = array_merge($vars,\SYSTEM\PAGE\text::tag('mojotrollz'));
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_register.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_register.tpl'))->SERVERPATH(), $vars);
     }
     public static function js(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_beta/js/default_beta.js'),
+        return array(   new PPAGE('default_beta/js/default_beta.js'),
                         \LIB\lib_jqbootstrapvalidation::js());}
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_beta/tpl/beta.tpl b/mojotrollz/page/default_beta/tpl/beta.tpl
index 77456ca..3afc415 100644
--- a/mojotrollz/page/default_beta/tpl/beta.tpl
+++ b/mojotrollz/page/default_beta/tpl/beta.tpl
@@ -1,13 +1,12 @@
-<div class="mojotrollz_col_content">
+<div style="padding-left: 10px; padding-right: 10px;">
     <div class="row">
         <div class="col-md-8">
-            <h2>Mojotrollz Beta</h2>
             ${invalid_key}
         </div>
         <div class="col-md-8">
             ${mojotrollz_progressive}
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4" style="padding-top: 25px;">
             ${beta_area}
         </div>
     </div>
diff --git a/mojotrollz/page/default_impressum/default_impressum.php b/mojotrollz/page/default_impressum/default_impressum.php
index d4875f1..dd37584 100644
--- a/mojotrollz/page/default_impressum/default_impressum.php
+++ b/mojotrollz/page/default_impressum/default_impressum.php
@@ -2,6 +2,6 @@
 class default_impressum extends \SYSTEM\PAGE\Page {
     public function html(){
         $vars['impressum'] = \SYSTEM\PAGE\text::get('webcraft_impressum');
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_impressum/tpl/impressum.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressum/tpl/impressum.tpl'))->SERVERPATH(), $vars);
     }
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_login/default_login.php b/mojotrollz/page/default_login/default_login.php
index 0e22991..c32135d 100644
--- a/mojotrollz/page/default_login/default_login.php
+++ b/mojotrollz/page/default_login/default_login.php
@@ -1,10 +1,10 @@
 <?php
 class default_login extends \SYSTEM\PAGE\Page {
     public static function js(){
-        return array(\SYSTEM\WEBPATH(new \PPAGE(),'default_login/js/default_login.js'));}
+        return array(new \PPAGE('default_login/js/default_login.js'));}
     public function html(){
         return \SYSTEM\SECURITY\Security::isLoggedIn() ? 
-                \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_login/tpl/loggedin.tpl'), \SYSTEM\PAGE\text::tag('mojotrollz'))
-                : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_login/tpl/loggedout.tpl'), \SYSTEM\PAGE\text::tag('mojotrollz'));
+                \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_login/tpl/loggedin.tpl'))->SERVERPATH(), \SYSTEM\PAGE\text::tag('mojotrollz'))
+                : \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_login/tpl/loggedout.tpl'))->SERVERPATH(), \SYSTEM\PAGE\text::tag('mojotrollz'));
     }
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css
index 09d6c2d..7439e74 100644
--- a/mojotrollz/page/default_page/css/default_page.css
+++ b/mojotrollz/page/default_page/css/default_page.css
@@ -73,10 +73,14 @@ mojotrollz_download_first{
 #content_teamspeak{}
 
 .mojotrollz_col_content{
-    padding-left: 35px;
-    padding-right: 35px;
+    padding-left: 25px;
+    padding-right: 25px;
     padding-bottom: 25px;
 }
+.mojotrollz_col_contentmain{
+    padding-left: 30px;
+    padding-right: 30px;
+}
 
 .ontop{
     z-index: 3;
diff --git a/mojotrollz/page/default_page/default_page.php b/mojotrollz/page/default_page/default_page.php
index ba44b30..44b1f1b 100644
--- a/mojotrollz/page/default_page/default_page.php
+++ b/mojotrollz/page/default_page/default_page.php
@@ -1,26 +1,29 @@
 <?php
 class default_page extends \SYSTEM\PAGE\Page {
     private static function js(){        
-        return  \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()).
-                \SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()).
-                \SYSTEM\HTML\html::script(\LIB\lib_system::js()).
-                \SYSTEM\HTML\html::script(\LIB\lib_jqbootstrapvalidation::js()).
-                \SYSTEM\HTML\html::script(\LIB\lib_flexslider::js()).
-                \SYSTEM\HTML\html::script(\SYSTEM\WEBPATH(new PPAGE(),'default_page/js/default_page.js'));
+        return  \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
+                \SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
+                \SYSTEM\HTML\html::script(\LIB\lib_jqbootstrapvalidation::js()->WEBPATH()).
+                \SYSTEM\HTML\html::script(\LIB\lib_flexslider::js()->WEBPATH()).
+                \SYSTEM\HTML\html::script(\SYSTEM\CACHE\cache_js::url(
+                    array(  \LIB\lib_system::js(),
+                            new PPAGE('default_page/js/default_page.js'))));
     }
     
     private static function css(){  
-        return  \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()).
-                \SYSTEM\HTML\html::link(\LIB\lib_font_awesome::css()).
-                \SYSTEM\HTML\html::link(\LIB\lib_animate::css()).
-                \SYSTEM\HTML\html::link(\LIB\lib_system::css()).
-                \SYSTEM\HTML\html::link(\LIB\lib_flexslider::css()).
-                \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css')).
-                \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/btn-success.css')).
-                \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/btn-primary.css')).
-                \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/btn-warning.css')).
-                \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/flexslider.css')).
-                \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/table.css'));
+        return  \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
+                \SYSTEM\HTML\html::link(\LIB\lib_font_awesome::css()->WEBPATH(false)).
+                \SYSTEM\HTML\html::link(\LIB\lib_animate::css()->WEBPATH()).
+                \SYSTEM\HTML\html::link(\LIB\lib_flexslider::css()->WEBPATH(false)).
+                \SYSTEM\HTML\html::link(\SYSTEM\CACHE\cache_css::url(
+                    array(  \LIB\lib_system::css(),
+                            new PPAGE('default_page/css/default_page.css'),
+                            new PPAGE('default_page/css/btn-success.css'),
+                            new PPAGE('default_page/css/btn-primary.css'),
+                            new PPAGE('default_page/css/btn-warning.css'),
+                            new PPAGE('default_page/css/flexslider.css'),
+                            new PPAGE('default_page/css/table.css')
+                )));
     }
     
     public function html($_escaped_fragment_ = NULL){
@@ -28,6 +31,6 @@ class default_page extends \SYSTEM\PAGE\Page {
         $vars['js'] = $_escaped_fragment_ ? '' : self::js();
         $vars['css'] = self::css();
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('mojotrollz'));
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/default_page.tpl'))->SERVERPATH(), $vars);
     }
 }
diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl
index a551e8b..035c7fd 100644
--- a/mojotrollz/page/default_page/tpl/default_page.tpl
+++ b/mojotrollz/page/default_page/tpl/default_page.tpl
@@ -63,7 +63,7 @@
             <!-- Flexslider -->
             <div class="row-fluid">
                 <div class="col-md-12 mojotrollz_col">
-                    <h1 class="fadeInDown animated lead mojotrollz_heading"><img title="mojotrollz.eu logo" alt="${mojotrollz_heading}" src="./api.php?call=files&amp;cat=content&amp;id=mojotrollz_logo.png" width="650"></h1>
+                    <h1 class="fadeInDown animated lead mojotrollz_heading"><img title="mojotrollz.eu logo" alt="${mojotrollz_heading}" src="./api.php?call=files&amp;cat=content&amp;id=mojotrollz_logo.png" width="55%"></h1>
                     <div class="flexslider mojotrollz_flexslider">
                         <ul class="slides">
                             <li><img alt="WoW Classic Vanilla Banner" src="./api.php?call=files&amp;cat=content&amp;id=banner_mojotrollz_1.gif" width="100%"></li>
@@ -76,7 +76,7 @@
             </div>
             <!-- Content -->
             <div class="row-fluid">
-                <div id="content" class="col-md-12 mojotrollz_col">
+                <div id="content" class="col-md-12 mojotrollz_col mojotrollz_col_contentmain">
                 </div>
             </div>
             <!-- Content More -->
diff --git a/mojotrollz/page/default_serverlist/default_serverlist.php b/mojotrollz/page/default_serverlist/default_serverlist.php
index 34e73b3..e1f2ca1 100644
--- a/mojotrollz/page/default_serverlist/default_serverlist.php
+++ b/mojotrollz/page/default_serverlist/default_serverlist.php
@@ -1,7 +1,7 @@
 <?php
 class default_serverlist extends \SYSTEM\PAGE\Page {
     public static function js(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_serverlist/js/default_serverlist.js'));}
+        return array(   new PPAGE('default_serverlist/js/default_serverlist.js'));}
     
     public function html(){
         $vars = array();
@@ -21,9 +21,9 @@ class default_serverlist extends \SYSTEM\PAGE\Page {
                 $row['glyphicon_vote'] = 'glyphicon-ok';
             }
             $row['score'] += $row['votes'];
-            $vars['server_list'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_serverlist/tpl/serverlist_tr.tpl'),$row);}
+            $vars['server_list'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_serverlist/tpl/serverlist_tr.tpl'))->SERVERPATH(),$row);}
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('mojotrollz'));
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_serverlist/tpl/serverlist.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_serverlist/tpl/serverlist.tpl'))->SERVERPATH(), $vars);
     }
     
     private static function version_icon($version){
diff --git a/mojotrollz/page/default_serverlist/tpl/serverlist.tpl b/mojotrollz/page/default_serverlist/tpl/serverlist.tpl
index 5b69c00..7c4d5d6 100644
--- a/mojotrollz/page/default_serverlist/tpl/serverlist.tpl
+++ b/mojotrollz/page/default_serverlist/tpl/serverlist.tpl
@@ -1,14 +1,14 @@
 <hr style="width: 100%;">
 ${mojotrollz_servers_text}
-<table class="mojotrollz_table">
+<table class="mojotrollz_table" style="width: 100%;">
     <tr>
         <th class="col-md-2" style="padding: 0;">${basic_name}</th>
         <th class="col-md-2" style="padding: 0;">${basic_version}</th>
-        <th class="col-md-5" style="padding: 0;">${basic_description}</th>
-        <th class="col-md-2" style="padding: 0;">${basic_score}</th>
-        <th class="col-md-1" style="padding: 0;">${basic_vote}</th>
-        <th class="col-md-1" style="padding: 0;">${basic_visit}</th>
-        <th class="col-md-1" style="padding: 0;">${basic_download}</th>
+        <th class="col-md-4" style="padding: 0;">${basic_description}</th>
+        <th class="col-md-1" style="padding: 0;">${basic_score}</th>
+        <th class="col-md-1" style="padding: 0;"></th>
+        <th class="col-md-1" style="padding: 0;"></th>
+        <th class="col-md-1" style="padding: 0;"></th>
     </tr>
     ${server_list}
 </table>
diff --git a/mojotrollz/page/default_serverlist/tpl/serverlist_tr.tpl b/mojotrollz/page/default_serverlist/tpl/serverlist_tr.tpl
index 1a39e76..3abb14c 100644
--- a/mojotrollz/page/default_serverlist/tpl/serverlist_tr.tpl
+++ b/mojotrollz/page/default_serverlist/tpl/serverlist_tr.tpl
@@ -10,7 +10,7 @@
     <td>${score}</td>
     <td>
         <button type="submit" class="btn_vote btn-sm btn ${btn_vote_color}" server="${id}" style="width: 95%;">
-            <span class="glyphicon ${glyphicon_vote}" aria-hidden="true"></span>
+            <span class="glyphicon ${glyphicon_vote}" aria-hidden="true"> vote</span>
         </button>
     </td>
     <td>
@@ -19,7 +19,7 @@
         </button>
     </td>
     <td>
-        <button type="submit" class="btn-sm btn btn-primary" onClick="location.href='${link_wow_${version_url}}'" style="width: 100%;">
+        <button type="submit" class="btn-sm btn btn-primary" onClick="location.href='${link_wow_${version_url}}'" style="width: 95%;">
             <span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span>
         </button>
     </td>
diff --git a/mojotrollz/page/default_start/default_start.php b/mojotrollz/page/default_start/default_start.php
index 89b3ebe..2a0434a 100644
--- a/mojotrollz/page/default_start/default_start.php
+++ b/mojotrollz/page/default_start/default_start.php
@@ -1,7 +1,7 @@
 <?php
 class default_start extends \SYSTEM\PAGE\Page {
     public static function js(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_start/js/default_start.js'));}
+        return array(new PPAGE('default_start/js/default_start.js'));}
     
     public function html(){
         $vars = array();
@@ -22,6 +22,6 @@ class default_start extends \SYSTEM\PAGE\Page {
             $vars['addon_list'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/addonlist_tr.tpl'),$row);}*/
             
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('mojotrollz'));
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_start.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_start/tpl/default_start.tpl'))->SERVERPATH(), $vars);
     }
 }
diff --git a/mojotrollz/path/PLIB.php b/mojotrollz/path/PLIB.php
index f0bb5dd..5dbda34 100644
--- a/mojotrollz/path/PLIB.php
+++ b/mojotrollz/path/PLIB.php
@@ -1,5 +1,5 @@
 <?php
 class PLIB extends \SYSTEM\PATH {
-    public static function getPath(){
-        return \SYSTEM\C_ROOT.'lib/'.\SYSTEM\C_SUBPATH;}
+    public function __construct($subpath = '') {
+        parent::__construct(new \SYSTEM\PROOT(), 'lib/', $subpath);}
 }
diff --git a/mojotrollz/path/PPAGE.php b/mojotrollz/path/PPAGE.php
index 6be9418..b72bab6 100644
--- a/mojotrollz/path/PPAGE.php
+++ b/mojotrollz/path/PPAGE.php
@@ -1,5 +1,5 @@
 <?php
 class PPAGE extends \SYSTEM\PATH {
-    public static function getPath(){
-        return \SYSTEM\C_ROOT.'mojotrollz/page/'.\SYSTEM\C_SUBPATH;}
+    public function __construct($subpath = '') {
+        parent::__construct(new \SYSTEM\PROOT(), 'mojotrollz/page/', $subpath);}
 }
diff --git a/mojotrollz/path/PSAI.php b/mojotrollz/path/PSAI.php
index bb8c86c..f4022f8 100644
--- a/mojotrollz/path/PSAI.php
+++ b/mojotrollz/path/PSAI.php
@@ -1,5 +1,5 @@
 <?php
 class PSAI extends \SYSTEM\PATH {
-    public static function getPath(){
-        return \SYSTEM\C_ROOT.'mojotrollz/sai/'.\SYSTEM\C_SUBPATH;}
+    public function __construct($subpath = '') {
+        parent::__construct(new \SYSTEM\PROOT(), 'mojotrollz/sai/', $subpath);}
 }
diff --git a/mojotrollz/path/PSQL.php b/mojotrollz/path/PSQL.php
index 3ca1788..b7ad423 100644
--- a/mojotrollz/path/PSQL.php
+++ b/mojotrollz/path/PSQL.php
@@ -1,5 +1,5 @@
 <?php
 class PSQL extends \SYSTEM\PATH {
-    public static function getPath(){
-        return \SYSTEM\C_ROOT.'mojotrollz/sql/'.\SYSTEM\C_SUBPATH;}
-}
+    public function __construct($subpath = '') {
+        parent::__construct(new \SYSTEM\PROOT(), 'mojotrollz/sql/', $subpath);}
+}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php b/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php
index 73aa0de..c7c8c54 100644
--- a/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php
+++ b/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php
@@ -24,13 +24,13 @@ class saimod_mojotrollz_beta extends \SYSTEM\SAI\SaiModule {
         while($code = $res->next()){
             $code['ago_date_generated'] = \SYSTEM\time::time_ago_string(strtotime($code['date_generated']));
             $code['ago_date_redeemed'] = $code['date_redeemed'] ? \SYSTEM\time::time_ago_string(strtotime($code['date_redeemed'])) : 'Open';
-            $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_beta/tpl/beta_entry.tpl'), $code);}
+            $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_beta/tpl/beta_entry.tpl'))->SERVERPATH(), $code);}
         $vars = \array_merge($vars, \SYSTEM\PAGE\text::tag('time'));    
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_beta/tpl/beta.tpl'), $vars);}
+        return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_beta/tpl/beta.tpl'))->SERVERPATH(), $vars);}
     
     public static function html_li_menu(){return '<li class=""><a data-toggle="tooltip" data-placement="left" title="Mojotrollz Beta Codes" href="#!mojotrollz_beta"><span class="glyphicon glyphicon-user" aria-hidden="true"></span>&nbsp;&nbsp;Mojotrollz Beta</a></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
-    public static function js(){return array(\SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_beta/js/saimod_mojotrollz_beta.js'));}        
+    public static function js(){return array(new \PSAI('saimod_mojotrollz_beta/js/saimod_mojotrollz_beta.js'));}        
     //public static function css(){return array();}
 }
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php
index 2a87779..7d05f15 100644
--- a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php
+++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php
@@ -54,7 +54,7 @@ class saimod_mojotrollz_npc_vendor_template extends \SYSTEM\SAI\SaiModule {
         $count_filtered = 0;
         $res->seek(100*$page);
         while(($row = $res->next()) && ($count_filtered < 100)){           
-            $vars['entries'] .=  \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor_entry.tpl'), $row);
+            $vars['entries'] .=  \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor_entry.tpl'))->SERVERPATH(), $row);
             $count_filtered++;
         }
         $vars['pagination'] = '';
@@ -62,13 +62,13 @@ class saimod_mojotrollz_npc_vendor_template extends \SYSTEM\SAI\SaiModule {
         $vars['page_last'] = ceil($count/100)-1;
         for($i=0;$i < ceil($count/100);$i++){
             $data = array('entry' => $entry, 'page' => $i,'search' => $search, 'active' => ($i == $page) ? 'active' : '');
-            $vars['pagination'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor_pagination.tpl'), $data);
+            $vars['pagination'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor_pagination.tpl'))->SERVERPATH(), $data);
         }
         $vars['search'] = htmlentities($search);
         $vars['count'] = $count_filtered.'/'.$count;
         $vars['entry'] = $entry;
         $vars = array_merge($vars,  \SYSTEM\PAGE\text::tag('basic'));
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor.tpl'))->SERVERPATH(), $vars);
     }
     public static function sai_mod__SAI_saimod_mojotrollz_npc_vendor_template($search='{}',$page=0){
         $vars = array();
@@ -117,7 +117,7 @@ class saimod_mojotrollz_npc_vendor_template extends \SYSTEM\SAI\SaiModule {
         $count_filtered = 0;
         $res->seek(100*$page);
         while(($row = $res->next()) && ($count_filtered < 100)){           
-            $vars['entries'] .=  \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_entry.tpl'), $row);
+            $vars['entries'] .=  \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_entry.tpl'))->SERVERPATH(), $row);
             $count_filtered++;
         }
         $vars['pagination'] = '';
@@ -125,16 +125,16 @@ class saimod_mojotrollz_npc_vendor_template extends \SYSTEM\SAI\SaiModule {
         $vars['page_last'] = ceil($count/100)-1;
         for($i=0;$i < ceil($count/100);$i++){
             $data = array('page' => $i,'search' => $search, 'active' => ($i == $page) ? 'active' : '');
-            $vars['pagination'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_pagination.tpl'), $data);
+            $vars['pagination'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_pagination.tpl'))->SERVERPATH(), $data);
         }
         $vars['search'] = htmlentities($search);
         $vars['count'] = $count_filtered.'/'.$count;
         $vars = array_merge($vars,  \SYSTEM\PAGE\text::tag('basic'));
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template.tpl'))->SERVERPATH(), $vars);
     }
     public static function html_li_menu(){return '<li role="separator" class="nav-divider"></li><li><a data-toggle="tooltip" data-placement="left" title="test server: npc_vendor_template" href="#!mojotrollz_npc_vendor_template"><span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>&nbsp;&nbsp;Vendor Template</a></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
-    public static function js(){return array(\SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_npc_vendor_template/js/saimod_mojotrollz_npc_vendor_template.js'));}        
+    public static function js(){return array(new \PSAI('saimod_mojotrollz_npc_vendor_template/js/saimod_mojotrollz_npc_vendor_template.js'));}        
     //public static function css(){return array();}
 }
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php
index 85270ef..a88faf6 100644
--- a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php
+++ b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php
@@ -17,8 +17,7 @@ class saimod_mojotrollz_server_handling extends \SYSTEM\SAI\SaiModule {
     public static function html_li_menu(){return '<li class=""><a data-toggle="tooltip" data-placement="left" title="Mojotrollz Server" href="#!mojotrollz_server"><span class="glyphicon glyphicon-home" aria-hidden="true"></span>&nbsp;&nbsp;Mojotrollz Server</a></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
-    public static function js(){return array(
-            \SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_server_handling/js/saimod_mojotrollz_server_handling.js'));}
+    public static function js(){return array(new \PSAI('saimod_mojotrollz_server_handling/js/saimod_mojotrollz_server_handling.js'));}
     //public static function css(){}
     
     public static function sai_mod__SAI_saimod_mojotrollz_server_handling_action_stats_tbc($filter = 600){
diff --git a/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php b/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php
index 097c8b6..0149bd9 100644
--- a/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php
@@ -12,9 +12,9 @@ class saimod_mojotrollz_servers extends \SYSTEM\SAI\SaiModule {
             $r['selected_0'] = $r['selected_1'] = '';
             $r['selected_'.$r['visible']] = 'selected';
             $r['i'] = $i++;
-            $vars['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_servers/tpl/list_entry.tpl'), $r);}
+            $vars['content'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_servers/tpl/list_entry.tpl'))->SERVERPATH(), $r);}
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_TIME),\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_BASIC));
-        return \SYSTEM\PAGE\replace::replaceFile(   \SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_servers/tpl/saimod_mojotrollz_servers.tpl'),$vars);}
+        return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_servers/tpl/saimod_mojotrollz_servers.tpl'))->SERVERPATH(),$vars);}
     public static function html_li_menu(){return '<li class=""><a data-toggle="tooltip" data-placement="left" title="Vote Servers" href="#!mojotrollz_servers"><span class="glyphicon glyphicon-stats" aria-hidden="true"></span>&nbsp;&nbsp;Vote Servers</a></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
@@ -32,7 +32,7 @@ class saimod_mojotrollz_servers extends \SYSTEM\SAI\SaiModule {
         return \SYSTEM\LOG\JsonResult::ok();}
     
     /*public static function css(){
-        return array(   \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/css/saistart_sys_sai.css'));}*/
+        return array((new \SYSTEM\PSAI('modules/saistart_sys_sai/css/saistart_sys_sai.css'));}*/
     public static function js(){
-        return array(   \SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_servers/js/saimod_mojotrollz_servers.js'));}
+        return array(new \PSAI('saimod_mojotrollz_servers/js/saimod_mojotrollz_servers.js'));}
 }
\ No newline at end of file