diff --git a/docs/CHANGELOG.html b/docs/CHANGELOG.html
index 7cce22d4e..001a75108 100644
--- a/docs/CHANGELOG.html
+++ b/docs/CHANGELOG.html
@@ -1,5 +1,37 @@
+<!--
+  ~  The MIT License (MIT)
+  ~
+  ~  Copyright (c) 2018 Chris Magnussen and Elior Boukhobza
+  ~
+  ~  Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~  of this software and associated documentation files (the "Software"), to deal
+  ~  in the Software without restriction, including without limitation the rights
+  ~  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~  copies of the Software, and to permit persons to whom the Software is
+  ~  furnished to do so, subject to the following conditions:
+  ~
+  ~  The above copyright notice and this permission notice shall be included in all
+  ~  copies or substantial portions of the Software.
+  ~
+  ~  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~  SOFTWARE.
+  ~
+  -->
+
 <h1>Changelog</h1>
-<hr/><h2>2.1.7</h2>
+<hr/><h2>2.2.0</h2>
+<ul>
+    <li><strong>DataGrip</strong> Icons!</li>
+    <li>Solarized Dark and Light color schemes</li>
+    <li>Improve Lighter Theme contrast and texts</li>
+    <li>Improve file colors for Monokai and Solarized</li>
+    <li>Extract ActionButtons into their own component</li>
+</ul><h2>2.1.7</h2>
 <ul>
     <li>Fix command line icons</li>
     <li>Reenable Darcula components when Material Components are disabled</li>
@@ -16,8 +48,7 @@ <h1>Changelog</h1>
 </ul><h2>2.1.5</h2>
 <ul>
     <li>New Component: Material NavBar</li>
-    <li>Set folder associations just like <a href="https://github.com/PKief/vscode-material-icon-theme">Material Icons
-        VSCode</a></li>
+    <li>Set folder associations just like <a href="https://github.com/PKief/vscode-material-icon-theme">Material Icons VSCode</a></li>
     <li>Center not centered folder icons</li>
     <li>Fix Action Combobox for Lighter Themes</li>
 </ul><h2>2.1.4</h2>
@@ -35,36 +66,62 @@ <h1>Changelog</h1>
 </ul><h2>2.1.1</h2>
 <ul>
     <li>Bug fixes and performance improvements</li>
-</ul><h2>2.1.0</h2><p>FEATURES: - New Themes: <strong>Solarized Dark and Light</strong>!</p><p>FIXES: - Fix issue with
-    Bundled Themes not being persisted - Set Arrows Color to be the same as the folder color - Add new darcula Button
-    resources to the Abstract Theme</p><p>CHORE: - Rename "Inactive Resources" to "Button Resources"</p><h2>2.0.0</h2>
-<p>FEATURES: - Complete rewrite of the Theming System! Now all themes inherit from the same parent class which defines
-    which resources get which color. Maintaining themes will be a lot easier! - <strong>Plugin extension</strong> to
-    allow plugin developers to add their own themes to the Material Theme plugin! It's still in beta but some examples
-    will be available shortly. - The caret is now an <strong>accent color</strong> resource. - The Arrows Style applies
-    now to menus as well - RubyMine icons for Ruby/Rails folders and actions.</p><p>FIXES: - Remove the "Button
-    Highlight color" and "Caret" property from Custom Themes - Checkboxes and RadioButtons are now a bit better. -
-    TabbedPanes and TextArea are now using the MaterialTheme namespace. - Fix the Black Line separating tool windows
-    from the editor - Fix the search inside lists and menus - Improvements to the themes - Bug fixes and
-    improvements.</p><p>Please note that this is a beta version, it is now entering the test phase and might contain
-    bugs.</p><h2>1.8.2</h2><p>FEATURES: - Add Non-Project Files default color to the current theme's disabled color -
-    New <strong>Material Toggle Button UI</strong> - Fix breadcrumb and parameter hint colors to their relevant theme
-    colors - Add a specific accent color for each color scheme: - Oceanic: Teal - Darker: Orange - Lighter: Indigo -
-    Palenight: Amethyst - Monokai: Lime - One Dark: Gold</p><p>FIXES: - Fix <strong>performance issues</strong> by
-    removing unused code and refactoring <em>Monochrome Icons</em> - Fix tooltip colors</p><p>OTHER: - Installed Test
-    framework</p><h2>1.8.1</h2><p>FEATURES: - Set Accent color to modified settings - Tool Window header color styles -
-    Add browserslist icon - Add CNAME icon</p><p>FIXES: - Fix Monochrome Icons to cover the whole IDE - Fix TextField UI
-    to include the magnifier for search fields - Fix Font in Text Fields to use the color scheme's font - Fix Action
-    button radius - Brighten primary buttons to be more differentiable - Change React default icon</p><p>OTHER: - Add
-    Acknowledgements in the documentation - Add new url for the documentation: www.material-theme.com</p><h2>1.8.0</h2>
-<p>FEATURES: - Add different angular icons by type: service, component, directive, pipe and routing - Add postcssrc and
-    postcssconfig icons - New feature: <strong>Compact Dropdowns</strong>. Reduce the size of dropdowns and their items.
-    - New feature: <strong>Monochrome Icons</strong>. Now you can decide to have icons desaturated with the color of the
-    current theme - New feature: <strong>Active tab highlighting</strong> for Lighter themes! - New feature: <strong>Tab
-        Opacity</strong>: allow to customize the opacity of the coloring of inactive tabs. - New feature: <strong>Uppercase
-        buttons</strong> - Theme dialog title color when inactive - Go to the documentation from the settings' help
-    buttons</p><p>FIXES: - Fix Tooltips color - Fix Accent scrollbars on Mac - Replace many UI Icons for the nodes - Fix
-    issues with Palenight theme - Fix and replace Option Button</p><h2>1.7.0.4</h2>
+</ul><h2>2.1.0</h2><p>FEATURES: - New Themes: <strong>Solarized Dark and Light</strong>!</p><p>FIXES: - Fix issue with Bundled Themes not
+                                                                                               being persisted - Set Arrows Color to be the
+                                                                                               same as the folder color - Add new darcula
+                                                                                               Button resources to the Abstract Theme</p><p>
+    CHORE: - Rename "Inactive Resources" to "Button Resources"</p><h2>2.0.0</h2><p>FEATURES: - Complete rewrite of the Theming System! Now
+                                                                                   all themes inherit from the same parent class which
+                                                                                   defines which resources get which color. Maintaining
+                                                                                   themes will be a lot easier! - <strong>Plugin
+                                                                                                                          extension</strong>
+                                                                                   to allow plugin developers to add their own themes to the
+                                                                                   Material Theme plugin! It's still in beta but some
+                                                                                   examples will be available shortly. - The caret is now an
+    <strong>accent color</strong> resource. - The Arrows Style applies now to menus as well - RubyMine icons for Ruby/Rails folders and
+                                                                                   actions.</p><p>FIXES: - Remove the "Button Highlight
+                                                                                                  color" and "Caret" property from Custom
+                                                                                                  Themes - Checkboxes and RadioButtons are
+                                                                                                  now a bit better. - TabbedPanes and
+                                                                                                  TextArea are now using the MaterialTheme
+                                                                                                  namespace. - Fix the Black Line separating
+                                                                                                  tool windows from the editor - Fix the
+                                                                                                  search inside lists and menus -
+                                                                                                  Improvements to the themes - Bug fixes and
+                                                                                                  improvements.</p><p>Please note that this
+                                                                                                                      is a beta version, it
+                                                                                                                      is now entering the
+                                                                                                                      test phase and might
+                                                                                                                      contain bugs.</p><h2>
+    1.8.2</h2><p>FEATURES: - Add Non-Project Files default color to the current theme's disabled color - New <strong>Material Toggle Button
+                                                                                                                     UI</strong> - Fix
+                 breadcrumb and parameter hint colors to their relevant theme colors - Add a specific accent color for each color scheme: -
+                 Oceanic: Teal - Darker: Orange - Lighter: Indigo - Palenight: Amethyst - Monokai: Lime - One Dark: Gold</p><p>FIXES: - Fix
+    <strong>performance issues</strong> by removing unused code and refactoring <em>Monochrome Icons</em> - Fix tooltip colors</p><p>OTHER:
+                                                                                                                                     -
+                                                                                                                                     Installed
+                                                                                                                                     Test
+                                                                                                                                     framework</p>
+<h2>1.8.1</h2><p>FEATURES: - Set Accent color to modified settings - Tool Window header color styles - Add browserslist icon - Add CNAME
+                 icon</p><p>FIXES: - Fix Monochrome Icons to cover the whole IDE - Fix TextField UI to include the magnifier for search
+                            fields - Fix Font in Text Fields to use the color scheme's font - Fix Action button radius - Brighten primary
+                            buttons to be more differentiable - Change React default icon</p><p>OTHER: - Add Acknowledgements in the
+                                                                                                documentation - Add new url for the
+                                                                                                documentation: www.material-theme.com</p>
+<h2>1.8.0</h2><p>FEATURES: - Add different angular icons by type: service, component, directive, pipe and routing - Add postcssrc and
+                 postcssconfig icons - New feature: <strong>Compact Dropdowns</strong>. Reduce the size of dropdowns and their items. - New
+                 feature: <strong>Monochrome Icons</strong>. Now you can decide to have icons desaturated with the color of the current
+                 theme - New feature: <strong>Active tab highlighting</strong> for Lighter themes! - New feature: <strong>Tab
+                                                                                                                          Opacity</strong>:
+                 allow to customize the opacity of the coloring of inactive tabs. - New feature: <strong>Uppercase buttons</strong> - Theme
+                 dialog title color when inactive - Go to the documentation from the settings' help buttons</p><p>FIXES: - Fix Tooltips
+                                                                                                                  color - Fix Accent
+                                                                                                                  scrollbars on Mac -
+                                                                                                                  Replace many UI Icons for
+                                                                                                                  the nodes - Fix issues
+                                                                                                                  with Palenight theme - Fix
+                                                                                                                  and replace Option
+                                                                                                                  Button</p><h2>1.7.0.4</h2>
 <ul>
     <li>Fix Notifications</li>
     <li>Fix tooltip colors</li>
@@ -103,19 +160,18 @@ <h1>Changelog</h1>
     <li>Fix RVM, NVM, cmd, README, Adobe Elements and InDesign associations</li>
 </ul><h2>1.6.0</h2>
 <ul>
-    <li>Fix <strong>Theme Switching requiring to restart the IDE</strong>. Now switching is becoming as easy as pie!
-    </li>
+    <li>Fix <strong>Theme Switching requiring to restart the IDE</strong>. Now switching is becoming as easy as pie!</li>
     <li>New feature: <strong>Windows Title Bar Theming</strong>.
         <ul>
-            <li><strong>Note</strong>: this changes the color of the title bar OS-wide, meaning that even after closing
-                the IDE the color will still be set. (see
-                https://www.howtogeek.com/222831/how-to-get-colored-window-title-bars-on-windows-10-instead-of-white/)
-                for setting it.
+            <li><strong>Note</strong>: this changes the color of the title bar OS-wide, meaning that even after closing the IDE the color
+                                     will still be set. (see
+                                     https://www.howtogeek.com/222831/how-to-get-colored-window-title-bars-on-windows-10-instead-of-white/)
+                                     for setting it.
             </li>
         </ul>
     </li>
-    <li>Added more other file icons: Atom, Appveyor, Bean, Cabal, Compass, Doxygen, Dylib, Ghostscript, Github, Jquery,
-        JS Minified, Makefile, Manpage, Nib, Godot, Openoffice, Patch, Phalcon, Redme
+    <li>Added more other file icons: Atom, Appveyor, Bean, Cabal, Compass, Doxygen, Dylib, Ghostscript, Github, Jquery, JS Minified,
+        Makefile, Manpage, Nib, Godot, Openoffice, Patch, Phalcon, Redme
     </li>
     <li>Fix the inactive selection background color in trees</li>
     <li>Fix Status Bar Indicator height in HiDPi screens</li>
@@ -123,22 +179,21 @@ <h1>Changelog</h1>
 </ul><h2>1.5.4</h2>
 <ul>
     <li>Change color of unfocused tree elements</li>
-    <li>New file icons for: Autohotkey, API Blueprint, MACOSX, Jekyll, Mathematica, ReasonML, RestructuredText, Maven,
-        ObjectiveC, Spring, Tomcat, Test Ruby and VHDL.
+    <li>New file icons for: Autohotkey, API Blueprint, MACOSX, Jekyll, Mathematica, ReasonML, RestructuredText, Maven, ObjectiveC, Spring,
+        Tomcat, Test Ruby and VHDL.
     </li>
     <li>Try to fix issue with createResolvedStylesheet by loading the Darcula default properties</li>
 </ul><h2>1.5.3</h2>
 <ul>
     <li>Custom Notification Colors for the Custom Themes</li>
     <li>Change default colors of Notifications to Contrast Color</li>
-    <li>Revert the buggy fix of the Tool Window Header (also known as the ToolWindowHeader hack) and add a new action
-        "Patch Tool Window Header" to approve the hack of the Window Header
-        (https://github.com/ChrisRM/material-theme-jetbrains/issues/548)
+    <li>Revert the buggy fix of the Tool Window Header (also known as the ToolWindowHeader hack) and add a new action "Patch Tool Window
+        Header" to approve the hack of the Window Header (https://github.com/ChrisRM/material-theme-jetbrains/issues/548)
     </li>
 </ul><h2>1.5.2.2</h2>
 <ul>
-    <li>Better Buttons (closes <a href="https://github.com/ChrisRM/material-theme-jetbrains/issues/561">#561</a> and <a
-        href="https://github.com/ChrisRM/material-theme-jetbrains/issues/562">#562</a>)
+    <li>Better Buttons (closes <a href="https://github.com/ChrisRM/material-theme-jetbrains/issues/561">#561</a> and
+        <a href="https://github.com/ChrisRM/material-theme-jetbrains/issues/562">#562</a>)
     </li>
 </ul><h2>1.5.2</h2>
 <ul>
@@ -173,9 +228,7 @@ <h1>Changelog</h1>
 <ul>
     <li>Add new option to select the style of arrows in trees</li>
     <li>Restore Bold directories</li>
-    <li>Fix https://github.com/ChrisRM/material-theme-jetbrains/issues/540 by setting a lighter selection background
-        color on refactor
-    </li>
+    <li>Fix https://github.com/ChrisRM/material-theme-jetbrains/issues/540 by setting a lighter selection background color on refactor</li>
 </ul><h2>1.4.3</h2>
 <ul>
     <li>Add setting for Dark title bar</li>
@@ -203,9 +256,7 @@ <h1>Changelog</h1>
     <li>Better File Status Colors by making use of Darcula/IntelliJ color scheme instead like VCS file colors</li>
 </ul><h2>1.3.8</h2>
 <ul>
-    <li>Use experimental feature to set dark title bar when using dark themes. Only works on latest EAP, but is planned
-        for 2018.X
-    </li>
+    <li>Use experimental feature to set dark title bar when using dark themes. Only works on latest EAP, but is planned for 2018.X</li>
 </ul><h2>1.3.7</h2>
 <ul>
     <li>Fix issue with Android Studio</li>
@@ -240,16 +291,13 @@ <h1>Changelog</h1>
     <li>Deprecating EAP :/</li>
 </ul><h2>1.3.0</h2>
 <ul>
-    <li>New option: <strong>Light Custom Theme</strong>: Use custom colors with IntelliJ Look and Feel. Used for Light
-        themes.
-    </li>
+    <li>New option: <strong>Light Custom Theme</strong>: Use custom colors with IntelliJ Look and Feel. Used for Light themes.</li>
     <li>Fix Custom Themes styling issues.</li>
     <li>Change light themes notification colors.</li>
     <li>Rename Material Default to <strong>Material Oceanic</strong></li>
     <li>Automatically change color scheme when switching themes</li>
     <li>Add alert to reset custom theme colors when switching Look and Feel</li>
-    <li>Change instance fields, static fields and properties colors from Red to White as it is confused with errors.
-    </li>
+    <li>Change instance fields, static fields and properties colors from Red to White as it is confused with errors.</li>
     <li>Add update notifications.</li>
 </ul><h2>1.2.1</h2>
 <ul>
@@ -258,9 +306,7 @@ <h1>Changelog</h1>
 <ul>
     <li>Add new UI Icons for Structure and Web Deployment sections</li>
     <li>New feature: Accent Scrollbars</li>
-    <li>Changed Active Tab Highlight to display Tab File Colors if defined, at the cost of having a transparent
-        overlay
-    </li>
+    <li>Changed Active Tab Highlight to display Tab File Colors if defined, at the cost of having a transparent overlay</li>
     <li>Added Markdown navigator color scheme</li>
     <li>Added Browse Word at Caret plugin colors</li>
     <li>Improve File Colors performance by initializing colors statically (thanks @denofevil)</li>
@@ -275,8 +321,7 @@ <h1>Changelog</h1>
     <li>Travis file icons</li>
 </ul><h2>1.1.0</h2>
 <ul>
-    <li>Adding Resharper Hint and Suggestion Colors, improved Unknown Variable color, Debugger Colors and Link Colors
-    </li>
+    <li>Adding Resharper Hint and Suggestion Colors, improved Unknown Variable color, Debugger Colors and Link Colors</li>
     <li>Updated Lighter scheme default color to be like VSC Lighter Theme</li>
     <li>Improved Lighter Theme Foreground Color</li>
     <li>Fix annotations</li>
@@ -319,8 +364,7 @@ <h1>Changelog</h1>
 </ul><h2>0.10.1</h2>
 <ul>
     <li>Fix issue with module directories taking the default icon in PyCharm</li>
-    <li>Added icons for the theme switcher (thanks @halacoglu https://github.com/halacoglu/sublime-material-icon-pack)
-    </li>
+    <li>Added icons for the theme switcher (thanks @halacoglu https://github.com/halacoglu/sublime-material-icon-pack)</li>
     <li>Rework MTWallpaper Component to fix remaining issues</li>
     <li>Fix accents not being loaded with Material Theme disabled</li>
     <li>Improve Arc Dark Theme</li>
@@ -438,8 +482,8 @@ <h1>Changelog</h1>
 <ul>
     <li>Fix issue with Merge branches window</li>
     <li>Put Material Theme options under "Appearance"</li>
-    <li>Add Actions for Settings: Compact Sidebar, Compact Statusbar, Material Theme, Material Components, Material
-        Icons, Status Bar Indicator and Project View Decorators
+    <li>Add Actions for Settings: Compact Sidebar, Compact Statusbar, Material Theme, Material Components, Material Icons, Status Bar
+        Indicator and Project View Decorators
     </li>
     <li>Add actions for Hide File Icons, Bigger Tabs and set actions as toggles</li>
     <li>Themed Action UI Icons, General UI Icons and Debugger UI Icons</li>
@@ -453,14 +497,19 @@ <h1>Changelog</h1>
     <li>Fix issue with caret (#379)</li>
     <li>Add docker compose yaml association (thanks @thaffenden)</li>
     <li>Other fixes</li>
-</ul><h2>0.5.2</h2><p>Fix many issues related to Lighter theme: - Breakpoint colors - Autocomplete - Tree colors -
-    Notifications color - Progress bar - Memory indicator - Scrollbars - Also removed None theme since we can simply
-    uncheck the option in the settings</p><h2>0.5.1</h2><p>Small update so I can have feedback about possible bugs -
-    Material Headers (experimental)</p><h2>0.5.0</h2><p>This version is more focused on the UI: - Themed Scrollbars -
-    Material Table Headers - Material Inputs (not applicable everywhere at the moment) - Material Passwords (with option
-    of showing passwords) - Material Tabs - Add option to disable Material Theme only (leaving components, tabs and
-    other options on) - Tab Height customizable - Notification colors - Custom Tree Indents - Better Dialog titles -
-    More UI Icons - Bug fixes (and possibly improvements)</p><h2>0.4.4</h2>
+</ul><h2>0.5.2</h2><p>Fix many issues related to Lighter theme: - Breakpoint colors - Autocomplete - Tree colors - Notifications color -
+                      Progress bar - Memory indicator - Scrollbars - Also removed None theme since we can simply uncheck the option in the
+                      settings</p><h2>0.5.1</h2><p>Small update so I can have feedback about possible bugs - Material Headers
+                                                   (experimental)</p><h2>0.5.0</h2><p>This version is more focused on the UI: - Themed
+                                                                                      Scrollbars - Material Table Headers - Material Inputs
+                                                                                      (not applicable everywhere at the moment) - Material
+                                                                                      Passwords (with option of showing passwords) -
+                                                                                      Material Tabs - Add option to disable Material Theme
+                                                                                      only (leaving components, tabs and other options on) -
+                                                                                      Tab Height customizable - Notification colors - Custom
+                                                                                      Tree Indents - Better Dialog titles - More UI Icons -
+                                                                                      Bug fixes (and possibly improvements)</p><h2>
+    0.4.4</h2>
 <ul>
     <li>Added remaining options to TopHitProvider</li>
     <li>Tinted Icon implementation</li>
@@ -481,8 +530,8 @@ <h1>Changelog</h1>
     <li>Fix bad associations</li>
 </ul><h2>0.4.1</h2>
 <ul>
-    <li>Change behavior of custom wallpaper to not disable the background if the user unchecks the option, allowing to
-        set custom wallpaper with the IDE
+    <li>Change behavior of custom wallpaper to not disable the background if the user unchecks the option, allowing to set custom wallpaper
+        with the IDE
     </li>
     <li>Add Disable option for the current theme indicator in the status bar</li>
     <li>Fix issue with SQLite icon</li>
@@ -499,8 +548,8 @@ <h1>Changelog</h1>
     <li>Fix #92</li>
     <li>Fix: Do not try to replace all icons, if an icon is not provided use Jetbrains one.</li>
     <li>Refactor project: put the selected theme in the MTConfig + better folder structure</li>
-    <li>Add more icons: Access, Word, Powerpoint, Excel, Audio, Video, Elm, Go, Hack, Julia, Pug, Kotlin, Maya, Markup,
-        Premiere, Powershell, Rake, Riot, Stata, Sublime, Vim
+    <li>Add more icons: Access, Word, Powerpoint, Excel, Audio, Video, Elm, Go, Hack, Julia, Pug, Kotlin, Maya, Markup, Premiere,
+        Powershell, Rake, Riot, Stata, Sublime, Vim
     </li>
     <li>Fix PHP + JS Code Schemes</li>
     <li>New: Background image for empty IDE with customization available in options</li>
@@ -525,36 +574,35 @@ <h1>Changelog</h1>
 <ul>
     <li>Fix association for Angular files</li>
     <li>Fix tests</li>
-</ul><h2>0.3.0.0</h2><p>Thanks to @mallowigi for taking the project to the next level. This is all him: - Code coverage
-    colors - Notification, Information and Documentation popups - Fix Python Color schemes - Fix Go Color Schemes - New
-    Python component to take the right file icon - Fix next occurence wrong icon - Restore accidently deleted edit icons
-    - C and CPP color schemes - Add option to set bold tabs - Add toggle options to Search Everything - Change trees
-    collapse and expand icons - Themed IDE icons: Checkout, Project Structure, Back, Forward, History, Up, Down, Step
-    Into, Step Out, Compile, Jars, Library... - Other bug fixes and improvements - Fix button background not taking the
-    full width - Themed Memory Indicator - Add .pcss file icon - Fix Console colors - Align text and menu colors with
-    the original theme - Welcome Screen theming - Progress Bar theming - Striped tables theming - Remove some borders
-    added by Darcula - Focused buttons are now distinguable - Paint new breadcrumbs - Restore plugin.xml icon - Make
-    buttons stand out a bit more anyway - Fix Rider error - Fix Ruby Colors schemes - Add option in the settings to
-    enable/disable the new buttons look - Fix issue with Font Scale on HiDPI screens - Put the active tab higlight on
-    the left instead of the right when choosing Placement left. - Messages bundle for easy replacing texts - New
-    Buttons! Now buttons look even more like the Sublime plugin! - Add simple implementation of disabling the Material
-    Theme (only the colors) - Fix some colors again... - Some colors were lost during the last update. This update
-    should fix them. - Fix custom font issue. - Fix issue with theme switcher when some parts of the UI do not update -
-    (hopefully) fix font apply - Updated color schemes to reflect the Sublime plugin's color schemes - New option:
-    <strong>Contrast mode</strong>. This will allow you to apply a higher contrasted Look and feel - Allow resetting the
-    Active Tab settings with the default ones - Updated file status colors: modified, added, ignored, conflicts... -
-    Replace the "asterisk" icon with an "*edit*" material icon - Set Open and closed folders according to open tabs
-    (still buggy) - Now the active tab indicator is following the user's tabs placement settings! - Started creating
-    settings for customizing the plugin. - Active tab indicator color - Active tab indicator thickness - Fixed issue
-    with tabs in last EAP - Update file icons to use the latest icons from the original Sublime theme repository. -
-    Added a new theme, the <strong>Palenight</strong> theme, that is a violet shade of the Default theme. - Prevent file
-    icons from being assigned to classes, methods, etc. - #285 @mjdetullio - Separate psd icons from the images group -
-    #292 @Freezystem - Set parent scheme for dark themes to Darcula - #289 @vsch - Load MT file icons before anything
-    else - #292 @mallowigi - Fix font overriding - #279 @mallowigi - Context and menu lighter border - #281 - Add file
-    association for <code>.yaml</code> files - #297 @thaffenden - Add Dart icon - #296 @seanjohnite - Add
-    <code>htpasswd</code> to htaccess group - @Freezystem - Add icons for <code>package.json, gruntfile, gulpfile</code>
-    and <code>webpack</code> - @mallowigi - Set better color for Parameter hints - @mallowigi</p><h2>0.2.3</h2><h3>
-    Changed</h3>
+</ul><h2>0.3.0.0</h2><p>Thanks to @mallowigi for taking the project to the next level. This is all him: - Code coverage colors -
+                        Notification, Information and Documentation popups - Fix Python Color schemes - Fix Go Color Schemes - New Python
+                        component to take the right file icon - Fix next occurence wrong icon - Restore accidently deleted edit icons - C
+                        and CPP color schemes - Add option to set bold tabs - Add toggle options to Search Everything - Change trees
+                        collapse and expand icons - Themed IDE icons: Checkout, Project Structure, Back, Forward, History, Up, Down, Step
+                        Into, Step Out, Compile, Jars, Library... - Other bug fixes and improvements - Fix button background not taking the
+                        full width - Themed Memory Indicator - Add .pcss file icon - Fix Console colors - Align text and menu colors with
+                        the original theme - Welcome Screen theming - Progress Bar theming - Striped tables theming - Remove some borders
+                        added by Darcula - Focused buttons are now distinguable - Paint new breadcrumbs - Restore plugin.xml icon - Make
+                        buttons stand out a bit more anyway - Fix Rider error - Fix Ruby Colors schemes - Add option in the settings to
+                        enable/disable the new buttons look - Fix issue with Font Scale on HiDPI screens - Put the active tab higlight on
+                        the left instead of the right when choosing Placement left. - Messages bundle for easy replacing texts - New
+                        Buttons! Now buttons look even more like the Sublime plugin! - Add simple implementation of disabling the Material
+                        Theme (only the colors) - Fix some colors again... - Some colors were lost during the last update. This update
+                        should fix them. - Fix custom font issue. - Fix issue with theme switcher when some parts of the UI do not update -
+                        (hopefully) fix font apply - Updated color schemes to reflect the Sublime plugin's color schemes - New option:
+    <strong>Contrast mode</strong>. This will allow you to apply a higher contrasted Look and feel - Allow resetting the Active Tab settings
+                        with the default ones - Updated file status colors: modified, added, ignored, conflicts... - Replace the "asterisk"
+                        icon with an "*edit*" material icon - Set Open and closed folders according to open tabs (still buggy) - Now the
+                        active tab indicator is following the user's tabs placement settings! - Started creating settings for customizing
+                        the plugin. - Active tab indicator color - Active tab indicator thickness - Fixed issue with tabs in last EAP -
+                        Update file icons to use the latest icons from the original Sublime theme repository. - Added a new theme, the
+    <strong>Palenight</strong> theme, that is a violet shade of the Default theme. - Prevent file icons from being assigned to classes,
+                        methods, etc. - #285 @mjdetullio - Separate psd icons from the images group - #292 @Freezystem - Set parent scheme
+                        for dark themes to Darcula - #289 @vsch - Load MT file icons before anything else - #292 @mallowigi - Fix font
+                        overriding - #279 @mallowigi - Context and menu lighter border - #281 - Add file association for <code>.yaml</code>
+                        files - #297 @thaffenden - Add Dart icon - #296 @seanjohnite - Add <code>htpasswd</code> to htaccess group -
+                        @Freezystem - Add icons for <code>package.json, gruntfile, gulpfile</code> and <code>webpack</code> - @mallowigi -
+                        Set better color for Parameter hints - @mallowigi</p><h2>0.2.3</h2><h3>Changed</h3>
 <ul>
     <li>Updated Gradle wrapper</li>
 </ul><h3>Added</h3>
@@ -574,8 +622,8 @@ <h1>Changelog</h1>
 </ul><h2>0.2.0</h2><h3>Fixed</h3>
 <ul>
     <li>Improved visibility for diffs on default color scheme. Thanks @marvhock - #208</li>
-    <li>Hopefully fixed issue #205, <a href="https://youtrack.jetbrains.com/issue/IDEA-157843">IDEA-157843</a> and <a
-        href="https://youtrack.jetbrains.com/issue/IDEA-156327">IDEA-156327</a></li>
+    <li>Hopefully fixed issue #205, <a href="https://youtrack.jetbrains.com/issue/IDEA-157843">IDEA-157843</a> and
+        <a href="https://youtrack.jetbrains.com/issue/IDEA-156327">IDEA-156327</a></li>
     <li>Merged recent changes made to the platform</li>
 </ul><h3>Added</h3>
 <ul>
@@ -611,4 +659,4 @@ <h1>Changelog</h1>
 </ul><h3>Fixed</h3>
 <ul>
     <li>Fix issues with the color schemes.</li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 53ffa0913..6734ae00a 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 ----
 
+## 2.2.0
+- **DataGrip** Icons!
+- Solarized Dark and Light color schemes
+- Improve Lighter Theme contrast and texts
+- Improve file colors for Monokai and Solarized
+- Extract ActionButtons into their own component
+
 ## 2.1.7
 - Fix command line icons
 - Reenable Darcula components when Material Components are disabled