diff --git a/config/config.ini b/config/config.ini
index 9511ddf..c9eb138 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -83,6 +83,21 @@ companyLogo = ${rootUrl}/resources/companylogo.png
 companyLogoWidth = 313px
 ; ALT text - for accessibility purposes.
 companyLogoTitle = ACME Corporation
+; Main logo
+mainLogo = 
+; the logo's width in pixels
+mainLogoWidth = 219px
+; ALT text - for accessibility purposes.
+mainLogoTitle = Pinnacle Knowledge Management Systems
+; enable/disable powered by kt logo
+poweredByDisabled = 1
+; powered by kt logo
+powerLogo = ${rootUrl}/resources/powered-by-kt.png
+; the logo's width in pixels
+powerLogoWidth = 130px
+; ALT text - for accessibility purposes.
+powerLogoTitle = Powered by KnowledgeTree
+
 ; use the additional IE specific GIF theme overrides.
 ; using this means that arbitrary theme packs may not work without 
 ; having GIF versions available.
diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css
index 854853c..1048492 100644
--- a/resources/css/kt-framing.css
+++ b/resources/css/kt-framing.css
@@ -1602,6 +1602,13 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
     overflow: hidden;
 }
 
+.copyrightbarBorderLogo{
+	position: absolute;
+    top:1px;
+    right:20px;
+	border: 0;
+}
+
 hr {
     border-width: 1px 0 0 0;
     border-style: solid;
diff --git a/resources/css/kt-login.css b/resources/css/kt-login.css
index a916daa..8c9e127 100644
--- a/resources/css/kt-login.css
+++ b/resources/css/kt-login.css
@@ -24,6 +24,17 @@
             /*-moz-border-radius: 1em;*/
         }
 
+		#loginbox_skin {
+			position: relative;
+            padding: 1em;
+            /*border: 1px solid #888;*/
+            width: 252px;
+            margin-left: auto;
+            margin-right: auto;
+            text-align: left;
+            background: white url(../powered-by-kt.png) bottom right no-repeat;
+		}
+
         #loginboxTopLeft {
             position: absolute;
             background: url(../graphics/login_corner_topleft.gif) top left no-repeat;
diff --git a/resources/graphics/bullet.gif b/resources/graphics/bullet.gif
new file mode 100644
index 0000000..a8d9282
--- /dev/null
+++ b/resources/graphics/bullet.gif
diff --git a/resources/graphics/bullet_toggle_close.gif b/resources/graphics/bullet_toggle_close.gif
new file mode 100644
index 0000000..336bcc5
--- /dev/null
+++ b/resources/graphics/bullet_toggle_close.gif
diff --git a/resources/graphics/bullet_toggle_minus.gif b/resources/graphics/bullet_toggle_minus.gif
new file mode 100644
index 0000000..a85ef40
--- /dev/null
+++ b/resources/graphics/bullet_toggle_minus.gif
diff --git a/resources/graphics/bullet_toggle_plus.gif b/resources/graphics/bullet_toggle_plus.gif
new file mode 100644
index 0000000..cf63e16
--- /dev/null
+++ b/resources/graphics/bullet_toggle_plus.gif
diff --git a/resources/graphics/dashlet-gradient.gif b/resources/graphics/dashlet-gradient.gif
new file mode 100644
index 0000000..db9ecaa
--- /dev/null
+++ b/resources/graphics/dashlet-gradient.gif
diff --git a/resources/graphics/dashlet_bottomleft.gif b/resources/graphics/dashlet_bottomleft.gif
new file mode 100644
index 0000000..d0736c7
--- /dev/null
+++ b/resources/graphics/dashlet_bottomleft.gif
diff --git a/resources/graphics/dashlet_bottomrepeat.gif b/resources/graphics/dashlet_bottomrepeat.gif
new file mode 100644
index 0000000..9f28119
--- /dev/null
+++ b/resources/graphics/dashlet_bottomrepeat.gif
diff --git a/resources/graphics/dashlet_bottomright.gif b/resources/graphics/dashlet_bottomright.gif
new file mode 100644
index 0000000..dcbccc3
--- /dev/null
+++ b/resources/graphics/dashlet_bottomright.gif
diff --git a/resources/graphics/dashlet_leftrepeat.gif b/resources/graphics/dashlet_leftrepeat.gif
new file mode 100644
index 0000000..0b64eca
--- /dev/null
+++ b/resources/graphics/dashlet_leftrepeat.gif
diff --git a/resources/graphics/dashlet_rightrepeat.gif b/resources/graphics/dashlet_rightrepeat.gif
new file mode 100644
index 0000000..31eaa04
--- /dev/null
+++ b/resources/graphics/dashlet_rightrepeat.gif
diff --git a/resources/graphics/dashlet_topleft.gif b/resources/graphics/dashlet_topleft.gif
new file mode 100644
index 0000000..11ee051
--- /dev/null
+++ b/resources/graphics/dashlet_topleft.gif
diff --git a/resources/graphics/dashlet_toprepeat.gif b/resources/graphics/dashlet_toprepeat.gif
new file mode 100644
index 0000000..00a970d
--- /dev/null
+++ b/resources/graphics/dashlet_toprepeat.gif
diff --git a/resources/graphics/dashlet_topright.gif b/resources/graphics/dashlet_topright.gif
new file mode 100644
index 0000000..8a667ff
--- /dev/null
+++ b/resources/graphics/dashlet_topright.gif
diff --git a/resources/powered-by-kt.png b/resources/powered-by-kt.png
new file mode 100644
index 0000000..c83f399
--- /dev/null
+++ b/resources/powered-by-kt.png
diff --git a/setup/upgrade.php b/setup/upgrade.php
index af91f10..2196113 100644
--- a/setup/upgrade.php
+++ b/setup/upgrade.php
@@ -147,7 +147,12 @@ td { vertical-align: top; }
   </head>
 
   <body>
-  <img src="../resources/graphics/ktlogo-topbar-right.png">
+  <img src="<?php 
+  	if($oKTConfig->get('ui/mainLogo')){
+  		echo $oKTConfig->get('ui/mainLogo');
+  	}else{
+	  	echo '../resources/graphics/ktlogo-topbar-right.png';
+	}?>">
   <p>
   <img src="upgrade-title.jpg">
   <table width=800 height=500>
@@ -949,5 +954,10 @@ function Upgrade()
 
 ?>
 <tr>
-<td height=80 background="../resources/graphics/ktbg.png">&nbsp;
+<td height=80 <?php 
+  	if($oKTConfig->get('ui/poweredByDisabled') == '0'){
+  		?> align="right"><img src="<?php echo $oKTConfig->get('ui/powerLogo');?>"></td>
+  	<?php }else{ ?>
+	  	background="../resources/graphics/ktbg.png">&nbsp;</td>;
+	<?php }?>
 </table>
\ No newline at end of file
diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty
index 33a5ce8..665323e 100644
--- a/templates/kt3/standard_page.smarty
+++ b/templates/kt3/standard_page.smarty
@@ -58,8 +58,14 @@
         <div id="bodyTopRight"></div>        
         <div id="bodyPad">
             <div id="logobar">
-                <a href="{$page->systemURL}"><img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" class="primary" title="{$page->systemName}"/></a>
-                <a href="{$rootUrl}/"><img src="{$config->get("ui/companyLogo")}" height="50px" width="{$config->get("ui/companyLogoWidth")}" alt="{$config->get("ui/companyLogoTitle")}" title="{$config->get("companyLogoTitle")}" class="secondary" /></a>
+            	{if $config->get("ui/mainLogo") != ''}
+            		<a href="{$rootUrl}"><img src="{$config->get("ui/mainLogo")}" class="primary" alt="{$config->get("ui/companyLogoTitle")}" title="{$config->get("ui/mainLogoTitle")}"/></a>
+            	{else}
+                	<a href="{$page->systemURL}"><img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" class="primary" title="{$page->systemName}"/></a>
+                {/if}
+                {if $config->get("ui/companyLogo") != ''}
+                	<a href="{$rootUrl}/"><img src="{$config->get("ui/companyLogo")}" height="50px" width="{$config->get("ui/companyLogoWidth")}" alt="{$config->get("ui/companyLogoTitle")}" title="{$config->get("companyLogoTitle")}" class="secondary" /></a>
+                {/if}
                 <div class="floatClear"></div>
             </div>
             {if (!$page->hide_navbar)}
@@ -205,6 +211,9 @@
             &mdash; {i18n arg_version="$versionname"}KnowledgeTree Version: #version#{/i18n} &mdash; {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}
             {$page->getDisclaimer()}
         </div>
+        {if $config->get("ui/poweredByDisabled") == '0'}
+        	<a href="{$rootUrl}"><img src="{$config->get("ui/powerLogo")}" class="copyrightbarBorderLogo" alt="{$config->get("ui/powerLogoTitle")}" title="{$config->get("ui/powerLogoTitle")}"/></a>
+        {/if}
     </div>    
 </body>
 </html>
diff --git a/templates/ktcore/login.smarty b/templates/ktcore/login.smarty
index 27eddda..1aaada6 100644
--- a/templates/ktcore/login.smarty
+++ b/templates/ktcore/login.smarty
@@ -13,7 +13,7 @@
 </head>
 <body onload="document.getElementById('username').focus()">
 
-    <div id="loginbox" {if ($disclaimer)} class="hasDisclaimer" {/if}>
+    <div id="{if $config->get("ui/poweredByDisabled") == '0'}loginbox_skin{else}loginbox{/if}" {if ($disclaimer)} class="hasDisclaimer" {/if}>
 
         <div id="formbox">
 
@@ -21,7 +21,11 @@
 	        <input type="hidden" name="action" value="login" />
 		<input type="hidden" name="cookieverify" value="{$cookietest}" />
 		<input type="hidden" name="redirect" value="{$redirect|escape}" />
-		<img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" alt="KnowledgeTree DMS" class="logoimage" height="50" width="252"/><br />
+		{if $config->get("ui/mainLogo") != ''}
+			<img src="{$config->get("ui/mainLogo")}" alt="{$config->get("ui/mainLogoTitle")}" class="logoimage"/><br />
+		{else}
+			<img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" alt="KnowledgeTree DMS" class="logoimage" height="50" width="252"/><br />
+		{/if}
             
 	        {if ($errorMessage == null)}
 		    <p class="descriptiveText">{i18n}Please enter your details below to login.{/i18n}</p>