diff --git a/CHANGELOG.md b/CHANGELOG.md
index 222afc9..1b25214 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+<a name="1.11.0"></a>
+# [1.11.0](https://github.com/flextype-plugins/form/compare/v1.10.1...v1.11.0) (2021-01-14)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.16
+
+### Bug Fixes
+
+* **fields** fix select_media field
+* **fields** fix select_template field
+
 <a name="1.10.1"></a>
 # [1.10.1](https://github.com/flextype-plugins/form/compare/v1.10.0...v1.10.1) (2021-01-07)
 
diff --git a/README.md b/README.md
index 96f151e..783cdd5 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">Form Plugin for <a href="https://flextype.org/">Flextype</a></h1>
 
 <p align="center">
-<a href="https://github.com/flextype-plugins/form/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/form.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/form"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/form"><img src="https://img.shields.io/github/downloads/flextype-plugins/form/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.15-green.svg?color=black" alt="Flextype"></a> <a href="https://scrutinizer-ci.com/g/flextype-plugins/form?branch=dev&color=black"><img src="https://img.shields.io/scrutinizer/g/flextype-plugins/form.svg?branch=dev" alt="Quality Score"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+<a href="https://github.com/flextype-plugins/form/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/form.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/form"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/form"><img src="https://img.shields.io/github/downloads/flextype-plugins/form/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.16-green.svg?color=black" alt="Flextype"></a> <a href="https://scrutinizer-ci.com/g/flextype-plugins/form?branch=dev&color=black"><img src="https://img.shields.io/scrutinizer/g/flextype-plugins/form.svg?branch=dev" alt="Quality Score"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
 </p>
 
 Form Plugin to render user forms for Flextype.
@@ -12,7 +12,7 @@ The following dependencies need to be installed for Form Plugin.
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.15 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.16 | [download](https://github.com/flextype/flextype/releases) |
 | [twig](https://github.com/flextype-plugins/twig) | >=2.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 | [jquery](https://github.com/flextype-plugins/jquery) | >=1.0.0 | [download](https://github.com/flextype-plugins/jquery/releases) |
 
@@ -428,7 +428,9 @@ form:
 ```yaml
 title: Default
 default_field: title
-icon: 'far fa-file-alt'
+icon:
+  name: "file-alt"
+  set: "fontawesome|solid"
 size: 12
 form:
   name: default
diff --git a/fieldsets/fields/select_media/field.html b/fieldsets/fields/select_media/field.html
index c370d72..033893b 100644
--- a/fieldsets/fields/select_media/field.html
+++ b/fieldsets/fields/select_media/field.html
@@ -1,10 +1,10 @@
-{% set media_files = filesystem().find().in(PATH_PROJECT ~ '/media/entries/' ~ query.id ~ '/').files() %}
+{% set media_files = filesystem().find().depth(0).in(PATH_PROJECT ~ '/media/entries/' ~ query.id ~ '/').files() %}
 <div class="form-group {% if properties.size %}{{ sizes[properties.size] }}{% else %}{{ sizes[12] }}{% endif %}">
     <label for="{{ field_id }}" class="form-control-title">{{ tr(properties.title) }}</label>
     <select class="form-control {{ properties.class }} js-select-media" name="{{ field_name }}">
         {% for media_file in media_files %}
-            {% if media_file.extension in flextype.registry.get('plugins.admin.settings.entries.media.accept_file_types') %}
-                <option value="{{ media_file.filename }}" {% if media_file.basename == field_value %} selected="selected" {% endif %}>{{ media_file.filename }}</option>
+            {% if media_file.getExtension() in flextype.registry.get('plugins.admin.settings.entries.media.accept_file_types') %}
+                <option value="{{ media_file.getFilename() }}" {% if media_file.getFilename() == field_value %} selected="selected" {% endif %}>{{ query.id ~ '/' ~ media_file.getFilename() }}</option>
             {% endif %}
         {% endfor %}
     </select>
diff --git a/fieldsets/fields/select_template/field.html b/fieldsets/fields/select_template/field.html
index 5486b56..a8510af 100644
--- a/fieldsets/fields/select_template/field.html
+++ b/fieldsets/fields/select_template/field.html
@@ -1,10 +1,10 @@
-{% set templates = filesystem().find().in(PATH_PROJECT ~ '/themes/' ~ flextype.registry.get('plugins.site.settings.theme') ~ '/templates/').files() %}
+{% set templates = filesystem().find().depth(0).in(PATH_PROJECT ~ '/themes/' ~ flextype.registry.get('plugins.site.settings.theme') ~ '/templates/').files() %}
 <div class="form-group {% if properties.size %}{{ sizes[properties.size] }}{% else %}{{ sizes[12] }}{% endif %}">
     <label for="{{ field_id }}" class="form-control-title">{{ tr(properties.title) }}</label>
     <select class="form-control {{ properties.class }} js-select-template" name="{{ field_name }}">
         {% for template in templates %}
-            {% if template.extension == 'html'%}
-                <option value="{{ template.basename }}" {% if template.basename == field_value %} selected="selected" {% endif %}>{{ template.basename }}</option>
+            {% if template.getExtension() == 'html'%}
+                <option value="{{ template.getBasename('.html') }}" {% if template.getBasename('.html') == field_value %} selected="selected" {% endif %}>{{ template.getBasename('.html') }}</option>
             {% endif %}
         {% endfor %}
     </select>
diff --git a/package.json b/package.json
index d3947fd..4fbe69b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Form",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "Form Plugin to render user forms for Flextype.",
   "homepage": "https://flextype.org",
   "author": "Sergey Romanenko",
diff --git a/plugin.yaml b/plugin.yaml
index 0de274e..ebb1719 100755
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -1,5 +1,5 @@
 name: Form
-version: 1.10.1
+version: 1.11.0
 description: Form Plugin to render user forms for Flextype.
 icon:
   name: check-circle
@@ -16,6 +16,6 @@ keywords: form, fieldsets
 license: MIT
 
 dependencies:
-  flextype: 0.9.15
+  flextype: 0.9.16
   twig: '>=2.0.0'
   jquery: '>=1.0.0'