81,83c81,83
<           <?php if ($site_name || $site_slogan): ?>
<             <?php if ($title && $site_name && $site_slogan): ?>
<               <div id="site-name"><strong>
---
>           <?php if ($site_name): ?>
>             <?php if ($title): ?>
>               <p id="site-name"><strong>
85,88c85,87
<               </strong></div>
< 			  <div id="site-slogan"><?php print $site_slogan; ?></div>
< 			<?php elseif($title && $site_name): /* Use div when the content title is not empty and site name exists */ ?>
< 			  <div id="site-name"><strong>
---
>               </strong></p>
>             <?php else: /* Use h1 when the content title is empty */ ?>
>               <h1 id="site-name">
90,101c89
<               </strong></div>
< 			<?php elseif($title && $site_slogan): /* Use div when the content title is not empty and slogan exists */ ?>
< 			  <div id="site-slogan"><?php print $site_slogan; ?></div>
<             <?php elseif($site_slogan && $site_name): /* Use hgroup when the content title is empty and slogan and site name exists */ ?>
<               <hgroup>  
< 			    <h1 id="site-name">
<                   <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><?php print $site_name; ?></a>
<                 </h1>
< 				<h2 id="site-slogan"><?php print $site_slogan; ?></h2>
< 			  </hgroup>
< 			<?php elseif($site_slogan): /* Use h2 when the content title is empty and slogan exists */ ?>
< 			<h2 id="site-slogan"><?php print $site_slogan; ?></h2>
---
>               </h1>
104c92,95
< 		  
---
> 
>           <?php if ($site_slogan): ?>
>             <p id="site-slogan"><?php print $site_slogan; ?></p>
>           <?php endif; ?>