diff --git a/Changelog.md b/Changelog.md
new file mode 100644
index 0000000..60cd808
--- /dev/null
+++ b/Changelog.md
@@ -0,0 +1,11 @@
+# Changelog
+
+## Update in 2.0.0
+
+### General
+1 - Moved from HTML4J back to Swing.
+
+### Fixes
+1 - [#3](https://github.com/Chris2011/NbScratchFile/issues/3): Dialog shrinks when typing, outer box doesn't.
+2 - [#16](https://github.com/Chris2011/NbScratchFile/issues/16): Doesn't create folder anymore.
+3 - [#24](https://github.com/Chris2011/NbScratchFile/issues/24): Input field is not empty after choosing an extension.
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
index 094461b..810ec6c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,25 +1,43 @@
-# Scratch Files for Netbeans (Required JDK 8 > 1.8.0_122 - #1)
-
-# ATM there is no support for JDK >= 9, yet. I'm working on it.
-
-### With this plugin you can create scratch files which will be saved on disk. You don't need a project for this. After typing `Ctrl + Alt + Shift + N` you can choose a language and the file will be saved to your user dir: `/userDir/.netbeans/scratches`
-
-The idea came up while using Sublime Text 2, where you can type `Ctrl + N` to creates an empty file.
-This is really simple, it will open a new tab with a Untitled file. Nothins special.
-
-IntelliJ has a similar but more powerful functionalty too: IntelliJ IDEA 14 eap 138.2210 brings scratch files....
-
-So my plugin is more like the IntelliJ functionaliy, because you will choose the target language after hitting `Ctrl + Shift + Alt + N` and it will open and automatically
-save the file to your user `/userDir/.netbeans/scratches`. You can see all the saved scratches as nodes at `Services -> Scratches`
-
-## Screenshots
-### `File -> New Scratch File` or `Ctrl + Alt + Shift + N`
-![Alt text](/screenshots/NbScratchFile.jpg?raw=true)
-
-
-### Choose target language
-![Alt text](/screenshots/ChooseLanguage.gif?raw=true)
-
-
-### Service node integration
-![Alt text](/screenshots/ServiceNodeIntegration.gif?raw=true)
+# NbScratchFile
+
+![License](https://img.shields.io/github/license/Chris2011/NbScratchFile.svg)
+![Release](https://img.shields.io/github/release/Chris2011/NbScratchFile.svg)
+![Contributors](https://img.shields.io/github/contributors/chris2011/NbScratchFile.svg)
+![Downloads](https://img.shields.io/github/downloads/chris2011/NbScratchFile/total.svg)
+
+
+## Description
+
+With this plugin you can create scratch files which will be saved on disk. You don't need a project for this. After typing `Ctrl + Alt + Shift + N` you can choose a language and the file will be saved to your user dir: `/userDir/.netbeans/scratches`
+
+The idea came up while using Sublime Text 2, where you can type `Ctrl + N` to creates an empty file.
+This is really simple, it will open a new tab with a Untitled file. Nothins special.
+
+IntelliJ has a similar but more powerful functionalty too: IntelliJ IDEA 14 eap 138.2210 brings scratch files....
+
+So my plugin is more like the IntelliJ functionaliy, because you will choose the target language after hitting `Ctrl + Shift + Alt + N` and it will open and automatically
+save the file to your user `/userDir/.netbeans/scratches`. You can see all the saved scratches as nodes at `Services -> Scratches`
+
+
+## Screenshots
+
+### `File -> New Scratch File` or `Ctrl + Alt + Shift + N`
+![Alt text](/screenshots/NbScratchFile.jpg?raw=true)
+
+
+### Choose target language
+![Alt text](/screenshots/ChooseLanguage.gif?raw=true)
+
+
+### Service node integration
+![Alt text](/screenshots/ServiceNodeIntegration.gif?raw=true)
+
+
+## Changelog
+
+See [Changelog](./Changelog.md) for all information
+
+
+## NetBeans Compatibility
+
+Version >= 2.0.0 is compatible to Apache NetBeans >= 9.0
\ No newline at end of file