From 9e1b1ed462c17c6a109ac921269d97d99e6b1565 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Wed, 22 Apr 2015 15:27:30 -0400
Subject: [PATCH] Moved color settings to CSS.

The templates have been modified to remove hard-coded background
color settings and use the styles defined in a new CSS file.

https://fedorahosted.org/pki/ticket/1296
---
 base/ca/shared/webapps/ca/404.html                 |  2 +-
 base/ca/shared/webapps/ca/500.html                 |  2 +-
 .../ca/admin/ca/securitydomainlogin.template       |  2 +-
 .../shared/webapps/ca/admin/ca/sendCookie.template |  2 +-
 base/ca/shared/webapps/ca/agent/header.template    |  3 ++-
 base/ca/shared/webapps/ca/agent/index.template     |  3 ++-
 base/ca/shared/webapps/ca/agent/ports.template     |  3 ++-
 base/ca/shared/webapps/ca/ee/ca/index.html         |  5 ++--
 base/ca/shared/webapps/ca/ee/ca/tabs.html          |  3 ++-
 base/ca/shared/webapps/ca/services.template        |  2 +-
 base/kra/shared/webapps/kra/404.html               |  2 +-
 base/kra/shared/webapps/kra/500.html               |  2 +-
 base/kra/shared/webapps/kra/agent/header.template  |  3 ++-
 base/kra/shared/webapps/kra/agent/index.template   |  3 ++-
 base/kra/shared/webapps/kra/services.template      |  2 +-
 base/ocsp/shared/webapps/ocsp/404.html             |  2 +-
 base/ocsp/shared/webapps/ocsp/500.html             |  2 +-
 .../ocsp/shared/webapps/ocsp/agent/header.template |  3 ++-
 base/ocsp/shared/webapps/ocsp/agent/index.template |  3 ++-
 base/ocsp/shared/webapps/ocsp/agent/ports.template |  3 ++-
 base/ocsp/shared/webapps/ocsp/services.template    |  2 +-
 base/server/share/webapps/ROOT/index.jsp           |  2 +-
 .../pki/admin/console/config/config_addhsm.vm      |  2 +-
 .../webapps/pki/admin/console/config/login.vm      |  2 +-
 .../console/config/securitydomainloginpanel.vm     |  2 +-
 .../webapps/pki/admin/console/config/wizard.vm     |  2 +-
 base/tks/shared/webapps/tks/404.html               |  2 +-
 base/tks/shared/webapps/tks/500.html               |  2 +-
 base/tks/shared/webapps/tks/agent/header.template  |  3 ++-
 base/tks/shared/webapps/tks/agent/index.template   |  3 ++-
 base/tks/shared/webapps/tks/agent/ports.template   |  3 ++-
 base/tks/shared/webapps/tks/services.template      |  2 +-
 base/tps-client/apache/docroot/404.html            |  2 +-
 base/tps-client/apache/docroot/500.html            |  2 +-
 base/tps-client/apache/docroot/index.vm            |  2 +-
 .../apache/docroot/tokendb/addResults.template     |  3 ++-
 .../apache/docroot/tokendb/auditAdmin.template     |  3 ++-
 .../apache/docroot/tokendb/delete.template         |  3 ++-
 .../apache/docroot/tokendb/deleteResults.template  |  3 ++-
 .../apache/docroot/tokendb/doToken.template        |  3 ++-
 .../apache/docroot/tokendb/doTokenConfirm.template |  3 ++-
 .../apache/docroot/tokendb/edit.template           |  3 ++-
 .../apache/docroot/tokendb/editResults.template    |  3 ++-
 .../apache/docroot/tokendb/editUser.template       |  3 ++-
 .../apache/docroot/tokendb/error.template          |  3 ++-
 .../apache/docroot/tokendb/index.template          |  3 ++-
 .../apache/docroot/tokendb/indexAdmin.template     |  3 ++-
 .../apache/docroot/tokendb/indexOperator.template  |  3 ++-
 .../tps-client/apache/docroot/tokendb/new.template |  3 ++-
 .../apache/docroot/tokendb/newUser.template        |  3 ++-
 .../apache/docroot/tokendb/revoke.template         |  3 ++-
 .../apache/docroot/tokendb/search.template         |  3 ++-
 .../apache/docroot/tokendb/searchActivity.template |  3 ++-
 .../docroot/tokendb/searchActivityAdmin.template   |  3 ++-
 .../tokendb/searchActivityAdminResults.template    |  3 ++-
 .../docroot/tokendb/searchActivityResults.template |  3 ++-
 .../apache/docroot/tokendb/searchAdmin.template    |  3 ++-
 .../docroot/tokendb/searchAdminResults.template    |  3 ++-
 .../docroot/tokendb/searchCertificate.template     |  3 ++-
 .../tokendb/searchCertificateResults.template      |  3 ++-
 .../apache/docroot/tokendb/searchResults.template  |  3 ++-
 .../apache/docroot/tokendb/searchUser.template     |  3 ++-
 .../docroot/tokendb/searchUserResults.template     |  3 ++-
 .../apache/docroot/tokendb/selfTest.template       |  3 ++-
 .../docroot/tokendb/selfTestResults.template       |  3 ++-
 .../apache/docroot/tokendb/show.template           |  3 ++-
 .../apache/docroot/tokendb/showAdmin.template      |  3 ++-
 .../apache/docroot/tokendb/showCert.template       |  3 ++-
 .../apache/docroot/tokendb/userDelete.template     |  3 ++-
 .../tps/admin/console/config/config_addhsm.vm      |  2 +-
 .../docroot/tps/admin/console/config/config_db.vm  |  2 +-
 .../docroot/tps/admin/console/config/config_hsm.vm |  2 +-
 .../tps/admin/console/config/config_join.vm        |  2 +-
 .../tps/admin/console/config/config_rootca.vm      |  2 +-
 .../docroot/tps/admin/console/config/login.vm      |  2 +-
 .../console/config/securitydomainloginpanel.vm     |  2 +-
 .../docroot/tps/admin/console/config/wizard.vm     |  2 +-
 base/tps/shared/webapps/tps/404.html               |  2 +-
 base/tps/shared/webapps/tps/500.html               |  2 +-
 dogtag/common-ui/shared/css/pki-360.css            |  1 -
 dogtag/common-ui/shared/css/pki-base.css           |  1 +
 dogtag/common-ui/shared/css/pki-theme.css          | 28 ++++++++++++++++++++++
 82 files changed, 156 insertions(+), 81 deletions(-)
 create mode 100644 dogtag/common-ui/shared/css/pki-theme.css

diff --git a/base/ca/shared/webapps/ca/404.html b/base/ca/shared/webapps/ca/404.html
index 49f75a9a39d985471db1266f0fd67295b7efe819..27d18979bbe3055c099edb8f24836aeaf01b16f2 100755
--- a/base/ca/shared/webapps/ca/404.html
+++ b/base/ca/shared/webapps/ca/404.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/ca/shared/webapps/ca/500.html b/base/ca/shared/webapps/ca/500.html
index fe8f8de33d33f16e748cd0fe71952f874d426f48..7a336c165d901f769c2fba9df5dac25145250d16 100755
--- a/base/ca/shared/webapps/ca/500.html
+++ b/base/ca/shared/webapps/ca/500.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template b/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
index eac3ac4765b18f36346a42f51d8c0b3633738550..c6aee1d80bcbabc2fdc2b369cef2ec6dc84aa68e 100644
--- a/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
+++ b/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
@@ -39,7 +39,7 @@
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
                                                                                 
 <div id="mainNavInner">
diff --git a/base/ca/shared/webapps/ca/admin/ca/sendCookie.template b/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
index 296f2f07b2f38140b34e4c8be0bd25310dd67502..4e0821063a79dd3ad7c19b541a7c7fb5abed9408 100644
--- a/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
+++ b/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
@@ -36,7 +36,7 @@
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
                                                                                 
 <div id="mainNavInner">
diff --git a/base/ca/shared/webapps/ca/agent/header.template b/base/ca/shared/webapps/ca/agent/header.template
index 654393722e462d5d427fbb35b55bc61fbaf6b236..6406a21c47f1b85cf60d70b8b2a2af1aafadd1a3 100644
--- a/base/ca/shared/webapps/ca/agent/header.template
+++ b/base/ca/shared/webapps/ca/agent/header.template
@@ -42,10 +42,11 @@ $(function() {
 <CMS_TEMPLATE>
 <title>Header</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body onResize=location.reload() bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/ca/shared/webapps/ca/agent/index.template b/base/ca/shared/webapps/ca/agent/index.template
index 4f45c73906158aae4c4f098e9700dd8b37864dba..246e6eb8e0228f12dde1e28e29e2df54e2287df3 100644
--- a/base/ca/shared/webapps/ca/agent/index.template
+++ b/base/ca/shared/webapps/ca/agent/index.template
@@ -21,11 +21,12 @@
 <CMS_TEMPLATE>
 <title>CA Agent</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 <table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#000080"> 
+  <tr class="pki-agent-theme">
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
diff --git a/base/ca/shared/webapps/ca/agent/ports.template b/base/ca/shared/webapps/ca/agent/ports.template
index bfec339817e86fd55e29c1c50565e889a8b3925a..adf1c5a80a20178a4d5551867506593fff63ca36 100644
--- a/base/ca/shared/webapps/ca/agent/ports.template
+++ b/base/ca/shared/webapps/ca/agent/ports.template
@@ -21,11 +21,12 @@
 <CMS_TEMPLATE>
 <title>CA Agent Ports</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 <table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#000080"> 
+  <tr class="pki-agent-theme">
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
diff --git a/base/ca/shared/webapps/ca/ee/ca/index.html b/base/ca/shared/webapps/ca/ee/ca/index.html
index df8d8d2d8367ed0064f49c1e0e04eb56ce0274f1..bf25a16ad5a46333d7ccc8017d3cced8492ec084 100644
--- a/base/ca/shared/webapps/ca/ee/ca/index.html
+++ b/base/ca/shared/webapps/ca/ee/ca/index.html
@@ -24,6 +24,7 @@
 <title>CA End-Entity</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 <SCRIPT LANGUAGE="JavaScript"></SCRIPT>
 <script lang="javascript" src="/ca/ee/dynamicVars.js"></script>
 <script lang="javascript" src="/ca/ee/cms-funcs.js"></script>
@@ -310,9 +311,9 @@ function reloadTabs(tabnum)
 function loadTabs()
 {
 	with (top.tabsf.document) {
-        writeln('<body onresize="top.doResize();" bgcolor="#4f52b5" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">');
+        writeln('<body onresize="top.doResize();" class="pki-ee-theme" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">');
 
-		writeln('<table border=0 width="100%" cellspacing="0" cellpadding="0" bgcolor="#4f52b5">');
+		writeln('<table border=0 width="100%" cellspacing="0" cellpadding="0" class="pki-ee-theme">');
 		writeln('<tr><td>');
 		writeln('<table border=0 cellspacing=12 cellpadding=0>');
 		writeln('<tr>');
diff --git a/base/ca/shared/webapps/ca/ee/ca/tabs.html b/base/ca/shared/webapps/ca/ee/ca/tabs.html
index 2cf6ee3be4668ec999f6edaedb1741d605f03e8b..53977e43f86b8d69e7f47e93d7c3d305a0b3c361 100644
--- a/base/ca/shared/webapps/ca/ee/ca/tabs.html
+++ b/base/ca/shared/webapps/ca/ee/ca/tabs.html
@@ -20,12 +20,13 @@
 <head>
 <title>CA End-Entity</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 <SCRIPT LANGUAGE="JavaScript"></SCRIPT>
 <SCRIPT LANGUAGE="JavaScript" SRC="/ca/ee/dynamicVars.js"></SCRIPT>
 <SCRIPT LANGUAGE="JavaScript" SRC="/ca/ee/cms-funcs.js"> </SCRIPT>
 </head>
 
-<body bgcolor="#4f52b5" onresize="top.doResize();">
+<body class="pki-ee-theme" onresize="top.doResize();">
 <script lang="javascript">
 <!--//
 top.loadTabs();
diff --git a/base/ca/shared/webapps/ca/services.template b/base/ca/shared/webapps/ca/services.template
index 648ffd8a9a1c605139b435e653e2b824def781c8..22081081ef648a73f04238621ab596d218271197 100644
--- a/base/ca/shared/webapps/ca/services.template
+++ b/base/ca/shared/webapps/ca/services.template
@@ -62,7 +62,7 @@ $(function() {
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/kra/shared/webapps/kra/404.html b/base/kra/shared/webapps/kra/404.html
index 8ccd40650c00808b8a9082038bcd48fdb4ec5b15..b3cca0165f0b3ee6dae4ae99a42546f042c54f0e 100755
--- a/base/kra/shared/webapps/kra/404.html
+++ b/base/kra/shared/webapps/kra/404.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/kra/shared/webapps/kra/500.html b/base/kra/shared/webapps/kra/500.html
index 1dc79ac2cb2c004ee0e0295ebf974407925277a3..102710dbd5185724f0c58fb885f26e03f2340fa8 100755
--- a/base/kra/shared/webapps/kra/500.html
+++ b/base/kra/shared/webapps/kra/500.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/kra/shared/webapps/kra/agent/header.template b/base/kra/shared/webapps/kra/agent/header.template
index d1221b14ba59565c0bcdf59901e87d94fd325459..f500bb0d5d5a0dfe528a6a7bdfc507f5a8ae8159 100644
--- a/base/kra/shared/webapps/kra/agent/header.template
+++ b/base/kra/shared/webapps/kra/agent/header.template
@@ -21,10 +21,11 @@
 <CMS_TEMPLATE>
 <title>Header</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body onResize=location.reload() bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/kra/shared/webapps/kra/agent/index.template b/base/kra/shared/webapps/kra/agent/index.template
index c3200bb9c24a801fddcc8401f5ef2ff77d447f3b..dcb39ce3ddbee1a8be9008811e7d02f55a9e6d8e 100644
--- a/base/kra/shared/webapps/kra/agent/index.template
+++ b/base/kra/shared/webapps/kra/agent/index.template
@@ -21,11 +21,12 @@
 <CMS_TEMPLATE>
 <title>DRM Agent</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 <table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#000080"> 
+  <tr class="pki-agent-theme">
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
diff --git a/base/kra/shared/webapps/kra/services.template b/base/kra/shared/webapps/kra/services.template
index 3b9f4ee4828d1caf296cb2554ba2c5cc72018341..7f075dd91d4a3cb0410bbeaecb05b4453a2b7b5d 100644
--- a/base/kra/shared/webapps/kra/services.template
+++ b/base/kra/shared/webapps/kra/services.template
@@ -62,7 +62,7 @@ $(function() {
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
                                                                                 
diff --git a/base/ocsp/shared/webapps/ocsp/404.html b/base/ocsp/shared/webapps/ocsp/404.html
index fd5264c438268cb7be1dd4e17ee3cefef678800d..b8725e73f138844e968f37030ad6fca467931449 100755
--- a/base/ocsp/shared/webapps/ocsp/404.html
+++ b/base/ocsp/shared/webapps/ocsp/404.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/ocsp/shared/webapps/ocsp/500.html b/base/ocsp/shared/webapps/ocsp/500.html
index 2749fc752dd02ba3788796f1baf9a2d98c9f785a..420d8ceade338c6d695ab270726ab75a00904160 100755
--- a/base/ocsp/shared/webapps/ocsp/500.html
+++ b/base/ocsp/shared/webapps/ocsp/500.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/ocsp/shared/webapps/ocsp/agent/header.template b/base/ocsp/shared/webapps/ocsp/agent/header.template
index d1221b14ba59565c0bcdf59901e87d94fd325459..f500bb0d5d5a0dfe528a6a7bdfc507f5a8ae8159 100644
--- a/base/ocsp/shared/webapps/ocsp/agent/header.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/header.template
@@ -21,10 +21,11 @@
 <CMS_TEMPLATE>
 <title>Header</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body onResize=location.reload() bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/ocsp/shared/webapps/ocsp/agent/index.template b/base/ocsp/shared/webapps/ocsp/agent/index.template
index be2c39d9e3c8c6892b685a9dcaa063e13fe1931f..f8ae3d010fc39b66613cb95421b6856169d3259a 100644
--- a/base/ocsp/shared/webapps/ocsp/agent/index.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/index.template
@@ -21,11 +21,12 @@
 <CMS_TEMPLATE>
 <title>OCSP Agent</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 <table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#000080"> 
+  <tr class="pki-agent-theme">
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
diff --git a/base/ocsp/shared/webapps/ocsp/agent/ports.template b/base/ocsp/shared/webapps/ocsp/agent/ports.template
index 8413ada1baff28accd83491dd50aa86327ba7040..2acc873e83940e8e0e496bfc21046280b5e216c3 100644
--- a/base/ocsp/shared/webapps/ocsp/agent/ports.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ports.template
@@ -21,11 +21,12 @@
 <CMS_TEMPLATE>
 <title>OCSP Agent Ports</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 <table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#000080"> 
+  <tr class="pki-agent-theme">
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
diff --git a/base/ocsp/shared/webapps/ocsp/services.template b/base/ocsp/shared/webapps/ocsp/services.template
index a34d75deb6c8fffcc08aa6664bc96c59e67c7916..a57a7f3b450abbc5c862d25d604d0ac2a160c0c0 100644
--- a/base/ocsp/shared/webapps/ocsp/services.template
+++ b/base/ocsp/shared/webapps/ocsp/services.template
@@ -62,7 +62,7 @@ $(function() {
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/server/share/webapps/ROOT/index.jsp b/base/server/share/webapps/ROOT/index.jsp
index 277969219f9a5b5036d6031a7737109cc7e40857..509a2d02ed79fcc3c97c516e587d22bcb5de84a3 100644
--- a/base/server/share/webapps/ROOT/index.jsp
+++ b/base/server/share/webapps/ROOT/index.jsp
@@ -60,7 +60,7 @@ $(function() {
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/server/share/webapps/pki/admin/console/config/config_addhsm.vm b/base/server/share/webapps/pki/admin/console/config/config_addhsm.vm
index 839cff56a2a3a545fc2fa42a8d959451317e1ee0..3642a2d697dea3f4373ac29f38c9c0e07445f708 100644
--- a/base/server/share/webapps/pki/admin/console/config/config_addhsm.vm
+++ b/base/server/share/webapps/pki/admin/console/config/config_addhsm.vm
@@ -38,7 +38,7 @@
 
   <body onLoad="checkClose();"><div id="wrap"><div id="wrap">
   
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 
 <div id="mainNavInner">
diff --git a/base/server/share/webapps/pki/admin/console/config/login.vm b/base/server/share/webapps/pki/admin/console/config/login.vm
index 2400bd2d3cd1eac501209ac0cc0b1c5f299b69e2..9ce0b9074748fd981884ecfaa2dfb512cecb5a52 100644
--- a/base/server/share/webapps/pki/admin/console/config/login.vm
+++ b/base/server/share/webapps/pki/admin/console/config/login.vm
@@ -32,7 +32,7 @@
   
 #include ( "admin/console/config/header.vm" )
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 
 <div id="mainNavInner">
diff --git a/base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm b/base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm
index e9e0763abf0cb75231bfc2c34f7cf3984259d5f0..f7b51c36d2c022c55146f70760bbc9f0609e5613 100644
--- a/base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm
+++ b/base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm
@@ -40,7 +40,7 @@
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
                                                                                 
 <div id="mainNavInner">
diff --git a/base/server/share/webapps/pki/admin/console/config/wizard.vm b/base/server/share/webapps/pki/admin/console/config/wizard.vm
index cc868e5727f2bbbffcbb2416440e75af510de47f..41ed63205ea7b6673a938f984e0fdf7490e22ed1 100644
--- a/base/server/share/webapps/pki/admin/console/config/wizard.vm
+++ b/base/server/share/webapps/pki/admin/console/config/wizard.vm
@@ -55,7 +55,7 @@ function process(fop) {
   
 #include ( "admin/console/config/header.vm" )
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 
 <div id="mainNavInner">
diff --git a/base/tks/shared/webapps/tks/404.html b/base/tks/shared/webapps/tks/404.html
index 5122cc2e207dae89c4fd101a0f0b5f27674fbc40..68e0e316c24824428f27cf640202a23cc777a265 100755
--- a/base/tks/shared/webapps/tks/404.html
+++ b/base/tks/shared/webapps/tks/404.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/tks/shared/webapps/tks/500.html b/base/tks/shared/webapps/tks/500.html
index 7547fa864b9ac9c652d3b460119c1b20b16563d6..e15f0a4b94de90c6b7af4a09f3d01654e5c54113 100755
--- a/base/tks/shared/webapps/tks/500.html
+++ b/base/tks/shared/webapps/tks/500.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/tks/shared/webapps/tks/agent/header.template b/base/tks/shared/webapps/tks/agent/header.template
index d1221b14ba59565c0bcdf59901e87d94fd325459..f500bb0d5d5a0dfe528a6a7bdfc507f5a8ae8159 100644
--- a/base/tks/shared/webapps/tks/agent/header.template
+++ b/base/tks/shared/webapps/tks/agent/header.template
@@ -21,10 +21,11 @@
 <CMS_TEMPLATE>
 <title>Header</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body onResize=location.reload() bgcolor="#CCCCCC" link="#FFFFFF" vlink="#FFFFFF" alink="#CCCCFF">
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tks/shared/webapps/tks/agent/index.template b/base/tks/shared/webapps/tks/agent/index.template
index 534ad257b173225b8fddc432f9b5ab0fa0c240e7..ebf0a930144e7a1254e3bbcad5d2249b558766e9 100644
--- a/base/tks/shared/webapps/tks/agent/index.template
+++ b/base/tks/shared/webapps/tks/agent/index.template
@@ -21,11 +21,12 @@
 <CMS_TEMPLATE>
 <title>TKS Agent</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 <table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#000080"> 
+  <tr class="pki-agent-theme">
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
diff --git a/base/tks/shared/webapps/tks/agent/ports.template b/base/tks/shared/webapps/tks/agent/ports.template
index 4d33dd3f02180dcc91a8d40be78b0a5ffc69e40f..4bdfaa10538887a4ea95c10208e42f0af73a7f10 100644
--- a/base/tks/shared/webapps/tks/agent/ports.template
+++ b/base/tks/shared/webapps/tks/agent/ports.template
@@ -21,11 +21,12 @@
 <CMS_TEMPLATE>
 <title>TKS Agent Ports</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </head>
 
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 <table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#000080"> 
+  <tr class="pki-agent-theme">
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
diff --git a/base/tks/shared/webapps/tks/services.template b/base/tks/shared/webapps/tks/services.template
index 212374d7f113e789cd8c4bdf0a6690d202f5eb5a..d3f598cb64b00dceddfb90b28562af93f7001118 100644
--- a/base/tks/shared/webapps/tks/services.template
+++ b/base/tks/shared/webapps/tks/services.template
@@ -62,7 +62,7 @@ $(function() {
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/tps-client/apache/docroot/404.html b/base/tps-client/apache/docroot/404.html
index 01a0832c9cc34906ff87f082fd1d73f899a107c4..c4aa02e9ce314213253f97477315742cbd73e396 100755
--- a/base/tps-client/apache/docroot/404.html
+++ b/base/tps-client/apache/docroot/404.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/tps-client/apache/docroot/500.html b/base/tps-client/apache/docroot/500.html
index 94ff29712a405027a82b4aa5b15245eed0ceb264..929ac3f8970f9bd811b0e9b98c99195787be5cb0 100755
--- a/base/tps-client/apache/docroot/500.html
+++ b/base/tps-client/apache/docroot/500.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/tps-client/apache/docroot/index.vm b/base/tps-client/apache/docroot/index.vm
index 438d014ef9caebeca60e44be0db4c7324376b714..5fb21cd38f06db840bacd67c4a15521da75fbfdb 100755
--- a/base/tps-client/apache/docroot/index.vm
+++ b/base/tps-client/apache/docroot/index.vm
@@ -28,7 +28,7 @@
 
 #include ( "header.vm" )
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/tps-client/apache/docroot/tokendb/addResults.template b/base/tps-client/apache/docroot/tokendb/addResults.template
index eca814f8b16781bd39370be5024e4d194b513c98..b79209ece55c1568845d2cdc5aa28307cc8e57d9 100644
--- a/base/tps-client/apache/docroot/tokendb/addResults.template
+++ b/base/tps-client/apache/docroot/tokendb/addResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/auditAdmin.template b/base/tps-client/apache/docroot/tokendb/auditAdmin.template
index ff299530c9ce4302782d275554db1db174b68488..db700f18103c8f7327f96530b007c21fb15cc4a0 100644
--- a/base/tps-client/apache/docroot/tokendb/auditAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/auditAdmin.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/delete.template b/base/tps-client/apache/docroot/tokendb/delete.template
index 4d3243db19a3a19129e158abc83a15680b400b3d..9369630b278de867fda84d24fde3eb8d3eb41fca 100644
--- a/base/tps-client/apache/docroot/tokendb/delete.template
+++ b/base/tps-client/apache/docroot/tokendb/delete.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/deleteResults.template b/base/tps-client/apache/docroot/tokendb/deleteResults.template
index 606e11bb091a40a47e24340e5c61b36606f2ea3b..8bb29b9854046b4a7a83cb2ee9be9857440b0057 100644
--- a/base/tps-client/apache/docroot/tokendb/deleteResults.template
+++ b/base/tps-client/apache/docroot/tokendb/deleteResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/doToken.template b/base/tps-client/apache/docroot/tokendb/doToken.template
index 419a9a240c4d7afdaa4d7487c4e9155316f96abc..d4d380c1db6f3def80d47e87cc741ac5a0ac562b 100644
--- a/base/tps-client/apache/docroot/tokendb/doToken.template
+++ b/base/tps-client/apache/docroot/tokendb/doToken.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/doTokenConfirm.template b/base/tps-client/apache/docroot/tokendb/doTokenConfirm.template
index 16bd2a191db52bedf51dc8e94afca9962c825628..c8c3015f8d3b90d8ba84547187c4effe72560b14 100644
--- a/base/tps-client/apache/docroot/tokendb/doTokenConfirm.template
+++ b/base/tps-client/apache/docroot/tokendb/doTokenConfirm.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/edit.template b/base/tps-client/apache/docroot/tokendb/edit.template
index 163ae3bd18a73c1e14ca24495b4d007ef361e45a..b21bf92fa6c45a718cb1aa08e80617b3d865c9aa 100644
--- a/base/tps-client/apache/docroot/tokendb/edit.template
+++ b/base/tps-client/apache/docroot/tokendb/edit.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/editResults.template b/base/tps-client/apache/docroot/tokendb/editResults.template
index 783b065c39c1f4bcd6a35cd4812cad9e5202548c..781d2a6049ce3be8281a4b89767e8f5fc7078b09 100644
--- a/base/tps-client/apache/docroot/tokendb/editResults.template
+++ b/base/tps-client/apache/docroot/tokendb/editResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/editUser.template b/base/tps-client/apache/docroot/tokendb/editUser.template
index 55b587cbeafdc788e164fd52e4aeff4164148413..babda09272b3e68f91abb1631c76090c7eeeccc5 100644
--- a/base/tps-client/apache/docroot/tokendb/editUser.template
+++ b/base/tps-client/apache/docroot/tokendb/editUser.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/error.template b/base/tps-client/apache/docroot/tokendb/error.template
index 8f629ff72ce8776dcb3241e09e3bdf6ce2fb1d92..ee6e184238b4f14da0dd387306f22ff9cfd20d46 100644
--- a/base/tps-client/apache/docroot/tokendb/error.template
+++ b/base/tps-client/apache/docroot/tokendb/error.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS Error!</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/index.template b/base/tps-client/apache/docroot/tokendb/index.template
index 4aa9f0cdde75f67fd3ff2e00b1993fcc4e0a8a90..4cfee59ddcfc2839801f88456ef9665c8dfb928d 100644
--- a/base/tps-client/apache/docroot/tokendb/index.template
+++ b/base/tps-client/apache/docroot/tokendb/index.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS Agent</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/indexAdmin.template b/base/tps-client/apache/docroot/tokendb/indexAdmin.template
index 97086257b86bd4b2aa5ad1c6ed18e7d83726ea86..f95f0ea1700c42ab5547bdc25710633e824605f1 100644
--- a/base/tps-client/apache/docroot/tokendb/indexAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/indexAdmin.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS Admin</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/indexOperator.template b/base/tps-client/apache/docroot/tokendb/indexOperator.template
index 1b19028436c62d21820763422f689f959321ae87..ecebeffde5949fb4f9ff1eb5969869098680cf98 100644
--- a/base/tps-client/apache/docroot/tokendb/indexOperator.template
+++ b/base/tps-client/apache/docroot/tokendb/indexOperator.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS Operator</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/new.template b/base/tps-client/apache/docroot/tokendb/new.template
index f4bf1475d4a863190a51a4d718ef680d6e7d35af..2672bc91d079b3a8f83bc4ad7fcc4616c458cadf 100644
--- a/base/tps-client/apache/docroot/tokendb/new.template
+++ b/base/tps-client/apache/docroot/tokendb/new.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/newUser.template b/base/tps-client/apache/docroot/tokendb/newUser.template
index f1e7e6e353259502f029175fe4506c41263f2555..e489ebd9631766f9af7de7b90065ff8039b2e8aa 100644
--- a/base/tps-client/apache/docroot/tokendb/newUser.template
+++ b/base/tps-client/apache/docroot/tokendb/newUser.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/revoke.template b/base/tps-client/apache/docroot/tokendb/revoke.template
index 6a62ea11629818d36a3c221d36516b69a87d8c50..1f7fa7803798c298a9bd33cb7e3caf4fbe7fca39 100644
--- a/base/tps-client/apache/docroot/tokendb/revoke.template
+++ b/base/tps-client/apache/docroot/tokendb/revoke.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/search.template b/base/tps-client/apache/docroot/tokendb/search.template
index 305c9cd745dc08216d34cf179d23a3f4eda41425..4dccc50465d7c2ca94d4c6e1b7ada66df94677c1 100644
--- a/base/tps-client/apache/docroot/tokendb/search.template
+++ b/base/tps-client/apache/docroot/tokendb/search.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchActivity.template b/base/tps-client/apache/docroot/tokendb/searchActivity.template
index e831a28723d12911f0fed308e9df9ff036d6a5c4..9c3d0262e109fe6f4f7ac9f7d52883d28fe354af 100644
--- a/base/tps-client/apache/docroot/tokendb/searchActivity.template
+++ b/base/tps-client/apache/docroot/tokendb/searchActivity.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchActivityAdmin.template b/base/tps-client/apache/docroot/tokendb/searchActivityAdmin.template
index da201d97f36d90f6f0460c87fb6454295620222e..858087dd229863fbbacbd9aea91feac6aa157e2e 100644
--- a/base/tps-client/apache/docroot/tokendb/searchActivityAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/searchActivityAdmin.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchActivityAdminResults.template b/base/tps-client/apache/docroot/tokendb/searchActivityAdminResults.template
index d8f6587aafe8a4474976f562b146dd1840d264c7..44ffac17c686428312758a05d77612b252d69b02 100644
--- a/base/tps-client/apache/docroot/tokendb/searchActivityAdminResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchActivityAdminResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchActivityResults.template b/base/tps-client/apache/docroot/tokendb/searchActivityResults.template
index 1f97860a0b892a1d8a9bf56286e94cc704762a53..745614d2507b09b234dcc80423269c6db3588132 100644
--- a/base/tps-client/apache/docroot/tokendb/searchActivityResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchActivityResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchAdmin.template b/base/tps-client/apache/docroot/tokendb/searchAdmin.template
index b0960f5718849c20acbd60eb20485287d30a7bd4..92b07bdf1434e7b7e319decea22f78ba7061bd9d 100644
--- a/base/tps-client/apache/docroot/tokendb/searchAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/searchAdmin.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchAdminResults.template b/base/tps-client/apache/docroot/tokendb/searchAdminResults.template
index ab0a471c2a0eced3614683103dfce6e59ea9541d..b73129d7cecb3f3bce94c5597e55f36665529777 100644
--- a/base/tps-client/apache/docroot/tokendb/searchAdminResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchAdminResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchCertificate.template b/base/tps-client/apache/docroot/tokendb/searchCertificate.template
index 788491fbf3e17b522aaa6f51c55c488f9b08620c..54bf1fa5b9caadf336c07a554a9cba152969734d 100644
--- a/base/tps-client/apache/docroot/tokendb/searchCertificate.template
+++ b/base/tps-client/apache/docroot/tokendb/searchCertificate.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchCertificateResults.template b/base/tps-client/apache/docroot/tokendb/searchCertificateResults.template
index bb6dcabf3f53024a8baa9092eba56f3886ee6834..3b29fd4a26048e870baacc06f36b56e50e1ba935 100644
--- a/base/tps-client/apache/docroot/tokendb/searchCertificateResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchCertificateResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchResults.template b/base/tps-client/apache/docroot/tokendb/searchResults.template
index f4644b355971401c67bb31ced1687901067ba9a7..4aeb82611a2f68e6ec22ef6850a139a0075ba2ad 100644
--- a/base/tps-client/apache/docroot/tokendb/searchResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchUser.template b/base/tps-client/apache/docroot/tokendb/searchUser.template
index 57e3a550789e413af2c9dba327ead2f870dbe60d..70dd76e2c7091eebf519e02aa9b4e71c24e4030f 100644
--- a/base/tps-client/apache/docroot/tokendb/searchUser.template
+++ b/base/tps-client/apache/docroot/tokendb/searchUser.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/searchUserResults.template b/base/tps-client/apache/docroot/tokendb/searchUserResults.template
index bbb885f3155153dcb9ea4711a30906b23684f7bf..eda5039b0ff1f55bf4520629bb2c152e188ba1f0 100644
--- a/base/tps-client/apache/docroot/tokendb/searchUserResults.template
+++ b/base/tps-client/apache/docroot/tokendb/searchUserResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/selfTest.template b/base/tps-client/apache/docroot/tokendb/selfTest.template
index 163437d17cd0796d1eb9f7754154da98af1040eb..9f083b120ef13f926d5451f8c69abb8469055b6e 100644
--- a/base/tps-client/apache/docroot/tokendb/selfTest.template
+++ b/base/tps-client/apache/docroot/tokendb/selfTest.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme"">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/selfTestResults.template b/base/tps-client/apache/docroot/tokendb/selfTestResults.template
index aeb49d7117ddc56250d4a40fb69f61be26c481f6..fb57e44e72bd0170d3ad90cfaa6f167350a5ffb7 100644
--- a/base/tps-client/apache/docroot/tokendb/selfTestResults.template
+++ b/base/tps-client/apache/docroot/tokendb/selfTestResults.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/show.template b/base/tps-client/apache/docroot/tokendb/show.template
index a9dd393346bf3493332342f880487ce573963bbb..40a27d0a90e10ca789550b9adcfa825bc87d9faa 100644
--- a/base/tps-client/apache/docroot/tokendb/show.template
+++ b/base/tps-client/apache/docroot/tokendb/show.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/showAdmin.template b/base/tps-client/apache/docroot/tokendb/showAdmin.template
index fe3292011d742e0940116b45ebc36d81c9dd3438..8a103c32b838468069450c4a51551f94b26a42d6 100644
--- a/base/tps-client/apache/docroot/tokendb/showAdmin.template
+++ b/base/tps-client/apache/docroot/tokendb/showAdmin.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/showCert.template b/base/tps-client/apache/docroot/tokendb/showCert.template
index 9640358872173bbdbf447edec70621080517d0d2..00b990567f88faddf71216da5a6a2bef122e45d8 100644
--- a/base/tps-client/apache/docroot/tokendb/showCert.template
+++ b/base/tps-client/apache/docroot/tokendb/showCert.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tokendb/userDelete.template b/base/tps-client/apache/docroot/tokendb/userDelete.template
index db4b226cd369b612074e3326af72e5e8b52a5aad..cc1ea7db22443876620e8107cd5e6859550f9415 100755
--- a/base/tps-client/apache/docroot/tokendb/userDelete.template
+++ b/base/tps-client/apache/docroot/tokendb/userDelete.template
@@ -21,9 +21,10 @@
 <link rel="shortcut icon" href="/pki/images/favicon.ico" />
 <HEAD>
 <TITLE>TPS</Title>
+<link rel="stylesheet" href="/pki/css/pki-theme.css" type="text/css" />
 </HEAD>
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="pki-agent-theme">
   <tr>
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
diff --git a/base/tps-client/apache/docroot/tps/admin/console/config/config_addhsm.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_addhsm.vm
index 90d2f0ea9f6a3eee7ad632345dc82f98eb628fbc..265ad014e9ea51af4f0d5bbf311c1342f6dfd014 100644
--- a/base/tps-client/apache/docroot/tps/admin/console/config/config_addhsm.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_addhsm.vm
@@ -37,7 +37,7 @@
 
   <body onLoad="checkClose();"><div id="wrap"><div id="wrap">
   
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 
 <div id="mainNavInner">
diff --git a/base/tps-client/apache/docroot/tps/admin/console/config/config_db.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_db.vm
index ba40c7ceef1c234801d02995a523408d8040f25a..db9718bb02d50d12f23a9b27f00ad189fe5f0f15 100644
--- a/base/tps-client/apache/docroot/tps/admin/console/config/config_db.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_db.vm
@@ -41,7 +41,7 @@
 <div id="wrap">
 #include ( "admin/console/config/header.vm" )
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
                                                                                 
 <div id="mainNavInner">
diff --git a/base/tps-client/apache/docroot/tps/admin/console/config/config_hsm.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_hsm.vm
index 7ec82522c7a90636d853d20e76b6f40c20f2abdd..b12a669b5b74160ccdd92977a520efb0cdda80ca 100644
--- a/base/tps-client/apache/docroot/tps/admin/console/config/config_hsm.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_hsm.vm
@@ -37,7 +37,7 @@
 
   <body onLoad="checkClose();"><div id="wrap">
   
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 
 <div id="mainNavInner">
diff --git a/base/tps-client/apache/docroot/tps/admin/console/config/config_join.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_join.vm
index 49e43fbc4a4504d8f354bfd29f2faed071e679d9..fb2789dc4f587aac5b794a26dc9fd1625d2b18eb 100644
--- a/base/tps-client/apache/docroot/tps/admin/console/config/config_join.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_join.vm
@@ -40,7 +40,7 @@
   
 #include ( "admin/console/config/header.vm" )
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
                                                                                 
 <div id="mainNavInner">
diff --git a/base/tps-client/apache/docroot/tps/admin/console/config/config_rootca.vm b/base/tps-client/apache/docroot/tps/admin/console/config/config_rootca.vm
index 7e17fef357c9f314a0b8bd51045632d5285c7a13..598458e8f9693e6dbc13950166c96f20b0cb2dc4 100644
--- a/base/tps-client/apache/docroot/tps/admin/console/config/config_rootca.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/config_rootca.vm
@@ -40,7 +40,7 @@
   
 #include ( "admin/console/config/header.vm" )
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
                                                                                 
 <div id="mainNavInner">
diff --git a/base/tps-client/apache/docroot/tps/admin/console/config/login.vm b/base/tps-client/apache/docroot/tps/admin/console/config/login.vm
index 73f53afa6a6cd9b2fd2edec409eb57092204b0d0..762e60d66b39468d5b9a4c9d8362c7a78508a5f5 100644
--- a/base/tps-client/apache/docroot/tps/admin/console/config/login.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/login.vm
@@ -31,7 +31,7 @@
   
 #include ( "tps/admin/console/config/header.vm" )
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 
 <div id="mainNavInner">
diff --git a/base/tps-client/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/base/tps-client/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm
index a8c0c807900e2ea499511a2824b042065b6d01a9..27cc501819b15b095b5d4ffbcca9e1331b8a5712 100644
--- a/base/tps-client/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm
@@ -39,7 +39,7 @@
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
                                                                                 
 <div id="mainNavInner">
diff --git a/base/tps-client/apache/docroot/tps/admin/console/config/wizard.vm b/base/tps-client/apache/docroot/tps/admin/console/config/wizard.vm
index 31d395edf780ac742c8b9f65ed3590ce6206468f..d2385d5b73e07d61782427d38c01137d6b4e8e6b 100644
--- a/base/tps-client/apache/docroot/tps/admin/console/config/wizard.vm
+++ b/base/tps-client/apache/docroot/tps/admin/console/config/wizard.vm
@@ -52,7 +52,7 @@ function process(fop) {
   
 #include ( "tps/admin/console/config/header.vm" )
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 
 <div id="mainNavInner">
diff --git a/base/tps/shared/webapps/tps/404.html b/base/tps/shared/webapps/tps/404.html
index 0bf93578c8418986bef4623d1d11b9404e3e45af..dc78f60d228107e7874611762001cc9ea6fe4cae 100755
--- a/base/tps/shared/webapps/tps/404.html
+++ b/base/tps/shared/webapps/tps/404.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/base/tps/shared/webapps/tps/500.html b/base/tps/shared/webapps/tps/500.html
index 3e1e8bb66e8d45f9223a0452d46902ca4669c29f..9cd22f36a7453c95279238ff9221ee0e7520f1cf 100755
--- a/base/tps/shared/webapps/tps/500.html
+++ b/base/tps/shared/webapps/tps/500.html
@@ -68,7 +68,7 @@ document.write('" alt="Dogtag" id="myLogo" /></a>');
     </div>
 </div>
 
-<div id="mainNavOuter">
+<div id="mainNavOuter" class="pki-ee-theme">
 <div id="mainNav">
 <div id="mainNavInner">
 
diff --git a/dogtag/common-ui/shared/css/pki-360.css b/dogtag/common-ui/shared/css/pki-360.css
index c5d022f519504a066ec77edcd615f0bfe64b5ae7..055fbefe914650132908997e4f64e471143b97e5 100644
--- a/dogtag/common-ui/shared/css/pki-360.css
+++ b/dogtag/common-ui/shared/css/pki-360.css
@@ -783,7 +783,6 @@ div.contentnav-row2 div.bottom {
 	
 #mainNavOuter {
 	width: 100%;
-	background-color: #4f52b5;
 	}
 	
 #mainNav {
diff --git a/dogtag/common-ui/shared/css/pki-base.css b/dogtag/common-ui/shared/css/pki-base.css
index 12c057fab905478a0992b8a90d67e07aa387e7d4..a6c48e02de3af1b7ff99a1c96b57297165b616da 100644
--- a/dogtag/common-ui/shared/css/pki-base.css
+++ b/dogtag/common-ui/shared/css/pki-base.css
@@ -19,6 +19,7 @@
 
 @import url("pki.css");
 @import url("pki-360.css");
+@import url("pki-theme.css");
 
 /* The following styles are for ALL browsers, including Netscape
    Navigator 4.x.  Put more detailed CSS in pki.css. */
diff --git a/dogtag/common-ui/shared/css/pki-theme.css b/dogtag/common-ui/shared/css/pki-theme.css
new file mode 100644
index 0000000000000000000000000000000000000000..3b295cac26f80ea05ac411543664d2cb63366f4d
--- /dev/null
+++ b/dogtag/common-ui/shared/css/pki-theme.css
@@ -0,0 +1,28 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2015 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK ---
+ *
+ * @author Endi S. Dewata
+ */
+
+.pki-ee-theme {
+	background-color: #4f52b5;
+}
+
+.pki-agent-theme {
+	background-color: #000080;
+}
-- 
1.9.3