From 780dd81037d20ad4f080ef242612a97570ffb680 Mon Sep 17 00:00:00 2001
From: Shift <shift@laravelshift.com>
Date: Sat, 25 Jan 2025 04:23:36 +0000
Subject: [PATCH 1/2] Swap dependency

---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 974dd292a0..1db8df3151 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,6 @@
         "laravel/telescope": "^5.2",
         "laravel/tinker": "^2.10",
         "laravel/ui": "^4.6",
-
         "lavary/laravel-menu": "^1.8",
         "lcobucci/jwt": "^5.4",
         "league/flysystem-aws-s3-v3": "^3.29",
@@ -58,7 +57,7 @@
         "ralouphie/getallheaders": "^3.0",
         "simplesoftwareio/simple-qrcode": "*",
         "spatie/laravel-fractal": "^6.3",
-        "spatie/laravel-html": "*",
+        "spatie/laravel-html": "^3.11",
         "spatie/laravel-medialibrary": "^11.11",
         "spomky-labs/otphp": "^11.3",
         "symfony/expression-language": "^7.2",

From a440441d7541b7be98dde6726103b02c8cfae390 Mon Sep 17 00:00:00 2001
From: Shift <shift@laravelshift.com>
Date: Sat, 25 Jan 2025 04:23:36 +0000
Subject: [PATCH 2/2] Convert `Form` facade

---
 .../views/admin/auth-clients/index.blade.php  | 10 +-
 resources/views/admin/groups/edit.blade.php   | 49 +++-------
 resources/views/admin/groups/index.blade.php  | 12 +--
 resources/views/admin/users/edit.blade.php    | 12 +--
 resources/views/admin/users/list.blade.php    | 43 ++++-----
 .../views/auth/passwords/change.blade.php     |  9 +-
 resources/views/categories/list.blade.php     | 10 +-
 resources/views/processes/edit.blade.php      | 71 ++++----------
 .../environment-variables/edit.blade.php      | 19 ++--
 .../views/processes/screens/edit.blade.php    | 20 ++--
 .../views/processes/scripts/edit.blade.php    | 21 ++--
 .../views/processes/signals/edit.blade.php    | 18 ++--
 .../views/processes/signals/index.blade.php   | 14 +--
 resources/views/profile/edit.blade.php        | 25 ++---
 resources/views/shared/input.blade.php        |  4 +-
 .../views/shared/users/profile.blade.php      | 95 +++++++------------
 .../views/shared/users/sidebar.blade.php      | 28 +++---
 resources/views/tasks/edit.blade.php          |  2 +-
 resources/views/templates/configure.blade.php | 15 +--
 19 files changed, 162 insertions(+), 315 deletions(-)

diff --git a/resources/views/admin/auth-clients/index.blade.php b/resources/views/admin/auth-clients/index.blade.php
index 39651acf3c..656f1fa568 100644
--- a/resources/views/admin/auth-clients/index.blade.php
+++ b/resources/views/admin/auth-clients/index.blade.php
@@ -19,9 +19,8 @@
         <pm-modal ref="createEditAuthClient" id="createEditAuthClient" :title="title" @hidden="onClose" @ok.prevent="onSave" style="display: none;">
             <required></required>
             <div class="form-group" required>
-                {!!Form::label('name', __('Name'))!!}
-                {!!Form::text('name', null, ['class'=> 'form-control', 'v-model'=> 'authClient.name',
-                'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true'])!!}
+                {{ html()->label(__('Name'), 'name') }}
+                {{ html()->text('name')->class('form-control')->attribute('v-model', 'authClient.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
                 <small class="form-text text-muted">{{ __('Name must be unique') }}</small>
                 <div class="invalid-feedback" role="alert" v-if="errors.name">@{{ errors.name[0] }}</div>
             </div>
@@ -31,9 +30,8 @@
                 <b-form-checkbox value="authorization_code_grant">{{__('Enable Authorization Code Grant')}}</b-form-checkbox>
                 <br />
                 <template v-if="authClient['types'].includes('authorization_code_grant')">
-                  {!!Form::label('redirect', __('Redirect URL'))!!}
-                  {!!Form::text('redirect', null, ['class'=> 'form-control', 'v-model'=> 'authClient.redirect',
-                  'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.redirect}','rows'=>3])!!}
+                  {{ html()->label(__('Redirect URL'), 'redirect') }}
+                  {{ html()->text('redirect')->class('form-control')->attribute('v-model', 'authClient.redirect')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.redirect}')->attribute('rows', 3) }}
                   <div class="invalid-feedback" role="alert" v-if="errors.redirect">@{{ errors.redirect[0] }}</div>
                 </template>
               </div>
diff --git a/resources/views/admin/groups/edit.blade.php b/resources/views/admin/groups/edit.blade.php
index 9f6ca3420c..2bf2b9cecb 100644
--- a/resources/views/admin/groups/edit.blade.php
+++ b/resources/views/admin/groups/edit.blade.php
@@ -38,49 +38,28 @@
                          aria-labelledby="nav-home-tab">
                         <required></required>
                         <div class="form-group">
-                            {!! Form::label('name', __('Name') . '<small class="ml-1">*</small>', [], false) !!}
-                            {!! Form::text('name', null, [
-                            'id' => 'name',
-                            'class'=> 'form-control',
-                            'maxlength' => '255',
-                            'v-model' => 'formData.name',
-                            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true']) !!}
+                            {{ html()->label(__('Name') . '<small class="ml-1">*</small>', 'name') }}
+                            {{ html()->text('name')->id('name')->class('form-control')->maxlength('255')->attribute('v-model', 'formData.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
                             <small class="form-text text-muted">{{__('Group name must be unique')}}</small>
                             <div class="invalid-feedback" role="alert" v-if="errors.name">@{{errors.name[0]}}</div>
                         </div>
                         <div class="form-group mt-3">
-                            {!! Form::label('description', __('Description')) !!}
-                            {!! Form::textarea('description', null, [
-                            'id' => 'description',
-                            'rows' => 4,
-                            'class'=> 'form-control',
-                            'v-model' => 'formData.description',
-                            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.description}']) !!}
+                            {{ html()->label(__('Description'), 'description') }}
+                            {{ html()->textarea('description')->id('description')->rows(4)->class('form-control')->attribute('v-model', 'formData.description')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.description}') }}
                             <div class="invalid-feedback" role="alert" v-if="errors.description">@{{errors.description[0]}}</div>
                         </div>
                         <div class="form-group mt-3">
-                            {!! Form::label('status', __('Status')) !!}
-                            {!! Form::select('status', ['ACTIVE' => __('Active'), 'INACTIVE' => __('Inactive')], null, [
-                            'id' => 'status',
-                            'class' => 'form-control',
-                            'v-model' => 'formData.status',
-                            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.status}']) !!}
+                            {{ html()->label(__('Status'), 'status') }}
+                            {{ html()->select('status', ['ACTIVE' => __('Active'), 'INACTIVE' => __('Inactive')])->id('status')->class('form-control')->attribute('v-model', 'formData.status')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.status}') }}
                             <div class="invalid-feedback" role="alert" v-if="errors.status">@{{errors.status[0]}}</div>
                         </div>
 
                         @if ($settings['2fa_enabled'])
                             <div class="form-group mt-3">
                                 <div class="custom-control custom-switch">
-                                    {!! Form::checkbox('enabled_2fa', 1, null, [
-                                        'id' => 'enabled_2fa',
-                                        'class' => 'custom-control-input',
-                                        'v-model' => 'formData.enabled_2fa',
-                                    ]) !!}
+                                    {{ html()->checkbox('enabled_2fa', null, 1)->id('enabled_2fa')->class('custom-control-input')->attribute('v-model', 'formData.enabled_2fa') }}
 
-                                    {!! Form::label('enabled_2fa', __('Two Factor Authentication'), [
-                                        'class' => 'custom-control-label',
-                                        'for' => 'enabled_2fa',
-                                    ]) !!}
+                                    {{ html()->label(__('Two Factor Authentication'), 'enabled_2fa')->class('custom-control-label')->for('enabled_2fa') }}
                                 </div>
                             </div>
                         @endif
@@ -92,8 +71,8 @@
                         @endisset
                         <br>
                         <div class="d-flex justify-content-end mt-3">
-                            {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-                            {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'onUpdate', 'id'=>'saveGroup']) !!}
+                            {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                            {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'onUpdate')->id('saveGroup') }}
                         </div>
                     </div>
                     <div class="card card-body border-top-0 tab-pane p-3" id="nav-users" role="tabpanel" aria-labelledby="nav-profile-tab">
@@ -150,8 +129,8 @@
                             </div>
                             @include('admin.shared.permissions')
                             <div class="d-flex justify-content-end mt-3">
-                                {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose'])!!}
-                                {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'permissionUpdate','id'=>'savePermissions'])!!}
+                                {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                                {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'permissionUpdate')->id('savePermissions') }}
                             </div>
                         </div>
                     </div>
@@ -161,7 +140,7 @@
             <pm-modal ref="addUser" id="addUser" title="{{__('Add Users')}}" @hidden="onCloseAddUser" @ok.prevent="onSave" style="display: none;">
                 <div class="form-user">
                     <required></required>
-                    {!!Form::label('users', __('Users') . '<small class="ml-1">*</small>', [], false)!!}
+                    {{ html()->label(__('Users') . '<small class="ml-1">*</small>', 'users') }}
                     <multiselect id="users"
                                  v-model="selectedUsers"
                                  placeholder="{{__('Select user or type here to search users')}}"
@@ -206,7 +185,7 @@ class="multiselect__tag-icon"></i>
             <pm-modal ref="addGroup" id="addGroup" title="{{__('Add Groups')}}" @hidden="onCloseAddGroup" @ok.prevent="onSaveGroups" style="display: none;">
                 <div class="form-user">
                     <required></required>
-                    {!!Form::label('groups', __('Groups') . '<small class="ml-1">*</small>', [], false)!!}
+                    {{ html()->label(__('Groups') . '<small class="ml-1">*</small>', 'groups') }}
                     <multiselect id="groups"
                                  v-model="selectedGroups"
                                  placeholder="{{__('Select group or type here to search groups')}}"
diff --git a/resources/views/admin/groups/index.blade.php b/resources/views/admin/groups/index.blade.php
index c016b8b800..227a1b1741 100644
--- a/resources/views/admin/groups/index.blade.php
+++ b/resources/views/admin/groups/index.blade.php
@@ -36,18 +36,16 @@
                         <pm-modal ref="createGroupModal" id="createGroupModal" title="{{__('Create Group')}}" @hidden="onClose" @ok.prevent="onSubmit" :ok-disabled="disabled" style="display: none;">
                             <required></required>
                             <div class="form-group">
-                                {!! Form::label('name', __('Name')) !!}<small class="ml-1">*</small>
-                                {!! Form::text('name', null, ['id' => 'name','class'=> 'form-control', 'v-model' =>
-                                'formData.name', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true']) !!}
+                                {{ html()->label(__('Name'), 'name') }}<small class="ml-1">*</small>
+                                {{ html()->text('name')->id('name')->class('form-control')->attribute('v-model', 'formData.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
                                 <small id="emailHelp"
                                        class="form-text text-muted">{{__('Group name must be unique')}}</small>
                                 <div class="invalid-feedback" role="alert" v-for="name in errors.name">@{{name}}</div>
                             </div>
                             <div class="form-group">
-                                {!! Form::label('description', __('Description')) !!}
-                                {!! Form::textarea('description', null, ['id' => 'description', 'rows' => 4, 'class'=>
-                                'form-control', 'v-model' => 'formData.description', 'v-bind:class' => '{\'form-control\':true,
-                                \'is-invalid\':errors.description}']) !!}
+                                {{ html()->label(__('Description'), 'description') }}
+                                {{ html()->textarea('description')->id('description')->rows(4)->class('form-control')->attribute('v-model', 'formData.description')->attribute('v-bind:class', '{\'form-control\':true,
+                                \'is-invalid\':errors.description}') }}
                                 <div class="invalid-feedback" role="alert" v-for="description in errors.description">@{{description}}
                                 </div>
                             </div>
diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php
index c2ba133f42..a437c46e22 100644
--- a/resources/views/admin/users/edit.blade.php
+++ b/resources/views/admin/users/edit.blade.php
@@ -50,8 +50,8 @@
                                 </div>
                             </div>
                             <div class="d-flex justify-content-end mt-3">
-                                {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-                                {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'profileUpdate','id'=>'saveUser']) !!}
+                                {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                                {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'profileUpdate')->id('saveUser') }}
                             </div>
                         </div>
                         <div class="tab-pane show" id="nav-groups" role="tabpanel"
@@ -71,8 +71,8 @@
                                 />
                             </div>
                             <div class="d-flex justify-content-end mt-3">
-                                {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-                                {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'onSaveGroups','id'=>'saveGroups']) !!}
+                                {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                                {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'onSaveGroups')->id('saveGroups') }}
                             </div>
                         </div>
                         <div class="tab-pane" id="nav-profile" role="tabpanel" aria-labelledby="nav-profile-tab">
@@ -87,8 +87,8 @@
                                 </div>
                                 @include('admin.shared.permissions')
                                 <div class="d-flex justify-content-end mt-3">
-                                    {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose'])!!}
-                                    {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'permissionUpdate','id'=>'savePermissions'])!!}
+                                    {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                                    {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'permissionUpdate')->id('savePermissions') }}
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/admin/users/list.blade.php b/resources/views/admin/users/list.blade.php
index c75f4cd14d..d179f30fce 100644
--- a/resources/views/admin/users/list.blade.php
+++ b/resources/views/admin/users/list.blade.php
@@ -39,9 +39,8 @@
             <template v-slot:default>
                 <required></required>
                 <div class="form-group">
-                    {!!Form::label('username', __('Username'))!!}<small class="ml-1">*</small>
-                    {!!Form::text('username', null, ['class'=> 'form-control', 'v-model'=> 'config.username', 'v-bind:class'
-                    => '{\'form-control\':true, \'is-invalid\':config.addError.username}', 'autocomplete' => 'off', 'required', 'aria-required' => 'true']) !!}
+                    {{ html()->label(__('Username'), 'username') }}<small class="ml-1">*</small>
+                    {{ html()->text('username')->class('form-control')->attribute('v-model', 'config.username')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':config.addError.username}')->attribute('autocomplete', 'off')->required()->attribute('aria-required', 'true') }}
                     <div class="invalid-feedback" role="alert" v-for="username in config.addError.username">
                         <div v-if="username !== 'userExists'">
                             @{{username}}
@@ -49,35 +48,28 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    {!!Form::label('firstname', __('First Name'))!!}<small class="ml-1">*</small>
-                    {!!Form::text('firstname', null, ['class'=> 'form-control', 'v-model'=> 'config.firstname', 'v-bind:class'
-                    => '{\'form-control\':true, \'is-invalid\':config.addError.firstname}', 'required', 'aria-required' => 'true'])!!}
+                    {{ html()->label(__('First Name'), 'firstname') }}<small class="ml-1">*</small>
+                    {{ html()->text('firstname')->class('form-control')->attribute('v-model', 'config.firstname')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':config.addError.firstname}')->required()->attribute('aria-required', 'true') }}
                     <div class="invalid-feedback" role="alert" v-for="firstname in config.addError.firstname">@{{firstname}}</div>
                 </div>
                 <div class="form-group">
-                    {!!Form::label('lastname', __('Last Name'))!!}<small class="ml-1">*</small>
-                    {!!Form::text('lastname', null, ['class'=> 'form-control', 'v-model'=> 'config.lastname', 'v-bind:class'
-                    => '{\'form-control\':true, \'is-invalid\':config.addError.lastname}', 'required', 'aria-required' => 'true'])!!}
+                    {{ html()->label(__('Last Name'), 'lastname') }}<small class="ml-1">*</small>
+                    {{ html()->text('lastname')->class('form-control')->attribute('v-model', 'config.lastname')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':config.addError.lastname}')->required()->attribute('aria-required', 'true') }}
                     <div class="invalid-feedback" role="alert" v-for="lastname in config.addError.lastname">@{{lastname}}</div>
                 </div>
                 <div class="form-group">
-                    {!!Form::label('title', __('Job Title'))!!}
-                    {!!Form::text('title', null, ['class'=> 'form-control', 'v-model'=> 'config.title', 'v-bind:class'
-                    => '{\'form-control\':true, \'is-invalid\':config.addError.title}'])!!}
+                    {{ html()->label(__('Job Title'), 'title') }}
+                    {{ html()->text('title')->class('form-control')->attribute('v-model', 'config.title')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':config.addError.title}') }}
                     <div class="invalid-feedback" role="alert" v-for="title in config.addError.title">@{{title}}</div>
                 </div>
                 <div class="form-group">
-                    {!!Form::label('status', __('Status'));!!}<small class="ml-1">*</small>
-                    {!!Form::select('status',[null => __('Select')]+['ACTIVE' => __('Active'), 'INACTIVE' => __('Inactive')], 'Active',
-                    [
-                    'class'=> 'form-control', 'v-model'=> 'config.status',
-                    'v-bind:class' => '{\'form-control\':true, \'is-invalid\':config.addError.status}', 'required', 'aria-required' => 'true']);!!}
+                    {{ html()->label(__('Status'), 'status') }}<small class="ml-1">*</small>
+                    {{ html()->select('status', [null => __('Select')] + ['ACTIVE' => __('Active'), 'INACTIVE' => __('Inactive')], 'Active')->class('form-control')->attribute('v-model', 'config.status')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':config.addError.status}')->required()->attribute('aria-required', 'true') }}
                     <div class="invalid-feedback" role="alert" v-for="status in config.addError.status">@{{status}}</div>
                 </div>
                 <div class="form-group">
-                    {!!Form::label('email', __('Email'))!!}<small class="ml-1">*</small>
-                    {!!Form::email('email', null, ['class'=> 'form-control', 'v-model'=> 'config.email', 'v-bind:class' =>
-                    '{\'form-control\':true, \'is-invalid\':config.addError.email}', 'autocomplete' => 'off', 'required', 'aria-required' => 'true'])!!}
+                    {{ html()->label(__('Email'), 'email') }}<small class="ml-1">*</small>
+                    {{ html()->email('email')->class('form-control')->attribute('v-model', 'config.email')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':config.addError.email}')->attribute('autocomplete', 'off')->attribute('required', )->attribute('aria-required', 'true') }}
                     <div class="invalid-feedback" role="alert" v-for="email in config.addError.email">
                         <div v-if="email !== 'userExists'">
                             @{{email}}
@@ -85,19 +77,16 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    {!!Form::label('password', __('Password'))!!}<small class="ml-1">*</small>
+                    {{ html()->label(__('Password'), 'password') }}<small class="ml-1">*</small>
                     <vue-password v-model="config.password" :disable-toggle=true ref="passwordStrength">
                         <div slot="password-input" slot-scope="props">
-                            {!!Form::password('password', ['class'=> 'form-control', 'v-model'=> 'config.password',
-                            '@input' => 'props.updatePassword($event.target.value)', 'autocomplete' => 'new-password',
-                            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':config.addError.password}', 'required', 'aria-required' => 'true'])!!}
+                            {{ html()->password('password')->class('form-control')->attribute('v-model', 'config.password')->attribute('@input', 'props.updatePassword($event.target.value)')->attribute('autocomplete', 'new-password')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':config.addError.password}')->attribute('required', )->attribute('aria-required', 'true') }}
                         </div>
                     </vue-password>
                 </div>
                 <div class="form-group">
-                    {!!Form::label('confpassword', __('Confirm Password'))!!}<small class="ml-1">*</small>
-                    {!!Form::password('confpassword', ['class'=> 'form-control', 'v-model'=> 'config.confpassword',
-                    'v-bind:class' => '{\'form-control\':true, \'is-invalid\':config.addError.password}', 'autocomplete' => 'new-password', 'required', 'aria-required' => 'true'])!!}
+                    {{ html()->label(__('Confirm Password'), 'confpassword') }}<small class="ml-1">*</small>
+                    {{ html()->password('confpassword')->class('form-control')->attribute('v-model', 'config.confpassword')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':config.addError.password}')->attribute('autocomplete', 'new-password')->attribute('required', )->attribute('aria-required', 'true') }}
                     <div class="invalid-feedback" role="alert" v-for="password in config.addError.password">@{{password}}</div>
                 </div>
             </template>
diff --git a/resources/views/auth/passwords/change.blade.php b/resources/views/auth/passwords/change.blade.php
index 1410c0d3dc..c273b71e7b 100644
--- a/resources/views/auth/passwords/change.blade.php
+++ b/resources/views/auth/passwords/change.blade.php
@@ -40,9 +40,7 @@
                             <label for="password">{{ __('New Password') }}</label>
                             <vue-password v-model="formData.password" :disable-toggle=true ref="passwordStrength">
                                 <div slot="password-input" slot-scope="props">
-                                    {!! Form::password('password', ['id' => 'password', 'rows' => 4, 'class'=> 'form-control', 'v-model'
-                                    => 'formData.password', 'autocomplete' => 'new-password', '@input' => 'props.updatePassword($event.target.value)',
-                                    'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.password}']) !!}
+                                    {{ html()->password('password')->id('password')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.password')->attribute('autocomplete', 'new-password')->attribute('@input', 'props.updatePassword($event.target.value)')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.password}') }}
                                 </div>
                             </vue-password>
                             <small v-for="(error, index) in errors.password" v-cloak class="text-danger">
@@ -50,9 +48,8 @@
                             </small>
                         </div>
                         <div class="form-group">
-                            {!!Form::label('confpassword', __('Confirm Password'))!!}<small class="ml-1">*</small>
-                            {!!Form::password('confpassword', ['class'=> 'form-control', 'v-model'=> 'formData.confpassword',
-                            'v-bind:class' => '{\'form-control\':true}', 'autocomplete' => 'new-password'])!!}
+                            {{ html()->label(__('Confirm Password'), 'confpassword') }}<small class="ml-1">*</small>
+                            {{ html()->password('confpassword')->class('form-control')->attribute('v-model', 'formData.confpassword')->attribute('v-bind:class', '{\'form-control\':true}')->attribute('autocomplete', 'new-password') }}
                         </div>
                         <div class="form-group pt-3 pb-2">
                             <button type="button" @click.prevent="submit" name="changepassword" class="btn btn-primary btn-block text-uppercase" dusk="changepassword">{{ __('Change Password') }}</button>
diff --git a/resources/views/categories/list.blade.php b/resources/views/categories/list.blade.php
index 7cb375c918..2ab4811da2 100644
--- a/resources/views/categories/list.blade.php
+++ b/resources/views/categories/list.blade.php
@@ -53,18 +53,16 @@ class="btn btn-secondary"
         <pm-modal ref="createCategoryModal" id="createCategoryModal" :title="getTitle()" @hidden="onClose" @ok.prevent="onSubmit" :ok-disabled="disabled" style="display: none;">
             <required></required>
             <div class="form-group">
-                {!!Form::label('category-name', __('Category Name'))!!}<small class="ml-1">*</small>
-                {!!Form::text('name', null, ['class'=> 'form-control', 'v-model'=> 'name', 'id' => 'category-name',
-                'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true'])!!}
+                {{ html()->label(__('Category Name'), 'category-name') }}<small class="ml-1">*</small>
+                {{ html()->text('name')->class('form-control')->attribute('v-model', 'name')->id('category-name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
                 <small class="form-text text-muted" v-if="! errors.name">
                     {{ __('The category name must be unique.') }}
                 </small>
                 <div class="invalid-feedback" role="alert" v-for="name in errors.name">@{{name}}</div>
             </div>
             <div class="form-group">
-                {!! Form::label('status', __('Status')) !!}
-                {!! Form::select('status', ['ACTIVE' => __('Active'), 'INACTIVE' => __('Inactive')], null, ['id' => 'status',
-                'class' => 'form-control', 'v-model' => 'status', 'v-bind:class' => '{"form-control":true, "is-invalid":errors.status}']) !!}
+                {{ html()->label(__('Status'), 'status') }}
+                {{ html()->select('status', ['ACTIVE' => __('Active'), 'INACTIVE' => __('Inactive')])->id('status')->class('form-control')->attribute('v-model', 'status')->attribute('v-bind:class', '{"form-control":true, "is-invalid":errors.status}') }}
                 <div class="invalid-feedback" role="alert" v-for="status in errors.status">@{{status}}</div>
             </div>
         </pm-modal>
diff --git a/resources/views/processes/edit.blade.php b/resources/views/processes/edit.blade.php
index 743e60175a..cad862d871 100644
--- a/resources/views/processes/edit.blade.php
+++ b/resources/views/processes/edit.blade.php
@@ -79,19 +79,9 @@ class="collapse show"
                                         <b-row>
                                             <b-col>
                                                 <div class="form-group">
-                                                    {!!Form::label('name',
-                                                        __('Name') . '
-                                                        <small class="ml-1 required-text-color">*</small>',
-                                                        [],
-                                                        false)
-                                                    !!}
-                                                    {!!Form::text('name', null,
-                                                        [ 'id'=> 'name',
-                                                            'class'=> 'form-control',
-                                                            'v-model'=> 'formData.name',
-                                                            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}'
-                                                        ])
-                                                    !!}
+                                                    {{ html()->label(__('Name') . '
+                                                        <small class="ml-1 required-text-color">*</small>', 'name') }}
+                                                    {{ html()->text('name')->id('name')->class('form-control')->attribute('v-model', 'formData.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}') }}
                                                     <small class="form-text text-muted"
                                                         v-if="! errors.name">{{ __('The process name must be unique.') }}</small>
                                                     <div
@@ -112,20 +102,8 @@ class="invalid-feedback"
                                             </b-col>
                                             <b-col>
                                                 <div class="form-group">
-                                                    {!! Form::label('description',
-                                                        __('Description')  .
-                                                        '<small class="ml-1 required-text-color">*</small>',
-                                                        [],
-                                                        false)
-                                                    !!}
-                                                    {!! Form::textarea('description', null,
-                                                        ['id' => 'description',
-                                                            'rows' => 4,
-                                                            'class'=> 'form-control',
-                                                            'v-model' => 'formData.description',
-                                                            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.description}'
-                                                        ])
-                                                    !!}
+                                                    {{ html()->label(__('Description') . '<small class="ml-1 required-text-color">*</small>', 'description') }}
+                                                    {{ html()->textarea('description')->id('description')->rows(4)->class('form-control')->attribute('v-model', 'formData.description')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.description}') }}
                                                     <div
                                                         class="invalid-feedback"
                                                         role="alert"
@@ -219,14 +197,8 @@ class="collapse show"
                                         <b-row>
                                             <b-col>
                                                 <div class="form-group">
-                                                    {!! Form::label('case_title', __('Case Title')) !!}
-                                                    {!!Form::text('case_title', null,
-                                                        [ 'id'=> 'case_title',
-                                                            'class'=> 'form-control',
-                                                            'v-model'=> 'formData.case_title',
-                                                            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.case_title}'
-                                                        ])
-                                                    !!}
+                                                    {{ html()->label(__('Case Title'), 'case_title') }}
+                                                    {{ html()->text('case_title')->id('case_title')->class('form-control')->attribute('v-model', 'formData.case_title')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.case_title}') }}
                                                     <div
                                                         v-if="errors.case_title"
                                                         class="invalid-feedback"
@@ -239,7 +211,7 @@ class="invalid-feedback"
                                                     </small>
                                                 </div>
                                                 <div class="form-group">
-                                                    {!! Form::label('cancelScreen', __('Cancel Screen')) !!}
+                                                    {{ html()->label(__('Cancel Screen'), 'cancelScreen') }}
                                                     <multiselect
                                                         aria-label="{{ __('Cancel Screen') }}"
                                                         v-model="screenCancel"
@@ -268,9 +240,7 @@ class="invalid-feedback"
                                                     </div>
                                                 </div>
                                                 <div class="form-group">
-                                                    {!! Form::label('requestDetailScreen',
-                                                        __('Request Detail Screen'))
-                                                    !!}
+                                                    {{ html()->label(__('Request Detail Screen'), 'requestDetailScreen') }}
                                                     <multiselect
                                                         aria-label="{{ __('Request Detail Screen') }}"
                                                         v-model="screenRequestDetail"
@@ -302,7 +272,7 @@ class="invalid-feedback"
                                             </b-col>
                                             <b-col>
                                                 <div class="form-group p-0">
-                                                    {!! Form::label('cancelRequest', __('Cancel Case')) !!}
+                                                    {{ html()->label(__('Cancel Case'), 'cancelRequest') }}
                                                     <multiselect
                                                         id="cancelRequest"
                                                         v-model="canCancel"
@@ -326,7 +296,7 @@ class="invalid-feedback"
                                                     </multiselect>
                                                 </div>
                                                 <div class="form-group p-0">
-                                                    {!! Form::label('editData', __('Edit Data')) !!}
+                                                    {{ html()->label(__('Edit Data'), 'editData') }}
                                                     <multiselect
                                                         id="editData"
                                                         v-model="canEditData"
@@ -350,7 +320,7 @@ class="invalid-feedback"
                                                     </multiselect>
                                                 </div>
                                                 <div class="form-group">
-                                                    {!! Form::label('status', __('Status')) !!}
+                                                    {{ html()->label(__('Status'), 'status') }}
                                                     <select-status
                                                         v-model="formData.status"
                                                         :multiple="false"
@@ -363,14 +333,8 @@ class="invalid-feedback"
                             </div>
 
                             <div class="d-flex justify-content-end mt-2">
-                                {!! Form::button(__('Cancel'),
-                                    ['class'=>'btn btn-outline-secondary button-custom',
-                                    '@click' => 'onClose'])
-                                !!}
-                                {!! Form::button(__('Save'),
-                                    ['class'=>'btn btn-secondary ml-3 button-custom',
-                                    '@click' => 'onUpdate'])
-                                !!}
+                                {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary button-custom')->attribute('@click', 'onClose') }}
+                                {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3 button-custom')->attribute('@click', 'onUpdate') }}
                             </div>
                         </div>
 
@@ -519,11 +483,8 @@ class="custom-control-input">
                                 </table>
                             </div>
                             <div class="d-flex justify-content-end mt-2">
-                                {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-                                {!! Form::button(__('Save'), [
-                                    'class' => 'btn btn-secondary ml-2',
-                                    '@click' => 'onUpdate'
-                                ]) !!}
+                                {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                                {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-2')->attribute('@click', 'onUpdate') }}
                             </div>
                         </div>
 
diff --git a/resources/views/processes/environment-variables/edit.blade.php b/resources/views/processes/environment-variables/edit.blade.php
index c6d3088869..ebcac047b2 100644
--- a/resources/views/processes/environment-variables/edit.blade.php
+++ b/resources/views/processes/environment-variables/edit.blade.php
@@ -22,29 +22,26 @@
                 <div class="card card-body">
                     <required></required>
                     <div class="form-group">
-                        {!!Form::label('name', __('Name')  . '<small class="ml-1">*</small>', [], false)!!}
-                        {!!Form::text('name', null, ['class'=> 'form-control', 'v-model'=> 'formData.name',
-                        'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true'])!!}
+                        {{ html()->label(__('Name') . '<small class="ml-1">*</small>', 'name') }}
+                        {{ html()->text('name')->class('form-control')->attribute('v-model', 'formData.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
                         <small class="form-text text-muted" v-if="! errors.name">{{__('The environment variable name must be unique.') }}</small>
                         <div class="invalid-feedback" role="alert" v-for="name in errors.name">@{{name}}</div>
                     </div>
                     <div class="form-group">
-                        {!!Form::label('description', __('Description')  . '<small class="ml-1">*</small>', [], false)!!}
-                        {!!Form::textArea('description', null, ['class'=> 'form-control', 'v-model'=> 'formData.description',
-                        'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.description}','rows'=>3, 'required', 'aria-required' => 'true'])!!}
+                        {{ html()->label(__('Description') . '<small class="ml-1">*</small>', 'description') }}
+                        {{ html()->textarea('description')->class('form-control')->attribute('v-model', 'formData.description')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.description}')->rows(3)->required()->attribute('aria-required', 'true') }}
                         <div class="invalid-feedback" role="alert" v-for="description in errors.description">@{{description}}</div>
                     </div>
                     <div class="form-group">
-                        {!!Form::label('value', __('Value'))!!}
-                        {!!Form::textArea('value', null, ['class'=> 'form-control', 'v-model'=> 'formData.value',
-                        'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.description}','rows'=>3, 'required', 'aria-required' => 'true'])!!}
+                        {{ html()->label(__('Value'), 'value') }}
+                        {{ html()->textarea('value')->class('form-control')->attribute('v-model', 'formData.value')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.description}')->rows(3)->required()->attribute('aria-required', 'true') }}
                         <small class="form-text text-muted">{{__('For security purposes, this field will always appear empty') }}</small>
                         <div class="invalid-feedback" role="alert" v-for="value in errors.value">@{{value}}</div>
                     </div>
                     <br>
                     <div class="text-right">
-                        {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-                        {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-2', '@click' => 'onUpdate']) !!}
+                        {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                        {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-2')->attribute('@click', 'onUpdate') }}
                     </div>
                 </div>
             </div>
diff --git a/resources/views/processes/screens/edit.blade.php b/resources/views/processes/screens/edit.blade.php
index 65e97948f7..3c56b22098 100644
--- a/resources/views/processes/screens/edit.blade.php
+++ b/resources/views/processes/screens/edit.blade.php
@@ -41,16 +41,14 @@
                         <div class="tab-pane fade show active" id="nav-config" role="tabpanel" aria-labelledby="nav-config-tab">
                             <required></required>
                             <div class="form-group">
-                                {!! Form::label('title', __('Name')  . '<small class="ml-1">*</small>', [], false) !!}
-                                {!! Form::text('title', null, ['id' => 'title','class'=> 'form-control', 'v-model' => 'formData.title',
-                                'v-bind:class' => '{"form-control":true, "is-invalid":errors.title}', 'required', 'aria-required' => 'true']) !!}
+                                {{ html()->label(__('Name') . '<small class="ml-1">*</small>', 'title') }}
+                                {{ html()->text('title')->id('title')->class('form-control')->attribute('v-model', 'formData.title')->attribute('v-bind:class', '{"form-control":true, "is-invalid":errors.title}')->required()->attribute('aria-required', 'true') }}
                                 <small class="form-text text-muted" v-if="! errors.title">{{__('The screen name must be unique.') }}</small>
                                 <div class="invalid-feedback" role="alert" v-if="errors.title">@{{errors.title[0]}}</div>
                             </div>
                             <div class="form-group">
-                                {!! Form::label('description', __('Description') . '<small class="ml-1">*</small>', [], false) !!}
-                                {!! Form::textarea('description', null, ['id' => 'description', 'rows' => 4, 'class'=> 'form-control',
-                                'v-model' => 'formData.description', 'v-bind:class' => '{"form-control":true, "is-invalid":errors.description}', 'required', 'aria-required' => 'true']) !!}
+                                {{ html()->label(__('Description') . '<small class="ml-1">*</small>', 'description') }}
+                                {{ html()->textarea('description')->id('description')->rows(4)->class('form-control')->attribute('v-model', 'formData.description')->attribute('v-bind:class', '{"form-control":true, "is-invalid":errors.description}')->required()->attribute('aria-required', 'true') }}
                                 <div class="invalid-feedback" role="alert" v-if="errors.description">@{{errors.description[0]}}</div>
                             </div>
                             <category-select :label="$t('Category')" api-get="screen_categories" api-list="screen_categories" v-model="formData.screen_category_id" :errors="errors.screen_category_id">
@@ -64,14 +62,8 @@
                             </project-select>
                             <br>
                             <div class="text-right">
-                                {!! Form::button(__('Cancel'), [
-                                    'class'=>'btn btn-outline-secondary',
-                                    '@click' => 'onClose'
-                                ]) !!}
-                                {!! Form::button(__('Save and publish'), [
-                                    'class'=>'btn btn-secondary ml-2',
-                                    '@click' => 'onUpdate'
-                                ]) !!}
+                                {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                                {{ html()->button(__('Save and publish'), 'button')->class('btn btn-secondary ml-2')->attribute('@click', 'onUpdate') }}
                             </div>
                         </div>
                         @isset($addons)
diff --git a/resources/views/processes/scripts/edit.blade.php b/resources/views/processes/scripts/edit.blade.php
index 2c926ba7ec..626333b109 100644
--- a/resources/views/processes/scripts/edit.blade.php
+++ b/resources/views/processes/scripts/edit.blade.php
@@ -42,9 +42,8 @@
                         <div class="tab-pane fade show active" id="nav-config" role="tabpanel" aria-labelledby="nav-config-tab">
                             <required></required>
                             <div class="form-group">
-                            {!! Form::label('title', __('Name')  . '<small class="ml-1">*</small>', [], false) !!}
-                            {!! Form::text('title', null, ['id' => 'title','class'=> 'form-control', 'v-model' => 'formData.title',
-                            'v-bind:class' => '{"form-control":true, "is-invalid":errors.title}', 'required', 'aria-required' => 'true']) !!}
+                            {{ html()->label(__('Name') . '<small class="ml-1">*</small>', 'title') }}
+                            {{ html()->text('title')->id('title')->class('form-control')->attribute('v-model', 'formData.title')->attribute('v-bind:class', '{"form-control":true, "is-invalid":errors.title}')->required()->attribute('aria-required', 'true') }}
                             <small class="form-text text-muted"
                                   v-if="! errors.title">{{ __('The script name must be unique.') }}</small>
                             <div class="invalid-feedback" role="alert" v-if="errors.title">@{{errors.title[0]}}</div>
@@ -71,17 +70,15 @@
                             }
                         @endphp
                         <div class="form-group">
-                            {!!Form::label('script_executor_id', __('Script Executor'))!!}<small class="ml-1">*</small>
-                            {!!Form::select('script_executor_id', [''=>__('Select')] + $scriptExecutorsLang, null, ['class'=>
-                            'form-control', 'v-model'=> 'formData.script_executor_id', 'v-bind:class' => '{\'form-control\':true,
-                            \'is-invalid\':errors.script_executor_id}', 'required', 'aria-required' => 'true']);!!}
+                            {{ html()->label(__('Script Executor'), 'script_executor_id') }}<small class="ml-1">*</small>
+                            {{ html()->select('script_executor_id', ['' => __('Select')] + $scriptExecutorsLang)->class('form-control')->attribute('v-model', 'formData.script_executor_id')->attribute('v-bind:class', '{\'form-control\':true,
+                            \'is-invalid\':errors.script_executor_id}')->required()->attribute('aria-required', 'true') }}
                             <div class="invalid-feedback" role="alert" v-if="errors.script_executor_id">@{{errors.script_executor_id[0]}}</div>
                         </div>
 
                         <div class="form-group">
-                            {!! Form::label('description', __('Description') . '<small class="ml-1">*</small>', [], false) !!}
-                            {!! Form::textarea('description', null, ['id' => 'description', 'rows' => 4, 'class'=> 'form-control',
-                            'v-model' => 'formData.description', 'v-bind:class' => '{"form-control":true, "is-invalid":errors.description}', 'required', 'aria-required' => 'true']) !!}
+                            {{ html()->label(__('Description') . '<small class="ml-1">*</small>', 'description') }}
+                            {{ html()->textarea('description')->id('description')->rows(4)->class('form-control')->attribute('v-model', 'formData.description')->attribute('v-bind:class', '{"form-control":true, "is-invalid":errors.description}')->required()->attribute('aria-required', 'true') }}
                             <div class="invalid-feedback" role="alert" v-if="errors.description">@{{errors.description[0]}}</div>
                         </div>
 
@@ -124,8 +121,8 @@
                         ></component>
                         <br>
                         <div class="text-right">
-                            {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-                            {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-2', '@click' => 'onUpdate']) !!}
+                            {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                            {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-2')->attribute('@click', 'onUpdate') }}
                         </div>
                         </div>
                         @isset($addons)
diff --git a/resources/views/processes/signals/edit.blade.php b/resources/views/processes/signals/edit.blade.php
index 8adb253965..e671dd6b77 100644
--- a/resources/views/processes/signals/edit.blade.php
+++ b/resources/views/processes/signals/edit.blade.php
@@ -37,22 +37,18 @@
           <div class="modal-body">
             <required></required>
             <div class="form-group">
-              {!! Form::label('name', __('Signal Name') . '<small class="ml-1">*</small>', [], false) !!}
-              {!! Form::text('name', null, ['id' => 'name','class'=> 'form-control', 'v-model' =>
-              'formData.name', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true']) !!}
+              {{ html()->label(__('Signal Name') . '<small class="ml-1">*</small>', 'name') }}
+              {{ html()->text('name')->id('name')->class('form-control')->attribute('v-model', 'formData.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
               <div class="invalid-feedback" role="alert" v-for="name in errors.name">@{{name}}</div>
             </div>
             <div class="form-group">
-              {!! Form::label('id', __('Signal ID') . '<small class="ml-1">*</small>', [], false) !!}
-              {!! Form::text('id', null, ['id' => 'id','class'=> 'form-control', 'v-model' =>
-              'formData.id', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.id}', 'required', 'aria-required' => 'true']) !!}
+              {{ html()->label(__('Signal ID') . '<small class="ml-1">*</small>', 'id') }}
+              {{ html()->text('id')->id('id')->class('form-control')->attribute('v-model', 'formData.id')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.id}')->required()->attribute('aria-required', 'true') }}
               <small id="emailHelp" class="form-text text-muted"></small>
               <div class="invalid-feedback" role="alert" v-for="id in errors.id">@{{id}}</div>
             </div>
             <div class="form-group">
-              {!! Form::textarea('detail', null, ['id' => 'detail', 'rows' => 4, 'class'=> 'form-control', 'v-bind:placeholder' => '$t("Additional Details (optional)")',
-              'aria-label' => __('Additional Details (optional)'),
-              'v-model' => 'formData.detail', 'v-bind:class' => '{"form-control":true, "is-invalid":errors.detail}']) !!}
+              {{ html()->textarea('detail')->id('detail')->rows(4)->class('form-control')->attribute('v-bind:placeholder', '$t("Additional Details (optional)")')->attribute('aria-label', __('Additional Details (optional)'))->attribute('v-model', 'formData.detail')->attribute('v-bind:class', '{"form-control":true, "is-invalid":errors.detail}') }}
               <div class="invalid-feedback" role="alert" v-if="errors.detail">@{{errors.detail[0]}}</div>
             </div>
           </div>
@@ -63,8 +59,8 @@
           @endisset
           @if(!hasPackage('package-data-sources'))
           <div class="card-footer text-right mt-3">
-            {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-            {!! Form::button(__('Confirm and Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'onUpdate', 'id'=>'saveSingal']) !!}
+            {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+            {{ html()->button(__('Confirm and Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'onUpdate')->id('saveSingal') }}
           </div>
           @endif
         </div>
diff --git a/resources/views/processes/signals/index.blade.php b/resources/views/processes/signals/index.blade.php
index a5b9a04388..9abf84211c 100644
--- a/resources/views/processes/signals/index.blade.php
+++ b/resources/views/processes/signals/index.blade.php
@@ -49,21 +49,17 @@
             <pm-modal ref="createSignal" id="createSignal" title="{{__('New Signal')}}" @hidden="onClose" @ok.prevent="onSubmit" :ok-disabled="disabled" style="display: none;">
                 <required></required>
                 <div class="form-group">
-                    {!! Form::label('name', __('Signal Name') . '<small class="ml-1">*</small>', [], false) !!}
-                    {!! Form::text('name', null, ['id' => 'name','class'=> 'form-control', 'v-model' =>
-                    'formData.name', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true']) !!}
+                    {{ html()->label(__('Signal Name') . '<small class="ml-1">*</small>', 'name') }}
+                    {{ html()->text('name')->id('name')->class('form-control')->attribute('v-model', 'formData.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
                     <div class="invalid-feedback" role="alert" v-for="name in errors.name">@{{name}}</div>
                 </div>
                 <div class="form-group">
-                    {!! Form::label('id', __('Signal ID') . '<small class="ml-1">*</small>', [], false) !!}
-                    {!! Form::text('id', null, ['id' => 'id','class'=> 'form-control', 'v-model' =>
-                    'formData.id', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.id}', 'required', 'aria-required' => 'true']) !!}
+                    {{ html()->label(__('Signal ID') . '<small class="ml-1">*</small>', 'id') }}
+                    {{ html()->text('id')->id('id')->class('form-control')->attribute('v-model', 'formData.id')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.id}')->required()->attribute('aria-required', 'true') }}
                     <div class="invalid-feedback" role="alert" v-for="id in errors.id">@{{id}}</div>
                 </div>
                 <div class="form-group">
-                    {!! Form::textarea('detail', null, ['id' => 'detail', 'rows' => 4, 'class'=> 'form-control', 'v-bind:placeholder' => '$t("Additional Details (optional)")',
-                    'aria-label' => __('Additional Details (optional)'),
-                    'v-model' => 'formData.detail', 'v-bind:class' => '{"form-control":true, "is-invalid":errors.detail}']) !!}
+                    {{ html()->textarea('detail')->id('detail')->rows(4)->class('form-control')->attribute('v-bind:placeholder', '$t("Additional Details (optional)")')->attribute('aria-label', __('Additional Details (optional)'))->attribute('v-model', 'formData.detail')->attribute('v-bind:class', '{"form-control":true, "is-invalid":errors.detail}') }}
                     <div class="invalid-feedback" role="alert" v-if="errors.detail">@{{errors.detail[0]}}</div>
                 </div>
             </pm-modal>
diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php
index 5f43a80979..7bcb152215 100644
--- a/resources/views/profile/edit.blade.php
+++ b/resources/views/profile/edit.blade.php
@@ -37,8 +37,8 @@
                     </div>
                 </div>
                 <div class="d-flex justify-content-end mt-3">
-                    {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-                    {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'profileUpdate']) !!}
+                    {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                    {{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'profileUpdate') }}
                 </div>
               </div>
             </div>
@@ -85,29 +85,20 @@
         @onSubmit="onSubmit"
     >
       <div class="form-group">
-        {!! Form::label('url', __('URL')) !!}
-        {!! Form::text('url', null, ['id' => 'url','class'=> 'form-control', 'v-model' =>
-        'formData.url', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.url}',
-        'v-bind:placeholder' => '$t("Placeholder")',
-        'required', 'aria-required' => 'true']) !!}
+        {{ html()->label(__('URL'), 'url') }}
+        {{ html()->text('url')->id('url')->class('form-control')->attribute('v-model', 'formData.url')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.url}')->attribute('v-bind:placeholder', '$t("Placeholder")')->required()->attribute('aria-required', 'true') }}
         <div class="invalid-feedback" role="alert" v-for="url in errors.url">@{{url}}</div>
       </div>
       <div class="form-group">
-        {!! Form::label('user', __('User')) !!}
-        {!! Form::text('user', null, ['id' => 'user', 'rows' => 4, 'class'=>
-        'form-control', 'v-model' => 'formData.user',
-        'v-bind:placeholder' => '$t("Placeholder")',
-        'v-bind:class' => '{\'form-control\':true,\'is-invalid\':errors.user}']) !!}
+        {{ html()->label(__('User'), 'user') }}
+        {{ html()->text('user')->id('user')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.user')->attribute('v-bind:placeholder', '$t("Placeholder")')->attribute('v-bind:class', '{\'form-control\':true,\'is-invalid\':errors.user}') }}
         <div class="invalid-feedback" role="alert" v-for="user in errors.user">
           @{{user}}
         </div>
       </div>
       <div class="form-group">
-        {!! Form::label('accessKey', __('Access Key')) !!}
-        {!! Form::text('accessKey', null, ['id' => 'accessKey', 'rows' => 4, 'class'=>
-        'form-control', 'v-model' => 'formData.accessKey',
-        'v-bind:placeholder' => '$t("Placeholder")',
-        'v-bind:class' => '{\'form-control\':true,\'is-invalid\':errors.accessKey}']) !!}
+        {{ html()->label(__('Access Key'), 'accessKey') }}
+        {{ html()->text('accessKey')->id('accessKey')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.accessKey')->attribute('v-bind:placeholder', '$t("Placeholder")')->attribute('v-bind:class', '{\'form-control\':true,\'is-invalid\':errors.accessKey}') }}
         <div class="invalid-feedback" role="alert" v-for="accessKey in errors.accessKey">
           @{{accessKey}}
         </div>
diff --git a/resources/views/shared/input.blade.php b/resources/views/shared/input.blade.php
index c31d341220..ab8fc98492 100644
--- a/resources/views/shared/input.blade.php
+++ b/resources/views/shared/input.blade.php
@@ -1,5 +1,5 @@
 @if (isset($label))
-    {!! Form::label($name, $label) !!}
+    {{ html()->label($label, $name) }}
 @endif
 
 @php
@@ -9,6 +9,6 @@
     $mustache = '{{ errors. ' . $name . '[0] }}';
 @endphp
 @if ($type == 'text')
-    {!! Form::text($name, null, ['id' => $name,'class'=> 'form-control', 'v-model' => $model, 'v-bind:class' => '{\'form-control\':true,\'is-invalid\':errors.' . $name . '}']) !!}
+    {{ html()->text($name)->id($name)->class('form-control')->attribute('v-model', $model)->attribute('v-bind:class', '{\'form-control\':true,\'is-invalid\':errors.' . $name . '}') }}
 @endif
 <div class="invalid-feedback" role="alert" v-if="errors.{{ $name }}">{{ $mustache }}</div>
diff --git a/resources/views/shared/users/profile.blade.php b/resources/views/shared/users/profile.blade.php
index 209940fd51..d3473f04fc 100644
--- a/resources/views/shared/users/profile.blade.php
+++ b/resources/views/shared/users/profile.blade.php
@@ -4,21 +4,17 @@
     <h5 class="mb-3">{{__('General Information')}}</h5>
         <div class="row">
             <div class="form-group col">
-                {!! Form::label('firstname', __('First Name') . '<small class="ml-1">*</small>', [], false) !!}
-                {!! Form::text('firstname', null, ['id' => 'firstname','class'=>
-                'form-control', 'v-model' => 'formData.firstname',
-                'v-bind:class' => '{\'form-control\':true,
-                \'is-invalid\':errors.firstname}', 'required', 'aria-required' => 'true']) !!}
+                {{ html()->label(__('First Name') . '<small class="ml-1">*</small>', 'firstname') }}
+                {{ html()->text('firstname')->id('firstname')->class('form-control')->attribute('v-model', 'formData.firstname')->attribute('v-bind:class', '{\'form-control\':true,
+                \'is-invalid\':errors.firstname}')->required()->attribute('aria-required', 'true') }}
                 <div class="invalid-feedback" role="alert" v-if="errors.firstname">
                     @{{errors.firstname[0]}}
                 </div>
             </div>
             <div class="form-group col">
-                {!! Form::label('lastname', __('Last Name') . '<small class="ml-1">*</small>', [], false)!!}
-                {!! Form::text('lastname', null, ['id' => 'lastname', 'rows' => 4,
-                'class'=> 'form-control', 'v-model'
-                => 'formData.lastname', 'v-bind:class' => '{\'form-control\':true,
-                \'is-invalid\':errors.lastname}', 'required', 'aria-required' => 'true']) !!}
+                {{ html()->label(__('Last Name') . '<small class="ml-1">*</small>', 'lastname') }}
+                {{ html()->text('lastname')->id('lastname')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.lastname')->attribute('v-bind:class', '{\'form-control\':true,
+                \'is-invalid\':errors.lastname}')->required()->attribute('aria-required', 'true') }}
                 <div class="invalid-feedback" role="alert" v-if="errors.lastname">
                     @{{errors.lastname[0]}}
                 </div>
@@ -26,7 +22,7 @@
         </div>
 
         <div class="form-group">
-            {!!Form::label('title', __('Job Title')) !!}
+            {{ html()->label(__('Job Title'), 'title') }}
             <b-form-input
               id="title"
               class="mb-2"
@@ -40,41 +36,29 @@ class="mb-2"
     <h5 class="mt-1 mb-3">{{__('Contact Information')}}</h5>
 
         <div class="form-group">
-            {!! Form::label('email', __('Email') . '<small class="ml-1">*</small>', [], false) !!}
-            {!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
-            'form-control', 'v-model'
-            => 'formData.email', 'v-bind:class' => '{\'form-control\':true,
-            \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
-            '@input' => 'checkEmailChange']) !!}
+            {{ html()->label(__('Email') . '<small class="ml-1">*</small>', 'email') }}
+            {{ html()->email('email')->id('email')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.email')->attribute('v-bind:class', '{\'form-control\':true,
+            \'is-invalid\':errors.email}')->attribute('required', )->attribute('aria-required', 'true')->attribute('@input', 'checkEmailChange') }}
             <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
             </div>
         </div>
         <div class="form-group">
-            {!! Form::label('phone', __('Phone')) !!}
-            {!! Form::text('phone', null, ['id' => 'phone','class'=> 'form-control',
-            'v-model' => 'formData.phone',
-            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.phone}'])
-            !!}
+            {{ html()->label(__('Phone'), 'phone') }}
+            {{ html()->text('phone')->id('phone')->class('form-control')->attribute('v-model', 'formData.phone')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.phone}') }}
             <div class="invalid-feedback" role="alert" v-if="errors.phone">@{{errors.phone[0]}}
             </div>
         </div>
 
         <div class="form-group">
-            {!! Form::label('fax', __('Fax')) !!}
-            {!! Form::text('fax', null, ['id' => 'fax','class'=> 'form-control',
-            'v-model' => 'formData.fax',
-            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.fax}'])
-            !!}
+            {{ html()->label(__('Fax'), 'fax') }}
+            {{ html()->text('fax')->id('fax')->class('form-control')->attribute('v-model', 'formData.fax')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.fax}') }}
             <div class="invalid-feedback" role="alert" v-if="errors.fax">@{{errors.fax[0]}}
             </div>
         </div>
 
         <div class="form-group">
-            {!! Form::label('cell', __('Cell')) !!}
-            {!! Form::text('cell', null, ['id' => 'cell','class'=> 'form-control',
-            'v-model' => 'formData.cell',
-            'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.cell}'])
-            !!}
+            {{ html()->label(__('Cell'), 'cell') }}
+            {{ html()->text('cell')->id('cell')->class('form-control')->attribute('v-model', 'formData.cell')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.cell}') }}
             <div class="invalid-feedback" role="alert" v-if="errors.cell">@{{errors.cell[0]}}
             </div>
         </div>
@@ -82,7 +66,7 @@ class="mb-2"
     <h5 class="mt-1 mb-3">{{__('Address')}}</h5>
     <div class="row">
         <div class="form-group col">
-            {!! Form::label('country', __('Country')) !!}
+            {{ html()->label(__('Country'), 'country') }}
             <b-form-select id="country" v-model="formData.country" :options="countries" placeholder="Select" class="form-control">
                 <template slot="first">
                     <option :value="null" disabled>{{__('Select')}}</option>
@@ -95,11 +79,9 @@ class="mb-2"
     </div>
     <div class="row">
         <div class="form-group col">
-            {!! Form::label('address', __('Address')) !!}
-            {!! Form::text('address', null, ['id' => 'address','class'=>
-            'form-control', 'v-model' => 'formData.address',
-            'v-bind:class' => '{\'form-control\':true,
-            \'is-invalid\':errors.address}']) !!}
+            {{ html()->label(__('Address'), 'address') }}
+            {{ html()->text('address')->id('address')->class('form-control')->attribute('v-model', 'formData.address')->attribute('v-bind:class', '{\'form-control\':true,
+            \'is-invalid\':errors.address}') }}
             <div class="invalid-feedback" role="alert" v-if="errors.address">
                 @{{errors.address}}
             </div>
@@ -107,17 +89,15 @@ class="mb-2"
     </div>
     <div class="row">
         <div class="form-group col">
-            {!! Form::label('city', __('City')) !!}
-            {!! Form::text('city', null, ['id' => 'city', 'rows' => 4, 'class'=>
-            'form-control', 'v-model'
-            => 'formData.city', 'v-bind:class' => '{\'form-control\':true,
-            \'is-invalid\':errors.city}']) !!}
+            {{ html()->label(__('City'), 'city') }}
+            {{ html()->text('city')->id('city')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.city')->attribute('v-bind:class', '{\'form-control\':true,
+            \'is-invalid\':errors.city}') }}
             <div class="invalid-feedback" role="alert" v-if="errors.city">@{{errors.city}}</div>
         </div>
     </div>
     <div class="row">
         <div class="form-group col" v-if="formData.country == 'US'">
-            {!! Form::label('state', __('State or Region')) !!}
+            {{ html()->label(__('State or Region'), 'state') }}
             <b-form-select v-model="formData.state" :options="states" placeholder="Select" class="form-control">
                 <template slot="first">
                     <option :value="null" disabled>{{__('Select')}}</option>
@@ -127,20 +107,16 @@ class="mb-2"
             </div>
         </div>
         <div class="form-group col" v-else>
-            {!! Form::label('state', __('State or Region')) !!}
-            {!! Form::text('state', null, ['id' => 'state', 'rows' => 4, 'class'=>
-            'form-control', 'v-model'
-            => 'formData.state', 'v-bind:class' => '{\'form-control\':true,
-            \'is-invalid\':errors.state}']) !!}
+            {{ html()->label(__('State or Region'), 'state') }}
+            {{ html()->text('state')->id('state')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.state')->attribute('v-bind:class', '{\'form-control\':true,
+            \'is-invalid\':errors.state}') }}
             <div class="invalid-feedback" role="alert" v-if="errors.state">@{{errors.state}}
             </div>
         </div>
         <div class="form-group col">
-            {!! Form::label('postal', __('Postal Code')) !!}
-            {!! Form::text('postal', null, ['id' => 'postal', 'rows' => 4, 'class'=>
-            'form-control', 'v-model'
-            => 'formData.postal', 'v-bind:class' => '{\'form-control\':true,
-            \'is-invalid\':errors.postal}']) !!}
+            {{ html()->label(__('Postal Code'), 'postal') }}
+            {{ html()->text('postal')->id('postal')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.postal')->attribute('v-bind:class', '{\'form-control\':true,
+            \'is-invalid\':errors.postal}') }}
             <div class="invalid-feedback" role="alert" v-if="errors.postal">@{{errors.postal}}
             </div>
         </div>
@@ -151,10 +127,8 @@ class="mb-2"
         @foreach (config('users.properties') as $variable => $label)
             <div class="row">
                 <div class="form-group col">
-                    {!! Form::label("meta.$variable", __($label)) !!}
-                    {!! Form::text("meta.$variable", null, ['id' => "meta.$variable",'class'=>
-                    'form-control', 'v-model' => "formData.meta.$variable",
-                    'v-bind:class' => '{\'form-control\':true}']) !!}
+                    {{ html()->label(__($label), "meta.{$variable}") }}
+                    {{ html()->text("meta.{$variable}")->id("meta.{$variable}")->class('form-control')->attribute('v-model', "formData.meta.{$variable}")->attribute('v-bind:class', '{\'form-control\':true}') }}
                 </div>
             </div>
         @endforeach
@@ -172,10 +146,9 @@ class="mb-2"
       </div>
       <div class="modal-body">
             <div class="form-group col">
-                {!! Form::label('valpassword', __('Password')) !!}
+                {{ html()->label(__('Password'), 'valpassword') }}
                 <div style="position: relative;">
-                    {!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
-                            => 'formData.valpassword']) !!}
+                    {{ html()->password('valpassword')->id('valpassword')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.valpassword') }}
                     <i class="fa fa-eye" id="togglePassword" style="position: absolute; top: 32%; right: 4%; cursor: pointer; color: #51585E;"></i>
                 </div>
             </div>
diff --git a/resources/views/shared/users/sidebar.blade.php b/resources/views/shared/users/sidebar.blade.php
index c0ce5e0662..68a60d4853 100644
--- a/resources/views/shared/users/sidebar.blade.php
+++ b/resources/views/shared/users/sidebar.blade.php
@@ -27,9 +27,8 @@
                 <h5 class="mb-3 font-weight-bold">{{__('Login Information')}}</h5>
             </legend>
             <div class="form-group">
-               {!! Form::label('username', __('Username') . '<small class="ml-1">*</small>',  [], false) !!}
-               {!! Form::text('username', null, ['id' => 'username', 'rows' => 4, 'class'=> 'form-control', 'v-model'
-               => 'formData.username', 'autocomplete' => 'off', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.username}', 'required', 'aria-required' => 'true']) !!}
+               {{ html()->label(__('Username') . '<small class="ml-1">*</small>', 'username') }}
+               {{ html()->text('username')->id('username')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.username')->attribute('autocomplete', 'off')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.username}')->required()->attribute('aria-required', 'true') }}
                <div class="invalid-feedback" role="alert" v-if="errors.username">@{{errors.username[0]}}</div>
             </div>
             @if (config('password-policies.users_can_change', true) ||
@@ -43,20 +42,17 @@
                 </div>
             @endcan
             <div class="form-group">
-                {!! Form::label('password', __('New Password')) !!}
+                {{ html()->label(__('New Password'), 'password') }}
                 <vue-password v-model="formData.password" :disable-toggle=true>
                     <div slot="password-input" slot-scope="props">
-                        {!! Form::password('password', ['id' => 'password', 'rows' => 4, 'class'=> 'form-control', 'v-model'
-                        => 'formData.password', 'autocomplete' => 'new-password', '@input' => 'props.updatePassword($event.target.value)',
-                        'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.password}']) !!}
+                        {{ html()->password('password')->id('password')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.password')->attribute('autocomplete', 'new-password')->attribute('@input', 'props.updatePassword($event.target.value)')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.password}') }}
                     </div>
                 </vue-password>
             </div>
 
             <div class="form-group">
-                {!! Form::label('confPassword', __('Confirm Password')) !!}
-                {!! Form::password('confPassword', ['id' => 'confPassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
-                => 'formData.confPassword', 'autocomplete' => 'new-password', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.password}']) !!}
+                {{ html()->label(__('Confirm Password'), 'confPassword') }}
+                {{ html()->password('confPassword')->id('confPassword')->attribute('rows', 4)->class('form-control')->attribute('v-model', 'formData.confPassword')->attribute('autocomplete', 'new-password')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.password}') }}
                 <div class="invalid-feedback" :style="{display: (errors.password) ? 'block' : 'none' }" role="alert"
                      v-for="(error, index) in errors.password">@{{error}}</div>
             </div>
@@ -73,7 +69,7 @@
 
         @if (!\Request::is('profile/edit'))
         <div class="form-group">
-            {!! Form::label('forceChangePassword', __('User must change password at next login')) !!}
+            {{ html()->label(__('User must change password at next login'), 'forceChangePassword') }}
             <div class="grouped">
                 <div class="custom-control custom-switch">
                     <input v-model="formData.force_change_password" value="1" type="checkbox" class="custom-control-input" :id="'switch_force_change_password'">
@@ -85,7 +81,7 @@
 
         @if (config('password-policies.2fa_enabled', false) && count($global2FAEnabled) > 0 && $is2FAEnabledForGroup)
             <div class="form-group">
-                {!! Form::label('preferences_2fa', __('Two Factor Authentication')) !!}
+                {{ html()->label(__('Two Factor Authentication'), 'preferences_2fa') }}
                 <b-form-checkbox-group
                         id="preferences_2fa"
                         v-model="formData.preferences_2fa"
@@ -108,7 +104,7 @@
     <div class="card card-body mt-3">
         <h5 class="mb-3 font-weight-bold">{{__('Settings')}}</h5>
             <div class="form-group">
-                {!!Form::label('datetime_format', __('Date Format'));!!}
+                {{ html()->label(__('Date Format'), 'datetime_format') }}
                 <b-form-select id="datetime_format" v-model="formData.datetime_format" class="form-control" :options="datetimeFormats">
                 </b-form-select>
                 <div class="invalid-feedback" role="alert" v-if="errors.email">
@@ -116,7 +112,7 @@
                 </div>
             </div>
             <div class="form-group">
-                {!!Form::label('timezone', __('Time Zone'));!!}
+                {{ html()->label(__('Time Zone'), 'timezone') }}
                 <b-form-select id="timezone" v-model="formData.timezone" class="form-control" :options="timezones">
                 </b-form-select>
                 <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.timezone}}
@@ -124,7 +120,7 @@
             </div>
 
             <div class="form-group">
-                {!! Form::label('status', __('Status')) !!}
+                {{ html()->label(__('Status'), 'status') }}
                 <b-form-select id="status" v-model="formData.status" class="form-control" :options="status">
                 </b-form-select>
                 <div class="invalid-feedback" role="alert" v-if="errors.status">
@@ -133,7 +129,7 @@
             </div>
             
             <div class="form-group">
-                {!! Form::label('status', __('Recommendations')) !!}
+                {{ html()->label(__('Recommendations'), 'status') }}
                 <b-form-select
                     id="status"
                     v-model="disableRecommendations"
diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php
index 5eb6fb3db6..5fac95d39e 100644
--- a/resources/views/tasks/edit.blade.php
+++ b/resources/views/tasks/edit.blade.php
@@ -339,7 +339,7 @@ class="d-inline-flex pull-left align-items-center"
             v-cloak
             @hide="cancelReassign">
             <div class="form-group">
-              {!!Form::label('user', __('User'))!!}
+              {{ html()->label(__('User'), 'user') }}
               <p-m-dropdown-suggest v-model="selectedUser"
                 :options="reassignUsers"
                 @pmds-input="onReassignInput"
diff --git a/resources/views/templates/configure.blade.php b/resources/views/templates/configure.blade.php
index 521bfea3a1..095244e3d5 100644
--- a/resources/views/templates/configure.blade.php
+++ b/resources/views/templates/configure.blade.php
@@ -67,19 +67,8 @@
                         @endisset
                     </div>
                     <div class="d-flex justify-content-end mt-2">
-                        {!! Form::button(__('Cancel'),
-                            [
-                                'class'=>'btn btn-outline-secondary',
-                                '@click' => 'onClose'
-                            ])
-                        !!}
-                        {!! Form::button(__('Save'),
-                            [
-                                ':disabled' => 'isDefaultProcessmakerTemplate',
-                                'class'=>'btn btn-secondary ml-2',
-                                '@click' => 'onUpdate'
-                            ])
-                        !!}
+                        {{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
+                        {{ html()->button(__('Save'), 'button')->attribute(':disabled', 'isDefaultProcessmakerTemplate')->class('btn btn-secondary ml-2')->attribute('@click', 'onUpdate') }}
                     </div>
                 </div>
             </div>