diff --git a/src/octoprint/plugins/svgtogcode/__init__.py b/src/octoprint/plugins/svgtogcode/__init__.py
index d58abda0..c2940c41 100644
--- a/src/octoprint/plugins/svgtogcode/__init__.py
+++ b/src/octoprint/plugins/svgtogcode/__init__.py
@@ -144,7 +144,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
 		return {
 			"js": ["js/svgtogcode.js", "js/convert.js", "js/working_area.js", "js/lib/snap.svg-min.js"],
 			"less": ["less/svgtogcode.less"],
-			"css": ["css/svgtogcode.css"]
+			"css": ["css/svgtogcode.css", "css/mrbeam.css"]
 		}
 
 	##~~ SettingsPlugin API
@@ -228,7 +228,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
 
 		self._save_profile(path, new_profile, allow_overwrite=allow_overwrite)
 
-	def do_slice(self, model_path, machinecode_path=None, profile_path=None, on_progress=None, on_progress_args=None, on_progress_kwargs=None):
+	def do_slice(self, model_path, printer_profile, machinecode_path=None, profile_path=None, position=None, on_progress=None, on_progress_args=None, on_progress_kwargs=None):
 		if not profile_path:
 			profile_path = s.get(["default_profile"])
 		if not machinecode_path:
diff --git a/src/octoprint/static/css/mrbeam.css b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
similarity index 100%
rename from src/octoprint/static/css/mrbeam.css
rename to src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
diff --git a/src/octoprint/static/img/crosshair.png b/src/octoprint/plugins/svgtogcode/static/img/crosshair.png
similarity index 100%
rename from src/octoprint/static/img/crosshair.png
rename to src/octoprint/plugins/svgtogcode/static/img/crosshair.png
diff --git a/src/octoprint/static/img/safety_glasses_heads_up500.png b/src/octoprint/plugins/svgtogcode/static/img/safety_glasses_heads_up500.png
similarity index 100%
rename from src/octoprint/static/img/safety_glasses_heads_up500.png
rename to src/octoprint/plugins/svgtogcode/static/img/safety_glasses_heads_up500.png
diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js
index 59c56502..d29950b1 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/convert.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js
@@ -205,9 +205,10 @@ function VectorConversionViewModel(params) {
 
     self.onStartup = function() {
         self.requestData();
-		console.log("convert.js onStartup");
 		self.state.conversion = self; // hack! injecting method to avoid circular dependency.
 		self.files.conversion = self;
+		self._configureIntensitySlider();
+		self._configureFeedrateSlider();
     };
 	
 	self._configureIntensitySlider = function() {
@@ -240,10 +241,6 @@ function VectorConversionViewModel(params) {
         }).on("slideStop", self.changeFeedrate);
     };
 	
-	self.init = function(){
-		self._configureIntensitySlider();
-		self._configureFeedrateSlider();
-	};
 	
 	console.log("self.state", self.state);
 	self.state.convertWorkingArea = self.show_conversion_dialog; // hack! injecting method to avoid circular dependency.
diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index 63c5e75e..cb1ce35f 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -7,65 +7,8 @@
         <link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='img/apple-touch-icon-114x114.png') }}">
         <link rel="apple-touch-icon" sizes="144x144" href="{{ url_for('static', filename='img/apple-touch-icon-144x144.png') }}">
 
-        <link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet" media="screen">
-        <link href="{{ url_for('static', filename='css/bootstrap-modal.css') }}" rel="stylesheet" media="screen">
-        <link href="{{ url_for('static', filename='css/bootstrap-slider.css') }}" rel="stylesheet" media="screen">
-        <link href="{{ url_for('static', filename='css/font-awesome.min.css') }}" rel="stylesheet" media="screen">
-        <link href="{{ url_for('static', filename='css/jquery.fileupload-ui.css') }}" rel="stylesheet" media="screen">
-        <link href="{{ url_for('static', filename='css/pnotify.min.css') }}" rel="stylesheet" media="screen">
-
-        {% if stylesheet == "less" %}
-			<!--<link href="{{ url_for('static', filename='less/octoprint.less') }}" rel="stylesheet/less" type="text/css" media="screen">-->
-			<link href="{{ url_for('static', filename='less/mrbeam.less') }}" rel="stylesheet/less" type="text/css" media="screen">
-
-			<!-- Plugin files -->
-			{% for name, assets in assetPlugins.items() %}
-				{% if "less" in assets %}
-					{% for asset in assets["less"] %}
-					<link href="{{ url_for('plugin_assets', name=name, filename=asset) }}" rel="stylesheet/less" type="text/css" media="screen">
-					{% endfor %}
-				{% endif %}
-			{% endfor %}
-			<!-- /Plugin files -->
-
-			<script src="{{ url_for('static', filename='js/lib/less.min.js') }}" type="text/javascript"></script>
-        {% else %}
-			<!--<link href="{{ url_for('static', filename='css/octoprint.css') }}" rel="stylesheet" type="text/css" media="screen">-->
-			<link href="{{ url_for('static', filename='css/mrbeam.css') }}" rel="stylesheet" media="screen">
-			<!-- Plugin files -->
-			{% for name, assets in assetPlugins.items() %}
-				{% if "css" in assets %}
-					{% for asset in assets["css"] %}
-					<link href="{{ url_for('plugin_assets', name=name, filename=asset) }}" rel="stylesheet" type="text/css" media="screen">
-					{% endfor %}
-				{% endif %}
-			{% endfor %}
-			<!-- /Plugin files -->
-        {% endif %}
-
-        <script type="text/javascript" >
-		var BASEURL = "{{ url_for('index') }}";
-		var API_BASEURL = BASEURL + "api/";
-		var GCODE_WORKER = "{{ url_for('static', filename='gcodeviewer/js/Worker.js') }}";
-		var CONFIG_GCODEFILESPERPAGE = 5000;
-		var CONFIG_TIMELAPSEFILESPERPAGE = 10;
-		var CONFIG_LOGFILESPERPAGE = 10;
-		var CONFIG_USERSPERPAGE = 10;
-		var CONFIG_WEBCAM_STREAM = "{{ webcamStream }}";
-		var CONFIG_ACCESS_CONTROL = {% if enableAccessControl -%} true; {% else %} false; {%- endif %}
-		var CONFIG_SD_SUPPORT = {% if enableSdSupport -%} true; {% else %} false; {%- endif %}
-		var CONFIG_FIRST_RUN = {% if firstRun -%} true; {% else %} false; {%- endif %}
-		var CONFIG_TEMPERATURE_GRAPH = {% if enableTemperatureGraph -%} true; {% else %} false; {%- endif %}
-		var CONFIG_GCODE_SIZE_THRESHOLD = {{ gcodeThreshold }};
-		var CONFIG_GCODE_MOBILE_SIZE_THRESHOLD = {{ gcodeMobileThreshold }};
-		var SOCKJS_URI = window.location.protocol.slice(0, - 1) + "://" + (window.document ? window.document.domain : window.location.hostname) + ":" + window.location.port + BASEURL + "sockjs";
-		var SOCKJS_DEBUG = {% if debug -%} true; {% else %} false; {%- endif %}
-
-var UI_API_KEY = "{{ uiApiKey }}";
-		var VERSION = "{{ version }}";
-		var DISPLAY_VERSION = "{{ display_version }}";
-		var LOCALE = "{{ g.locale }}";
-		var ADDITIONAL_VIEWMODELS = [];		</script>
+		{% include 'stylesheets.jinja2' %}
+        {% include 'initscript.jinja2' %}
     </head>
     <body>
 		<div class="container octoprint-container">
@@ -449,7 +392,7 @@ var UI_API_KEY = "{{ uiApiKey }}";
 						<div class="row-fluid">
 
 							<div class="settings" >
-								{% include 'settings_mrbeam.jinja2' %}
+								{% include 'dialogs/settings.jinja2' %}
 							</div>
 
 						</div>
@@ -478,7 +421,6 @@ var UI_API_KEY = "{{ uiApiKey }}";
 					</div>
 
 
-					{% include 'dialogs.jinja2' %}
 
 					<!-- Plugin template files -->
 					{%  if templatePlugins %}
@@ -489,82 +431,24 @@ var UI_API_KEY = "{{ uiApiKey }}";
 					<!-- End plugin template files -->
 
 
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.min.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/modernizr.custom.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/underscore-min.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/underscore.string.min.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/knockout.js') }}"></script>
-					<!--<script type="text/javascript" src="{{ url_for('static', filename='js/lib/knockout-2.2.1.debug.js') }}"></script>-->
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/knockout.mapping-latest.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/babel.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/avltree.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/bootstrap/bootstrap.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/bootstrap/bootstrap-modalmanager.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/bootstrap/bootstrap-modal.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/bootstrap/bootstrap-slider.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.ui.core.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.ui.widget.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.ui.mouse.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.flot.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.iframe-transport.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.fileupload.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.slimscroll.min.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/sockjs-0.3.4.min.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/moment-with-locales.min.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/pusher.color.min.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/detectmobilebrowser.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/md5.min.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/lib/pnotify.min.js') }}"></script>
+					 <!-- Dialogs -->
+        {% include 'dialogs/confirmation.jinja2' %}
+        {% include 'dialogs/firstrun.jinja2' %}
+        {#% include 'dialogs/settings.jinja2' %#}
+        {% include 'dialogs/slicing.jinja2' %}
+        <!-- End of dialogs -->
 
+        <!-- Overlays -->
+        {% include 'overlays/dragndrop.jinja2' %}
+        {% include 'overlays/offline.jinja2' %}
+        <!-- End of overlays -->
 
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/appearance.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/connection.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/control.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/firstrun.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/gcode.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/files.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/loginstate.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/navigation.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/printerstate.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/printerprofiles.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/settings.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/slicing.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/temperature.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/terminal.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/timelapse.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/users.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/viewmodels/log.js') }}"></script>
+        <!-- Generic plugin template files -->
+        {% for data in genericEntries %}
+            {% include data.template ignore missing %}
+        {% endfor %}
+        <!-- End of generic plugin template files -->
 
-
-					{% for name, assets in assetPlugins.items() %}
-					{% if "js" in assets %}
-					{% for asset in assets["js"] %}
-					<script type="text/javascript" src="{{ url_for('plugin_assets', name=name, filename=asset) }}"></script>
-					{% endfor %}
-					{% endif %}
-					{% endfor %}
-
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/dataupdater.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/helpers.js') }}"></script>
-
-					<script type="text/javascript" src="{{ url_for('static', filename='js/app/main.js') }}"></script>
-					<!-- /Include OctoPrint files -->
-
-					<!-- Include i18n language files -->
-					{% if g.locale != 'en' %}
-					<script type="text/javascript" src="{{ url_for('static', filename='js/i18n/%s.js' % g.locale) }}"></script>
-					{% endif %}
-					<!-- /Include i18n language files -->
-
-					<script type="text/javascript" src="{{ url_for('static', filename='gcodeviewer/js/ui.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='gcodeviewer/js/gCodeReader.js') }}"></script>
-					<script type="text/javascript" src="{{ url_for('static', filename='gcodeviewer/js/renderer.js') }}"></script>
-
-					<script src="{{ url_for('static', filename='js/lib/jscut/gl-matrix-2.2.0-min.js') }}"></script>
-					<script src="{{ url_for('static', filename='js/lib/jscut/webgl-utils.js') }}"></script>
-					<script src="{{ url_for('static', filename='js/lib/jscut/parseGcode.js') }}"></script>
-					<script src="{{ url_for('static', filename='js/lib/jscut/RenderPath.js') }}"></script>
-
-				
-				</body>
-			</html>
+        {% include 'javascripts.jinja2' %}
+	</body>
+</html>
diff --git a/src/octoprint/printer/__init__.py b/src/octoprint/printer/__init__.py
index 257b8a43..4b9668aa 100644
--- a/src/octoprint/printer/__init__.py
+++ b/src/octoprint/printer/__init__.py
@@ -225,7 +225,6 @@ class Printer():
 		"""
 		 Sends multiple gcode commands (provided as a list) to the printer.
 		"""
-		print("printer.commands", self._comm)
 		if self._comm is None:
 			return
 
diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index dc47679d..53357fa4 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -182,19 +182,19 @@ def index():
 	#~~ settings dialog
 
 	settings_entries = [
-		(gettext("Printer"), None),
+#		(gettext("Printer"), None),
 		(gettext("Serial Connection"), dict(template="dialogs/settings/serialconnection.jinja2", _div="settings_serialConnection", custom_bindings=False)),
-		(gettext("Printer Profiles"), dict(template="dialogs/settings/printerprofiles.jinja2", _div="settings_printerProfiles", custom_bindings=False)),
-		(gettext("Temperatures"), dict(template="dialogs/settings/temperatures.jinja2", _div="settings_temperature", custom_bindings=False)),
+		(gettext("Machine Profiles"), dict(template="dialogs/settings/printerprofiles.jinja2", _div="settings_printerProfiles", custom_bindings=False)),
+#		(gettext("Temperatures"), dict(template="dialogs/settings/temperatures.jinja2", _div="settings_temperature", custom_bindings=False)),
 		(gettext("Terminal Filters"), dict(template="dialogs/settings/terminalfilters.jinja2", _div="settings_terminalFilters", custom_bindings=False)),
-		(gettext("Features"), None),
+#		(gettext("Features"), None),
 		(gettext("Features"), dict(template="dialogs/settings/features.jinja2", _div="settings_features", custom_bindings=False)),
 		(gettext("Webcam"), dict(template="dialogs/settings/webcam.jinja2", _div="settings_webcam", custom_bindings=False)),
 		(gettext("Access Control"), dict(template="dialogs/settings/accesscontrol.jinja2", _div="settings_users", custom_bindings=False)),
-		(gettext("API"), dict(template="dialogs/settings/api.jinja2", _div="settings_api", custom_bindings=False)),
-		(gettext("OctoPrint"), None),
-		(gettext("Folders"), dict(template="dialogs/settings/folders.jinja2", _div="settings_folders", custom_bindings=False)),
-		(gettext("Appearance"), dict(template="dialogs/settings/appearance.jinja2", _div="settings_appearance", custom_bindings=False)),
+#		(gettext("API"), dict(template="dialogs/settings/api.jinja2", _div="settings_api", custom_bindings=False)),
+#		(gettext("OctoPrint"), None),
+#		(gettext("Folders"), dict(template="dialogs/settings/folders.jinja2", _div="settings_folders", custom_bindings=False)),
+#		(gettext("Appearance"), dict(template="dialogs/settings/appearance.jinja2", _div="settings_appearance", custom_bindings=False)),
 		(gettext("Logs"), dict(template="dialogs/settings/logs.jinja2", _div="settings_logs"))
 	]
 	if len(plugin_includes_settings):
diff --git a/src/octoprint/templates/dialogs/settings.jinja2 b/src/octoprint/templates/dialogs/settings.jinja2
index c6ab24a9..add81d59 100644
--- a/src/octoprint/templates/dialogs/settings.jinja2
+++ b/src/octoprint/templates/dialogs/settings.jinja2
@@ -1,4 +1,4 @@
-<div id="settings_dialog" class="modal hide fade container" tabindex="-1" role="dialog" aria-labelledby="settings_dialog_label" aria-hidden="true">
+<div id="settings_dialog" class="container" role="dialog" aria-labelledby="settings_dialog_label" aria-hidden="true">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal">&times;</button>
         <h3 id="settings_dialog_label">{{ _('OctoPrint Settings') }}</h3>
@@ -42,8 +42,8 @@
             </div>
         </div>
     </div>
-    <div class="modal-footer">
+<!--    <div class="modal-footer">
         <button class="btn" data-dismiss="modal" aria-hidden="true">{{ _('Cancel') }}</button>
         <button class="btn btn-primary" data-bind="click: saveData">{{ _('Save') }}</button>
-    </div>
+    </div>-->
 </div>
diff --git a/src/octoprint/templates/dialogs/settings/features.jinja2 b/src/octoprint/templates/dialogs/settings/features.jinja2
index f00b4640..af9f6569 100644
--- a/src/octoprint/templates/dialogs/settings/features.jinja2
+++ b/src/octoprint/templates/dialogs/settings/features.jinja2
@@ -1,11 +1,11 @@
 <form class="form-horizontal">
-    <div class="control-group">
+<!--    <div class="control-group">
         <div class="controls">
             <label class="checkbox">
                 <input type="checkbox" data-bind="checked: feature_temperatureGraph" id="settings-featureTemperatureGraph"> {{ _('Enable Temperature Graph') }}
             </label>
         </div>
-    </div>
+    </div>-->
     <div class="control-group">
         <div class="controls">
             <label class="checkbox">
@@ -13,13 +13,13 @@
             </label>
         </div>
     </div>
-    <div class="control-group">
+<!--    <div class="control-group">
         <div class="controls">
             <label class="checkbox">
                 <input type="checkbox" data-bind="checked: feature_sdSupport" id="settings-featureSdSupport"> {{ _('Enable SD support') }}
             </label>
         </div>
-    </div>
+    </div>-->
     <div class="control-group">
         <div class="controls">
             <label class="checkbox">
@@ -27,14 +27,14 @@
             </label>
         </div>
     </div>
-    <div class="control-group">
+<!--    <div class="control-group">
         <div class="controls">
             <label class="checkbox">
                 <input type="checkbox" data-bind="checked: feature_sdAlwaysAvailable" id="settings-featureSdAlwaysAvailable"> {{ _('Always assume SD card is present') }} <span class="label">{{ _('Repetier') }}</span>
             </label>
         </div>
-    </div>
-    <div class="control-group">
+    </div>-->
+<!--    <div class="control-group">
         <div class="controls">
             <label class="checkbox">
                 <input type="checkbox" data-bind="checked: feature_waitForStart" id="settings-featureWaitForStart"> {{ _('Wait for <code>start</code> on connect') }}
@@ -61,5 +61,5 @@
                 <input type="checkbox" data-bind="checked: feature_swallowOkAfterResend" id="settings-swallowOkAfterResend"> {{ _('Swallow the first "ok" after a resend response') }}
             </label>
         </div>
-    </div>
+    </div>-->
 </form>
diff --git a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2 b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
index f41cbe32..3d145052 100644
--- a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
+++ b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
@@ -2,19 +2,19 @@
     <div class="control-group">
         <label class="control-label" for="settings-serialPort">{{ _('Serial Port') }}</label>
         <div class="controls">
-            <select id="settings-serialPort" data-bind="options: serial_portOptions, optionsCaption: 'AUTO', value: serial_port"></select>
+            <select id="settings-serialPort"  data-bind="event: {change: saveall}, options: serial_portOptions, optionsCaption: 'AUTO', value: serial_port"></select>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label" for="settings-baudrate">{{ _('Baudrate') }}</label>
         <div class="controls">
-            <select id="settings-baudrate" data-bind="options: serial_baudrateOptions, optionsCaption: 'AUTO', value: serial_baudrate"></select>
+            <select id="settings-baudrate"  data-bind="event: {change: saveall}, options: serial_baudrateOptions, optionsCaption: 'AUTO', value: serial_baudrate"></select>
         </div>
     </div>
     <div class="control-group">
         <div class="controls">
             <label class="checkbox">
-                <input type="checkbox" data-bind="checked: serial_autoconnect" id="settings-serialAutoconnect"> {{ _('Auto-connect to printer on server start') }}
+                <input type="checkbox"  data-bind="event: {change: saveall}, checked: serial_autoconnect" id="settings-serialAutoconnect"> {{ _('Auto-connect to printer on server start') }}
             </label>
         </div>
     </div>
@@ -22,7 +22,7 @@
         <label class="control-label" for="settings-serialTimeoutCommunication">{{ _('Communication timeout') }}</label>
         <div class="controls">
             <div class="input-append">
-                <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutCommunication" id="settings-serialTimeoutCommunication">
+                <input type="number" step="any" min="0" class="input-mini text-right"  data-bind="event: {change: saveall}, value: serial_timeoutCommunication" id="settings-serialTimeoutCommunication">
                 <span class="add-on">s</span>
             </div>
         </div>
@@ -31,7 +31,7 @@
         <label class="control-label" for="settings-movementSpeedE">{{ _('Temperature timeout') }}</label>
         <div class="controls">
             <div class="input-append">
-                <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutTemperature" id="settings-serialTimeoutTemperature">
+                <input type="number" step="any" min="0" class="input-mini text-right"  data-bind="event: {change: saveall}, value: serial_timeoutTemperature" id="settings-serialTimeoutTemperature">
                 <span class="add-on">s</span>
             </div>
         </div>
@@ -40,7 +40,7 @@
         <label class="control-label" for="settings-serialTimeoutSdStatus">{{ _('SD status timeout') }}</label>
         <div class="controls">
             <div class="input-append">
-                <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutSdStatus" id="settings-serialTimeoutSdStatus">
+                <input type="number" step="any" min="0" class="input-mini text-right"  data-bind="event: {change: saveall}, value: serial_timeoutSdStatus" id="settings-serialTimeoutSdStatus">
                 <span class="add-on">s</span>
             </div>
         </div>
@@ -49,7 +49,7 @@
         <label class="control-label" for="settings-serialTimeoutConnection">{{ _('Connection timeout') }}</label>
         <div class="controls">
             <div class="input-append">
-                <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutConnection" id="settings-serialTimeoutConnection">
+                <input type="number" step="any" min="0" class="input-mini text-right"  data-bind="event: {change: saveall}, value: serial_timeoutConnection" id="settings-serialTimeoutConnection">
                 <span class="add-on">s</span>
             </div>
         </div>
@@ -58,7 +58,7 @@
         <label class="control-label" for="settings-serialTimeoutDetection">{{ _('Autodetection timeout') }}</label>
         <div class="controls">
             <div class="input-append">
-                <input type="number" step="any" min="0" class="input-mini text-right" data-bind="value: serial_timeoutDetection" id="settings-serialTimeoutDetection">
+                <input type="number" step="any" min="0" class="input-mini text-right"  data-bind="event: {change: saveall}, value: serial_timeoutDetection" id="settings-serialTimeoutDetection">
                 <span class="add-on">s</span>
             </div>
         </div>
@@ -66,7 +66,7 @@
     <div class="control-group">
         <div class="controls">
             <label class="checkbox">
-                <input type="checkbox" data-bind="checked: serial_log" id="settings-serialLog"> {{ _('Log communication to serial.log (might negatively impact performance)') }} <span class="label label-important">{{ _('Warning') }}</span>
+                <input type="checkbox"  data-bind="event: {change: saveall}, checked: serial_log" id="settings-serialLog"> {{ _('Log communication to serial.log (might negatively impact performance)') }} <span class="label label-important">{{ _('Warning') }}</span>
             </label>
         </div>
     </div>
diff --git a/src/octoprint/templates/settings_mrbeam.jinja2 b/src/octoprint/templates/settings_mrbeam.jinja2
index 5366933b..c7dadb2d 100644
--- a/src/octoprint/templates/settings_mrbeam.jinja2
+++ b/src/octoprint/templates/settings_mrbeam.jinja2
@@ -3,27 +3,29 @@
     <div class="">
         <div class="tabbable">
             <ul class="nav nav-list span3" id="settingsTabs">
-                <li class="active"><a href="#settings_serialConnection" data-toggle="tab">{{ _('Serial Connection') }}</a></li>
-                <li><a href="#settings_printerParameters" data-toggle="tab">{{ _('Parameters') }}</a></li>
 
-                {% if enableAccessControl %}
-				<li><a href="#settings_users" data-toggle="tab">{{ _('Access Control') }}</a></li>
-				{% endif %}
-               
-                <li><a href="#settings_folder" data-toggle="tab">{{ _('Folders') }}</a></li>
-                <li><a href="#settings_logs" data-toggle="tab">{{ _('Logs') }}</a></li>
-                {% if settingsPlugins %}
-                    <li class="nav-header">Plugins</li>
-                    {% for plugin_name, vars in settingsPlugins.items() %}
-                        {% if vars._settings_menu_entry %}
-                            <li><a href="#settings_plugin_{{ plugin_name }}" data-toggle="tab">{{ vars._settings_menu_entry }}</a></li>
-                        {% endif %}
-                    {% endfor %}
-                {% endif %}
+			{% if settingsEntries %}
+				<!--<li class="nav-header">Plugins</li>-->
+				{% for entry, data in settingsEntries %}
+                    {% if data is none %}
+                        <li class="nav-header">{{ entry }}</li>
+                    {% else %}
+                        {% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- ko allowBindings: false -->{% endif %}
+                        <li id="{{ data._div }}_link"
+                            {% if "data_bind" in data %}data-bind="{{ data.data_bind }}"{% endif %}
+                            class="{% if not active_set %}active{% set active_set = true %}{% endif %} {% if "classes_link" in data %}{{ data.classes_link|join(' ') }}{% elif "classes" in data %}{{ data.classes|join(' ') }}{% endif %}"
+                            {% if "styles_link" in data %} style="{{ data.styles_link|join(', ') }}" {% elif "styles" in data %} style="{{ data.styles|join(', ') }}" {% endif %}
+                                >
+                            <a href="#{{ data._div }}" data-toggle="tab">{{ entry }}</a>
+                        </li>
+                        {% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- /ko -->{% endif %}
+                    {% endif %}
+                {% endfor %}
+			{% endif %}
             </ul>
 
             <div class="tab-content span8">
-                <div class="tab-pane active" id="settings_serialConnection">
+<!--                <div class="tab-pane active" id="settings_serialConnection">
                     <form class="form-horizontal">
                         <div class="control-group">
                             <label class="control-label" for="settings-serialPort">{{ _('Serial Port') }}</label>
@@ -68,8 +70,8 @@
                             </div>
                         </div>
                     </form>
-                </div>
-
+                </div>-->
+<!--
 				<div class="tab-pane" id="settings_printerParameters">
                     <form class="form-horizontal">
 
@@ -99,82 +101,82 @@
                         </div>
                     </form>
                 </div>
-            
-				<div class="tab-pane" id="settings_features">
+            -->
+<!--				<div class="tab-pane" id="settings_features">
                     <form class="form-horizontal">
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <!--<input type="checkbox" data-bind="event: {change: saveall}, checked: feature_temperatureGraph" id="settings-featureTemperatureGraph"> {{ _('Enable Temperature Graph') }}-->
+                                    <input type="checkbox" data-bind="event: {change: saveall}, checked: feature_temperatureGraph" id="settings-featureTemperatureGraph"> {{ _('Enable Temperature Graph') }}
                                 </label>
                             </div>
                         </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <!--<input type="checkbox" data-bind="event: {change: saveall}, checked: feature_gcodeViewer" id="settings-featureGcodeViewer"> {{ _('Enable GCode Visualizer') }}-->
+                                    <input type="checkbox" data-bind="event: {change: saveall}, checked: feature_gcodeViewer" id="settings-featureGcodeViewer"> {{ _('Enable GCode Visualizer') }}
                                 </label>
                             </div>
                         </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <!--<input type="checkbox" data-bind="event: {change: saveall}, checked: feature_sdSupport" id="settings-featureSdSupport"> {{ _('Enable SD support') }}-->
+                                    <input type="checkbox" data-bind="event: {change: saveall}, checked: feature_sdSupport" id="settings-featureSdSupport"> {{ _('Enable SD support') }}
                                 </label>
                             </div>
                         </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <!--<input type="checkbox" data-bind="event: {change: saveall}, checked: feature_sdAlwaysAvailable" id="settings-featureSdAlwaysAvailable"> {{ _('Always assume SD card is present') }} <span class="label">{{ _('Repetier') }}</span>-->
+                                    <input type="checkbox" data-bind="event: {change: saveall}, checked: feature_sdAlwaysAvailable" id="settings-featureSdAlwaysAvailable"> {{ _('Always assume SD card is present') }} <span class="label">{{ _('Repetier') }}</span>
                                 </label>
                             </div>
                         </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <!--<input type="checkbox" data-bind="event: {change: saveall}, checked: feature_waitForStart" id="settings-featureWaitForStart"> {{ _('Wait for <code>start</code> on connect') }}-->
+                                    <input type="checkbox" data-bind="event: {change: saveall}, checked: feature_waitForStart" id="settings-featureWaitForStart"> {{ _('Wait for <code>start</code> on connect') }}
                                 </label>
                             </div>
                         </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <!--<input type="checkbox" data-bind="event: {change: saveall}, checked: feature_alwaysSendChecksum" id="settings-featureAlwaysSendChecksum"> {{ _('Send a checksum with <strong>every</strong> command') }}  <span class="label">{{ _('Repetier') }}</span>-->
+                                    <input type="checkbox" data-bind="event: {change: saveall}, checked: feature_alwaysSendChecksum" id="settings-featureAlwaysSendChecksum"> {{ _('Send a checksum with <strong>every</strong> command') }}  <span class="label">{{ _('Repetier') }}</span>
                                 </label>
                             </div>
                         </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <!--<input type="checkbox" data-bind="event: {change: saveall}, checked: feature_repetierTargetTemp" id="settings-featureRepetierTargetTemp"> {{ _('Support <code>TargetExtr%%n</code>/<code>TargetBed</code> target temperature format') }} <span class="label">{{ _('Repetier') }}</span>-->
+                                    <input type="checkbox" data-bind="event: {change: saveall}, checked: feature_repetierTargetTemp" id="settings-featureRepetierTargetTemp"> {{ _('Support <code>TargetExtr%%n</code>/<code>TargetBed</code> target temperature format') }} <span class="label">{{ _('Repetier') }}</span>
                                 </label>
                             </div>
                         </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <!--<input type="checkbox" data-bind="event: {change: saveall}, checked: feature_swallowOkAfterResend" id="settings-swallowOkAfterResend"> {{ _('Swallow the first "ok" after a resend response') }}-->
+                                    <input type="checkbox" data-bind="event: {change: saveall}, checked: feature_swallowOkAfterResend" id="settings-swallowOkAfterResend"> {{ _('Swallow the first "ok" after a resend response') }}
                                 </label>
                             </div>
                         </div>
                     </form>
-                </div>
-               
+                </div>-->
+     <!--          
 				<div class="tab-pane" id="settings_folder">
                     <form class="form-horizontal">
                         <div class="control-group">
                             <label class="control-label" for="settings-folderUploads">{{ _('Upload Folder') }}</label>
                             <div class="controls">
                                 <!--<input type="text" class="input-block-level" data-bind="event: {change: saveall}, value: folder_uploads" id="settings-folderUploads">-->
-                            </div>
+     <!--                       </div>
                         </div>
 
                         <div class="control-group">
                             <label class="control-label" for="settings-folderLogs">{{ _('Logs Folder') }}</label>
                             <div class="controls">
                                 <!--<input type="text" class="input-block-level" data-bind="event: {change: saveall}, value: folder_logs" id="settings-folderLogs">-->
-                            </div>
+   <!--                         </div>
                         </div>
 
                     </form>
@@ -281,7 +283,7 @@
                         </div>
                     </form>
                 </div>
-
+-->
                 {% if enableAccessControl %}
                 <div class="tab-pane" id="settings_users">
                     <table class="table table-condensed table-hover" id="system_users">
@@ -442,13 +444,23 @@
                 </div>
                 {% endif %}
 
-                {% for plugin_name, vars in settingsPlugins.items() %}
-                    <div class="tab-pane" id="settings_plugin_{{ plugin_name }}" data-bind="allowBindings: true">
-                        {% include plugin_name+"_settings_dialog.jinja2" ignore missing %}
-                    </div>
+
+				{% set active_set = false %}
+                {% for entry, data in settingsEntries %}
+                    {% if data is not none %}
+                        {% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- ko allowBindings: false -->{% endif %}
+                        <div id="{{ data._div }}"
+                             {% if "data_bind" in data %}data-bind="{{ data.data_bind }}"{% endif %}
+                             class="tab-pane {% if not active_set %}active{% set active_set = true %}{% endif %} {% if classes_content in data %}{{ data.classes_content|join(' ') }}{% elif classes in data %}{{ data.classes|join(' ') }}{% endif %}"
+                             {% if "styles_content" in data %} style="{{ data.styles_content|join(', ') }}" {% elif styles in data %} style="{{ data.styles|join(', ') }}" {% endif %}
+                                >
+                            {% include data.template ignore missing %}
+                        </div>
+                        {% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- /ko -->{% endif %}
+                    {% endif %}
                 {% endfor %}
 
-                <div class="tab-pane" id="settings_logs" data-bind="allowBindings: false">
+<!--                <div class="tab-pane" id="settings_logs" data-bind="allowBindings: false">
                     <div id="logs">
 
                         <div class="pull-right">
@@ -494,7 +506,7 @@
                             </ul>
                         </div>
                     </div>
-                </div>
+                </div>-->
             </div>
         </div>
     </div>