diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c867ef4fa5a7a29b332f7b171ff791e07571d38..f8bf3f3ba96f9cb15680ba52eb982625599c7293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,49 @@
 # Changelog
 
+## 0.3.0
+
+### General
+
+- Added support for string values in Tailwind's `important` option (#96)
+- Removed all unnecessary logs (#91)
+- Added support for components in addition to utilities (#67)
+- Added description to custom variant completion items where possible
+- Config parsing errors are now displayed in the VS Code UI
+- Class names from `@tailwind base` are now included (by default `@tailwind base` does not include any class names but plugins may contribute them)
+- Color swatches can now be displayed for rules with multiple properties and/or colors with variable alpha (#113)
+- Added `tailwindCSS.includeLanguages` setting:
+  ```json
+  {
+    "tailwindCSS.includeLanguages": {
+      "plaintext": "html"
+    }
+  }
+  ```
+  This setting allows you to add additional language support. The key of each entry is the new language ID and the value is any one of the extensions built-in languages, depending on how you want the new language to be treated (e.g. `html`, `css`, or `javascript`)
+
+### HTML
+
+- Added built-in support for `liquid`, `aspnetcorerazor`, `mustache`, `HTML (EEx)`, `html-eex`, `gohtml`, `GoHTML`, and `hbs` languages
+- Added syntax definition to embedded stylesheets in HTML files
+
+### CSS
+
+- Added built-in support for `sugarss` language
+- Added `theme` (and `config`) helper hovers
+- Added `@apply` class name hovers
+- Added directive completion items with links to documentation
+- Added `@tailwind` completion items (`preflight`/`base`, `utilities`, `components`, `screens`) with links to documentation
+- Helper completion items that contain the `.` character will now insert square brackets when selected
+- `@apply` completion list now excludes class names that are not compatible
+- Added CSS syntax highlighting in `.vue` files (#15)
+
+### JS(X)
+
+- Completions now trigger when using backticks (#50, #93):
+  ```js
+  const App = () => <div className={`_
+  ```
+
 ## 0.2.0
 
 - Support for Tailwind v1 via LSP 🎉

diff --git a/README.md b/README.md
index f766281b17269168b2bfc6fd931b1652b0f3e241..d6ae5f1cc0edbeeb4c14c25727806c82d316a947 100644
--- a/README.md
+++ b/README.md
@@ -21,10 +21,11 @@ - [CSS preview when hovering over class names](#css-preview-when-hovering-over-class-names)
 
 ### CSS
 
-- [Suggestions when using `@apply` and `config()`](#suggestions-when-using-apply-and-config)
+- [Suggestions when using `@apply` and config helpers](#suggestions-when-using-apply-and-config)
 - Suggestions when using the `@screen` directive
+- Suggestions when using the `@variants` directive
+> [Tailwind CSS](https://tailwindcss.com/) class name completion for VS Code
 # Tailwind CSS IntelliSense
-Tailwind CSS IntelliSense uses your projects Tailwind installation and configuration to provide suggestions as you type.
 
 ## Examples
 
@@ -36,12 +37,12 @@ #### CSS preview when hovering over class names
 
 <img src="https://raw.githubusercontent.com/bradlc/vscode-tailwindcss/master/img/html-hover.gif" alt="HTML hover preview" width="750">
 
-
+> [Tailwind CSS](https://tailwindcss.com/) class name completion for VS Code
 
 
 <img src="https://raw.githubusercontent.com/bradlc/vscode-tailwindcss/master/img/css.gif" alt="CSS autocompletion" width="750">
 
-#### Improves syntax highlighting when using `@apply` and `config()`
+#### Improves syntax highlighting when using `@apply` and config helpers
 
 Before:
 
@@ -50,3 +51,27 @@
 After:
 
 <img src="https://raw.githubusercontent.com/bradlc/vscode-tailwindcss/master/img/css-highlighting-after.png" alt="CSS syntax highlighting after" width="400">
+
+## Settings
+
+### `tailwindCSS.includeLanguages`
+
+This setting allows you to add additional language support. The key of each entry is the new language ID and the value is any one of the extensions built-in languages, depending on how you want the new language to be treated (e.g. `html`, `css`, or `javascript`):
+
+```json
+{
+  "tailwindCSS.includeLanguages": {
+    "plaintext": "html"
+  }
+}
+```
+
+### `tailwindcss.emmetCompletions`
+
+Enable completions when using [Emmet](https://emmet.io/)-style syntax, for example `div.bg-red-500.uppercase`. Default: `false`
+
+```json
+{
+  "tailwindCSS.emmetCompletions": true
+}
+```