diff --git a/.gitignore b/.gitignore
index a450d65..ee43924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,105 @@
+# Created by https://www.gitignore.io/api/osx,windows,phpstorm
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Windows ###
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+### PhpStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+
+*.iml
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+
+
 bower_components
 node_modules
 
+material-decorator.js
+material-decorator.min.js
\ No newline at end of file
diff --git a/examples/data/switch.json b/examples/data/switch.json
new file mode 100644
index 0000000..6cc03a7
--- /dev/null
+++ b/examples/data/switch.json
@@ -0,0 +1,21 @@
+{
+  "schema": {
+    "type": "object",
+    "properties": {
+      "live":  {
+        "title": "Mode",
+        "type": "string",
+        "titleMap": {
+          "true": "'Yes I do'",
+          "false": "'Hell no'"
+        }
+      }
+    }
+  },
+  "form": [
+    {
+      "key":"live",
+      "type":"switch"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/examples/material-example.html b/examples/material-example.html
index a18fed5..dd396f4 100644
--- a/examples/material-example.html
+++ b/examples/material-example.html
@@ -184,6 +184,7 @@ <h3>Schema</h3>
 app.controller('TestCtrl', function($scope, $http, $location, $timeout, $q) {
 
   $scope.tests = [
+    { name: "Switch", data: 'data/switch.json'},
     { name: "Material Flex Grid", data: 'data/grid.json' },
     { name: "Autocomplete", data: 'data/autocomplete.json' },
     { name: "Simple", data: 'data/simple.json' },
diff --git a/material-decorator.js b/material-decorator.js
index 571f15c..319191f 100644
--- a/material-decorator.js
+++ b/material-decorator.js
@@ -6,7 +6,7 @@ $templateCache.put("decorators/material/checkbox.html","<div class=\"checkbox sc
 $templateCache.put("decorators/material/checkboxes.html","<div sf-array=\"form\" sf-field-model=\"\" class=\"form-group schema-form-checkboxes {{form.htmlClass}}\" ng-class=\"{\'has-error\': hasError(), \'has-success\': hasSuccess()}\"><label class=\"control-label\" ng-show=\"showTitle()\">{{form.title}}</label><div class=\"checkbox\" ng-repeat=\"val in titleMapValues track by $index\"><md-checkbox ng-model=\"titleMapValues[$index]\" sf-changed=\"form\" ng-disabled=\"form.readonly\" name=\"{{form.key.slice(-1)[0]}}\" ng-true-value=\"true\" ng-false-value=\"false\" aria-label=\"{{form.title || form.key.slice(-1)[0]}}\"><span ng-bind-html=\"form.titleMap[$index].name\"></span></md-checkbox></div><div ng-messages=\"ngModel.$error\"><div sf-message=\"\" ng-message=\"\"></div></div></div>");
 $templateCache.put("decorators/material/chips.html","<div class=\"form-group schema-form-chips {{form.htmlClass}}\" ng-class=\"{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false}\"><md-chips sf-field-model=\"\" readonly=\"form.readonly\" flex=\"\" placeholder=\"{{form.title || form.key.slice(-1)[0]}}\"><md-chip-template><strong ng-if=\"!form.template\">{{$chip}}</strong></md-chip-template></md-chips><div ng-messages=\"ngModel.$error\"><div sf-message=\"\" ng-message=\"\"></div></div></div>");
 $templateCache.put("decorators/material/date.html","<div class=\"schema-form-date {{form.htmlClass}}\"><label ng-show=\"showTitle()\" for=\"{{form.key.slice(-1)[0]}}\">{{form.title}}</label><md-datepicker sf-field-model=\"\" sf-changed=\"form\" schema-validate=\"form\" sf-type-parser=\"form.schema\" id=\"{{form.key.slice(-1)[0]}}\" ng-show=\"form.key\" ng-class=\"form.fieldHtmlClass\" ng-disabled=\"form.readonly\" md-placeholder=\"Enter date\" sf-messages=\"\"></md-datepicker></div>");
-$templateCache.put("decorators/material/default.html","<md-input-container class=\"schema-form-{{form.type}} {{form.htmlClass}}\" sf-messages=\"\"><label ng-show=\"showTitle()\" for=\"{{form.key.slice(-1)[0]}}\">{{form.title}}</label><input sf-field-model=\"\" ng-show=\"form.key\" type=\"{{form.type}}\" step=\"any\" sf-changed=\"form\" id=\"{{form.key.slice(-1)[0]}}\" ng-class=\"form.fieldHtmlClass\" sf-type-parser=\"form.schema\" ng-disabled=\"form.readonly\" schema-validate=\"form\" name=\"{{form.key.slice(-1)[0]}}\" aria-describedby=\"{{form.key.slice(-1)[0] + \'Status\'}}\"></md-input-container>");
+$templateCache.put("decorators/material/default.html","<md-input-container class=\"schema-form-{{form.type}} {{form.htmlClass}}\" ng-class=\"{\'md-input-has-value\':model[\'{{form.key.slice(-1)[0]}}\']}\" sf-messages=\"\"><label ng-show=\"showTitle()\" for=\"{{form.key.slice(-1)[0]}}\">{{form.title}}</label><input sf-field-model=\"\" ng-show=\"form.key\" type=\"{{form.type}}\" step=\"any\" sf-changed=\"form\" id=\"{{form.key.slice(-1)[0]}}\" ng-class=\"form.fieldHtmlClass\" sf-type-parser=\"form.schema\" ng-disabled=\"form.readonly\" schema-validate=\"form\" name=\"{{form.key.slice(-1)[0]}}\" aria-describedby=\"{{form.key.slice(-1)[0] + \'Status\'}}\"></md-input-container>");
 $templateCache.put("decorators/material/fieldset-trcl.html","<fieldset ng-disabled=\"form.readonly\" class=\"standard {{form.htmlClass}}\" flex=\"\"><legend ng-show=\"form.title\">{{ form.title }}</legend><div ng-transclude=\"\"></div></fieldset>");
 $templateCache.put("decorators/material/fieldset.html","<fieldset ng-disabled=\"form.readonly\" class=\"standard {{form.htmlClass}}\" flex=\"\"><legend ng-show=\"form.title\">{{ form.title }}</legend></fieldset>");
 $templateCache.put("decorators/material/help.html","<div class=\"helpvalue schema-form-helpvalue {{form.htmlClass}}\" ng-bind-html=\"form.helpvalue\"></div>");
@@ -16,7 +16,7 @@ $templateCache.put("decorators/material/radios.html","<div class=\"form-group sc
 $templateCache.put("decorators/material/section.html","<div class=\"schema-form-section {{form.htmlClass}}\"></div>");
 $templateCache.put("decorators/material/select.html","<md-input-container class=\"form-group {{form.htmlClass}} schema-form-select\" ng-class=\"{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false}\"><label ng-show=\"showTitle()\">{{form.title}}</label><md-select sf-field-model=\"\"><md-optgroup ng-repeat-start=\"(key, opt) in form.titleMap | orderBy:\'group\' as optGroups\" ng-if=\"opt.group && opt.group != optGroups[key-1].group\" label=\"{{opt.group}}\"><md-option ng-repeat=\"(key, filtered) in form.titleMap | filter: {group: opt.group} | orderBy:\'name\' as opts\" ng-value=\"filtered.value\">{{filtered.name}}</md-option></md-optgroup><md-option ng-repeat-end=\"\" ng-if=\"!opt.group\" ng-value=\"opt.value\">{{opt.name}}</md-option></md-select><div ng-messages=\"ngModel.$error\"><div sf-message=\"\" ng-message=\"\"></div></div></md-input-container>");
 $templateCache.put("decorators/material/submit.html","<section class=\"schema-form-submit {{form.htmlClass}}\"><md-button class=\"md-raised {{ form.style || \'md-primary\' }} {{form.fieldHtmlClass}}\" ng-disabled=\"form.readonly\">{{form.title}}</md-button></section>");
-$templateCache.put("decorators/material/switch.html","<md-input-container class=\"schema-form-switch {{form.htmlClass}}\"><md-switch sf-field-model=\"\" sf-changed=\"form\" sf-type-parser=\"form.schema\" schema-validate=\"form\" id=\"{{form.key.slice(-1)[0]}}\" aria-label=\"{{form.title}}\" ng-true-value=\"\'yup\'\" ng-false-value=\"\'nope\'\" ng-show=\"form.key\" ng-class=\"form.fieldHtmlClass\" ng-disabled=\"form.readonly\"><label ng-show=\"showTitle()\" for=\"{{form.key.slice(-1)[0]}}\">{{form.title}}</label><div ng-messages=\"ngModel.$error\"><div sf-message=\"\" ng-message=\"\"></div></div></md-switch></md-input-container>");
+$templateCache.put("decorators/material/switch.html","<md-input-container class=\"schema-form-switch {{form.htmlClass}}\"><md-switch sf-field-model=\"\" sf-changed=\"form\" sf-type-parser=\"form.schema\" schema-validate=\"form\" id=\"{{form.key.slice(-1)[0]}}\" aria-label=\"{{form.title}}\" ng-show=\"form.key\" ng-class=\"form.fieldHtmlClass\" ng-disabled=\"form.readonly\"><span ng-show=\"showTitle()\" for=\"{{form.key.slice(-1)[0]}}\">{{form.title}}</span><div ng-messages=\"ngModel.$error\"><div sf-message=\"\" ng-message=\"\"></div></div></md-switch></md-input-container>");
 $templateCache.put("decorators/material/tabarray.html","<div sf-array=\"form\" ng-init=\"selected = { tab: 0 }\" class=\"clearfix schema-form-tabarray schema-form-tabarray-{{form.tabType || \'left\'}} {{form.htmlClass}}\"><div ng-if=\"!form.tabType || form.tabType !== \'right\'\" ng-class=\"{\'col-xs-3\': !form.tabType || form.tabType === \'left\'}\"><ul class=\"nav nav-tabs\" ng-class=\"{ \'tabs-left\': !form.tabType || form.tabType === \'left\'}\"><li ng-repeat=\"item in modelArray track by $index\" ng-click=\"$event.preventDefault() || (selected.tab = $index)\" ng-class=\"{active: selected.tab === $index}\"><a href=\"#\">{{interp(form.title,{\'$index\':$index, value: item}) || $index}}</a></li><li ng-hide=\"form.readonly\" ng-click=\"$event.preventDefault() || (selected.tab = appendToArray().length - 1)\"><a href=\"#\"><i class=\"glyphicon glyphicon-plus\"></i> {{ form.add || \'Add\'}}</a></li></ul></div><div ng-class=\"{\'col-xs-9\': !form.tabType || form.tabType === \'left\' || form.tabType === \'right\'}\"><div class=\"tab-content {{form.fieldHtmlClass}}\"><div class=\"tab-pane clearfix\" ng-repeat=\"item in modelArray track by $index\" ng-show=\"selected.tab === $index\" ng-class=\"{active: selected.tab === $index}\"><sf-decorator ng-init=\"arrayIndex = $index\" form=\"copyWithIndex($index)\"></sf-decorator><button ng-hide=\"form.readonly\" ng-click=\"selected.tab = deleteFromArray($index).length - 1\" type=\"button\" class=\"btn {{ form.style.remove || \'btn-default\' }} pull-right\"><i class=\"glyphicon glyphicon-trash\"></i> {{ form.remove || \'Remove\'}}</button></div></div></div><div ng-if=\"form.tabType === \'right\'\" class=\"col-xs-3\"><ul class=\"nav nav-tabs tabs-right\"><li ng-repeat=\"item in modelArray track by $index\" ng-click=\"$event.preventDefault() || (selected.tab = $index)\" ng-class=\"{active: selected.tab === $index}\"><a href=\"#\">{{interp(form.title,{\'$index\':$index, value: item}) || $index}}</a></li><li ng-hide=\"form.readonly\" ng-click=\"$event.preventDefault() || appendToArray()\"><a href=\"#\"><i class=\"glyphicon glyphicon-plus\"></i> {{ form.add || \'Add\'}}</a></li></ul></div></div>");
 $templateCache.put("decorators/material/tabs.html","<div sf-field-model=\"\" class=\"schema-form-tabs {{form.htmlClass}}\"><md-tabs md-dynamic-height=\"\" md-selected=\"selected\" md-autoselect=\"\" ng-init=\"selected = 0\"></md-tabs></div>");
 $templateCache.put("decorators/material/textarea.html","<md-input-container class=\"{{form.htmlClass}} schema-form-textarea\"><label ng-show=\"showTitle()\" for=\"{{form.key.slice(-1)[0]}}\">{{form.title}}</label> <textarea ng-class=\"form.fieldHtmlClass\" id=\"{{form.key.slice(-1)[0]}}\" sf-changed=\"form\" ng-disabled=\"form.readonly\" sf-field-model=\"\" schema-validate=\"form\" name=\"{{form.key.slice(-1)[0]}}\"></textarea><div ng-messages=\"ngModel.$error\"><div sf-message=\"\" ng-message=\"\"></div></div></md-input-container>");}]);
@@ -50,17 +50,28 @@ angular.module('schemaForm')
         if (mdAutocompleteFrag) {
           if (args.form.onChange) {
             mdAutocompleteFrag.setAttribute('md-selected-item-change', 'args.form.onChange(searchText)');
-          };
+          }
           if (args.form.onChange) {
             mdAutocompleteFrag.setAttribute('md-search-text-change', 'args.form.onChange(searchText)');
-          };
+          }
           // mdAutocompleteFrag.setAttribute('md-items', 'item in $filter(''autocomplete'')(searchText);');
           var minLength = args.form.minLength || 1;
           var maxLength = args.form.maxLength || false;
           mdAutocompleteFrag.setAttribute('md-min-length', minLength);
           if (maxLength) {
             mdAutocompleteFrag.setAttribute('md-max-length', maxLength);
-          };
+          }
+        }
+      };
+
+      var mdSwitch = function(args) {
+        var mdSwitchFrag = args.fieldFrag.querySelector('md-switch');
+        if (args.form.schema.titleMap) {
+          mdSwitchFrag.setAttribute('ng-true-value',args.form.schema.titleMap.true);
+          mdSwitchFrag.setAttribute('ng-false-value',args.form.schema.titleMap.false);
+        }
+        if (args.form.schema.ink) {
+          mdSwitchFrag.setIdAttribute('md-no-ink',args.form.schema.ink);
         }
       };
 
@@ -69,16 +80,16 @@ angular.module('schemaForm')
         if (mdDatepickerFrag) {
           if (args.form.onChange) {
             mdDatepickerFrag.setAttribute('ng-change', 'args.form.onChange(searchText)');
-          };
+          }
           // mdDatepickerFrag.setAttribute('md-items', 'item in $filter(''autocomplete'')(searchText);');
           var minDate = args.form.minimum || false;
           var maxDate = args.form.maximum || false;
           if (minDate) {
             mdDatepickerFrag.setAttribute('md-max-date', minDate);
-          };
+          }
           if (maxDate) {
             mdDatepickerFrag.setAttribute('md-max-date', maxDate);
-          };
+          }
         }
       };
 
@@ -131,7 +142,11 @@ angular.module('schemaForm')
         submit: { template: base + 'submit.html', builder: defaults },
         tabs: { template: base + 'tabs.html', builder: [ sfField, mdTabs, condition ] },
         tabarray: { template: base + 'tabarray.html', builder: [ sfField, ngModelOptions, ngModel, array, condition ] },
-        textarea: { template: base + 'textarea.html', builder: defaults }
+        textarea: { template: base + 'textarea.html', builder: defaults },
+        switch: {
+          template: base + 'switch.html',
+          builder: [ sfField, ngModel, ngModelOptions, sfMessages, condition, mdSwitch ]
+        }
       });
 
       /**
diff --git a/material-decorator.min.js b/material-decorator.min.js
index 2fab929..eb93316 100644
--- a/material-decorator.min.js
+++ b/material-decorator.min.js
@@ -1 +1 @@
-angular.module("schemaForm").run(["$templateCache",function(e){e.put("decorators/material/actions-trcl.html",'<div class="btn-group schema-form-actions {{form.htmlClass}}" ng-transclude=""></div>'),e.put("decorators/material/actions.html",'<section layout="row" class="btn-group schema-form-actions {{form.htmlClass}}"></section>'),e.put("decorators/material/array.html",'<div class="schema-form-array {{form.htmlClass}}" sf-field-model="sf-new-array" sf-new-array=""><label class="control-label" ng-show="showTitle()">{{ form.title }}</label><md-list class="list-group" sf-field-model="" ui-sortable="form.sortOptions"><md-list-item layout="row" class="list-group-item" sf-field-model="ng-repeat" ng-repeat="item in $$value$$ track by $index" schema-form-array-items=""><md-button flex="none" flex-order="2" type="button" ng-hide="form.readonly || form.remove === null" ng-click="deleteFromArray($index)" ng-disabled="form.schema.minItems >= modelArray.length" class="md-icon-button" aria-label="More" style="position: relative; z-index: 20;"><md-icon md-svg-icon="img/icons/ic_clear_black_18px.svg"></md-icon></md-button></md-list-item></md-list><div class="clearfix" style="padding: 15px;" ng-model="modelArray" schema-validate="form"><div class="help-block" ng-show="(hasError() && errorMessage(schemaError())) || form.description" ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div><md-button ng-hide="form.readonly || form.add === null" ng-click="appendToArray()" ng-disabled="form.schema.maxItems <= modelArray.length" type="button" class="btn md-raised md-primary {{ form.style.add || \'btn-default\' }} pull-right"><i class="glyphicon glyphicon-plus"></i> {{ form.add || \'Add\'}}</md-button></div></div>'),e.put("decorators/material/autocomplete.html",'<div class="form-group {{form.htmlClass}} schema-form-select" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false}"><md-autocomplete flex="" ng-disabled="form.readonly" ng-model="$$value$$" sf-autocomplete="" sf-field-model="replaceAll" schema-validate="form" md-selected-item="$$value$$" md-search-text="searchText" md-selected-item-change="\'todo\';" md-items="item in evalExpr(\'this[\\\'\'+form.optionFilter+\'\\\'](\\\'\'+searchText+\'\\\')\')" md-item-text="item.name" md-floating-label="{{form.title || form.key.slice(-1)[0]}}" md-menu-class="autocomplete-custom-template"><md-item-template><span md-highlight-text="searchText">{{item.title}}</span></md-item-template><md-not-found>No matches found</md-not-found></md-autocomplete><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/checkbox.html",'<div class="checkbox schema-form-checkbox {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><md-checkbox sf-field-model="" sf-changed="form" ng-disabled="form.readonly" schema-validate="form" class="{{form.fieldHtmlClass}}" name="{{form.key.slice(-1)[0]}}" aria-label="{{form.title || form.key.slice(-1)[0]}}"><span ng-bind-html="form.title"></span></md-checkbox><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/checkboxes.html",'<div sf-array="form" sf-field-model="" class="form-group schema-form-checkboxes {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><label class="control-label" ng-show="showTitle()">{{form.title}}</label><div class="checkbox" ng-repeat="val in titleMapValues track by $index"><md-checkbox ng-model="titleMapValues[$index]" sf-changed="form" ng-disabled="form.readonly" name="{{form.key.slice(-1)[0]}}" ng-true-value="true" ng-false-value="false" aria-label="{{form.title || form.key.slice(-1)[0]}}"><span ng-bind-html="form.titleMap[$index].name"></span></md-checkbox></div><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/chips.html",'<div class="form-group schema-form-chips {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false}"><md-chips sf-field-model="" readonly="form.readonly" flex="" placeholder="{{form.title || form.key.slice(-1)[0]}}"><md-chip-template><strong ng-if="!form.template">{{$chip}}</strong></md-chip-template></md-chips><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/date.html",'<div class="schema-form-date {{form.htmlClass}}"><label ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label><md-datepicker sf-field-model="" sf-changed="form" schema-validate="form" sf-type-parser="form.schema" id="{{form.key.slice(-1)[0]}}" ng-show="form.key" ng-class="form.fieldHtmlClass" ng-disabled="form.readonly" md-placeholder="Enter date" sf-messages=""></md-datepicker></div>'),e.put("decorators/material/default.html",'<md-input-container class="schema-form-{{form.type}} {{form.htmlClass}}" sf-messages=""><label ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label><input sf-field-model="" ng-show="form.key" type="{{form.type}}" step="any" sf-changed="form" id="{{form.key.slice(-1)[0]}}" ng-class="form.fieldHtmlClass" sf-type-parser="form.schema" ng-disabled="form.readonly" schema-validate="form" name="{{form.key.slice(-1)[0]}}" aria-describedby="{{form.key.slice(-1)[0] + \'Status\'}}"></md-input-container>'),e.put("decorators/material/fieldset-trcl.html",'<fieldset ng-disabled="form.readonly" class="standard {{form.htmlClass}}" flex=""><legend ng-show="form.title">{{ form.title }}</legend><div ng-transclude=""></div></fieldset>'),e.put("decorators/material/fieldset.html",'<fieldset ng-disabled="form.readonly" class="standard {{form.htmlClass}}" flex=""><legend ng-show="form.title">{{ form.title }}</legend></fieldset>'),e.put("decorators/material/help.html",'<div class="helpvalue schema-form-helpvalue {{form.htmlClass}}" ng-bind-html="form.helpvalue"></div>'),e.put("decorators/material/radio-buttons.html",'<div class="form-group schema-form-radiobuttons {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><div><label class="control-label" ng-show="showTitle()">{{form.title}}</label></div><section layout="row" layout-sm="column" layout-align="center center"><md-input-container ng-repeat="item in form.titleMap"><md-button type="button" class="group md-raised" sf-field-model="replaceAll" ng-model="$$value$$" sf-changed="form" ng-class="{\'md-primary\': ($$value$$ == item.value)}" ng-disabled="form.readonly" ng-model-options="form.ngModelOptions" schema-validate="form" ng-value="item.value" ng-click="$$value$$ = item.value" name="{{form.key.join(\'.\')}}"><span ng-bind-html="item.name"></span></md-button></md-input-container></section><div class="help-block" sf-message="form.description"></div></div>'),e.put("decorators/material/radios-inline.html",'<div class="form-group schema-form-radios-inline {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><label class="control-label" ng-show="showTitle()">{{form.title}}</label><md-radio-group layout="row" sf-field-model="replaceAll" ng-model="$$value$$" class="{{form.fieldHtmlClass}}" ng-class="{ active: item.value === $$value$$ }" sf-changed="form" schema-validate="form" ng-disabled="form.readonly" name="{{form.key.join(\'.\')}}"><md-radio-button ng-repeat="item in form.titleMap" ng-value="item.value"><span ng-bind-html="item.name"></span></md-radio-button></md-radio-group><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/radios.html",'<div class="form-group schema-form-radios {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><label class="control-label" ng-show="showTitle()" aria-label="{{form.title}}">{{form.title}} {{form.titleMap | json}}</label><md-radio-group sf-field-model="" sf-changed="form" ng-disabled="form.readonly" name="{{form.key.join(\'.\')}}"><md-radio-button ng-repeat="item in form.titleMap" ng-value="item.value" class="{{form.fieldHtmlClass}}" sf-field-model="ng-class" ng-class="{ active: item.value === $$value$$ }"><span ng-bind-html="item.name"></span></md-radio-button></md-radio-group><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/section.html",'<div class="schema-form-section {{form.htmlClass}}"></div>'),e.put("decorators/material/select.html",'<md-input-container class="form-group {{form.htmlClass}} schema-form-select" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false}"><label ng-show="showTitle()">{{form.title}}</label><md-select sf-field-model=""><md-optgroup ng-repeat-start="(key, opt) in form.titleMap | orderBy:\'group\' as optGroups" ng-if="opt.group && opt.group != optGroups[key-1].group" label="{{opt.group}}"><md-option ng-repeat="(key, filtered) in form.titleMap | filter: {group: opt.group} | orderBy:\'name\' as opts" ng-value="filtered.value">{{filtered.name}}</md-option></md-optgroup><md-option ng-repeat-end="" ng-if="!opt.group" ng-value="opt.value">{{opt.name}}</md-option></md-select><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></md-input-container>'),e.put("decorators/material/submit.html",'<section class="schema-form-submit {{form.htmlClass}}"><md-button class="md-raised {{ form.style || \'md-primary\' }} {{form.fieldHtmlClass}}" ng-disabled="form.readonly">{{form.title}}</md-button></section>'),e.put("decorators/material/switch.html",'<md-input-container class="schema-form-switch {{form.htmlClass}}"><md-switch sf-field-model="" sf-changed="form" sf-type-parser="form.schema" schema-validate="form" id="{{form.key.slice(-1)[0]}}" aria-label="{{form.title}}" ng-true-value="\'yup\'" ng-false-value="\'nope\'" ng-show="form.key" ng-class="form.fieldHtmlClass" ng-disabled="form.readonly"><label ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></md-switch></md-input-container>'),e.put("decorators/material/tabarray.html",'<div sf-array="form" ng-init="selected = { tab: 0 }" class="clearfix schema-form-tabarray schema-form-tabarray-{{form.tabType || \'left\'}} {{form.htmlClass}}"><div ng-if="!form.tabType || form.tabType !== \'right\'" ng-class="{\'col-xs-3\': !form.tabType || form.tabType === \'left\'}"><ul class="nav nav-tabs" ng-class="{ \'tabs-left\': !form.tabType || form.tabType === \'left\'}"><li ng-repeat="item in modelArray track by $index" ng-click="$event.preventDefault() || (selected.tab = $index)" ng-class="{active: selected.tab === $index}"><a href="#">{{interp(form.title,{\'$index\':$index, value: item}) || $index}}</a></li><li ng-hide="form.readonly" ng-click="$event.preventDefault() || (selected.tab = appendToArray().length - 1)"><a href="#"><i class="glyphicon glyphicon-plus"></i> {{ form.add || \'Add\'}}</a></li></ul></div><div ng-class="{\'col-xs-9\': !form.tabType || form.tabType === \'left\' || form.tabType === \'right\'}"><div class="tab-content {{form.fieldHtmlClass}}"><div class="tab-pane clearfix" ng-repeat="item in modelArray track by $index" ng-show="selected.tab === $index" ng-class="{active: selected.tab === $index}"><sf-decorator ng-init="arrayIndex = $index" form="copyWithIndex($index)"></sf-decorator><button ng-hide="form.readonly" ng-click="selected.tab = deleteFromArray($index).length - 1" type="button" class="btn {{ form.style.remove || \'btn-default\' }} pull-right"><i class="glyphicon glyphicon-trash"></i> {{ form.remove || \'Remove\'}}</button></div></div></div><div ng-if="form.tabType === \'right\'" class="col-xs-3"><ul class="nav nav-tabs tabs-right"><li ng-repeat="item in modelArray track by $index" ng-click="$event.preventDefault() || (selected.tab = $index)" ng-class="{active: selected.tab === $index}"><a href="#">{{interp(form.title,{\'$index\':$index, value: item}) || $index}}</a></li><li ng-hide="form.readonly" ng-click="$event.preventDefault() || appendToArray()"><a href="#"><i class="glyphicon glyphicon-plus"></i> {{ form.add || \'Add\'}}</a></li></ul></div></div>'),e.put("decorators/material/tabs.html",'<div sf-field-model="" class="schema-form-tabs {{form.htmlClass}}"><md-tabs md-dynamic-height="" md-selected="selected" md-autoselect="" ng-init="selected = 0"></md-tabs></div>'),e.put("decorators/material/textarea.html",'<md-input-container class="{{form.htmlClass}} schema-form-textarea"><label ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label> <textarea ng-class="form.fieldHtmlClass" id="{{form.key.slice(-1)[0]}}" sf-changed="form" ng-disabled="form.readonly" sf-field-model="" schema-validate="form" name="{{form.key.slice(-1)[0]}}"></textarea><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></md-input-container>')}]),angular.module("schemaForm").config(["schemaFormProvider","schemaFormDecoratorsProvider","sfBuilderProvider","sfPathProvider","$injector",function(e,a,t,s,r){var l="decorators/material/",o=t.builders.simpleTransclusion,m=t.builders.ngModelOptions,i=t.builders.ngModel,d=t.builders.sfField,n=t.builders.condition,c=t.builders.array,f=function(){var e='<div ng-if="ngModel.$invalid" ng-messages="ngModel.$error"><div sf-message ng-message></div></div>',a=document.createElement("div");return a.innerHTML=e,a.firstChild}(),h=function(e){var a=e.fieldFrag.querySelector("[sf-messages]");a&&f&&a.appendChild(f)},g=function(e){var a=e.fieldFrag.querySelector("md-autocomplete");if(a){e.form.onChange&&a.setAttribute("md-selected-item-change","args.form.onChange(searchText)"),e.form.onChange&&a.setAttribute("md-search-text-change","args.form.onChange(searchText)");var t=e.form.minLength||1,s=e.form.maxLength||!1;a.setAttribute("md-min-length",t),s&&a.setAttribute("md-max-length",s)}},u=function(e){var a=e.fieldFrag.querySelector("md-datepicker");if(a){e.form.onChange&&a.setAttribute("ng-change","args.form.onChange(searchText)");var t=e.form.minimum||!1,s=e.form.maximum||!1;t&&a.setAttribute("md-max-date",t),s&&a.setAttribute("md-max-date",s)}},p=function(e){if(e.form.tabs&&e.form.tabs.length>0){var a=e.fieldFrag.querySelector("md-tabs");e.form.tabs.forEach(function(t,s){var r=document.createElement("md-tab");r.setAttribute("label","{{"+e.path+".tabs["+s+"].title}}");var l=document.createElement("md-tab-body"),o=e.build(t.items,e.path+".tabs["+s+"].items",e.state);l.appendChild(o),r.appendChild(l),a.appendChild(r)})}},b=[d,i,m,h,n];a.defineDecorator("materialDecorator",{actions:{template:l+"actions.html",builder:[d,o,n]},array:{template:l+"array.html",builder:[d,m,i,c,n]},autocomplete:{template:l+"autocomplete.html",builder:[d,i,m,h,n,g]},"boolean":{template:l+"checkbox.html",builder:b},button:{template:l+"submit.html",builder:b},checkbox:{template:l+"checkbox.html",builder:b},checkboxes:{template:l+"checkboxes.html",builder:[d,m,i,c,n]},date:{template:l+"date.html",builder:[d,i,m,h,u,n]},"default":{template:l+"default.html",builder:b},fieldset:{template:l+"fieldset.html",builder:[d,o,n]},help:{template:l+"help.html",builder:b},number:{template:l+"default.html",builder:b},password:{template:l+"default.html",builder:b},radios:{template:l+"radios.html",builder:b},"radios-inline":{template:l+"radios-inline.html",builder:b},radiobuttons:{template:l+"radio-buttons.html",builder:b},section:{template:l+"section.html",builder:[d,o,n]},select:{template:l+"select.html",builder:b},submit:{template:l+"submit.html",builder:b},tabs:{template:l+"tabs.html",builder:[d,p,n]},tabarray:{template:l+"tabarray.html",builder:[d,m,i,c,n]},textarea:{template:l+"textarea.html",builder:b}});var v=function(a,t,r){if("string"===t.type&&("date"===t.format||"date-time"===t.format)){var l=e.stdFormObj(a,t,r);return l.key=r.path,l.type="date",r.lookup[s.stringify(r.path)]=l,l}};e.defaults.string.unshift(v)}]),angular.module("schemaForm").directive("sfTypeParser",function(){return{restrict:"A",scope:!1,require:"ngModel",link:function(e,a,t,s){var r=e.$watch(t.sfTypeParser,function(e){if(e){var a=-1!==e.type.indexOf("number"),t=-1!==e.type.indexOf("integer"),l=/^[0-9]*$/;(a||t)&&s.$parsers.push(function(e){var t;return a?t=parseFloat(e):l.test(e)&&(t=parseInt(e,10)),console.log("parser",l.test(e),e,t),void 0===t||isNaN(t)?e:t}),r()}})}}});
\ No newline at end of file
+angular.module("schemaForm").run(["$templateCache",function(e){e.put("decorators/material/actions-trcl.html",'<div class="btn-group schema-form-actions {{form.htmlClass}}" ng-transclude=""></div>'),e.put("decorators/material/actions.html",'<section layout="row" class="btn-group schema-form-actions {{form.htmlClass}}"></section>'),e.put("decorators/material/array.html",'<div class="schema-form-array {{form.htmlClass}}" sf-field-model="sf-new-array" sf-new-array=""><label class="control-label" ng-show="showTitle()">{{ form.title }}</label><md-list class="list-group" sf-field-model="" ui-sortable="form.sortOptions"><md-list-item layout="row" class="list-group-item" sf-field-model="ng-repeat" ng-repeat="item in $$value$$ track by $index" schema-form-array-items=""><md-button flex="none" flex-order="2" type="button" ng-hide="form.readonly || form.remove === null" ng-click="deleteFromArray($index)" ng-disabled="form.schema.minItems >= modelArray.length" class="md-icon-button" aria-label="More" style="position: relative; z-index: 20;"><md-icon md-svg-icon="img/icons/ic_clear_black_18px.svg"></md-icon></md-button></md-list-item></md-list><div class="clearfix" style="padding: 15px;" ng-model="modelArray" schema-validate="form"><div class="help-block" ng-show="(hasError() && errorMessage(schemaError())) || form.description" ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div><md-button ng-hide="form.readonly || form.add === null" ng-click="appendToArray()" ng-disabled="form.schema.maxItems <= modelArray.length" type="button" class="btn md-raised md-primary {{ form.style.add || \'btn-default\' }} pull-right"><i class="glyphicon glyphicon-plus"></i> {{ form.add || \'Add\'}}</md-button></div></div>'),e.put("decorators/material/autocomplete.html",'<div class="form-group {{form.htmlClass}} schema-form-select" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false}"><md-autocomplete flex="" ng-disabled="form.readonly" ng-model="$$value$$" sf-autocomplete="" sf-field-model="replaceAll" schema-validate="form" md-selected-item="$$value$$" md-search-text="searchText" md-selected-item-change="\'todo\';" md-items="item in evalExpr(\'this[\\\'\'+form.optionFilter+\'\\\'](\\\'\'+searchText+\'\\\')\')" md-item-text="item.name" md-floating-label="{{form.title || form.key.slice(-1)[0]}}" md-menu-class="autocomplete-custom-template"><md-item-template><span md-highlight-text="searchText">{{item.title}}</span></md-item-template><md-not-found>No matches found</md-not-found></md-autocomplete><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/checkbox.html",'<div class="checkbox schema-form-checkbox {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><md-checkbox sf-field-model="" sf-changed="form" ng-disabled="form.readonly" schema-validate="form" class="{{form.fieldHtmlClass}}" name="{{form.key.slice(-1)[0]}}" aria-label="{{form.title || form.key.slice(-1)[0]}}"><span ng-bind-html="form.title"></span></md-checkbox><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/checkboxes.html",'<div sf-array="form" sf-field-model="" class="form-group schema-form-checkboxes {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><label class="control-label" ng-show="showTitle()">{{form.title}}</label><div class="checkbox" ng-repeat="val in titleMapValues track by $index"><md-checkbox ng-model="titleMapValues[$index]" sf-changed="form" ng-disabled="form.readonly" name="{{form.key.slice(-1)[0]}}" ng-true-value="true" ng-false-value="false" aria-label="{{form.title || form.key.slice(-1)[0]}}"><span ng-bind-html="form.titleMap[$index].name"></span></md-checkbox></div><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/chips.html",'<div class="form-group schema-form-chips {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false}"><md-chips sf-field-model="" readonly="form.readonly" flex="" placeholder="{{form.title || form.key.slice(-1)[0]}}"><md-chip-template><strong ng-if="!form.template">{{$chip}}</strong></md-chip-template></md-chips><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/date.html",'<div class="schema-form-date {{form.htmlClass}}"><label ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label><md-datepicker sf-field-model="" sf-changed="form" schema-validate="form" sf-type-parser="form.schema" id="{{form.key.slice(-1)[0]}}" ng-show="form.key" ng-class="form.fieldHtmlClass" ng-disabled="form.readonly" md-placeholder="Enter date" sf-messages=""></md-datepicker></div>'),e.put("decorators/material/default.html",'<md-input-container class="schema-form-{{form.type}} {{form.htmlClass}}" ng-class="{\'md-input-has-value\':model[\'{{form.key.slice(-1)[0]}}\']}" sf-messages=""><label ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label><input sf-field-model="" ng-show="form.key" type="{{form.type}}" step="any" sf-changed="form" id="{{form.key.slice(-1)[0]}}" ng-class="form.fieldHtmlClass" sf-type-parser="form.schema" ng-disabled="form.readonly" schema-validate="form" name="{{form.key.slice(-1)[0]}}" aria-describedby="{{form.key.slice(-1)[0] + \'Status\'}}"></md-input-container>'),e.put("decorators/material/fieldset-trcl.html",'<fieldset ng-disabled="form.readonly" class="standard {{form.htmlClass}}" flex=""><legend ng-show="form.title">{{ form.title }}</legend><div ng-transclude=""></div></fieldset>'),e.put("decorators/material/fieldset.html",'<fieldset ng-disabled="form.readonly" class="standard {{form.htmlClass}}" flex=""><legend ng-show="form.title">{{ form.title }}</legend></fieldset>'),e.put("decorators/material/help.html",'<div class="helpvalue schema-form-helpvalue {{form.htmlClass}}" ng-bind-html="form.helpvalue"></div>'),e.put("decorators/material/radio-buttons.html",'<div class="form-group schema-form-radiobuttons {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><div><label class="control-label" ng-show="showTitle()">{{form.title}}</label></div><section layout="row" layout-sm="column" layout-align="center center"><md-input-container ng-repeat="item in form.titleMap"><md-button type="button" class="group md-raised" sf-field-model="replaceAll" ng-model="$$value$$" sf-changed="form" ng-class="{\'md-primary\': ($$value$$ == item.value)}" ng-disabled="form.readonly" ng-model-options="form.ngModelOptions" schema-validate="form" ng-value="item.value" ng-click="$$value$$ = item.value" name="{{form.key.join(\'.\')}}"><span ng-bind-html="item.name"></span></md-button></md-input-container></section><div class="help-block" sf-message="form.description"></div></div>'),e.put("decorators/material/radios-inline.html",'<div class="form-group schema-form-radios-inline {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><label class="control-label" ng-show="showTitle()">{{form.title}}</label><md-radio-group layout="row" sf-field-model="replaceAll" ng-model="$$value$$" class="{{form.fieldHtmlClass}}" ng-class="{ active: item.value === $$value$$ }" sf-changed="form" schema-validate="form" ng-disabled="form.readonly" name="{{form.key.join(\'.\')}}"><md-radio-button ng-repeat="item in form.titleMap" ng-value="item.value"><span ng-bind-html="item.name"></span></md-radio-button></md-radio-group><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/radios.html",'<div class="form-group schema-form-radios {{form.htmlClass}}" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess()}"><label class="control-label" ng-show="showTitle()" aria-label="{{form.title}}">{{form.title}} {{form.titleMap | json}}</label><md-radio-group sf-field-model="" sf-changed="form" ng-disabled="form.readonly" name="{{form.key.join(\'.\')}}"><md-radio-button ng-repeat="item in form.titleMap" ng-value="item.value" class="{{form.fieldHtmlClass}}" sf-field-model="ng-class" ng-class="{ active: item.value === $$value$$ }"><span ng-bind-html="item.name"></span></md-radio-button></md-radio-group><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></div>'),e.put("decorators/material/section.html",'<div class="schema-form-section {{form.htmlClass}}"></div>'),e.put("decorators/material/select.html",'<md-input-container class="form-group {{form.htmlClass}} schema-form-select" ng-class="{\'has-error\': hasError(), \'has-success\': hasSuccess(), \'has-feedback\': form.feedback !== false}"><label ng-show="showTitle()">{{form.title}}</label><md-select sf-field-model=""><md-optgroup ng-repeat-start="(key, opt) in form.titleMap | orderBy:\'group\' as optGroups" ng-if="opt.group && opt.group != optGroups[key-1].group" label="{{opt.group}}"><md-option ng-repeat="(key, filtered) in form.titleMap | filter: {group: opt.group} | orderBy:\'name\' as opts" ng-value="filtered.value">{{filtered.name}}</md-option></md-optgroup><md-option ng-repeat-end="" ng-if="!opt.group" ng-value="opt.value">{{opt.name}}</md-option></md-select><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></md-input-container>'),e.put("decorators/material/submit.html",'<section class="schema-form-submit {{form.htmlClass}}"><md-button class="md-raised {{ form.style || \'md-primary\' }} {{form.fieldHtmlClass}}" ng-disabled="form.readonly">{{form.title}}</md-button></section>'),e.put("decorators/material/switch.html",'<md-input-container class="schema-form-switch {{form.htmlClass}}"><md-switch sf-field-model="" sf-changed="form" sf-type-parser="form.schema" schema-validate="form" id="{{form.key.slice(-1)[0]}}" aria-label="{{form.title}}" ng-show="form.key" ng-class="form.fieldHtmlClass" ng-disabled="form.readonly"><span ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</span><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></md-switch></md-input-container>'),e.put("decorators/material/tabarray.html",'<div sf-array="form" ng-init="selected = { tab: 0 }" class="clearfix schema-form-tabarray schema-form-tabarray-{{form.tabType || \'left\'}} {{form.htmlClass}}"><div ng-if="!form.tabType || form.tabType !== \'right\'" ng-class="{\'col-xs-3\': !form.tabType || form.tabType === \'left\'}"><ul class="nav nav-tabs" ng-class="{ \'tabs-left\': !form.tabType || form.tabType === \'left\'}"><li ng-repeat="item in modelArray track by $index" ng-click="$event.preventDefault() || (selected.tab = $index)" ng-class="{active: selected.tab === $index}"><a href="#">{{interp(form.title,{\'$index\':$index, value: item}) || $index}}</a></li><li ng-hide="form.readonly" ng-click="$event.preventDefault() || (selected.tab = appendToArray().length - 1)"><a href="#"><i class="glyphicon glyphicon-plus"></i> {{ form.add || \'Add\'}}</a></li></ul></div><div ng-class="{\'col-xs-9\': !form.tabType || form.tabType === \'left\' || form.tabType === \'right\'}"><div class="tab-content {{form.fieldHtmlClass}}"><div class="tab-pane clearfix" ng-repeat="item in modelArray track by $index" ng-show="selected.tab === $index" ng-class="{active: selected.tab === $index}"><sf-decorator ng-init="arrayIndex = $index" form="copyWithIndex($index)"></sf-decorator><button ng-hide="form.readonly" ng-click="selected.tab = deleteFromArray($index).length - 1" type="button" class="btn {{ form.style.remove || \'btn-default\' }} pull-right"><i class="glyphicon glyphicon-trash"></i> {{ form.remove || \'Remove\'}}</button></div></div></div><div ng-if="form.tabType === \'right\'" class="col-xs-3"><ul class="nav nav-tabs tabs-right"><li ng-repeat="item in modelArray track by $index" ng-click="$event.preventDefault() || (selected.tab = $index)" ng-class="{active: selected.tab === $index}"><a href="#">{{interp(form.title,{\'$index\':$index, value: item}) || $index}}</a></li><li ng-hide="form.readonly" ng-click="$event.preventDefault() || appendToArray()"><a href="#"><i class="glyphicon glyphicon-plus"></i> {{ form.add || \'Add\'}}</a></li></ul></div></div>'),e.put("decorators/material/tabs.html",'<div sf-field-model="" class="schema-form-tabs {{form.htmlClass}}"><md-tabs md-dynamic-height="" md-selected="selected" md-autoselect="" ng-init="selected = 0"></md-tabs></div>'),e.put("decorators/material/textarea.html",'<md-input-container class="{{form.htmlClass}} schema-form-textarea"><label ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label> <textarea ng-class="form.fieldHtmlClass" id="{{form.key.slice(-1)[0]}}" sf-changed="form" ng-disabled="form.readonly" sf-field-model="" schema-validate="form" name="{{form.key.slice(-1)[0]}}"></textarea><div ng-messages="ngModel.$error"><div sf-message="" ng-message=""></div></div></md-input-container>')}]),angular.module("schemaForm").config(["schemaFormProvider","schemaFormDecoratorsProvider","sfBuilderProvider","sfPathProvider","$injector",function(e,a,t,s,r){var l="decorators/material/",o=t.builders.simpleTransclusion,m=t.builders.ngModelOptions,i=t.builders.ngModel,d=t.builders.sfField,n=t.builders.condition,c=t.builders.array,f=function(){var e='<div ng-if="ngModel.$invalid" ng-messages="ngModel.$error"><div sf-message ng-message></div></div>',a=document.createElement("div");return a.innerHTML=e,a.firstChild}(),h=function(e){var a=e.fieldFrag.querySelector("[sf-messages]");a&&f&&a.appendChild(f)},g=function(e){var a=e.fieldFrag.querySelector("md-autocomplete");if(a){e.form.onChange&&a.setAttribute("md-selected-item-change","args.form.onChange(searchText)"),e.form.onChange&&a.setAttribute("md-search-text-change","args.form.onChange(searchText)");var t=e.form.minLength||1,s=e.form.maxLength||!1;a.setAttribute("md-min-length",t),s&&a.setAttribute("md-max-length",s)}},u=function(e){var a=e.fieldFrag.querySelector("md-switch");e.form.schema.titleMap&&(a.setAttribute("ng-true-value",e.form.schema.titleMap["true"]),a.setAttribute("ng-false-value",e.form.schema.titleMap["false"])),e.form.schema.ink&&a.setIdAttribute("md-no-ink",e.form.schema.ink)},p=function(e){var a=e.fieldFrag.querySelector("md-datepicker");if(a){e.form.onChange&&a.setAttribute("ng-change","args.form.onChange(searchText)");var t=e.form.minimum||!1,s=e.form.maximum||!1;t&&a.setAttribute("md-max-date",t),s&&a.setAttribute("md-max-date",s)}},b=function(e){if(e.form.tabs&&e.form.tabs.length>0){var a=e.fieldFrag.querySelector("md-tabs");e.form.tabs.forEach(function(t,s){var r=document.createElement("md-tab");r.setAttribute("label","{{"+e.path+".tabs["+s+"].title}}");var l=document.createElement("md-tab-body"),o=e.build(t.items,e.path+".tabs["+s+"].items",e.state);l.appendChild(o),r.appendChild(l),a.appendChild(r)})}},v=[d,i,m,h,n];a.defineDecorator("materialDecorator",{actions:{template:l+"actions.html",builder:[d,o,n]},array:{template:l+"array.html",builder:[d,m,i,c,n]},autocomplete:{template:l+"autocomplete.html",builder:[d,i,m,h,n,g]},"boolean":{template:l+"checkbox.html",builder:v},button:{template:l+"submit.html",builder:v},checkbox:{template:l+"checkbox.html",builder:v},checkboxes:{template:l+"checkboxes.html",builder:[d,m,i,c,n]},date:{template:l+"date.html",builder:[d,i,m,h,p,n]},"default":{template:l+"default.html",builder:v},fieldset:{template:l+"fieldset.html",builder:[d,o,n]},help:{template:l+"help.html",builder:v},number:{template:l+"default.html",builder:v},password:{template:l+"default.html",builder:v},radios:{template:l+"radios.html",builder:v},"radios-inline":{template:l+"radios-inline.html",builder:v},radiobuttons:{template:l+"radio-buttons.html",builder:v},section:{template:l+"section.html",builder:[d,o,n]},select:{template:l+"select.html",builder:v},submit:{template:l+"submit.html",builder:v},tabs:{template:l+"tabs.html",builder:[d,b,n]},tabarray:{template:l+"tabarray.html",builder:[d,m,i,c,n]},textarea:{template:l+"textarea.html",builder:v},"switch":{template:l+"switch.html",builder:[d,i,m,h,n,u]}});var y=function(a,t,r){if("string"===t.type&&("date"===t.format||"date-time"===t.format)){var l=e.stdFormObj(a,t,r);return l.key=r.path,l.type="date",r.lookup[s.stringify(r.path)]=l,l}};e.defaults.string.unshift(y)}]),angular.module("schemaForm").directive("sfTypeParser",function(){return{restrict:"A",scope:!1,require:"ngModel",link:function(e,a,t,s){var r=e.$watch(t.sfTypeParser,function(e){if(e){var a=-1!==e.type.indexOf("number"),t=-1!==e.type.indexOf("integer"),l=/^[0-9]*$/;(a||t)&&s.$parsers.push(function(e){var t;return a?t=parseFloat(e):l.test(e)&&(t=parseInt(e,10)),console.log("parser",l.test(e),e,t),void 0===t||isNaN(t)?e:t}),r()}})}}});
\ No newline at end of file
diff --git a/src/material-decorator.js b/src/material-decorator.js
index 3b52959..c3d8a1e 100644
--- a/src/material-decorator.js
+++ b/src/material-decorator.js
@@ -28,17 +28,28 @@ angular.module('schemaForm')
         if (mdAutocompleteFrag) {
           if (args.form.onChange) {
             mdAutocompleteFrag.setAttribute('md-selected-item-change', 'args.form.onChange(searchText)');
-          };
+          }
           if (args.form.onChange) {
             mdAutocompleteFrag.setAttribute('md-search-text-change', 'args.form.onChange(searchText)');
-          };
+          }
           // mdAutocompleteFrag.setAttribute('md-items', 'item in $filter(''autocomplete'')(searchText);');
           var minLength = args.form.minLength || 1;
           var maxLength = args.form.maxLength || false;
           mdAutocompleteFrag.setAttribute('md-min-length', minLength);
           if (maxLength) {
             mdAutocompleteFrag.setAttribute('md-max-length', maxLength);
-          };
+          }
+        }
+      };
+
+      var mdSwitch = function(args) {
+        var mdSwitchFrag = args.fieldFrag.querySelector('md-switch');
+        if (args.form.schema.titleMap) {
+          mdSwitchFrag.setAttribute('ng-true-value',args.form.schema.titleMap.true);
+          mdSwitchFrag.setAttribute('ng-false-value',args.form.schema.titleMap.false);
+        }
+        if (args.form.schema.ink) {
+          mdSwitchFrag.setIdAttribute('md-no-ink',args.form.schema.ink);
         }
       };
 
@@ -47,16 +58,16 @@ angular.module('schemaForm')
         if (mdDatepickerFrag) {
           if (args.form.onChange) {
             mdDatepickerFrag.setAttribute('ng-change', 'args.form.onChange(searchText)');
-          };
+          }
           // mdDatepickerFrag.setAttribute('md-items', 'item in $filter(''autocomplete'')(searchText);');
           var minDate = args.form.minimum || false;
           var maxDate = args.form.maximum || false;
           if (minDate) {
             mdDatepickerFrag.setAttribute('md-max-date', minDate);
-          };
+          }
           if (maxDate) {
             mdDatepickerFrag.setAttribute('md-max-date', maxDate);
-          };
+          }
         }
       };
 
@@ -109,7 +120,11 @@ angular.module('schemaForm')
         submit: { template: base + 'submit.html', builder: defaults },
         tabs: { template: base + 'tabs.html', builder: [ sfField, mdTabs, condition ] },
         tabarray: { template: base + 'tabarray.html', builder: [ sfField, ngModelOptions, ngModel, array, condition ] },
-        textarea: { template: base + 'textarea.html', builder: defaults }
+        textarea: { template: base + 'textarea.html', builder: defaults },
+        switch: {
+          template: base + 'switch.html',
+          builder: [ sfField, ngModel, ngModelOptions, sfMessages, condition, mdSwitch ]
+        }
       });
 
       /**
diff --git a/src/switch.html b/src/switch.html
index 0f0d5d2..725f09d 100644
--- a/src/switch.html
+++ b/src/switch.html
@@ -5,12 +5,10 @@
              schema-validate="form"
              id="{{form.key.slice(-1)[0]}}"
              aria-label="{{form.title}}"
-             ng-true-value="'yup'"
-             ng-false-value="'nope'"
              ng-show="form.key"
              ng-class="form.fieldHtmlClass"
              ng-disabled="form.readonly">
-    <label  ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label>
+    <span  ng-show="showTitle()" for="{{form.key.slice(-1)[0]}}">{{form.title}}</span>
     <div ng-messages="ngModel.$error">
       <!--
          This is a bit of a hack. sf-message does the work, but ng-messages and ng-message