diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index bec3cfb2..b36e28b6 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -511,162 +511,7 @@
                 </div>
             </div>
         </div>
-
-        <div id="settings_dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="settings_dialog_label" aria-hidden="true">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">×</button>
-                <h3 id="settings_dialog_label">OctoPrint Settings</h3>
-            </div>
-            <div class="modal-body">
-                <div class="tabbable">
-                    <ul class="nav nav-pills" id="settingsTabs">
-                        <li class="active"><a href="#settings_printerParameters" data-toggle="tab">Printer Parameters</a></li>
-                        <li><a href="#settings_webcam" data-toggle="tab">Webcam</a></li>
-                        <li><a href="#settings_features" data-toggle="tab">Features</a></li>
-                        <li><a href="#settings_folder" data-toggle="tab">Folder</a></li>
-                        <li><a href="#settings_temperature" data-toggle="tab">Temperature</a></li>
-                    </ul>
-
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="settings_printerParameters">
-                            <form class="form-horizontal">
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-movementSpeedX">Movement Speed X Axis</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-mini text-right" data-bind="value: printer_movementSpeedX" id="settings-movementSpeedX">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-movementSpeedY">Movement Speed Y Axis</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-mini text-right" data-bind="value: printer_movementSpeedY" id="settings-movementSpeedY">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-movementSpeedZ">Movement Speed Z Axis</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-mini text-right" data-bind="value: printer_movementSpeedZ" id="settings-movementSpeedZ">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-movementSpeedE">Movement Speed Extruder</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-mini text-right" data-bind="value: printer_movementSpeedE" id="settings-movementSpeedE">
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                        <div class="tab-pane" id="settings_webcam">
-                            <form class="form-horizontal">
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-webcamStreamUrl">Stream URL</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-block-level" data-bind="value: webcam_streamUrl" id="settings-webcamStreamUrl">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-webcamStreamUrl">Snapshot URL</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-block-level" data-bind="value: webcam_snapshotUrl" id="settings-webcamSnapshotUrl">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-webcamStreamUrl">Path to FFMPEG</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-block-level" data-bind="value: webcam_ffmpegPath" id="settings-webcamFfmpegPath">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-webcamBitrate">Timelapse bitrate</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-block-level" data-bind="value: webcam_bitrate" id="settings-webcamBitrate">
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                        <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="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="checked: feature_waitForStart" id="settings-featureWaitForStart"> Wait for start on connect
-                                        </label>
-                                    </div>
-                                </div>
-                            </form>
-                        </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="value: folder_uploads" id="settings-folderUploads">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-folderTimelapse">Timelapse Folder</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-block-level" data-bind="value: folder_timelapse" id="settings-folderTimelapse">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-folderTimelapseTemp">Timelapse Temp Folder</label>
-                                    <div class="controls">
-                                        <input type="text" class="input-block-level" data-bind="value: folder_timelapseTmp" id="settings-folderTimelapseTemp">
-                                    </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="value: folder_logs" id="settings-folderLogs">
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                        <div class="tab-pane" id="settings_temperature">
-                            <form class="form-horizontal">
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-temperatureExtruderABS">Extruder Temperature (ABS)</label>
-                                    <div class="controls">
-                                        <input type="number" class="input-mini text-right" data-bind="value: temperature_extruderABS" id="settings-temperatureExtruderABS">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-temperatureBedABS">Bed Temperature (ABS)</label>
-                                    <div class="controls">
-                                        <input type="number" class="input-mini text-right" data-bind="value: temperature_bedABS" id="settings-temperatureBedABS">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-temperatureExtruderPLA">Extruder Temperature (PLA)</label>
-                                    <div class="controls">
-                                        <input type="number" class="input-mini text-right" data-bind="value: temperature_extruderPLA" id="settings-temperatureExtruderPLA">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label" for="settings-temperatureBedPLA">Bed Temperature (PLA)</label>
-                                    <div class="controls">
-                                        <input type="number" class="input-mini text-right" data-bind="value: temperature_bedPLA" id="settings-temperatureBedPLA">
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <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>
-
+{% include 'settings.html' %}
     <script type="text/javascript" src="http://code.jquery.com/jquery-latest.js"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/underscore-min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/knockout-2.2.1.js') }}"></script>