diff --git a/templates/main.js b/templates/main.js
index 18646385..5a16297e 100755
--- a/templates/main.js
+++ b/templates/main.js
@@ -112,12 +112,12 @@ var saved = {};
 var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0|addslashes }}{% raw %}';
 var styles = {
 	{% endraw %}
-	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
+	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{% if stylesheet.uri != '' %}{{ stylesheet.uri|addslashes }}?v={{ config.resource_version }}{% endif %}{% raw %}',
 	{% endraw %}{% endfor %}{% raw %}
 };
 var codestyles = {
 	{% endraw %}
-	{% for stylesheet in code_stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
+	{% for stylesheet in code_stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{% if stylesheet.uri != '' %}{{ stylesheet.uri|addslashes }}?v={{ config.resource_version }}{% endif %}{% raw %}',
 	{% endraw %}{% endfor %}{% raw %}
 };
 
@@ -150,17 +150,19 @@ function changeStyle(styleName, link) {
 	document.getElementById('stylesheet').href = styles[styleName];
 	selectedstyle = styleName;
 
-	// Code stylesheet
-	if (!document.getElementById('code_stylesheet')) {
-		var s = document.createElement('link');
-		s.rel = 'stylesheet';
-		s.type = 'text/css';
-		s.id = 'code_stylesheet';
-		var x = document.getElementsByTagName('head')[0];
-		x.appendChild(s);
-	}
+	if (codestyles[styleName]) {
+		// Code stylesheet
+		if (!document.getElementById('code_stylesheet')) {
+			var s = document.createElement('link');
+			s.rel = 'stylesheet';
+			s.type = 'text/css';
+			s.id = 'code_stylesheet';
+			var x = document.getElementsByTagName('head')[0];
+			x.appendChild(s);
+		}
 
-	document.getElementById('code_stylesheet').href = codestyles[styleName];
+		document.getElementById('code_stylesheet').href = codestyles[styleName];
+	}
 
 	if (document.getElementsByClassName('styles').length != 0) {
 		var styleLinks = document.getElementsByClassName('styles')[0].childNodes;