diff --git a/bl-themes/lingonberry/index.php b/bl-themes/lingonberry/index.php
index d8263020..ebb992a9 100644
--- a/bl-themes/lingonberry/index.php
+++ b/bl-themes/lingonberry/index.php
@@ -4,29 +4,23 @@
 	<head profile="http://gmpg.org/xfn/11">
 		<?php include(THEME_DIR_PHP.'head.php') ?>
 	</head>
-	
+
 	<?php
-		if( ($WHERE_AM_I == 'home') || ($WHERE_AM_I == 'tag')  )
-		{
-			echo '<body class="header-image fullwidth">';
-		}
-		else
-		{
-			if( $Page->status() == "fixed" )
-			{
+		if($WHERE_AM_I == 'page') {
+			if( $Page->status() == "fixed" ) {
 				echo '<body class="page page-template-default">';
 			}
-			elseif( $Page->status() == "published" )
-			{
+			elseif( $Page->status() == "published" ) {
 				echo '<body class="single single-post">';
-			}	
+			}
+		} else {
+			echo '<body class="header-image fullwidth">';
 		}
 	?>
 
-	
 		<!-- Plugins Site Body Begin -->
 		<?php Theme::plugins('siteBodyBegin') ?>
-	
+
 		<div class="navigation" >
 			<div class="navigation-inner section-inner">
 				<ul class="blog-menu">
@@ -34,64 +28,59 @@
 						$fixedPages = $dbPages->getFixedDB();
 						$fpKeys  = array_keys($fixedPages);
 						foreach($fpKeys as $pageKey) {
-							$page = buildPage($pageKey);
-							echo '<li class="menu-item menu-item-type-custom menu-item-object-custom"><a href="'.$page->permalink().'">'.$page->title().'</a></li> ';
-						} 
+							$fpage = buildPage($pageKey);
+							echo '<li class="menu-item menu-item-type-custom menu-item-object-custom"><a href="'.$fpage->permalink().'">'.$fpage->title().'</a></li> ';
+						}
 					?>
 				 </ul>
 				 <div class="clear"></div>
 			</div> <!-- /navigation-inner -->
 		</div> <!-- /navigation -->
-	
+
 		<div class="header section">
 			<div class="header-inner section-inner">
-				
-				<a href="<?php echo $Site->url() ?>" rel="home" class="logo"><img src="<?php echo(HTML_PATH_UPLOADS_PROFILES.'/admin.png') ?>" alt="<?php echo $Site->title() ?>"></a>
-			        				
+
+				<a href="<?php echo $Site->url() ?>" rel="home" class="logo"><img src="<?php echo(HTML_PATH_UPLOADS_PROFILES.'admin.png') ?>" alt="<?php echo $Site->title() ?>"></a>
+
 				<h1 class="blog-title">
 					<a href="<?php echo $Site->url() ?>" rel="home"><?php echo $Site->title() ?></a>
 				</h1>
-				
+
 				<div class="nav-toggle">
 					<div class="bar"></div>
 					<div class="bar"></div>
 					<div class="bar"></div>
-					
+
 					<div class="clear"></div>
 				</div>
- 				
+
 				<div class="clear"></div>
 			</div> <!-- /header section -->
 		</div> <!-- /header-inner section-inner -->
-		
+
 		<?php
-			if( ($WHERE_AM_I == 'home') || ($WHERE_AM_I == 'tag') )
-			{
-				include(THEME_DIR_PHP.'home.php');
-			}
-			else
-			{
-				if( $Page->status() == "fixed" )
-				{
+			if($WHERE_AM_I == 'page') {
+				if( $Page->status() == "fixed" ) {
 					include(THEME_DIR_PHP.'page.php');
 				}
-				elseif( $Page->status() == "published" )
-				{
+				elseif( $Page->status() == "published" ) {
 					include(THEME_DIR_PHP.'post.php');
 				}
+			} else {
+				include(THEME_DIR_PHP.'home.php');
 			}
 		?>
-		
+
 		<!-- Footer -->
 		<?php include(THEME_DIR_PHP.'sidebar.php') ?>
-		
+
 		<div class="credits section">
 			<div class="credits-inner section-inner">
-		
+
 				<p class="credits-left">
 					<span><?php echo $Site->footer() ?></span>
 				</p>
-				
+
 				<p class="credits-right">
 					<span>Lingonberry by <a href="http://www.andersnoren.se">Anders Noren</a> — Proudly Powered by <a href="https://www.bludit.com/">Bludit</a> — </span><a class="tothetop">Up ↑</a>
 				</p>
@@ -99,15 +88,15 @@
 				<div class="clear"></div>
 			</div> <!-- /credits-inner -->
 		</div> <!-- /credits -->
-		
+
 		<!-- Plugins Site Body End -->
 		<?php Theme::plugins('siteBodyEnd') ?>
-		
+
 		<!-- Javascript -->
 		<?php echo Theme::js(array(
 			'js/flexslider.min.js',
 			'js/global.js'
 		)); ?>
-		
+
 	</body>
 </html>
\ No newline at end of file
