diff --git a/CHANGELOG.md b/CHANGELOG.md
index 986cb9d..6a6b381 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v1.4.0, 2019-06-18
+* Updates for Flextype 0.9.0
+
 # v1.3.1, 2019-01-13
 * Updates for Flextype 0.8.2
 
diff --git a/LICENSE.txt b/LICENSE.txt
index 3f865be..36ddbe3 100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Flextype
+Copyright (c) 2019 Flextype
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 0b7645d..fe8b979 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Sitemap Plugin for [Flextype](http://flextype.org/)
-![version](https://img.shields.io/badge/version-1.3.1-brightgreen.svg?style=flat-square "Version")
-![Flextype](https://img.shields.io/badge/Flextype-0.8.2-green.svg?style=flat-square "Flextype Version")
+![version](https://img.shields.io/badge/version-1.4.0-brightgreen.svg?style=flat-square "Version")
+![Flextype](https://img.shields.io/badge/Flextype-0.9.0-green.svg?style=flat-square "Flextype Version")
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/flextype-plugins/tiny-url/blob/master/LICENSE.txt)
 
 Sitemap plugin provide automatically generated XML sitemap for Flextype.
@@ -9,9 +9,12 @@ Sitemap plugin provide automatically generated XML sitemap for Flextype.
 Unzip plugin to the folder `/site/plugins/`
 
 ## Settings
+enabled: true or false to disable the plugin
 
-```yaml
-enabled: true # or `false` to disable the plugin
+```json
+{
+    "enabled": true
+}
 ```
 
 ## License
diff --git a/languages/en.yaml b/languages/en.yaml
deleted file mode 100755
index 7af0d0d..0000000
--- a/languages/en.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-sitemap: "Sitemap"
-sitemap_description: "Sitemap plugin provide automatically generated XML sitemap for Flextype."
diff --git a/languages/ru.yaml b/languages/ru.yaml
deleted file mode 100755
index 7af0d0d..0000000
--- a/languages/ru.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-sitemap: "Sitemap"
-sitemap_description: "Sitemap plugin provide automatically generated XML sitemap for Flextype."
diff --git a/settings.yaml b/settings.yaml
deleted file mode 100755
index d4ca941..0000000
--- a/settings.yaml
+++ /dev/null
@@ -1 +0,0 @@
-enabled: true
diff --git a/sitemap.php b/sitemap.php
deleted file mode 100755
index 30341a3..0000000
--- a/sitemap.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Flextype;
-
-/**
- *
- * Flextype Sitemap Plugin
- *
- * @author Romanenko Sergey / Awilum <awilum@yandex.ru>
- * @link http://flextype.org
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Flextype\Component\Event\Event;
-use Flextype\Component\Http\Http;
-use Flextype\Component\Arr\Arr;
-
-//
-// Add listner for onCurrentPageAfterProcessed event
-//
-Event::addListener('onCurrentEntryBeforeLoaded', function () {
-    if (Http::getUriSegment(0) == 'sitemap.xml') {
-        Http::setResponseStatus(200);
-        Http::setRequestHeaders('Content-Type: text/xml; charset=utf-8');
-
-        foreach (Entries::getEntries('', 'date', 'DESC', null, null, true) as $entry) {
-            if ($entry['slug'] !== '404' && !(isset($entry['visibility']) && ($entry['visibility'] === 'draft' || $entry['visibility'] === 'hidden'))) {
-                $entries[] = $entry;
-            }
-        }
-
-        Themes::view('sitemap/views/sitemap')
-            ->assign('entries', $entries)
-            ->display();
-
-        Http::requestShutdown();
-    }
-});
diff --git a/sitemap.yaml b/sitemap.yaml
deleted file mode 100755
index 2171947..0000000
--- a/sitemap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Sitemap
-version: 1.3.0
-description: "Provide automatically generated XML sitemap."
-author:
-  name: Sergey Romanenko
-  email: awilum@yandex.ru
-  url: http://flextype.org
-homepage: https://github.com/flextype-plugins/sitemap
-bugs: https://github.com/flextype-plugins/sitemap/issues
-license: MIT
diff --git a/views/sitemap.php b/views/sitemap.php
deleted file mode 100755
index ef0a34a..0000000
--- a/views/sitemap.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?= '<?xml version="1.0" encoding="UTF-8"?>'."\n"; ?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<?php foreach($entries as $entry): ?>
-<url>
-<loc><?= $entry['url'] ?></loc>
-<lastmod><?= $entry['date'] ?></lastmod>
-<changefreq><?= $entry['changefreq'] ?? '1.0' ?></changefreq>
-<priority>1.0</priority>
-</url>
-<?php endforeach ?>
-</urlset>