diff --git a/CHANGELOG.md b/CHANGELOG.md
index db5054d..f9a7c8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
 ## [Unreleased]
+## [0.3.6] - 2020-05-18
 ### Changed
+- Updated file icons
 - Corrected `change-notes` section to store changes only for the latest version of the plugin
 
 ## [0.3.5] - 2020-05-13
@@ -73,7 +75,8 @@ and this project adheres to [Semantic Versioning](http://semver.org).
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/zephir-lang/idea-plugin/compare/0.3.5...HEAD
+[Unreleased]: https://github.com/zephir-lang/idea-plugin/compare/0.3.6...HEAD
+[0.3.6]: https://github.com/zephir-lang/idea-plugin/compare/0.3.5...0.3.6
 [0.3.5]: https://github.com/zephir-lang/idea-plugin/compare/0.3.4...0.3.5
 [0.3.4]: https://github.com/zephir-lang/idea-plugin/compare/0.3.3...0.3.4
 [0.3.3]: https://github.com/zephir-lang/idea-plugin/compare/0.3.2...0.3.3
diff --git a/README.md b/README.md
index 20f7304..8cd713c 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,19 @@
 # Zephir plugin for the IntelliJ Platform
 
-Provides [Zephir language][zephir-lang] support for IntelliJ IDEs.
+A IntelliJ plugin for editing [Zephir][zephir-lang] code. Provides syntax
+definition, autocompletion and syntax check support.
+
+Zephir is a high level programming language that eases the creation and
+maintainability of extensions for PHP. Zephir extensions are exported to C code
+that can be compiled and optimized by major C compilers such as gcc/clang/vc++.
+Functionality is exposed to the PHP language.
 
 ## Highlighted Features
 
-- Syntax highlighting for Zephir
-- Base autocompletion support
-- Base syntax check support
+- Syntax highlighting
+- Basic syntax definition
+- Basic autocompletion support
+- Basic syntax check support
 
 ## Install
 
@@ -23,8 +30,8 @@ missing functionality that you would want to see. Check out
 
 ## Links
 
-- [Zephir Language](https://docs.zephir-lang.com)
-- [Plugin page](http://plugins.jetbrains.com/plugin/7558)
+- [Zephir Language][zephir-lang]
+- [Plugin page][plugin-page]
 
 ## License
 
@@ -33,3 +40,4 @@ Copyright (c) 2014-2020 Zephir Team.
 Licensed under the [MIT](./LICENSE) License.
 
 [zephir-lang]: https://zephir-lang.com/en
+[plugin-page]: http://plugins.jetbrains.com/plugin/7558
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index a4ddacb..bddb090 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin url="https://github.com/zephir-lang/idea-plugin">
   <id>com.zephir</id>
   <name>Zephir</name>
-  <version>0.3.5</version>
+  <version>0.3.6</version>
   <vendor email="team@zephir-lang.com" url="https://zephir-lang.com">Zephir Team</vendor>
 
   <description><![CDATA[
@@ -20,18 +20,18 @@
 
     <h2>Highlighted Features</h2>
     <ul>
-      <li>Syntax highlighting for Zephir</li>
-      <li>Base autocompletion support</li>
-      <li>Base syntax check support</li>
+      <li>Syntax highlighting</li>
+      <li>Basic syntax definition</li>
+      <li>Basic autocompletion support</li>
+      <li>Basic syntax check support</li>
     </ul>
     ]]></description>
 
   <change-notes><![CDATA[
-    <b>Changes in version 0.4.0:</b>
+    <b>Changes in version 0.3.6:</b>
     <ul>
-      <li>
-        Corrected <code>change-notes</code> section to store changes only for the latest version of the plugin
-      </li>
+      <li>Updated file icons</li>
+      <li>Corrected <code>change-notes</code> section to store changes only for the latest version of the plugin</li>
     </ul>
     <p>
       To see full list of changes to this plugin refer to