diff --git a/bl-themes/defaultTheme/css/style.css b/bl-themes/defaultTheme/css/style.css
index 2b0dbad1..1b30bfc9 100755
--- a/bl-themes/defaultTheme/css/style.css
+++ b/bl-themes/defaultTheme/css/style.css
@@ -58,13 +58,14 @@ header#main-header {
 			}
 		}
 	}
+}
 
-	hgroup {
-		margin: auto;
-		padding: 4rem;
-		p, h1 {
-			text-align: center;
-		}
+#title-container {
+	margin: auto;
+	padding: 4rem;
+	p, h1 {
+		text-align: center;
+		margin-bottom: 0;
 	}
 }
 
@@ -261,6 +262,7 @@ hgroup {
 	font-weight: 700
 }
 
+#site-title,
 h1,
 h2,
 h3,
@@ -272,7 +274,7 @@ h6 {
 	font-weight: 700
 }
 
-h1 {
+h1, #site-title {
 	font-size: 3rem
 }
 
diff --git a/bl-themes/defaultTheme/php/header.php b/bl-themes/defaultTheme/php/header.php
index 4b4e73ba..27dce649 100644
--- a/bl-themes/defaultTheme/php/header.php
+++ b/bl-themes/defaultTheme/php/header.php
@@ -1,13 +1,13 @@
 <header id="main-header">
     <nav aria-label="<?php $language->p('Pages') ?>"><?php echo MenuHelper::getStatics(6, true, "", "", "active", '<li class="separator-left"><a href="'.Theme::siteUrl().'rss.xml">RSS</a></li>'); ?></nav>
-    <hgroup id="title-container">
+    <div id="title-container">
         <?php $logo = MediaHelper::getLogo(); ?>
         <?php if ($logo) : ?>
-            <h1><?php echo $logo->toHTML('logo') ?></h1>
+            <div id="site-title"><?php echo $logo->toHTML('logo') ?></div>
         <?php else : ?>
-            <h1><?php echo $site->title() ?></h1>
+            <p id="site-title"><?php echo $site->title() ?></h1>
             <p><?php echo $site->description() ?></p>
         <?php endif ?>
-    </hgroup>
+    </div>
     <nav aria-label="<?php $language->p('Categories') ?>"><?php echo MenuHelper::getCategories(true, false); ?></nav>
 </header>
\ No newline at end of file
diff --git a/bl-themes/defaultTheme/php/home.php b/bl-themes/defaultTheme/php/home.php
index 9b2c5d9c..42e6fafe 100644
--- a/bl-themes/defaultTheme/php/home.php
+++ b/bl-themes/defaultTheme/php/home.php
@@ -9,7 +9,7 @@
     <?php $language->p('No pages found') ?>
   </div>
 <?php else : ?>
-  <h2 class="p-name"><?php echo Theme::locationTitle(); ?></h2>
+  <h1 class="p-name"><?php echo Theme::locationTitle(); ?></h1>
   <p class="p-summary"><?php echo Theme::locationDescription(); ?></p>
 <?php endif ?>
 
@@ -21,9 +21,9 @@
     <?php Theme::plugins('pageBegin'); ?>
 
     <!-- Title -->
-    <h3 class="title p-name entry-title">
+    <h2 class="title p-name entry-title">
       <a class="u-url" rel="bookmark" href="<?php echo $page->permalink(); ?>"><?php echo $page->title(); ?></a>
-    </h3>
+    </h2>
 
     <!-- Cover image -->
     <?php if ($page->coverImage()) : ?>
diff --git a/bl-themes/defaultTheme/php/page.php b/bl-themes/defaultTheme/php/page.php
index fa23a8db..792aef72 100644
--- a/bl-themes/defaultTheme/php/page.php
+++ b/bl-themes/defaultTheme/php/page.php
@@ -5,9 +5,9 @@
 	<?php Theme::plugins('pageBegin'); ?>
 
     <!-- Title -->
-    <h2 class="title p-name entry-title">
+    <h1 class="title p-name entry-title">
       <a class="u-url" href="<?php echo $page->permalink(); ?>" rel="bookmark"><?php echo $page->title(); ?></a>
-    </h2>
+    </h1>
 
     <!-- Cover image -->
     <?php if ($page->coverImage()) : ?>