diff --git a/admin/mnet/mnet_themes.html b/admin/mnet/mnet_themes.html
index ed7505723b4..054e140271c 100644
--- a/admin/mnet/mnet_themes.html
+++ b/admin/mnet/mnet_themes.html
@@ -1,6 +1,7 @@
 <?php
-admin_externalpage_print_header($adminroot);
-
+admin_externalpage_print_header();
+print_heading(get_string('themes'));
+$original_theme = fullclone($THEME);
 $logurl = $CFG->wwwroot.
           '/course/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
           '%2F1&amp;user='.'0'.
@@ -10,18 +11,16 @@ $logurl = $CFG->wwwroot.
 $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
 $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
 $tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
-if ($mnet_peer->id != $CFG->mnet_all_hosts_id) $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+if ($mnet_peer->id != $CFG->mnet_all_hosts_id) {
+    $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+} 
+
 print_tabs(array($tabs), 'mnetthemes');
-print_simple_box_start("center", "");
-
-    print_heading($strthemes);
-
-
 
     $themes = get_list_of_plugins("theme");
     $sesskey = !empty($USER->id) ? $USER->sesskey : '';
 
-    echo "<table style=\"margin-left:auto;margin-right:auto;\" cellpadding=\"7\" cellspacing=\"5\">";
+    echo '<table style="margin-left:auto;margin-right:auto;" cellpadding="7" cellspacing="5">';
 
     if (count($report)) {
         echo '<tr>';
@@ -80,7 +79,7 @@ print_simple_box_start("center", "");
         }
 
         echo "<tr>";
-             
+
         // no point showing this if user is using screen reader
         if (!$USER->screenreader) {
             echo "<td align=\"center\">";
@@ -103,9 +102,9 @@ print_simple_box_start("center", "");
         } else {
             echo '<p style="font-size:1.5em;font-style:bold;color:red;">'.$theme.' (Moodle 1.4)</p>';
         }
-          
+
         if ($screenshot or $readme) {
-            echo '<ul>';      
+            echo '<ul>';
             if (!$USER->screenreader) {
                 echo '<li><a href="'.$CFG->wwwroot.'/theme/preview.php?preview='.$theme.'">'.$strpreview.'</a></li>';
             }
@@ -123,6 +122,6 @@ print_simple_box_start("center", "");
     }
     echo "</table>";
 
-print_simple_box_end();
-admin_externalpage_print_footer($adminroot);
+$THEME = $original_theme;
+admin_externalpage_print_footer();
 ?>
diff --git a/admin/mnet/mnet_themes.php b/admin/mnet/mnet_themes.php
index f566744af48..4ee49aec28b 100644
--- a/admin/mnet/mnet_themes.php
+++ b/admin/mnet/mnet_themes.php
@@ -4,8 +4,6 @@
     require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
     require_once($CFG->libdir.'/adminlib.php');
     include_once($CFG->dirroot.'/mnet/lib.php');
-error_reporting(E_ALL);
-ini_set('display_errors', true);
     require_login();
     admin_externalpage_setup('mnetpeers');
 
@@ -74,6 +72,6 @@ ini_set('display_errors', true);
             }
         }
     }
-
-    include('./mnet_themes.html');
+    $adminroot = admin_get_root();
+    require_once('./mnet_themes.html');
 ?>