diff --git a/.gitignore b/.gitignore
index e401947..e43b0f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-.svn*
\ No newline at end of file
+.DS_Store
diff --git a/about/theme.php b/about/theme.php
index 819caaa..a3556d2 100644
--- a/about/theme.php
+++ b/about/theme.php
@@ -5,5 +5,5 @@
 $theme_author_email = "ben.keen@gmail.com";
 $theme_link = "https://themes.formtools.org";
 $theme_description = "A remodelling of the old grey-styled Form Tools 1.x theme.";
-$theme_version = "2.0.2";
+$theme_version = "2.0.3";
 $theme_uses_swatches = "no";
diff --git a/images/favicon.ico b/images/favicon.ico
index 106271b..527a9af 100644
Binary files a/images/favicon.ico and b/images/favicon.ico differ
diff --git a/modules_footer.tpl b/modules_footer.tpl
index 20ee678..6096c55 100644
--- a/modules_footer.tpl
+++ b/modules_footer.tpl
@@ -4,21 +4,23 @@
             </div>
 
             <div id="left">
-                <div class="nav_heading">
-                    {$LANG.phrase_module_nav}
-                </div>
-                <div id="module_nav">
-                    {ft_include file="module_menu.tpl"}
-                </div>
+                {if !$hide_nav_menu}
+                    <div class="nav_heading">
+                        {$LANG.phrase_module_nav}
+                    </div>
+                    <div id="module_nav">
+                        {ft_include file="module_menu.tpl"}
+                    </div>
 
-                <br />
+                    <br />
 
-                <div class="nav_heading">
-                {$LANG.phrase_main_nav}
-                </div>
-                <div id="main_nav">
-                    {ft_include file="menu.tpl"}
-                </div>
+                    <div class="nav_heading">
+                    {$LANG.phrase_main_nav}
+                    </div>
+                    <div id="main_nav">
+                        {ft_include file="menu.tpl"}
+                    </div>
+                {/if}
             </div>
         </div>
 
diff --git a/modules_header.tpl b/modules_header.tpl
index f5ea0dc..f5fe7dd 100644
--- a/modules_header.tpl
+++ b/modules_header.tpl
@@ -33,10 +33,12 @@
 <body class="module_pages">
 
 <div id="container">
-    <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">
+        {if isset($settings.logo_link) && !empty($settings.logo_link)}<a href="{$settings.logo_link}">{/if}<img src="{$theme_url}/images/header_logo.jpg" width="392" height="60" border="0" />{if isset($settings.logo_link) && !empty($settings.logo_link)}</a>{/if}
+    </div>
     <div id="header_row">
         <div id="left_nav_top">
-            {if $account.is_logged_in}
+            {if !$hide_header_bar && $account.is_logged_in}
                 {if $settings.release_type == "alpha"}
                     <b>{$settings.program_version}-alpha-{$settings.release_date}</b>
                 {elseif $settings.release_type == "beta"}
diff --git a/theme_config.php b/theme_config.php
index f740ffd..cc8bf7d 100644
--- a/theme_config.php
+++ b/theme_config.php
@@ -40,7 +40,6 @@
   "css/views.css",
   "css/widgets.css",
   "footer.tpl",
-  "forget_password.tpl",
   "header.tpl",
   "images/",
   "images/account_section_bg.jpg",
@@ -103,15 +102,9 @@
   "images/utilities.png",
   "images/utilities_small.png",
   "images/view.png",
-  "index.tpl",
-  "menu.tpl",
-  "messages.tpl",
-  "module_menu.tpl",
   "modules_footer.tpl",
   "modules_header.tpl",
   "scripts/",
   "scripts/jquery-ui-1.8.14.custom.min.js",
-  "tabset_close.tpl",
-  "tabset_open.tpl",
   "theme_config.php"
-);
\ No newline at end of file
+);
