diff --git a/package-lock.json b/package-lock.json
index a625a14549..6d9008adf5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9631,20 +9631,6 @@
             "boom": "2.x.x",
             "hoek": "2.x.x",
             "joi": "5.x.x"
-          },
-          "dependencies": {
-            "joi": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/joi/-/joi-5.1.0.tgz",
-              "integrity": "sha1-FSrQfbjunGQBmX/1/SwSiWBwv1g=",
-              "dev": true,
-              "requires": {
-                "hoek": "^2.2.x",
-                "isemail": "1.x.x",
-                "moment": "2.x.x",
-                "topo": "1.x.x"
-              }
-            }
           }
         },
         "hoek": {
diff --git a/templates/components/common/forms/checkbox.html b/templates/components/common/forms/checkbox.html
index ff89e37bd2..6d616ed4ab 100644
--- a/templates/components/common/forms/checkbox.html
+++ b/templates/components/common/forms/checkbox.html
@@ -1,4 +1,4 @@
-<div class="form-field {{class_name}}" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}} {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}}>
     <label class="form-label" for="{{id}}">{{label}}
         {{#if required}}
             <small>{{lang 'common.required' }}</small>
diff --git a/templates/components/common/forms/date.html b/templates/components/common/forms/date.html
index bdb5a5ba94..9f637c4010 100644
--- a/templates/components/common/forms/date.html
+++ b/templates/components/common/forms/date.html
@@ -1,4 +1,4 @@
-<div class="form-field {{class_name}}" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}} {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}}>
     <label class="form-label" for="{{id}}" >{{label}}
     {{#if required}}<small>{{lang 'common.required' }}</small>{{/if}}</label>
     <div class="form-row form-row--third">
diff --git a/templates/components/common/forms/multiline.html b/templates/components/common/forms/multiline.html
index 897a809e41..29b322db05 100644
--- a/templates/components/common/forms/multiline.html
+++ b/templates/components/common/forms/multiline.html
@@ -1,4 +1,4 @@
-<div class="form-field {{class_name}}" id="{{id}}" data-validation="{{validation}}" {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}">
     <label class="form-label" for="{{id}}_input">{{label}}
         {{#if required}}
             <small>{{lang 'common.required' }}</small>
diff --git a/templates/components/common/forms/number.html b/templates/components/common/forms/number.html
index 5508824811..78e037843f 100644
--- a/templates/components/common/forms/number.html
+++ b/templates/components/common/forms/number.html
@@ -1,4 +1,4 @@
-<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}">
     <label class="form-label" for="{{id}}_input">{{label}}
         {{#if required}}<small>{{lang 'common.required' }}</small>{{/if}}
     </label>
diff --git a/templates/components/common/forms/password.html b/templates/components/common/forms/password.html
index 17676a5187..63ed7cb55f 100644
--- a/templates/components/common/forms/password.html
+++ b/templates/components/common/forms/password.html
@@ -1,4 +1,4 @@
-<div class="form-field {{class_name}}" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}} {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}}>
     <label class="form-label" for="{{id}}_input">{{label}}
         {{#if required}}
             <small>{{lang 'common.required' }}</small>
diff --git a/templates/components/common/forms/radio.html b/templates/components/common/forms/radio.html
index b38de51e16..93631fcb03 100644
--- a/templates/components/common/forms/radio.html
+++ b/templates/components/common/forms/radio.html
@@ -1,4 +1,4 @@
-<div class="form-field {{class_name}}" id="{{id}}" data-validation="{{validation}}" {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}">
     <label class="form-label">{{label}}
         {{#if required}}
             <small>{{lang 'common.required' }}</small>
diff --git a/templates/components/common/forms/select.html b/templates/components/common/forms/select.html
index 4856e234d5..8186233165 100644
--- a/templates/components/common/forms/select.html
+++ b/templates/components/common/forms/select.html
@@ -1,5 +1,5 @@
-<div class="form-field {{class_name}}" id="{{id}}" data-validation="{{validation}}" {{#if private_id}} data-type="{{private_id}}"
-    {{/if}} {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if private_id}} data-type="{{private_id}}"
+    {{/if}}>
     <label class="form-label" for="{{id}}_select">{{label}}
         {{#if required}}<small>{{lang 'common.required' }}</small>{{/if}}
     </label>
diff --git a/templates/components/common/forms/selectortext.html b/templates/components/common/forms/selectortext.html
index aa13a0e253..8a7c95d82e 100644
--- a/templates/components/common/forms/selectortext.html
+++ b/templates/components/common/forms/selectortext.html
@@ -1,4 +1,4 @@
-<div class="form-field {{class_name}}" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}} {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}}>
     <noscript>
         <label class="form-label" for="{{id}}_input">{{label}}
             {{#if required}}<small>{{lang 'common.required' }}</small>{{/if}}
diff --git a/templates/components/common/forms/text.html b/templates/components/common/forms/text.html
index e12ac3b88d..bd4e90046e 100644
--- a/templates/components/common/forms/text.html
+++ b/templates/components/common/forms/text.html
@@ -1,4 +1,4 @@
-<div class="form-field {{class_name}}" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}} {{#if style}}style="{{style}}{{#if size}}width:{{size}}px;{{/if}}"{{else}}{{#if size}}style="width:{{size}}px;"{{/if}}{{/if}}>
+<div class="form-field" id="{{id}}" data-validation="{{validation}}" {{#if private_id}}data-type="{{private_id}}"{{/if}}>
     <label class="form-label" for="{{id}}_input">{{label}}
         {{#if required}}<small>{{lang 'common.required' }}</small>{{/if}}
     </label>