diff --git a/templates/header.html b/templates/header.html
index 4ef6ce47..78dea225 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -18,10 +18,10 @@
 			<script type="text/javascript" src="{{ config.url_javascript }}?v={{ config.resource_version }}"></script>
 			{% if not config.additional_javascript_compile %}
 				{% if not config.deferred_javascript %}
-					{% for javascript in config.additional_javascript|merge(config.additional_javascript_defer) %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
+					{% for javascript in config.additional_javascript|merge(config.additional_javascript_defer) %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}?v={{ config.resource_version }}"></script>{% endfor %}
 				{% else %}
-					{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
-					{% for javascript in config.additional_javascript_defer %}<script defer type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
+					{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}?v={{ config.resource_version }}"></script>{% endfor %}
+					{% for javascript in config.additional_javascript_defer %}<script defer type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}?v={{ config.resource_version }}"></script>{% endfor %}
 				{% endif %}
 			{% endif %}
 			{% if mod %}
diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index 9e511b29..beae445f 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -1,10 +1,10 @@
 <script src='main.js?v={{ config.resource_version }}'></script>
-<script src='js/jquery.min.js'></script>
-<script src='js/style-select.js'></script>
-<script src='js/mobile-style.js'></script>
-<script src='js/strftime.min.js'></script>
-<script src='js/longtable/longtable.js'></script>
-<script src='js/mod/ban-list.js'></script>
+<script src='js/jquery.min.js?v={{ config.resource_version }}'></script>
+<script src='js/style-select.js?v={{ config.resource_version }}'></script>
+<script src='js/mobile-style.js?v={{ config.resource_version }}'></script>
+<script src='js/strftime.min.js?v={{ config.resource_version }}'></script>
+<script src='js/longtable/longtable.js?v={{ config.resource_version }}'></script>
+<script src='js/mod/ban-list.js?v={{ config.resource_version }}'></script>
 <link rel='stylesheet' href='stylesheets/longtable/longtable.css'>
 <link rel='stylesheet' href='stylesheets/mod/ban-list.css'>
 
@@ -33,7 +33,7 @@
 		</table>
 
 
-		
+
 	</form>
 {% if token_json %}
 	<script>$(function(){ banlist_init("{{ token_json }}", {{ boards }}); });</script>
diff --git a/templates/mod/pages.html b/templates/mod/pages.html
index c2395c02..f6be9487 100644
--- a/templates/mod/pages.html
+++ b/templates/mod/pages.html
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="js/jquery.min.js"></script>
+<script type="text/javascript" src="js/jquery.min.js?v={{ config.resource_version }}"></script>
 <div style="text-align:center">
 <p class="unimportant">
 {% if board %}
@@ -27,7 +27,7 @@
 <table>
 <tr><th>{% trans %}URL{% endtrans %}</th><th>{% trans %}Title{% endtrans %}</th></tr>
 <tr><td><input type="text" name="page"></td><td><input type="text" name="title"></td>
-</table>	
+</table>
 <input type="submit" value="{% trans %}Create{% endtrans %}">
 </form>
 
diff --git a/templates/mod/recent_posts.html b/templates/mod/recent_posts.html
index 8ee2e275..ba93bf60 100644
--- a/templates/mod/recent_posts.html
+++ b/templates/mod/recent_posts.html
@@ -1,5 +1,5 @@
-<script src="{{ config.additional_javascript_url }}js/mod/recent_posts.js"></script>
-<script src="{{ config.additional_javascript_url }}js/mod/recent-posts-auto-reload.js"></script>
+<script src="{{ config.additional_javascript_url }}js/mod/recent_posts.js?v={{ config.resource_version }}"></script>
+<script src="{{ config.additional_javascript_url }}js/mod/recent-posts-auto-reload.js?v={{ config.resource_version }}"></script>
 {% if not posts %}
 	<p style="text-align:center" class="unimportant">({% trans 'There are no active posts.' %})</p>
 {% else %}
diff --git a/templates/themes/calendar/calendar.html b/templates/themes/calendar/calendar.html
index eeb08f1c..bd348f27 100644
--- a/templates/themes/calendar/calendar.html
+++ b/templates/themes/calendar/calendar.html
@@ -11,8 +11,8 @@
 	</script>
     <title>{{ settings.title }}</title>
 	{% include 'header.html' %}
-	<script src='/js/moment.min.js'></script>
-	<script src='/js/fullcalendar.min.js'></script>
+	<script src='/js/moment.min.js?v={{ config.resource_version }}'></script>
+	<script src='/js/fullcalendar.min.js?v={{ config.resource_version }}'></script>
 </head>
 <body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
 	<div class="bar top">
@@ -25,11 +25,11 @@
 	<div class="ban">
 		<div id='calendar'></div>
 	</div>
-	
+
 	<hr/>
         <footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="https://github.com/savetheinternet/Tinyboard">Tinyboard</a> + 
-			<a href='https://github.com/vichan-devel/vichan'>vichan</a> + 
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="https://github.com/savetheinternet/Tinyboard">Tinyboard</a> +
+			<a href='https://github.com/vichan-devel/vichan'>vichan</a> +
 			<a href='https://github.com/lainchan/lainchan'>lainchan</a> {{ config.version }} -
 		<br><a href="https://github.com/savetheinternet/Tinyboard">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
 		<br><a href="https://github.com/vichan-devel/vichan">vichan</a> Copyright &copy; 2012-2016 vichan-devel
@@ -56,7 +56,7 @@
 						event.allDay = false;
 					}
 					element.find('.fc-title').append("<br/>" + event.description);
-				        element.css('background-color',event.color);	
+				        element.css('background-color',event.color);
 				},
 				selectable: true,
 				selectHelper: true,
@@ -102,7 +102,7 @@
 									url: url,
 									color:color,
 								},
-								true 
+								true
 								);
 					}
 					calendar.fullCalendar('unselect');
@@ -138,7 +138,7 @@
 					});
 				},
 				eventClick: function(event) {
-					var decision = confirm("Do you really want to do that?"); 
+					var decision = confirm("Do you really want to do that?");
 					if (decision) {
 						$.ajax({
 							type: "POST",
diff --git a/templates/themes/overboards/theme.php b/templates/themes/overboards/theme.php
index 34b9b6b0..409062d6 100644
--- a/templates/themes/overboards/theme.php
+++ b/templates/themes/overboards/theme.php
@@ -53,7 +53,7 @@
 				{
 					error('thread_limit must be an integer above 1.', true);
 				}
-				if (!is_array($overboard['exclude'])) 
+				if (!is_array($overboard['exclude']))
 				{
 					error('Exclude list must be array of strings.', true);
 				}
@@ -62,7 +62,7 @@
 						error('Exclude list must be array of strings.', true);
 					}
 				}
-					
+
 			}
 
 			return $settings;
@@ -199,7 +199,7 @@
 			}
 
 			$html .= '<script>var ukko_overflow = ' . json_encode($overflow) . '</script>';
-			$html .= '<script type="text/javascript" src="/'.$overboard['uri'].'/overboard.js"></script>';
+			$html .= '<script type="text/javascript" src="/'.$overboard['uri'].'/overboard.js?=' . $config['resource_version'] . '"></script>';
 
 			return Element('index.html', array(
 				'config'       => $config,