diff --git a/mojotrollz/files/register_files.php b/mojotrollz/files/register_files.php
index 2eb683a..ad2bf54 100644
--- a/mojotrollz/files/register_files.php
+++ b/mojotrollz/files/register_files.php
@@ -20,7 +20,7 @@
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/inventory/','inventory','*.*');
 
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_page/','default_page','*.png');
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_start/','default_start','*.png');
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/wizard_start/','wizard_start','*.png');
 
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/achievements_acc/','achievements_acc','*.*');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/achievements_pvp/','achievements_pvp','*.*');
\ No newline at end of file
diff --git a/mojotrollz/files/default_start/button.png b/mojotrollz/files/wizard_start/button.png
similarity index 100%
rename from mojotrollz/files/default_start/button.png
rename to mojotrollz/files/wizard_start/button.png
diff --git a/mojotrollz/files/default_start/help_gnome.png b/mojotrollz/files/wizard_start/help_gnome.png
similarity index 100%
rename from mojotrollz/files/default_start/help_gnome.png
rename to mojotrollz/files/wizard_start/help_gnome.png
diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc
index e0d06f5..2a40c0e 100644
--- a/mojotrollz/page/autoload.inc
+++ b/mojotrollz/page/autoload.inc
@@ -2,8 +2,8 @@
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_info','');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_start','');
 
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_start','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_details','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_visuals','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_skills','');
diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php
index 1d126cf..791b5a7 100644
--- a/mojotrollz/page/page_mojotrollz.php
+++ b/mojotrollz/page/page_mojotrollz.php
@@ -7,35 +7,25 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
             return new user_default();}
         return new default_page();}
         
-    //Default Start
-    public static function page_default_start(){
-        return new default_start();}
-    
     //Wizard
+    public static function page_wizard_start(){
+        return new wizard_start();}
     public static function page_wizard_details(){
         return new wizard_details();}
-    
     public static function page_wizard_visuals(){
         return new wizard_visuals();}
-    
     public static function page_wizard_friend(){
         return new wizard_friend();}
-        
     public static function page_wizard_skills($t = null){
         return new wizard_skills($t);}
-        
     public static function page_wizard_guild(){
         return new wizard_guild();}
-    
     public static function page_wizard_spawn(){
         return new wizard_spawn();}
-    
     public static function page_wizard_summary(){
         return new wizard_summary();}
-        
     public static function page_wizard_register(){
         return new wizard_register();}
-        
     public static function page_wizard_toolbar($last,$next){
         return new wizard_toolbar($last,$next);}
         
@@ -48,42 +38,34 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_start();}
-        
     public static function page_user_character(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_character();}
-    
     public static function page_user_menu(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_menu();}
-        
     public static function page_user_database(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_database();}
-    
     public static function page_user_shop_menu(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_shop_menu();}
-        
     public static function page_user_achievements_menu(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_achievements_menu();}
-        
     public static function page_user_achievements_menu_sub($menu){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_achievements_menu_sub($menu);}
-    
     public static function page_user_achievements_content($menu, $filter){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_achievements_content($menu, $filter);}
-        
     public static function page_user_logout(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
diff --git a/mojotrollz/page/user_default/user_default.tpl b/mojotrollz/page/user_default/user_default.tpl
index beacb95..8c44f54 100644
--- a/mojotrollz/page/user_default/user_default.tpl
+++ b/mojotrollz/page/user_default/user_default.tpl
@@ -2,7 +2,8 @@
 <html>
     <head>
         <title>${mojotrollz_page_title}</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">               
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link rel="icon" href="./api.php?call=files&cat=default_page&id=favicon.ico" type="image/x-icon"/>
         ${css}
         ${js}
     </head>
diff --git a/mojotrollz/page/default_start/js/default_start.js b/mojotrollz/page/wizard_start/js/wizard_start.js
similarity index 100%
rename from mojotrollz/page/default_start/js/default_start.js
rename to mojotrollz/page/wizard_start/js/wizard_start.js
diff --git a/mojotrollz/page/default_start/tpl/default_page_login.tpl b/mojotrollz/page/wizard_start/tpl/default_page_login.tpl
similarity index 100%
rename from mojotrollz/page/default_start/tpl/default_page_login.tpl
rename to mojotrollz/page/wizard_start/tpl/default_page_login.tpl
diff --git a/mojotrollz/page/default_start/tpl/default_page_new_char.tpl b/mojotrollz/page/wizard_start/tpl/default_page_new_char.tpl
similarity index 100%
rename from mojotrollz/page/default_start/tpl/default_page_new_char.tpl
rename to mojotrollz/page/wizard_start/tpl/default_page_new_char.tpl
diff --git a/mojotrollz/page/default_start/tpl/default_page_serverinfo.tpl b/mojotrollz/page/wizard_start/tpl/default_page_serverinfo.tpl
similarity index 100%
rename from mojotrollz/page/default_start/tpl/default_page_serverinfo.tpl
rename to mojotrollz/page/wizard_start/tpl/default_page_serverinfo.tpl
diff --git a/mojotrollz/page/default_start/tpl/default_page_welcome.tpl b/mojotrollz/page/wizard_start/tpl/default_page_welcome.tpl
similarity index 100%
rename from mojotrollz/page/default_start/tpl/default_page_welcome.tpl
rename to mojotrollz/page/wizard_start/tpl/default_page_welcome.tpl
diff --git a/mojotrollz/page/default_start/tpl/default_start.tpl b/mojotrollz/page/wizard_start/tpl/wizard_start.tpl
similarity index 100%
rename from mojotrollz/page/default_start/tpl/default_start.tpl
rename to mojotrollz/page/wizard_start/tpl/wizard_start.tpl
diff --git a/mojotrollz/page/default_start/default_start.php b/mojotrollz/page/wizard_start/wizard_start.php
similarity index 67%
rename from mojotrollz/page/default_start/default_start.php
rename to mojotrollz/page/wizard_start/wizard_start.php
index 35f8963..68e3c04 100644
--- a/mojotrollz/page/default_start/default_start.php
+++ b/mojotrollz/page/wizard_start/wizard_start.php
@@ -1,17 +1,17 @@
 <?php
-class default_start extends SYSTEM\PAGE\Page {
+class wizard_start extends SYSTEM\PAGE\Page {
     public static function js(){
-        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_start/js/default_start.js'));}
+        return array(   \SYSTEM\WEBPATH(new PPAGE(),'wizard_start/js/wizard_start.js'));}
     public static function css(){
         return array();}
     
     public function html(){
         $vars = array();               
-        $vars['default_page_new_char']       = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_new_char.tpl'), array());
-        $vars['default_page_welcome']    = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_welcome.tpl'), array());
-        $vars['default_page_login']         = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_page_login.tpl'), array());
+        $vars['default_page_new_char']       = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_start/tpl/default_page_new_char.tpl'), array());
+        $vars['default_page_welcome']    = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_start/tpl/default_page_welcome.tpl'), array());
+        $vars['default_page_login']         = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_start/tpl/default_page_login.tpl'), array());
         
-        $vars['PICPATH']         = \SYSTEM\FILES\files::getURL('default_start');
+        $vars['PICPATH']         = \SYSTEM\FILES\files::getURL('wizard_start');
         $vars['PICPATH_DEFAULT'] = \SYSTEM\FILES\files::getURL('default_page');
         
         $vars['realm_status']   = realm::status();
@@ -21,6 +21,6 @@ class default_start extends SYSTEM\PAGE\Page {
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO),
                                     \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC));
-        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_start.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_start/tpl/wizard_start.tpl'), $vars);
     }
 }
\ No newline at end of file