diff --git a/inc/config.php b/inc/config.php
index e71f3631..ca3aec91 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -249,6 +249,9 @@
 	$config['show_ratio']	= false;
 	// Display the file's original filename
 	$config['show_filename']= true;
+	// Inline expanding of images with Javascript
+	$config['inline_expanding'] = true;
+	
 	
 	// Directory where temporary files will be created. Not really used much yet except for some experimental stuff.
 	$config['tmp'] = '/tmp';
diff --git a/main.js b/main.js
index ff076598..477c90db 100644
--- a/main.js
+++ b/main.js
@@ -58,8 +58,8 @@ function citeReply(id) {
 
 var selectedstyle = 'Yotsuba B';
 var styles = [
-	['Yotsuba B', '/Tinyboard/default.css'],
-	['Yotsuba', '/Tinyboard/yotsuba.css']
+	['Yotsuba B', '/Tinyboard/stylesheets/default.css'],
+	['Yotsuba', '/Tinyboard/stylesheets/yotsuba.css']
 ];
 var saved = {};
 
@@ -113,31 +113,7 @@ function rememberStuff() {
 	}
 }
 
-function init()
-{
-	newElement = document.createElement('div');
-	newElement.className = 'styles';
-	
-	for(x=0;x<styles.length;x++) {
-		style = document.createElement('a');
-		style.innerHTML = '[' + styles[x][0] + ']';
-		style.href = 'javascript:changeStyle(' + x + ');';
-		if(selectedstyle == styles[x][0])
-			style.className = 'selected';
-		newElement.appendChild(style);
-	}	
-	
-	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild)
-	
-	if(document.forms.postcontrols) {
-		document.forms.postcontrols.password.value = localStorage.password;
-	}
-	
-	if (window.location.hash.indexOf('q') == 1)
-		citeReply(window.location.hash.substring(2));
-	else if (window.location.hash.substring(1))
-		highlightReply(window.location.hash.substring(1));
-	
+function init_expanding() {
 	link = document.getElementsByTagName('a');
 	for ( i in link ) {
 		if(typeof link[i] == "object" && link[i].childNodes[0].src) {
@@ -169,6 +145,34 @@ function init()
 	}
 }
 
+function init()
+{
+	newElement = document.createElement('div');
+	newElement.className = 'styles';
+	
+	for(x=0;x<styles.length;x++) {
+		style = document.createElement('a');
+		style.innerHTML = '[' + styles[x][0] + ']';
+		style.href = 'javascript:changeStyle(' + x + ');';
+		if(selectedstyle == styles[x][0])
+			style.className = 'selected';
+		newElement.appendChild(style);
+	}	
+	
+	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild)
+	
+	if(document.forms.postcontrols) {
+		document.forms.postcontrols.password.value = localStorage.password;
+	}
+	
+	if (window.location.hash.indexOf('q') == 1)
+		citeReply(window.location.hash.substring(2));
+	else if (window.location.hash.substring(1))
+		highlightReply(window.location.hash.substring(1));
+	
+	init_expanding();
+}
+
 var RecaptchaOptions = {
 	theme : 'clean'
 };
diff --git a/templates/main.js b/templates/main.js
index e4063ae9..577e6f66 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -113,31 +113,7 @@ function rememberStuff() {
 	}
 }
 
-function init()
-{
-	newElement = document.createElement('div');
-	newElement.className = 'styles';
-	
-	for(x=0;x<styles.length;x++) {
-		style = document.createElement('a');
-		style.innerHTML = '[' + styles[x][0] + ']';
-		style.href = 'javascript:changeStyle(' + x + ');';
-		if(selectedstyle == styles[x][0])
-			style.className = 'selected';
-		newElement.appendChild(style);
-	}	
-	
-	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild)
-	
-	if(document.forms.postcontrols) {
-		document.forms.postcontrols.password.value = localStorage.password;
-	}
-	
-	if (window.location.hash.indexOf('q') == 1)
-		citeReply(window.location.hash.substring(2));
-	else if (window.location.hash.substring(1))
-		highlightReply(window.location.hash.substring(1));
-	
+function init_expanding() {
 	link = document.getElementsByTagName('a');
 	for ( i in link ) {
 		if(typeof link[i] == "object" && link[i].childNodes[0].src) {
@@ -169,6 +145,34 @@ function init()
 	}
 }
 
+function init()
+{
+	newElement = document.createElement('div');
+	newElement.className = 'styles';
+	
+	for(x=0;x<styles.length;x++) {
+		style = document.createElement('a');
+		style.innerHTML = '[' + styles[x][0] + ']';
+		style.href = 'javascript:changeStyle(' + x + ');';
+		if(selectedstyle == styles[x][0])
+			style.className = 'selected';
+		newElement.appendChild(style);
+	}	
+	
+	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild)
+	
+	if(document.forms.postcontrols) {
+		document.forms.postcontrols.password.value = localStorage.password;
+	}
+	
+	if (window.location.hash.indexOf('q') == 1)
+		citeReply(window.location.hash.substring(2));
+	else if (window.location.hash.substring(1))
+		highlightReply(window.location.hash.substring(1));
+	
+	{config[inline_expanding]?init_expanding();}
+}
+
 var RecaptchaOptions = {
 	theme : 'clean'
 };