diff --git a/mozilla/webtools/testopia/testopia/css/default.css b/mozilla/webtools/testopia/skins/standard/testopia.css
old mode 100755
new mode 100644
similarity index 81%
rename from mozilla/webtools/testopia/testopia/css/default.css
rename to mozilla/webtools/testopia/skins/standard/testopia.css
index c51b84c3480..d678125e6b0
--- a/mozilla/webtools/testopia/testopia/css/default.css
+++ b/mozilla/webtools/testopia/skins/standard/testopia.css
@@ -1,3 +1,51 @@
+
+#header .label {
+    display: none;
+}
+
+#header .testopia_links {
+    background: #546292;
+}
+
+#header li.tr_find {
+	position:absolute;
+	top:0px;
+	right:10px;
+}
+#header li.tr_saved_search {
+    position:absolute;
+    top:2px;
+	right:185px;
+}
+
+#header .testopia_btn {
+    background-color:#546292;
+    color:#ffffff;
+    font-weight:bold;
+    font-size:100%;
+    border:none;
+}
+
+#footer li.tr_find {
+	position:absolute;
+	top:2px;
+	right:10px;
+}
+
+#footer li.tr_saved_search {
+    position:absolute;
+    top:4px;
+	right:185px;
+}
+#footer .tr_btn {
+    background-color: #808285;
+    font-size: 80%;
+    color:#ffffff;
+    font-size:100%;
+    border:none;
+}
+
+/* old default.css */
 textarea {
   background-color: #fff;
   border: 1px solid #999;
@@ -178,4 +226,4 @@ h3 {
 dt {
   font-weight: bold;
   font-size: medium;
-}
\ No newline at end of file
+}
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/access-list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/access-list.html.tmpl
index a6bc764817c..f2e741dfd67 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/access-list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/access-list.html.tmpl
@@ -19,7 +19,8 @@
   #%]
 
 <link href="testopia/css/default.css" rel="stylesheet" type="text/css" />
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 <script type="text/javascript">
   djConfig = {
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/add.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/add.html.tmpl
index e2b0d726ce1..7b843298483 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/add.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/add.html.tmpl
@@ -19,6 +19,7 @@
   #%]
   
   [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
     title = "Add a New Test Plan Type"
   %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/delete.html.tmpl
index b22b9089014..c93c2b1b3c8 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/delete.html.tmpl
@@ -19,5 +19,6 @@
   #%]
   
   [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
     title = "Test Plan Types"
   %]
\ No newline at end of file
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/edit.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/edit.html.tmpl
index cf4d7c5254a..7ebcf1e5136 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/edit.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/edit.html.tmpl
@@ -19,6 +19,7 @@
   #%]
   
   [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
     title = "Edit Test Plan Types"
   %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/show.html.tmpl
index d13d874404c..1fbbbb61ad5 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/plantypes/show.html.tmpl
@@ -19,6 +19,7 @@
   #%]
   
   [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
     title = "Test Plan Types"
   %]
   
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/admin/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/admin/show.html.tmpl
index b460dc1da0e..2cd2bcb4da7 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/admin/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/admin/show.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/attachment/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/attachment/choose.html.tmpl
index 8a17fb970be..c4f8c22c367 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/attachment/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/attachment/choose.html.tmpl
@@ -23,6 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
    title = "Search by Attachment Number"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/attachment/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/attachment/delete.html.tmpl
index 5ea991ad3bb..a6eed22c4ba 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/attachment/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/attachment/delete.html.tmpl
@@ -34,15 +34,18 @@
 
 [% IF deleted %]
   [% title = "Attachment Deleted" %]
-  [% PROCESS global/header.html.tmpl %]
+  [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
   [% PROCESS testopia/messages.html.tmpl %]
 [% ELSIF removed %]
   [% title = "Attachment Removed from $obj.type $obj.id" %]
-  [% PROCESS global/header.html.tmpl %]
+  [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
   [% PROCESS testopia/messages.html.tmpl %]
 [% ELSE %]
   [% title = "Delete Attachment '$attachment.description'" %]
-  [% PROCESS global/header.html.tmpl %]
+  [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% IF action == 'do_delete' %]
 You are about to permanantly delete this attachment.
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/attachment/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/attachment/show.html.tmpl
index e6dea842c88..dbf4bd49b18 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/attachment/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/attachment/show.html.tmpl
@@ -34,7 +34,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 [% PROCESS testopia/messages.html.tmpl %]
 
 [% IF attachment.cases.size > 0 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/build/form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/build/form.html.tmpl
index 67988e06df1..0553a74e9f9 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/build/form.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/build/form.html.tmpl
@@ -24,7 +24,8 @@
   [% title = "Edit Build $build.name for $product.name" %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 [% PROCESS testopia/blocks.html.tmpl %]
 
 <form method="POST" action="tr_builds.cgi" name="form">
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/build/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/build/list.html.tmpl
index a6582b10b34..caf47e8fd4b 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/build/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/build/list.html.tmpl
@@ -19,6 +19,7 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = "Product Builds for $product.name"
 %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/add.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/add.html.tmpl
index 311067846a0..8e657a99863 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/add.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/add.html.tmpl
@@ -32,6 +32,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/buglist-to-case-add.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/buglist-to-case-add.html.tmpl
index 75c489c8c41..57b491fcab4 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/buglist-to-case-add.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/buglist-to-case-add.html.tmpl
@@ -34,6 +34,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   style = style
 %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/buglist-to-case-entry.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/buglist-to-case-entry.html.tmpl
index a4ca9c0941b..643815abe53 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/buglist-to-case-entry.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/buglist-to-case-entry.html.tmpl
@@ -34,6 +34,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/choose.html.tmpl
index 2efa56074fa..c6ee543d797 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/choose.html.tmpl
@@ -23,6 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
    title = "Search by Test Case Number"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/clone.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/clone.html.tmpl
index 4300fac36e6..502c2f4a325 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/clone.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/clone.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 <form action="tr_show_case.cgi" method="POST">
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/delete-list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/delete-list.html.tmpl
index 2923cfe5cc4..56dc65d983d 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/delete-list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/delete-list.html.tmpl
@@ -32,7 +32,8 @@
 [%# Page Header #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] 
   title = "Deleting Multiple Test Cases" 
 %] 
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/delete.html.tmpl
index 5c4b3958122..9bd9c61e977 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/delete.html.tmpl
@@ -38,7 +38,8 @@
 [% ELSE %]
   [% title = "Delete Test Case: $case.id - $case.summary" %]
 [% END %]
-[% PROCESS global/header.html.tmpl %] 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %] 
 
 [% IF NOT deleted %]
 You are about to permanently delete this test case with all its history. 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/history.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/history.html.tmpl
index d604bf23fb2..665ef80091e 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/history.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/history.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/list.html.tmpl
index 0f0f26e3c28..751b9265069 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/list.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/show.html.tmpl
index 5cd476ca24f..fdc8a17adeb 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/show.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/case/unlink.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/case/unlink.html.tmpl
index 628d6f663c9..b298b0e9fe7 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/case/unlink.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/case/unlink.html.tmpl
@@ -24,7 +24,8 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] 
   title = "Unlink Test Case: $case.id - $case.summary" 
 %] 
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/caserun/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/caserun/delete.html.tmpl
index eec66313b1f..5a9b97a775a 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/caserun/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/caserun/delete.html.tmpl
@@ -33,7 +33,8 @@
 [%# Page Header #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %] 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %] 
 
 [% IF NOT deleted %]
 [% IF caseruns %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/caserun/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/caserun/list.html.tmpl
index 65f91b2f7e0..00d30c9eee8 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/caserun/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/caserun/list.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/caserun/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/caserun/show.html.tmpl
index 173815d2e1b..2dce881b5ba 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/caserun/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/caserun/show.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/messages.html.tmpl %]
 [% PROCESS testopia/caserun/navigate.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/category/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/category/delete.html.tmpl
index c9712e3336a..37161e1f408 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/category/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/category/delete.html.tmpl
@@ -19,6 +19,7 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = "Delete Category $category.name From Product $product.name"
 %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/category/form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/category/form.html.tmpl
index da66db5c39e..9a846e17009 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/category/form.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/category/form.html.tmpl
@@ -24,7 +24,8 @@
   [% title = "Edit Category $category.name for $product.name" %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 <form method="POST" action="tr_categories.cgi" name="form">
   <input type="hidden" name="action" value="[% action FILTER none %]"/>
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/category/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/category/list.html.tmpl
index 66619da2eed..002f590e7e1 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/category/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/category/list.html.tmpl
@@ -19,6 +19,7 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = "Test Categories for $product.name"
 %]
 <table>
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/add.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/add.html.tmpl
index abe7ab3961a..f6ded8069a3 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/add.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/add.html.tmpl
@@ -33,7 +33,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/show.html.tmpl
index 40b96b4dc2a..5d38e973b13 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/admin/show.html.tmpl
@@ -34,7 +34,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/choose.html.tmpl
index bb8e3cf7952..88f1c6ed5a8 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/choose.html.tmpl
@@ -23,6 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
    title = "Search by Test Run Environment Number"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/delete.html.tmpl
index 4f54a9e0849..e89f0222ec6 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/delete.html.tmpl
@@ -33,7 +33,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% IF deleted %]
 Environment Deleted
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/export.xml.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/export.xml.tmpl
index 8bf97bcf78b..1e91908717e 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/export.xml.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/export.xml.tmpl
@@ -33,7 +33,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/import.xml.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/import.xml.tmpl
index 5a95351ab13..a862412831b 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/import.xml.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/import.xml.tmpl
@@ -33,7 +33,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/list.html.tmpl
index 81de64049b0..b2b492ed999 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/list.html.tmpl
@@ -34,7 +34,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/environment/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/environment/show.html.tmpl
index f8832abef50..e0bccc01905 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/environment/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/environment/show.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/plan/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/plan/choose.html.tmpl
index 36eefefe7d3..3c661ee815b 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/plan/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/plan/choose.html.tmpl
@@ -23,6 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
    title = "Choose a Test Plan"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/plan/clone.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/plan/clone.html.tmpl
index b6734b81ce7..f2584c7e51e 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/plan/clone.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/plan/clone.html.tmpl
@@ -34,6 +34,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = "Clone Test Plan: $plan.name"
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/plan/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/plan/delete.html.tmpl
index 6092704c82e..1fc02e96cab 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/plan/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/plan/delete.html.tmpl
@@ -33,7 +33,8 @@
 [%# Page Header #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] 
   title = "Delete Test plan $plan.name" 
 %] 
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/plan/history.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/plan/history.html.tmpl
index b7b665ceab5..a27affc40da 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/plan/history.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/plan/history.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/plan/list-product.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/plan/list-product.html.tmpl
index f1da252ec28..f9e94fd8625 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/plan/list-product.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/plan/list-product.html.tmpl
@@ -35,6 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/plan/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/plan/list.html.tmpl
index e5cd2512c29..dc72e5ef768 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/plan/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/plan/list.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/plan/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/plan/show.html.tmpl
index 1390b3f5c1f..2f263f19dd9 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/plan/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/plan/show.html.tmpl
@@ -36,6 +36,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/quicksearch.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/quicksearch.html.tmpl
index 11eac235e52..74d47172f7e 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/quicksearch.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/quicksearch.html.tmpl
@@ -18,7 +18,8 @@
   # Contributor(s): Greg Hendricks <ghendricks@novell.com>
   #%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 <form action="tr_quicksearch.cgi"><b>Testopia Quick Search:</b> <input
   name="query"> <input type="submit"></form>
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl
index 13932615843..387b9e0c45d 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-count.html.tmpl
@@ -23,7 +23,8 @@
   #%]
   
 [% title = "Bug Impact Report for Plan $plan.id - $plan.name" %]
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 <p>This report details the bugs detected in this test plan and the number of test cases that each bug is attached to.
 Those bugs impacting the most test cases appear at the top. 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl
index fcbf63d2c70..f63f3e34e2d 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-severity-status-form.html.tmpl
@@ -35,6 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl
index e39da639cb9..e59305f21d1 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/bug-stats-form.html.tmpl
@@ -35,6 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl
index ca40edb14d3..87f3ed0d810 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/build-coverage.html.tmpl
@@ -34,7 +34,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 <h3>Summary of all runs</h3>
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/report.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/report.html.tmpl
index 54d486bf3b8..a50443c1d6c 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/report.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/report.html.tmpl
@@ -65,7 +65,8 @@
   [% col_field_disp FILTER html %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] 
   style = "
     .t1     { background-color: #ffffff } /* white       */
     .t2     { background-color: #dfefff } /* light blue  */
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl
index e8809723196..d857c718ef5 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/reports/test-burnout-form.html.tmpl
@@ -35,6 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/add.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/add.html.tmpl
index 95212d3d434..ad413791fca 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/add.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/add.html.tmpl
@@ -36,7 +36,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 <script type="text/javascript">
   djConfig = {
     parseWidgets: false,
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl
index 8274a80a6f5..c7f02a6ce1d 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/choose.html.tmpl
@@ -23,6 +23,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
    title = "Search by Test Run Number"
  %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/clone.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/clone.html.tmpl
index d849060dc66..002dd5a3df0 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/clone.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/clone.html.tmpl
@@ -33,7 +33,8 @@
 [%# Page Header #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] 
   title = "Clone Test Run: $run.summary" 
   style = style 
 %] 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/delete.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/delete.html.tmpl
index 3f73e39c45d..5cdb55ada6b 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/delete.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/delete.html.tmpl
@@ -33,7 +33,8 @@
 [%# Page Header #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] 
   title = "Delete Test Run $run.summary" 
 %] 
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/history.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/history.html.tmpl
index c8bd2f2347b..c1df7b40972 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/history.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/history.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/list.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/list.html.tmpl
index 51c0a7e9fbd..2c25b833f77 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/list.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/list.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/regression.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/regression.html.tmpl
index 69f2445e7e9..33d2720fcd7 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/regression.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/regression.html.tmpl
@@ -35,6 +35,7 @@
 [%############################################################################%]
 
 [% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css']
   title = title
   style = style
 %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/run/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/run/show.html.tmpl
index 64100f941d4..2a1da0b97d1 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/run/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/run/show.html.tmpl
@@ -35,7 +35,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 [% PROCESS testopia/blocks.html.tmpl %]
 [% PROCESS testopia/style.none.tmpl %]
 
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/search/advanced.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/search/advanced.html.tmpl
index c94774861cb..c27e741c069 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/search/advanced.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/search/advanced.html.tmpl
@@ -32,7 +32,8 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] %]
 [% PROCESS testopia/messages.html.tmpl %]
 [% PROCESS testopia/style.none.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]
diff --git a/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl
index bd3f2882236..0c3453616ae 100644
--- a/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/testopia/tag/show.html.tmpl
@@ -19,7 +19,8 @@
   #%]
   
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
+   style_urls = ['testopia.css'] 
    title = "Tags" %]
 [% PROCESS testopia/messages.html.tmpl %]
 [% PROCESS testopia/blocks.html.tmpl %]