diff --git a/.gitignore b/.gitignore
index 4086a246..2fca43e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
 # static html and json
-/*/*.html
-/*/*.json
-/*/res
-/*/src
-/*/thumb
+res/
+src/
+thumb/
 /*/config.php
 *.html
 
@@ -55,7 +53,8 @@ Thumbs.db
 *.rss
 /index.html
 /recent.css
-*.json 
+*.json
+/*/ukko.js
 
 # tmp filesystem
 /tmp/cache/*
diff --git a/inc/config.php b/inc/config.php
index 467f0585..2f2ff477 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -29,7 +29,7 @@
 
 // Json File Scrambler
 // Indicate if json filenames should be scrambled 
-$config['json_scrambler']['scramble'] = true;
+$config['json_scrambler']['scramble'] = false;
 // Salt for hashing json filenames
 $config['json_scrambler']['salt'] = '0123456789012345678901';
 
@@ -1238,6 +1238,9 @@ $config['nicenotice_reasons'][] = "We care, and we hope you feel better soon. We
 	// Minify Javascript using http://code.google.com/p/minify/.
 	$config['minify_js'] = false;
 
+	// Version number for main.js and style.css
+	$config['resource_version'] = 1;
+
 	// Dispatch thumbnail loading and image configuration with JavaScript. It will need a certain javascript
 	// code to work.
 	$config['javascript_image_dispatch'] = false;
diff --git a/stylesheets/style.css b/stylesheets/style.css
index e4d63d0d..537abb85 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1414,4 +1414,11 @@ table.archive-list tr:hover td {
 
 .embed_container {
     display: block;
+}
+
+.hover-show {
+    opacity: 0;
+}
+.hover-show:hover {
+    opacity: 1;
 }
\ No newline at end of file
diff --git a/templates/boardlist.html b/templates/boardlist.html
deleted file mode 100644
index 62646845..00000000
--- a/templates/boardlist.html
+++ /dev/null
@@ -1 +0,0 @@
-I'm your overboard boardlist. You can put here anything and I reside in templates/boardlist.html
diff --git a/templates/header.html b/templates/header.html
index ff2b7081..2625d347 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,4 +1,4 @@
-		<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
+		<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}?v={{ config.resource_version }}">
 		{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
@@ -15,7 +15,7 @@
 			<script type="text/javascript" src="/js/mod_snippets.js"></script>
 		{% endif %}
 		{% if not nojavascript %}
-			<script type="text/javascript" src="{{ config.url_javascript }}"></script>
+			<script type="text/javascript" src="{{ config.url_javascript }}?v={{ config.resource_version }}"></script>
 			{% if not config.additional_javascript_compile %}
 			{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
 			{% endif %}
diff --git a/templates/index.html b/templates/index.html
index 4988d171..40faa3a9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -42,8 +42,6 @@
 
 	{% if not no_post_form %}
 		{% include 'post_form.html' %}
-	{% else %}
-		{% include 'boardlist.html' %}
 	{% endif %}
 
 	{% if config.page_nav_top %}
@@ -75,7 +73,8 @@
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 	<input type="hidden" name="board" value="{{ board.uri }}" />
 	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
-	&nbsp; <a id="unimportant" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a> &nbsp; {% if config.catalog_link %}<a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %}
+	&nbsp; <a id="unimportant" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a>
+	{% if config.catalog_link %}&nbsp; <a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %}
 
 	&nbsp; <a id="unimportant" href="{% if mod %}{{ config.file_mod }}?{% endif %}{{ config.root }}{{ board.dir }}{{ config.file_index }}">[{% trans %}Reload{% endtrans %}]</a>
 
diff --git a/templates/themes/ukko/info.php b/templates/themes/ukko/info.php
index 9a0a53e6..37c701b6 100644
--- a/templates/themes/ukko/info.php
+++ b/templates/themes/ukko/info.php
@@ -10,19 +10,19 @@
 	// Theme configuration	
 	$theme['config'] = array();
 	
-	$theme['config'][] = array(
-		'title' => 'Board name',
-		'name' => 'title',
-		'type' => 'text',
-		'default' => 'Ukko'
-	);
 	$theme['config'][] = array(
 		'title' => 'Board URI',
 		'name' => 'uri',
 		'type' => 'text',
 		'default' => '*',
 		'comment' => '(ukko for example)'
-	);	
+	);
+	$theme['config'][] = array(
+		'title' => 'Title',
+		'name' => 'title',
+		'type' => 'text',
+		'default' => 'Ukko'
+	);
 	$theme['config'][] = array(
 		'title' => 'Subtitle',
 		'name' => 'subtitle',
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index e572c467..08523112 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -30,9 +30,11 @@
 			$body = '';
 			$overflow = array();
 			$board = array(
-				'url' => $this->settings['uri'],
-				'name' => $this->settings['title'],
-				'title' => sprintf($this->settings['subtitle'], $this->settings['thread_limit'])
+				'uri' => $this->settings['uri'],
+				'url' => sprintf('/%s/', $this->settings['uri']),
+				'dir' => sprintf('%s/', $this->settings['uri']),
+				'title' => $this->settings['title'],
+				'subtitle' => sprintf($this->settings['subtitle'], $this->settings['thread_limit'])
 			);
 
 			$query = '';
@@ -101,6 +103,8 @@
 			$body .= '<script> var overflow = ' . json_encode($overflow) . '</script>';
 			$body .= '<script type="text/javascript" src="/'.$this->settings['uri'].'/ukko.js"></script>';
 
+			$config['catalog_link'] = false;
+			$config['archive']['threads'] = false;
 			return Element('index.html', array(
 				'config' => $config,
 				'board' => $board,
diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index b2668e0b..cd2a4966 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -22,6 +22,7 @@ $(document).ready(function() {
 		var board = $(this).next().data("board");
 		var hr = $("<hr />");
 
+		$(this).append('&nbsp;');
 		$(this).append(ukkohide);
 		$(this).append(hr);
 
@@ -50,7 +51,7 @@ $(document).ready(function() {
 		});
 
 	};
-	$("h2").each(addukkohide);
+	$('form[name="postcontrols"] > h2').each(addukkohide);
 
 	$('.pages').hide();
 	var loadnext = function() {