diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index f0f46761..8ff1f998 100644
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -27,6 +27,8 @@ if (defined('S9Y_DATA_PATH')) {
 }
 
 $data['basedir'] = $basedir;
+$data['phpversion'] = phpversion();
+$data['versionInstalled'] = $serendipity['versionInstalled'];
 
 /**
  * Checks a return code constant if it's successfull or an error and return HTML code
@@ -384,6 +386,8 @@ if (!is_object($serendipity['smarty'])) {
     serendipity_smarty_init();
 }
 
+
+
 $serendipity['smarty']->assign($data);
 $tfile = serendipity_getTemplateFile("admin/installer.inc.tpl");
 
@@ -392,10 +396,6 @@ include $tfile;
 $content = ob_get_contents();
 ob_end_clean();
 
-
-#$content = $serendipity['smarty']->fetch('file:'. $tfile); // short notation with Smarty3 in S9y 1.7 and up
-#echo $content;
-
 // eval a string template and do not store compiled code
 echo $serendipity['smarty']->display('eval:'.$content);
 
diff --git a/serendipity_admin.php b/serendipity_admin.php
index f9e62846..55f9a34e 100644
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -298,239 +298,8 @@ if (!$use_installer && !$_SESSION['no_smarty'] && serendipity_smarty_init()) {
 
     $serendipity['smarty']->assignByRef('admin_vars', $admin_vars);
     $serendipity['smarty']->display(serendipity_getTemplateFile('admin/index.tpl', 'serendipityPath'));
-} else {
-?>
-<html>
-    <head>
-        <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
-        <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo $css_file; ?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo $admin_css_file; ?>" />
+}
 
-        <script type="text/javascript">
-        function spawn() {
-            if (self.Spawnextended) {
-                Spawnextended();
-            }
-
-            if (self.Spawnbody) {
-                Spawnbody();
-            }
-
-            if (self.Spawnnugget) {
-                Spawnnugget();
-            }
-        }
-
-        function SetCookie(name, value) {
-            var today  = new Date();
-            var expire = new Date();
-            expire.setTime(today.getTime() + (60*60*24*30*1000));
-            document.cookie = 'serendipity[' + name + ']='+escape(value) + ';expires=' + expire.toGMTString();
-        }
-
-        function addLoadEvent(func) {
-          var oldonload = window.onload;
-          if (typeof window.onload != 'function') {
-            window.onload = func;
-          } else {
-            window.onload = function() {
-              oldonload();
-              func();
-            }
-          }
-        }
-
-        </script>
-<?php
-    if ($admin_installed) {
-        serendipity_plugin_api::hook_event('backend_header', $serendipity);
-    }
-?>
-    </head>
-    <body id="serendipity_admin_page" onload="spawn()">
-        <table cellspacing="0" cellpadding="0" border="0" id="serendipityAdminFrame">
-        <?php if (!$no_banner) { ?>
-            <tr>
-                <td colspan="2" id="serendipityAdminBanner">
-                <?php if ($admin_installed) { ?>
-                    <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1>
-                    <h2><?php echo $serendipity['blogTitle'] ?></h2>
-                <?php } else { ?>
-                    <h1><?php echo SERENDIPITY_INSTALLATION ?></h1>
-                <?php } ?>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2" id="serendipityAdminInfopane">
-                    <?php if ($is_logged_in) { ?>
-                        <span><?php echo $self_info; ?></span>
-                    <?php } ?>
-                </td>
-            </tr>
-        <?php } ?>
-            <tr valign="top">
-<?php
 if ($use_installer) {
-?>
-                <td class="serendipityAdminContent" colspan="2">
-                    <?php require(S9Y_INCLUDE_PATH . $file); ?>
-<?php
-
-
-} elseif (!$is_logged_in) {
-    $out = array();
-    serendipity_plugin_api::hook_event('backend_login_page', $out);
-?>
-                <td colspan="2" class="serendipityAdminContent">
-                    <div id="serendipityAdminWelcome" align="center"><h2><?php echo WELCOME_TO_ADMIN ?></h2>
-                    <h3><?php echo PLEASE_ENTER_CREDENTIALS ?></h3></div>
-                    <?php echo $out['header']; ?>
-                    <?php if ($post_action != '' && !$is_logged_in ) { ?>
-                    <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_error.png'); ?>" alt="" /><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
-                    <?php } ?>
-                    <form action="serendipity_admin.php" method="post">
-                        <input type="hidden" name="serendipity[action]" value="admin" />
-                        <table id="serendipityAdminCredentials" cellspacing="10" cellpadding="0" border="0" align="center">
-                            <tr>
-                                <td><?php echo USERNAME ?></td>
-                                <td><input class="input_textbox" type="text" name="serendipity[user]" /></td>
-                            </tr>
-                            <tr>
-                                <td><?php echo PASSWORD ?></td>
-                                <td><input class="input_textbox" type="password" name="serendipity[pass]" /></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2"><input class="input_checkbox" id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?></label></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> &gt;" class="input_button serendipityPrettyButton" /></td>
-                            </tr>
-                            <?php echo $out['table']; ?>
-                        </table>
-                    </form>
-                    <?php echo $out['footer']; ?>
-                    <p id="serendipityBackToBlog"><a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a></p>
-<?php
-} else {
-    if (!$no_sidebar) { ?>
-                <td id="serendipitySideBar">
-                    <ul class="serendipitySideBarMenu serendipitySideBarMenuMain">
-                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuMainLinks" style="display:none"></li>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks serendipitySideBarMenuMainFrontpage"><a href="serendipity_admin.php"><?php echo ADMIN_FRONTPAGE; ?></a></li>
-<?php if (serendipity_checkPermission('personalConfiguration')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks serendipitySideBarMenuMainPersonal"><a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a></li>
-<?php } ?>
-                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuMainLinks" style="display:none"></li>
-                    </ul>
-<?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
-                    <ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
-                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuEntryLinks"><?php echo ADMIN_ENTRIES ?></li>
-<?php if (serendipity_checkPermission('adminEntries')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminComments')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminCategories')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=category&amp;serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
-                        <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
-<?php } ?>
-                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuEntryLinks" style="display:none"></li>
-                    </ul>
-<?php } ?>
-                    
-<?php if (serendipity_checkPermission('adminImages')) { ?>
-                    <ul class="serendipitySideBarMenu serendipitySideBarMenuMedia">
-                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuMediaLinks"><?php echo MEDIA; ?></li>
-<?php if (serendipity_checkPermission('adminImagesAdd')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminImagesView')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminImagesDirectories')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminImagesSync')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync"><?php echo CREATE_THUMBS; ?></a></li>
-<?php } ?>
-                        <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?>
-                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuMediaLinks" style="display:none"></li>
-                    </ul>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminTemplates') || serendipity_checkPermission('adminPlugins')) { ?>
-                    <ul class="serendipitySideBarMenu serendipitySideBarMenuAppearance">
-                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuAppearanceLinks"><?php echo APPEARANCE; ?></li>
-<?php if (serendipity_checkPermission('adminTemplates')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuAppearanceLinks"><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminPlugins')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuAppearanceLinks"><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li>
-<?php } ?>
-                        <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?>
-                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuAppearance" style="display:none"></li>
-                    </ul>
-<?php } ?>
-<?php if (serendipity_checkPermission('siteConfiguration') || serendipity_checkPermission('blogConfiguration') || serendipity_checkPermission('adminUsers') || serendipity_checkPermission('adminUsersGroups') || serendipity_checkPermission('adminImport')) { ?>
-                    <ul class="serendipitySideBarMenu serendipitySideBarMenuUserManagement">
-                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuUserManagementLinks"><?php echo ADMIN; ?></li>
-<?php if (serendipity_checkPermission('siteConfiguration') || serendipity_checkPermission('blogConfiguration')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminUsers')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminUsersGroups')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=groups"><?php echo MANAGE_GROUPS; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('adminImport')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li>
-<?php } ?>
-<?php if (serendipity_checkPermission('siteConfiguration') || serendipity_checkPermission('blogConfiguration')) { ?>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=integrity"><?php echo INTEGRITY; ?></a></li>
-<?php } ?>
-                        <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?>
-                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuUserManagement" style="display:none"></li>
-                    </ul>
-<?php } ?>
-                    <ul class="serendipitySideBarMenu serendipitySideBarMenuLogout">
-                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuLogoutLinks" style="display:none"></li>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks serendipitySideBarMenuLogoutWeblog"><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>
-                        <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks serendipitySideBarMenuLogoutLogout"><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li>
-                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuLogoutLinks" style="display:none"></li>
-                    </ul>
-
-                </td>
-<?php } ?>
-                <td class="serendipityAdminContent">
-<?php
-    echo $main_content;
-}
-?>
-                </td>
-            </tr>
-        </table>
-        <?php if (!$no_footer) { ?>
-        <div class="serendipityAdminFooterSpacer"></div>
-        
-        <div id="serendipityAdminFooter">
-            <span>
-            <?php 
-            if ($serendipity['expose_s9y']) {
-                echo sprintf(ADMIN_FOOTER_POWERED_BY, $serendipity['versionInstalled'], phpversion());
-            } else {
-                echo sprintf(ADMIN_FOOTER_POWERED_BY, '', '');
-            }
-            ?>
-            </span>
-        </div>
-        <?php } ?>
-    </body>
-</html>
-<?php
+    require(S9Y_INCLUDE_PATH . $file);
 }
diff --git a/templates/2k11/admin/installer.inc.tpl b/templates/2k11/admin/installer.inc.tpl
index 28fe0fee..1327c709 100644
--- a/templates/2k11/admin/installer.inc.tpl
+++ b/templates/2k11/admin/installer.inc.tpl
@@ -1,3 +1,58 @@
+<html>
+    <head>
+        <title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
+        <meta http-equiv="Content-Type" content="text/html; charset={$CONST.LANG_CHARSET}" />
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file='admin/style.css'}" />
+
+        <script type="text/javascript">
+        function spawn() {
+            if (self.Spawnextended) {
+                Spawnextended();
+            }
+
+            if (self.Spawnbody) {
+                Spawnbody();
+            }
+
+            if (self.Spawnnugget) {
+                Spawnnugget();
+            }
+        }
+
+        function SetCookie(name, value) {
+            var today  = new Date();
+            var expire = new Date();
+            expire.setTime(today.getTime() + (60*60*24*30*1000));
+            document.cookie = 'serendipity[' + name + ']='+escape(value) + ';expires=' + expire.toGMTString();
+        }
+
+        function addLoadEvent(func) {
+          var oldonload = window.onload;
+          if (typeof window.onload != 'function') {
+            window.onload = func;
+          } else {
+            window.onload = function() {
+              oldonload();
+              func();
+            }
+          }
+        }
+        </script>
+    </head>
+    <body id="serendipity_admin_page" onload="spawn()">
+        <table cellspacing="0" cellpadding="0" border="0" id="serendipityAdminFrame">
+            <tr>
+                <td colspan="2" id="serendipityAdminBanner">
+                    <h1>{$CONST.SERENDIPITY_INSTALLATION}</h1>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" id="serendipityAdminInfopane">
+                </td>
+            </tr>
+            <tr valign="top">
+                <td class="serendipityAdminContent" colspan="2">
+
 {if $is_errors && is_array($errors)}
     {foreach $errors AS $error}
         <span class="msg_error"><span class="icon-attention"></span> {$error}</span>
@@ -259,3 +314,17 @@
         <span class="msg_error"><span class="icon-attention"></span> {$CONST.ERROR_DETECTED_IN_INSTALL}</span>
     {/if}
 {/if}
+
+
+</td>
+            </tr>
+        </table>
+        <div class="serendipityAdminFooterSpacer"></div>
+        
+        <div id="serendipityAdminFooter">
+            <span> 
+                {$ADMIN_FOOTER_POWERED_BY|sprintf:$versionInstalled:$phpversion}
+            </span>
+        </div>
+    </body>
+</html>

+ {$CONST.SERENDIPITY_INSTALLATION} +
+
+ {if $is_errors && is_array($errors)} {foreach $errors AS $error} {$error} @@ -259,3 +314,17 @@ {$CONST.ERROR_DETECTED_IN_INSTALL} {/if} {/if} + + +