summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2015-04-22 15:27:30 -0400
committerMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2015-04-22 18:08:55 -0600
commitfe94f4a7d43a98a2a76a480a8655484738309ab0 (patch)
treeb17093ab90656f98d50c45fcd17609b61a25710d
parent04b6dafbf3954c0ff585c375b388c13cc9e83399 (diff)
downloadpki-fe94f4a7d43a98a2a76a480a8655484738309ab0.tar.gz
pki-fe94f4a7d43a98a2a76a480a8655484738309ab0.tar.xz
pki-fe94f4a7d43a98a2a76a480a8655484738309ab0.zip
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
-rwxr-xr-xbase/ca/shared/webapps/ca/404.html2
-rwxr-xr-xbase/ca/shared/webapps/ca/500.html2
-rw-r--r--base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template2
-rw-r--r--base/ca/shared/webapps/ca/admin/ca/sendCookie.template2
-rw-r--r--base/ca/shared/webapps/ca/agent/header.template3
-rw-r--r--base/ca/shared/webapps/ca/agent/index.template3
-rw-r--r--base/ca/shared/webapps/ca/agent/ports.template3
-rw-r--r--base/ca/shared/webapps/ca/ee/ca/index.html5
-rw-r--r--base/ca/shared/webapps/ca/ee/ca/tabs.html3
-rw-r--r--base/ca/shared/webapps/ca/services.template2
-rwxr-xr-xbase/kra/shared/webapps/kra/404.html2
-rwxr-xr-xbase/kra/shared/webapps/kra/500.html2
-rw-r--r--base/kra/shared/webapps/kra/agent/header.template3
-rw-r--r--base/kra/shared/webapps/kra/agent/index.template3
-rw-r--r--base/kra/shared/webapps/kra/services.template2
-rwxr-xr-xbase/ocsp/shared/webapps/ocsp/404.html2
-rwxr-xr-xbase/ocsp/shared/webapps/ocsp/500.html2
-rw-r--r--base/ocsp/shared/webapps/ocsp/agent/header.template3
-rw-r--r--base/ocsp/shared/webapps/ocsp/agent/index.template3
-rw-r--r--base/ocsp/shared/webapps/ocsp/agent/ports.template3
-rw-r--r--base/ocsp/shared/webapps/ocsp/services.template2
-rw-r--r--base/server/share/webapps/ROOT/index.jsp2
-rw-r--r--base/server/share/webapps/pki/admin/console/config/config_addhsm.vm2
-rw-r--r--base/server/share/webapps/pki/admin/console/config/login.vm2
-rw-r--r--base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm2
-rw-r--r--base/server/share/webapps/pki/admin/console/config/wizard.vm2
-rwxr-xr-xbase/tks/shared/webapps/tks/404.html2
-rwxr-xr-xbase/tks/shared/webapps/tks/500.html2
-rw-r--r--base/tks/shared/webapps/tks/agent/header.template3
-rw-r--r--base/tks/shared/webapps/tks/agent/index.template3
-rw-r--r--base/tks/shared/webapps/tks/agent/ports.template3
-rw-r--r--base/tks/shared/webapps/tks/services.template2
-rwxr-xr-xbase/tps-client/apache/docroot/404.html2
-rwxr-xr-xbase/tps-client/apache/docroot/500.html2
-rwxr-xr-xbase/tps-client/apache/docroot/index.vm2
-rw-r--r--base/tps-client/apache/docroot/tokendb/addResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/auditAdmin.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/delete.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/deleteResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/doToken.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/doTokenConfirm.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/edit.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/editResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/editUser.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/error.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/index.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/indexAdmin.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/indexOperator.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/new.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/newUser.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/revoke.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/search.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchActivity.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchActivityAdmin.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchActivityAdminResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchActivityResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchAdmin.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchAdminResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchCertificate.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchCertificateResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchUser.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/searchUserResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/selfTest.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/selfTestResults.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/show.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/showAdmin.template3
-rw-r--r--base/tps-client/apache/docroot/tokendb/showCert.template3
-rwxr-xr-xbase/tps-client/apache/docroot/tokendb/userDelete.template3
-rw-r--r--base/tps-client/apache/docroot/tps/admin/console/config/config_addhsm.vm2
-rw-r--r--base/tps-client/apache/docroot/tps/admin/console/config/config_db.vm2
-rw-r--r--base/tps-client/apache/docroot/tps/admin/console/config/config_hsm.vm2
-rw-r--r--base/tps-client/apache/docroot/tps/admin/console/config/config_join.vm2
-rw-r--r--base/tps-client/apache/docroot/tps/admin/console/config/config_rootca.vm2
-rw-r--r--base/tps-client/apache/docroot/tps/admin/console/config/login.vm2
-rw-r--r--base/tps-client/apache/docroot/tps/admin/console/config/securitydomainloginpanel.vm2
-rw-r--r--base/tps-client/apache/docroot/tps/admin/console/config/wizard.vm2
-rwxr-xr-xbase/tps/shared/webapps/tps/404.html2
-rwxr-xr-xbase/tps/shared/webapps/tps/500.html2
-rw-r--r--dogtag/common-ui/shared/css/pki-360.css1
-rw-r--r--dogtag/common-ui/shared/css/pki-base.css1
-rw-r--r--dogtag/common-ui/shared/css/pki-theme.css28
82 files changed, 156 insertions, 81 deletions
diff --git a/base/ca/shared/webapps/ca/404.html b/base/ca/shared/webapps/ca/404.html
index 49f75a9a3..27d18979b 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 fe8f8de33..7a336c165 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 eac3ac476..c6aee1d80 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 296f2f07b..4e0821063 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 a8606fc49..91bed383a 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 4f45c7390..246e6eb8e 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 bfec33981..adf1c5a80 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 df8d8d2d8..bf25a16ad 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 2cf6ee3be..53977e43f 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 648ffd8a9..22081081e 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 ff7b00d4e..4bbf7ec65 100755
--- a/base/kra/shared/webapps/kra/404.html
+++ b/base/kra/shared/webapps/kra/404.html
@@ -84,7 +84,7 @@ document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8"
</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 1fdb7b203..c2cf77f9d 100755
--- a/base/kra/shared/webapps/kra/500.html
+++ b/base/kra/shared/webapps/kra/500.html
@@ -84,7 +84,7 @@ document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8"
</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 61eaa3c76..b1183fd81 100644
--- a/base/kra/shared/webapps/kra/agent/header.template
+++ b/base/kra/shared/webapps/kra/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/kra/shared/webapps/kra/agent/index.template b/base/kra/shared/webapps/kra/agent/index.template
index 1ac5f520f..e0e4ff5c6 100644
--- a/base/kra/shared/webapps/kra/agent/index.template
+++ b/base/kra/shared/webapps/kra/agent/index.template
@@ -42,11 +42,12 @@ $(function() {
<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 3b9f4ee48..7f075dd91 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 fd5264c43..b8725e73f 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 2749fc752..420d8cead 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 d1221b14b..f500bb0d5 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 be2c39d9e..f8ae3d010 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 8413ada1b..2acc873e8 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 a34d75deb..a57a7f3b4 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 277969219..509a2d02e 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 839cff56a..3642a2d69 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 2400bd2d3..9ce0b9074 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 e9e0763ab..f7b51c36d 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 cc868e572..41ed63205 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 575dbf277..618098302 100755
--- a/base/tks/shared/webapps/tks/404.html
+++ b/base/tks/shared/webapps/tks/404.html
@@ -84,7 +84,7 @@ document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8"
</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 db20d0b6d..032cb0dd4 100755
--- a/base/tks/shared/webapps/tks/500.html
+++ b/base/tks/shared/webapps/tks/500.html
@@ -84,7 +84,7 @@ document.write('<META http-equiv=Content-Type content="text/html; charset=UTF-8"
</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 30d058483..b7dfef87b 100644
--- a/base/tks/shared/webapps/tks/agent/header.template
+++ b/base/tks/shared/webapps/tks/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/tks/shared/webapps/tks/agent/index.template b/base/tks/shared/webapps/tks/agent/index.template
index 38a9d34f2..b9a16384b 100644
--- a/base/tks/shared/webapps/tks/agent/index.template
+++ b/base/tks/shared/webapps/tks/agent/index.template
@@ -42,11 +42,12 @@ $(function() {
<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 88acbb90f..0f881c0bb 100644
--- a/base/tks/shared/webapps/tks/agent/ports.template
+++ b/base/tks/shared/webapps/tks/agent/ports.template
@@ -42,11 +42,12 @@ $(function() {
<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 212374d7f..d3f598cb6 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 01a0832c9..c4aa02e9c 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 94ff29712..929ac3f89 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 438d014ef..5fb21cd38 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 eca814f8b..b79209ece 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 ff299530c..db700f181 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 4d3243db1..9369630b2 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 606e11bb0..8bb29b985 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 419a9a240..d4d380c1d 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 16bd2a191..c8c3015f8 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 163ae3bd1..b21bf92fa 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 783b065c3..781d2a604 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 55b587cbe..babda0927 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 8f629ff72..ee6e18423 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 4aa9f0cdd..4cfee59dd 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 97086257b..f95f0ea17 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 1b1902843..ecebeffde 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 f4bf1475d..2672bc91d 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 f1e7e6e35..e489ebd96 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 6a62ea116..1f7fa7803 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 305c9cd74..4dccc5046 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 e831a2872..9c3d0262e 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 da201d97f..858087dd2 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 d8f6587aa..44ffac17c 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 1f97860a0..745614d25 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 b0960f571..92b07bdf1 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 ab0a471c2..b73129d7c 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 788491fbf..54bf1fa5b 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 bb6dcabf3..3b29fd4a2 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 f4644b355..4aeb82611 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 57e3a5507..70dd76e2c 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 bbb885f31..eda5039b0 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 163437d17..9f083b120 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 aeb49d711..fb57e44e7 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 a9dd39334..40a27d0a9 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 fe3292011..8a103c32b 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 964035887..00b990567 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 db4b226cd..cc1ea7db2 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 90d2f0ea9..265ad014e 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 ba40c7cee..db9718bb0 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 7ec82522c..b12a669b5 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 49e43fbc4..fb2789dc4 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 7e17fef35..598458e8f 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 73f53afa6..762e60d66 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 a8c0c8079..27cc50181 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 31d395edf..d2385d5b7 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 0bf93578c..dc78f60d2 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 3e1e8bb66..9cd22f36a 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 c5d022f51..055fbefe9 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 12c057fab..a6c48e02d 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 000000000..3b295cac2
--- /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;
+}