diff --git a/flextype/core/Forms.php b/flextype/core/Forms.php
deleted file mode 100644
index d929bc71..00000000
--- a/flextype/core/Forms.php
+++ /dev/null
@@ -1,656 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Flextype (http://flextype.org)
- * Founded by Sergey Romanenko and maintained by Flextype Community.
- */
-
-namespace Flextype;
-
-use Flextype\Component\Arr\Arr;
-use Flextype\Component\Form\Form;
-use Flextype\Component\Html\Html;
-use Flextype\Component\Filesystem\Filesystem;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use function count;
-use function date;
-use function Flextype\Component\I18n\__;
-use function str_replace;
-use function strlen;
-use function strpos;
-use function strtotime;
-use function substr_replace;
-
-class Forms
-{
-    /**
-     * Flextype Dependency Container
-     *
-     * @var
-     * @access private
-     */
-    private $flextype;
-
-    /**
-     * Form controls sizes
-     *
-     * @var array
-     * @access private
-     */
-    private $sizes = [
-        '1/12' => 'col w-1/12',
-        '2/12' => 'col w-2/12',
-        '3/12' => 'col w-3/12',
-        '4/12' => 'col w-4/12',
-        '5/12' => 'col w-5/12',
-        '6/12' => 'col w-6/12',
-        '7/12' => 'col w-7/12',
-        '8/12' => 'col w-8/12',
-        '9/12' => 'col w-9/12',
-        '10/12' => 'col w-10/12',
-        '12/12' => 'col w-full',
-        '12' => 'col w-full',
-    ];
-
-    /**
-     * Field class
-     *
-     * @var string
-     * @access private
-     */
-    private $field_class = 'form-control';
-
-    /**
-     * Constructor
-     *
-     * @access public
-     */
-    public function __construct($flextype)
-    {
-        $this->flextype = $flextype;
-    }
-
-    /**
-     * Render form
-     *
-     * @param array   $fieldset Fieldset
-     * @param array   $values   Fieldset values
-     * @param Request $request  PSR7 request
-     *
-     * @return string Returns form based on fieldsets
-     *
-     * @access public
-     */
-    public function render(array $fieldset, array $values = [], Request $request) : string
-    {
-        $form  = Form::open(null, ['id' => 'form']);
-        $form .= $this->_csrfHiddenField();
-        $form .= $this->_actionHiddenField();
-
-        // Go through all sections
-        if (count($fieldset['sections']) > 0) {
-
-            $form .= '<div class="tabs flex">';
-
-            // Go through all sections and create nav tabs
-            foreach ($fieldset['sections'] as $key => $section) {
-                $form .= '<div class="tabs__content w-9/12 ' . ($key === 'main' ? 'tabs__content--active' : '') . '">';
-                $form .= '<div class="row">';
-
-                foreach ($section['fields'] as $element => $properties) {
-                    // Set empty form field element
-                    $form_field = '';
-
-                    // Set element name
-                    $field_name = $this->getElementName($element);
-
-                    // Set element id
-                    $field_id = $this->getElementID($element);
-
-                    // Set element default value
-                    $field_value = $this->getElementValue($element, $values, $properties);
-
-                    // Seletct field type
-                    switch ($properties['type']) {
-                        case 'textarea':
-                            $form_field = $this->textareaField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'hidden':
-                            $form_field = $this->hiddenField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'html':
-                            $form_field = $this->htmlField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'select':
-                            $form_field = $this->selectField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'template_select':
-                            $form_field = $this->templateSelectField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'visibility_select':
-                            $form_field = $this->visibilitySelectField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'heading':
-                            $form_field = $this->headingField($field_id, $properties);
-                            break;
-                        case 'routable_select':
-                            $form_field = $this->routableSelectField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'tags':
-                            $form_field = $this->tagsField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'datetimepicker':
-                            $form_field = $this->dateField($field_id, $field_name, $field_value, $properties);
-                            break;
-                        case 'media_select':
-                            $form_field = $this->mediaSelectField($field_id, $field_name, $field_value, $properties, $request);
-                            break;
-                        default:
-                            $form_field = $this->textField($field_id, $field_name, $field_value, $properties);
-                            break;
-                    }
-
-                    $form .= $form_field;
-                }
-                $form .= '</div>';
-                $form .= '</div>';
-            }
-
-
-            $form .= '<nav class="tabs__nav w-3/12 pl-10"><div class="bg-dark text-white">';
-
-            // Go through all sections and create nav items
-            foreach ($fieldset['sections'] as $key => $section) {
-                $form .= '<a href="javascript:;" class="block opacity-90 p-2 pl-4 hover:bg-dark-muted hover:opacity-100 tabs__nav__link ' . ($key === 'main' ? 'tabs__nav__link--active' : '') . '">' . __($section['title']) . '</a>';
-            }
-
-            $form .= '</div></nav>';
-
-            $form .= '</div>';
-        }
-
-        $form .= Form::close();
-
-        return $form;
-    }
-
-    /**
-     * Get element value
-     *
-     * @param string $element    Form Element
-     * @param array  $values     Form Values
-     * @param array  $properties Field properties
-     *
-     * @return mixed Returns form element value
-     *
-     * @access protected
-     */
-    protected function getElementValue(string $element, array $values, array $properties)
-    {
-        if (Arr::keyExists($values, $element)) {
-            $field_value = Arr::get($values, $element);
-        } elseif(Arr::keyExists($properties, 'default')) {
-            $field_value = $properties['default'];
-        } else {
-            $field_value = '';
-        }
-
-        return $field_value;
-    }
-
-    /**
-     * Get element name
-     *
-     * @param string $element Element
-     *
-     * @return string Returns form element name
-     *
-     * @access protected
-     */
-    protected function getElementName(string $element) : string
-    {
-        $pos = strpos($element, '.');
-
-        if ($pos === false) {
-            $field_name = $element;
-        } else {
-            $field_name = str_replace('.', '][', "$element") . ']';
-        }
-
-        $pos = strpos($field_name, ']');
-
-        if ($pos !== false) {
-            $field_name = substr_replace($field_name, '', $pos, strlen(']'));
-        }
-
-        return $field_name;
-    }
-
-    /**
-     * Get element id
-     *
-     * @param string $element Element
-     *
-     * @return string Returns form element id
-     *
-     * @access protected
-     */
-    protected function getElementID(string $element) : string
-    {
-        $pos = strpos($element, '.');
-
-        if ($pos === false) {
-            $field_name = $element;
-        } else {
-            $field_name = str_replace('.', '_', "$element");
-        }
-
-        return $field_name;
-    }
-
-    /**
-     * Media select field
-     *
-     * @param string  $field_id    Field ID
-     * @param string  $field_name  Field name
-     * @param mixed   $field_value Field value
-     * @param array   $properties  Field properties
-     * @param Request $request     PSR7 request
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function mediaSelectField(string $field_id, string $field_name, $field_value, array $properties, Request $request) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-        $options = $this->flextype->EntriesController->getMediaList($request->getQueryParams()['id'], false);
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class . ' js-select';
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::select($field_name, $options, $field_value, $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Template select field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function templateSelectField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class . ' js-select';
-
-        $_templates_list = $this->flextype['themes']->getTemplates($this->flextype['registry']->get('settings.theme'));
-
-        $options = [];
-
-        if (count($_templates_list) > 0) {
-            foreach ($_templates_list as $template) {
-                if ($template['type'] !== 'file' || $template['extension'] !== 'html') {
-                    continue;
-                }
-
-                $options[$template['basename']] = $template['basename'];
-            }
-        }
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::select($field_name, $options, $field_value, $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Routable select field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function routableSelectField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-        $options = [true => __('admin_yes'), false => __('admin_no')];
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class . ' js-select';
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::select($field_name, $options, (is_string($field_value) ? true : ($field_value ? true : false)), $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Select field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function selectField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-        $options = isset($properties['options']) ? $properties['options'] : [];
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class . ' js-select';
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::select($field_name, $options, $field_value, $attributes);
-        $field .= ($help ? '<small>' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Heading field
-     *
-     * @param string $field_id   Field ID
-     * @param array  $properties Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function headingField(string $field_id, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $h     = isset($properties['h'])     ? $properties['h'] : 3;
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] . 'text-3xl border-b border-black' : 'text-3xl border-b border-black';
-
-        $field   = '<div class="form-group ' . $size . '">';
-        $field  .= Html::heading(__($title), $h, $attributes);
-        $field  .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Html field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function htmlField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class;
-        $attributes['class'] .= ' js-html-editor';
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::textarea($field_name, $field_value, $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Hidden field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function hiddenField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-
-        return Form::hidden($field_name, $field_value, $attributes);
-    }
-
-    /**
-     * Textarea field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param string $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function textareaField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class;
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::textarea($field_name, $field_value, $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Visibility field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function visibilitySelectField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-        $options = ['draft' => __('admin_entries_draft'), 'visible' => __('admin_entries_visible'), 'hidden' => __('admin_entries_hidden')];
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class . ' js-select';
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::select($field_name, $options, (! empty($field_value) ? $field_value : 'visible'), $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Text field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function textField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class;
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::input($field_name, $field_value, $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Tags field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function tagsField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class;
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= '<input type="text" value="' . $field_value . '" name="' . $field_name . '" class="' . $attributes['class'] . '" data-role="tagsinput" />';
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * Date field
-     *
-     * @param string $field_id    Field ID
-     * @param string $field_name  Field name
-     * @param mixed  $field_value Field value
-     * @param array  $properties  Field properties
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function dateField(string $field_id, string $field_name, $field_value, array $properties) : string
-    {
-        $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
-        $help  = isset($properties['help'])  ? $properties['help'] : '';
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= '<div class="input-group date" id="datetimepicker" data-target-input="nearest">';
-        $field .= '<input name="' . $field_name . '" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker" value="' . date($this->flextype->registry->get('settings.date_format'), strtotime($field_value)) . '" />
-                   <div class="input-group-append" data-target="#datetimepicker" data-toggle="datetimepicker">
-                      <div class="input-group-text"><i class="far fa-calendar-alt"></i></div>
-                   </div>';
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-        $field .= '</div>';
-
-        return $field;
-    }
-
-    /**
-     * _csrfHiddenField
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function _csrfHiddenField() : string
-    {
-        $field  = '<input type="hidden" name="' . $this->flextype['csrf']->getTokenNameKey() . '" value="' . $this->flextype['csrf']->getTokenName() . '">';
-        $field .= '<input type="hidden" name="' . $this->flextype['csrf']->getTokenValueKey() . '" value="' . $this->flextype['csrf']->getTokenValue() . '">';
-
-        return $field;
-    }
-
-    /**
-     * _actionHiddenField
-     *
-     * @return string Returns field
-     *
-     * @access protected
-     */
-    protected function _actionHiddenField() : string
-    {
-        return Form::hidden('action', 'save-form');
-    }
-}
diff --git a/flextype/dependencies.php b/flextype/dependencies.php
index 155be73a..bd1d1e83 100644
--- a/flextype/dependencies.php
+++ b/flextype/dependencies.php
@@ -202,13 +202,6 @@ $flextype['fieldsets'] = static function ($container) use ($flextype) {
     return new Fieldsets($flextype);
 };
 
-/**
- * Add forms service to Flextype container
- */
-$flextype['forms'] = static function ($container) use ($flextype) {
-    return new Forms($flextype);
-};
-
 /**
  * Add snippets service to Flextype container
  */