diff --git a/octoprint_enclosure/templates/enclosure_settings.jinja2 b/octoprint_enclosure/templates/enclosure_settings.jinja2
index c854705..0fa9706 100644
--- a/octoprint_enclosure/templates/enclosure_settings.jinja2
+++ b/octoprint_enclosure/templates/enclosure_settings.jinja2
@@ -45,36 +45,86 @@ Available options are: 11 for DHT11; 22 for DHT22; 2302 for AM2302; 1820 for DS1
     </div>
 </form>
 
-<h4>{{ _('Fan') }}</h4>
+<h4>{{ _('IO 1') }}</h4>
 <form class="form-horizontal">
     <div class="control-group">
         <div class="controls">
             <label class="checkbox">
-                <input type="checkbox" data-bind="checked: settings.plugins.enclosure.fanEnable">  {{ _('Enable Fan') }}
+                <input type="checkbox" data-bind="checked: settings.plugins.enclosure.io1Enable">  {{ _('Enable IO 1') }}
             </label>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="settings-enclosure-fanPin">{{ _('Fan Pin') }}</label>
+        <label class="control-label" for="settings-enclosure-io1">{{ _('IO 1 Label') }}</label>
         <div class="controls">
-            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.fanPin">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.io1Label">
+        </div>
+        <label class="control-label" for="settings-enclosure-io1">{{ _('IO 1 Number') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.io1">
         </div>
     </div>
 </form>
 
-<h4>{{ _('Light') }}</h4>
+<h4>{{ _('IO 2') }}</h4>
 <form class="form-horizontal">
     <div class="control-group">
         <div class="controls">
             <label class="checkbox">
-                <input type="checkbox" data-bind="checked: settings.plugins.enclosure.lightEnable">  {{ _('Enable Light') }}
+                <input type="checkbox" data-bind="checked: settings.plugins.enclosure.io2Enable">  {{ _('Enable IO 2') }}
             </label>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="settings-enclosure-lightPin">{{ _('Light Pin') }}</label>
+        <label class="control-label" for="settings-enclosure-io2">{{ _('IO 2 Label') }}</label>
         <div class="controls">
-            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.lightPin">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.io2Label">
+        </div>
+        <label class="control-label" for="settings-enclosure-io2">{{ _('IO 2 Number') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.io2">
+        </div>
+    </div>
+</form>
+
+<h4>{{ _('IO 3') }}</h4>
+<form class="form-horizontal">
+    <div class="control-group">
+        <div class="controls">
+            <label class="checkbox">
+                <input type="checkbox" data-bind="checked: settings.plugins.enclosure.io3Enable">  {{ _('Enable IO 3') }}
+            </label>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label" for="settings-enclosure-io3">{{ _('IO 3 Label') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.io3Label">
+        </div>
+        <label class="control-label" for="settings-enclosure-io3">{{ _('IO 3 Number') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.io3">
+        </div>
+    </div>
+</form>
+
+<h4>{{ _('IO 4') }}</h4>
+<form class="form-horizontal">
+    <div class="control-group">
+        <div class="controls">
+            <label class="checkbox">
+                <input type="checkbox" data-bind="checked: settings.plugins.enclosure.io4Enable">  {{ _('Enable IO 4') }}
+            </label>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label" for="settings-enclosure-io4">{{ _('IO 4 Label') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.io4Label">
+        </div>
+        <label class="control-label" for="settings-enclosure-io4">{{ _('IO 4 Number') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: settings.plugins.enclosure.io4">
         </div>
     </div>
 </form>
diff --git a/octoprint_enclosure/templates/enclosure_tab.jinja2 b/octoprint_enclosure/templates/enclosure_tab.jinja2
index ea3d87a..31ab824 100644
--- a/octoprint_enclosure/templates/enclosure_tab.jinja2
+++ b/octoprint_enclosure/templates/enclosure_tab.jinja2
@@ -32,12 +32,9 @@
         <th></th>
     </tr>
 </table>
-<h4>{{ _('Fan') }}</h4>
-<button type="submit" data-bind="click: turnFanOn, enable: settings.settings.plugins.enclosure.fanEnable && isConnected()" class="btn">Turn on</button> 
-<button type="submit" data-bind="click: turnFanOff, enable: settings.settings.plugins.enclosure.fanEnable && isConnected()"   class="btn">Turn off</button>
-<h4>{{ _('Light') }}</h4>
-<button type="submit" data-bind="click: turnLightOn, enable: settings.settings.plugins.enclosure.lightEnable && isConnected()"  class="btn">Turn on</button>
-<button type="submit" data-bind="click: turnLightOff, enable: settings.settings.plugins.enclosure.lightEnable && isConnected()"   class="btn">Turn off</button>
+<h4  data-bind="html: settings.settings.plugins.enclosure.io1Label "> </h4>
+<button type="submit" data-bind="click: handleIO(io1,on), enable: settings.settings.plugins.enclosure.io1Enable && isConnected()" class="btn">Turn on</button> 
+<button type="submit" data-bind="click: handleIO(io1,off), enable: settings.settings.plugins.enclosure.io1Enable && isConnected()"   class="btn">Turn off</button>