diff --git a/about/theme.php b/about/theme.php
index 605b30e..79b5d7e 100644
--- a/about/theme.php
+++ b/about/theme.php
@@ -6,8 +6,9 @@
  */
 
 $theme_name = "Classic Grey";
-$theme_author = "Encore Web Studios";
-$theme_author_email = "formtools@encorewebstudios.com";
-$theme_link = "http://themes.formtools.org/classicgrey/";
+$theme_author = "Ben Keen";
+$theme_author_email = "ben.keen@gmail.com";
+$theme_link = "http://themes.formtools.org";
 $theme_description = "A remodelling of the old grey-styled Form Tools 1.x theme.";
-$theme_version = "1.1.3";
\ No newline at end of file
+$theme_version = "2.0.0";
+$theme_uses_swatches = "no";
diff --git a/footer.tpl b/footer.tpl
index 13c7ab3..a04cd39 100644
--- a/footer.tpl
+++ b/footer.tpl
@@ -4,9 +4,8 @@
         </div>
 
         <div id="left" class="pad_top_large">
-					{ft_include file="menu.tpl"}
+            {ft_include file="menu.tpl"}
         </div>
-
       </div>
 
       <div class="clear"></div>
@@ -18,10 +17,10 @@
 {* only display the footer area if there is some text entered for it *}
 {if $account.settings.footer_text != "" || $g_enable_benchmarking}
   <div id="footer">
-    {$account.settings.footer_text}
+    {$footer_text}
     {show_page_load_time}
   </div>
 {/if}
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/header.tpl b/header.tpl
index 5cb23cc..f0bc67c 100644
--- a/header.tpl
+++ b/header.tpl
@@ -15,8 +15,8 @@
   {literal}}{/literal};
   //]]>
   </script>
-  <link type="text/css" rel="stylesheet" href="{$g_root_url}/global/css/main.css?v=2_1_0">
-  <link type="text/css" rel="stylesheet" href="{$theme_url}/css/styles.css?v=2_1_0">
+  <link type="text/css" rel="stylesheet" href="{$g_root_url}/global/css/main.css?v=3_0_0">
+  <link type="text/css" rel="stylesheet" href="{$theme_url}/css/styles.css?v=3_0_0">
   <link href="{$theme_url}/css/smoothness/jquery-ui-1.8.14.custom.css" rel="stylesheet" type="text/css"/>
   <script src="{$g_root_url}/global/scripts/jquery.js"></script>
   <script src="{$theme_url}/scripts/jquery-ui-1.8.14.custom.min.js"></script>
@@ -34,7 +34,7 @@
   <div id="header">{if $settings.logo_link}<a href="{$settings.logo_link}">{/if}<img src="{$theme_url}/images/header_logo.jpg" width="392" height="60" border="0" />{if $settings.logo_link}</a>{/if}</div>
   <div id="header_row">
     <div id="left_nav_top">
-      {if $SESSION.account.is_logged_in && !$g_omit_top_bar}
+      {if $is_logged_in && !$g_omit_top_bar}
         {if $settings.release_type == "alpha"}
           <b>{$settings.program_version}-alpha-{$settings.release_date}</b>
         {elseif $settings.release_type == "beta"}
@@ -42,8 +42,7 @@
         {else}
           <b>{$settings.program_version}</b>
         {/if}
-        {if $SESSION.account.account_type == "admin"}
-          &nbsp;
+        {if $account.account_type == "admin"}
           <a href="#" onclick="return ft.check_updates()" class="update_link">{$LANG.word_update}</a>
         {/if}
       {else}
diff --git a/images/header_logo.jpg b/images/header_logo.jpg
index ead351b..f7609b1 100644
Binary files a/images/header_logo.jpg and b/images/header_logo.jpg differ
diff --git a/menu.tpl b/menu.tpl
index 1f47225..84ea1fd 100644
--- a/menu.tpl
+++ b/menu.tpl
@@ -6,29 +6,29 @@
 *}
 
 
-  {assign var=is_current_parent_menu value=false}
+  {assign var=is_current_parent_menu value=false}
 
-  <div class="menu_items">
-  {foreach from=$SESSION.menu.menu_items key=k item=i}
+  <div class="menu_items">
+  {foreach from=$menu_items key=k item=i}
 
-    {assign var=link_id value=""}
+    {assign var=link_id value=""}
 
     {* main menu item *}
-    {if $i.is_submenu == "no"}
-
+    {if $i.is_submenu == "no"}
+
       {* if this parent menu contains the page that is currently being viewed, show the submenu options *}
-      {if $i.url == $nav_parent_page_url}
-        {assign var=is_current_parent_menu value=true}
-      {else}
-        {assign var=is_current_parent_menu value=false}
-      {/if}
+      {if $i.url == $nav_parent_page_url}
+        {assign var=is_current_parent_menu value=true}
+      {else}
+        {assign var=is_current_parent_menu value=false}
+      {/if}
 
       <div class="nav_link"><a href="{$i.url}"{$link_id} class="no_border">{$i.display_text}</a></div>
 
     {* child menu item *}
-    {else}
+    {else}
       <div class="nav_link_submenu"><a href="{$i.url}"{$link_id} class="no_border">&#8212; {$i.display_text}</a></div>
     {/if}
 
   {/foreach}
-  </div>
\ No newline at end of file
+  </div>
diff --git a/tabset_open.tpl b/tabset_open.tpl
index 9bebd8b..4cbd24b 100644
--- a/tabset_open.tpl
+++ b/tabset_open.tpl
@@ -4,7 +4,8 @@
         (a) the page var is the same as the current tab key (e.g. page=main in the query string), OR
         (b) if curr_tab.pages is specified as an array, and $page is included in the array (used for "sub-pages" in tabs) OR
         (c) $tab_number is specified and it's equal to $curr_tab_key *}
-      {if $curr_tab_key == $page || (is_array($curr_tab.pages) && $page|in_array:$curr_tab.pages) || $tab_number == $curr_tab_key}
+        {if $curr_tab_key == $page || (isset($curr_tab.pages) && is_array($curr_tab.pages) && $page|in_array:$curr_tab.pages) ||
+            (isset($tab_number) && $tab_number == $curr_tab_key)}
         <li class="selected"><a href="{$curr_tab.tab_link}">{$curr_tab.tab_label}</a></li>
       {else}
         <li><a href="{$curr_tab.tab_link}">{$curr_tab.tab_label}</a></li>
@@ -13,7 +14,7 @@
   </ul>
 
   <div class="prevnext_links">
-    {if $show_tabset_nav_links}
+    {if isset($show_tabset_nav_links) && $show_tabset_nav_links}
       {assign var=prev_label value=$prev_tabset_link_label|default:$LANG.word_previous_leftarrow}
       {if $prev_tabset_link}
         <span><a href="{$prev_tabset_link}">{$prev_label}</a></span>
@@ -31,4 +32,4 @@
   </div>
 
   <div class="clear"></div>
-  <div class="tab_content">
\ No newline at end of file
+  <div class="tab_content">