diff --git a/addon/js_upload/js_upload.php b/addon/js_upload/js_upload.php
index 042e9a988a..8691389fec 100644
--- a/addon/js_upload/js_upload.php
+++ b/addon/js_upload/js_upload.php
@@ -129,7 +129,7 @@ function js_upload_post_init(&$a,&$b) {
 
 	// max file size in bytes
 
-	$sizeLimit = 6 * 1024 * 1024;
+	$sizeLimit = get_config('system','maximagesize'); //6 * 1024 * 1024;
 
 	$uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
 
@@ -141,6 +141,7 @@ function js_upload_post_init(&$a,&$b) {
 
 	if(isset($result['error'])) {
 		logger('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , 'LOGGER_DEBUG');
+		echo json_encode($result);
 		killme();
 	}
 
diff --git a/images/onoff.jpg b/images/onoff.jpg
new file mode 100644
index 0000000000..7884912a7f
Binary files /dev/null and b/images/onoff.jpg differ
diff --git a/view/field_custom.tpl b/view/field_custom.tpl
new file mode 100644
index 0000000000..be15d3f607
--- /dev/null
+++ b/view/field_custom.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field custom'>
+		<label for='$field.0'>$field.1</label>
+		$field.2
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/field_password.tpl b/view/field_password.tpl
new file mode 100644
index 0000000000..e604b7f5da
--- /dev/null
+++ b/view/field_password.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field password'>
+		<label for='id_$field.0'>$field.1</label>
+		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/field_radio.tpl b/view/field_radio.tpl
new file mode 100644
index 0000000000..a915e8eb3c
--- /dev/null
+++ b/view/field_radio.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field radio'>
+		<label for='id_$field.0_$field.2'>$field.1</label>
+		<input type="radio" name='$field.0' id='id_$field.0_$field.2' value="$field.2" {{ if $field.4 }}checked="true"{{ endif }}>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/field_yesno.tpl b/view/field_yesno.tpl
new file mode 100644
index 0000000000..5d4a775c29
--- /dev/null
+++ b/view/field_yesno.tpl
@@ -0,0 +1,13 @@
+	<div class='field yesno'>
+		<label for='id_$field.0'>$field.1</label>
+		<div class='onoff' id="id_$field.0_onoff">
+			<input  type="hidden" name='$field.0' id='id_$field.0' value="$field.2">
+			<a href="#" class='off'>
+				{{ if $field.4 }}$field.4.0{{ else }}OFF{{ endif }}
+			</a>
+			<a href="#" class='on'>
+				{{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }}
+			</a>
+		</div>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
new file mode 100644
index 0000000000..8fe0b51944
--- /dev/null
+++ b/view/settings_addons.tpl
@@ -0,0 +1,11 @@
+$tabs
+
+<h1>$title</h1>
+
+
+<form action="settings/addon" method="post" >
+
+$settings_addons
+
+</form>
+
diff --git a/view/settings_tabs.tpl b/view/settings_tabs.tpl
new file mode 100644
index 0000000000..893fdfbce2
--- /dev/null
+++ b/view/settings_tabs.tpl
@@ -0,0 +1,6 @@
+
+<div id="profile-tabs-wrapper" >
+	<a href="$account.1" id="profile-tab-status-link" class="profile-tabs" >$account.0</a>
+	<a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs" >$plugins.0</a>
+<div id="profile-tabs-end"></div>
+</div>
diff --git a/view/theme/dispy/login-bg.gif b/view/theme/dispy/login-bg.gif
new file mode 100644
index 0000000000..cde836c893
Binary files /dev/null and b/view/theme/dispy/login-bg.gif differ