diff --git a/config/config.ini.example b/config/config.ini.example
index 423398c..bc7e6b0 100644
--- a/config/config.ini.example
+++ b/config/config.ini.example
@@ -19,8 +19,8 @@ blog.menu = ""
 ; Breadcrumb home text. Useful when installed on subfolder.
 breadcrumb.home = "Home"
 
-; Comment system. Choose "facebook" or "disqus".
-comment.system = "facebook"
+; Comment system. Choose "facebook", "disqus", or "disable".
+comment.system = "disable"
 
 ;Facebook comments
 fb.num = "5"
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index 0693e87..0af2134 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -16,7 +16,16 @@
 	<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
 		<div class="main">
 			<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url?>"><?php echo $p->title ?></a></h2>
-			<div class="date"><span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in <span itemprop="articleSection"><?php echo $p->tag ?></span> by <span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span><?php if (disqus_count()) {?> - <span><a href="<?php echo $p->url?>#disqus_thread">Comments</a></span><?php } else {?> - <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a> <?php } ?></div>
+			<div class="date">
+				<span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in 
+				<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
+				<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
+				<?php 
+					if (disqus_count()) {?> - <span><a href="<?php echo $p->url?>#disqus_thread">Comments</a></span>
+				<?php } elseif (facebook()){ ?> - 
+					<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
+				<?php } ?>
+			</div>
 			<div class="teaser-body" itemprop="articleBody">
 				<?php echo get_thumbnail($p->body)?>
 				<?php echo get_teaser($p->body, $p->url)?>
diff --git a/themes/default/main.html.php b/themes/default/main.html.php
index 0693e87..0af2134 100644
--- a/themes/default/main.html.php
+++ b/themes/default/main.html.php
@@ -16,7 +16,16 @@
 	<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
 		<div class="main">
 			<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url?>"><?php echo $p->title ?></a></h2>
-			<div class="date"><span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in <span itemprop="articleSection"><?php echo $p->tag ?></span> by <span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span><?php if (disqus_count()) {?> - <span><a href="<?php echo $p->url?>#disqus_thread">Comments</a></span><?php } else {?> - <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a> <?php } ?></div>
+			<div class="date">
+				<span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in 
+				<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
+				<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
+				<?php 
+					if (disqus_count()) {?> - <span><a href="<?php echo $p->url?>#disqus_thread">Comments</a></span>
+				<?php } elseif (facebook()){ ?> - 
+					<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
+				<?php } ?>
+			</div>
 			<div class="teaser-body" itemprop="articleBody">
 				<?php echo get_thumbnail($p->body)?>
 				<?php echo get_teaser($p->body, $p->url)?>
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index c228d12..c78f10a 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -16,7 +16,16 @@
 	<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
 		<div class="main">
 			<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url?>"><?php echo $p->title ?></a></h2>
-			<div class="date"><span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in <span itemprop="articleSection"><?php echo $p->tag ?></span> by <span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span><?php if (disqus_count()) {?> - <span><a href="<?php echo $p->url?>#disqus_thread">Comments</a></span><?php } else {?> - <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a> <?php } ?></div>
+			<div class="date">
+				<span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in 
+				<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
+				<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
+				<?php 
+					if (disqus_count()) {?> - <span><a href="<?php echo $p->url?>#disqus_thread">Comments</a></span>
+				<?php } elseif (facebook()){ ?> - 
+					<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
+				<?php } ?>
+			</div>
 			<div class="teaser-body" itemprop="articleBody">
 				<?php echo get_thumbnail($p->body)?>
 				<?php echo get_teaser($p->body, $p->url)?>