diff --git a/.gitmodules b/.gitmodules
index 0454fa6..a7c04cf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "lib/system"]
 	path = lib/system
-	url = git@mojotrollz.eu:webcraft/system.git
+	url = ../system.git
diff --git a/demo_basic/page/default_about/default_about.php b/demo_basic/page/default_about/default_about.php
index 0e65f75..a18784b 100644
--- a/demo_basic/page/default_about/default_about.php
+++ b/demo_basic/page/default_about/default_about.php
@@ -1,11 +1,11 @@
 <?php
 class default_about extends SYSTEM\PAGE\Page {
     public static function js(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_about/js/default_about.js'));}
+        return array(   new PPAGE('default_about/js/default_about.js'));}
     public static function css(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_about/css/default_about.css'));}
+        return array(   new PPAGE('default_about/css/default_about.css'));}
     public function html(){
         $vars = \SYSTEM\PAGE\text::tag('example');
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_about/tpl/default_about.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_about/tpl/default_about.tpl'))->SERVERPATH(), $vars);
     }
 }
\ No newline at end of file
diff --git a/demo_basic/page/default_impressum/default_impressum.php b/demo_basic/page/default_impressum/default_impressum.php
index ae3e19a..35036cf 100644
--- a/demo_basic/page/default_impressum/default_impressum.php
+++ b/demo_basic/page/default_impressum/default_impressum.php
@@ -3,9 +3,9 @@ class default_impressum extends \SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();
         $vars['impressum'] = \SYSTEM\PAGE\text::get('webcraft_imprint');
-        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);
     }
     public static function js(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_impressum/js/default_impressum.js'));
+        return array(   new PPAGE('default_impressum/js/default_impressum.js'));
     }
 }
\ No newline at end of file
diff --git a/demo_basic/page/default_page/default_page.php b/demo_basic/page/default_page/default_page.php
index e41d675..76cc7c5 100644
--- a/demo_basic/page/default_page/default_page.php
+++ b/demo_basic/page/default_page/default_page.php
@@ -1,15 +1,15 @@
 <?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(\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_system::js()->WEBPATH()).
+                \SYSTEM\HTML\html::script((new PPAGE('default_page/js/default_page.js'))->WEBPATH());
     }
     
     private static function css(){  
-        return  \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()).
-                \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css'));
+        return  \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH()).
+                \SYSTEM\HTML\html::link((new PPAGE('default_page/css/default_page.css'))->WEBPATH());
     }
     
     public function html($_escaped_fragment_ = null){
@@ -19,6 +19,6 @@ class default_page extends \SYSTEM\PAGE\Page {
             $vars['js'] = self::js();}
         $vars['css'] = self::css();
         $vars = array_merge($vars,  \SYSTEM\PAGE\text::tag('demo_basic'));
-        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);
     }
 }
\ No newline at end of file
diff --git a/demo_basic/page/default_start/default_start.php b/demo_basic/page/default_start/default_start.php
index 1f25173..0dbdc89 100644
--- a/demo_basic/page/default_start/default_start.php
+++ b/demo_basic/page/default_start/default_start.php
@@ -1,12 +1,12 @@
 <?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 static function css(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_start/css/default_start.css'));}
+        return array(   new PPAGE('default_start/css/default_start.css'));}
     public function html(){
         $vars = array();
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('demo_basic'));
-        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);
     }
 }
\ No newline at end of file
diff --git a/demo_basic/sql/DATA_DEMO_BASIC.php b/demo_basic/sql/DATA_DEMO_BASIC.php
index e62fd6f..57aee1c 100644
--- a/demo_basic/sql/DATA_DEMO_BASIC.php
+++ b/demo_basic/sql/DATA_DEMO_BASIC.php
@@ -3,9 +3,7 @@ namespace SQL;
 class DATA_DEMO_BASIC extends \SYSTEM\DB\QI {
     public static function get_class(){return \get_class();}
     public static function files_mysql(){
-        return array(   \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_page.sql'),
-                        \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/webcraft_imprint.sql')/*,
-                        \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_text.sql'),
-                        \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_cron.sql')*/);
+        return array(   (new \PSQL('/mysql/system_page.sql'))->SERVERPATH(),
+                        (new \PSQL('/mysql/webcraft_imprint.sql'))->SERVERPATH());
     }    
 }
\ No newline at end of file
diff --git a/lib/system b/lib/system
index d9e3857..90de2d6 160000
--- a/lib/system
+++ b/lib/system
@@ -1 +1 @@
-Subproject commit d9e385714bbdc868a6f504d9eb3bf76c452d42e9
+Subproject commit 90de2d66319486fafb2fae691c1b6b43240af005