diff --git a/js/catalog-link.js b/js/catalog-link.js
index ba53e8cf..66bd1d51 100644
--- a/js/catalog-link.js
+++ b/js/catalog-link.js
@@ -53,4 +53,7 @@ if (subtitle) {
 }
 }
 }
-$(document).ready(catalog); 
+
+if (!parseInt($('input[name="mod"]').val())) {
+	$(document).ready(catalog); 
+}
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 7b8c075a..aaa287f6 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -2,11 +2,8 @@
 <!doctype html>
 <html>
 <head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-	<title>{{ settings.title }}</title>
-	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
+	{% include "header.html" %}
 	<link rel="stylesheet" media="screen" href="{{ config.root }}{{ settings.css }}"/>
-	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
 </head>
 <body>
 	{{ boardlist.top }}
@@ -18,9 +15,11 @@
 	<ul>
 	{% for post in recent_posts %}
 		<div class="thread">
-			<a href="{{post.link}}">
-				<img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
-			</a>
+			<div class="image">
+				<a href="{{post.link}}">
+					<img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
+				</a>
+			</div>
 			<span class="replies">
 				<strong>{% trans %}1 reply{% plural post.reply_count %}{{ count }} replies{% endtrans %}</strong><br/>
 				{{ post.body }}
diff --git a/templates/themes/catalog/info.php b/templates/themes/catalog/info.php
index c68c9e09..91c68ad4 100644
--- a/templates/themes/catalog/info.php
+++ b/templates/themes/catalog/info.php
@@ -29,6 +29,13 @@
 		'comment' => '(space seperated)',
 		'default' => implode(' ', $__default_boards)
 	);
+
+	$theme['config'][] = Array(
+		'title' => 'Use all boards - &infin;chan',
+		'name' => 'all',
+		'type' => 'checkbox',
+		'default' => false
+	);
 	
 	$theme['config'][] = Array(
 		'title' => 'CSS file',
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 424a813b..7a8f2e98 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -11,7 +11,14 @@
 		//	- post (a reply has been made)
 		//	- post-thread (a thread has been made)
 		
-		$boards = explode(' ', $settings['boards']);
+		if ($settings['all']) {
+			$_boards = listBoards();
+			$boards = array();
+			foreach ($_boards as $i => $b)
+				$boards[] = $b['uri'];
+		} else {
+			$boards = explode(' ', $settings['boards']);
+		}
 				
 		if ($action == 'all') {
 			copy('templates/themes/catalog/catalog.css', $config['dir']['home'] . $settings['css']);
@@ -20,7 +27,7 @@
 				$b = new Catalog();
 				$b->build($settings, $board);
 			}
-		} elseif ($action == 'post-thread' || ($settings['update_on_posts'] && $action == 'post') || ($settings['update_on_posts'] && $action == 'post-delete') && in_array($board, $boards)) {
+		} elseif ($action == 'post-thread' || ($settings['update_on_posts'] && $action == 'post') || ($settings['update_on_posts'] && $action == 'post-delete') && (in_array($board, $boards) | $settings['all'])) {
 			$b = new Catalog();
 			$b->build($settings, $board);
 		}
