diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6498108..cd0787b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,36 +1,51 @@
 # Change Log
 
-## 2.0.9
+## [2.1.0]
+- Add support for FormGenerator v3.0.0
+
+## [2.0.9]
 - Fix rollback migrations.
 
-## 2.0.8
+## [2.0.8]
 - Fix migrations dependencies for future UF Version.
 
-## 2.0.7
+## [2.0.7]
 - Fix migrations.
 
-## 2.0.6
+## [2.0.6]
 - New `forProfileFieldsValue` scope (Usage :: `$groups = Group::forProfileFieldsValue($slug, $value);`) and `getProfileFieldsForSlug` custom mutator (Usage :: `$fieldValue = Group::getProfileFieldsForSlug($slug);`) both User and Group custom Models.
 
-## 2.0.5
+## [2.0.5]
 - Update controller from core one
 
-## 2.0.4
+## [2.0.4]
 - Fix db issue with group profile (Need to run new migration)
 
-## 2.0.3
+## [2.0.3]
 - Updated Readme
 - Fix issue with cache
 
-## 2.0.2
+## [2.0.2]
 - Fix issue where field value wound't display in user and group profile
 
-## 2.0.1
+## [2.0.1]
 - Updated FormGenerator dependencies
 
-## 2.0.0
+## [2.0.0]
 - First official release
 - Updated for UserFrosting v4.1.x
 
 ## 0.0.1
 - Initial beta release
+
+[2.1.0]: https://github.com/lcharette/UF_UserProfile/compare/2.0.9...2.1.0
+[2.0.9]: https://github.com/lcharette/UF_UserProfile/compare/2.0.8...2.0.9
+[2.0.8]: https://github.com/lcharette/UF_UserProfile/compare/2.0.7...2.0.8
+[2.0.7]: https://github.com/lcharette/UF_UserProfile/compare/2.0.6...2.0.7
+[2.0.6]: https://github.com/lcharette/UF_UserProfile/compare/2.0.5...2.0.6
+[2.0.5]: https://github.com/lcharette/UF_UserProfile/compare/2.0.4...2.0.5
+[2.0.4]: https://github.com/lcharette/UF_UserProfile/compare/2.0.3...2.0.4
+[2.0.3]: https://github.com/lcharette/UF_UserProfile/compare/2.0.2...2.0.3
+[2.0.2]: https://github.com/lcharette/UF_UserProfile/compare/2.0.1...2.0.2
+[2.0.1]: https://github.com/lcharette/UF_UserProfile/compare/2.0.0...2.0.1
+[2.0.0]: https://github.com/lcharette/UF_UserProfile/compare/0.0.1...2.0.0
diff --git a/README.md b/README.md
index 301b7f1..f7fd1bb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 # Custom User Profile Field Sprinkle for [UserFrosting 4](https://www.userfrosting.com)
 
-[![UserFrosting Version](https://img.shields.io/badge/UserFrosting->=%204.2-brightgreen.svg)](https://github.com/userfrosting/UserFrosting) [![Donate](https://img.shields.io/badge/Donate-Buy%20Me%20a%20Coffee-brightgreen.svg)](https://ko-fi.com/A7052ICP)
+[![Latest Version](https://img.shields.io/github/release/lcharette/UF_UserProfile.svg)](https://github.com/lcharette/UF_UserProfile/releases)
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
+[![UserFrosting Version](https://img.shields.io/badge/UserFrosting->=%204.1-brightgreen.svg)](https://github.com/userfrosting/UserFrosting)
+[![StyleCI](https://github.styleci.io/repos/83981830/shield?branch=master&style=flat)](https://github.styleci.io/repos/83981830)
+[![Donate](https://img.shields.io/badge/Donate-Buy%20Me%20a%20Coffee-blue.svg)](https://ko-fi.com/A7052ICP)
 
 This Sprinkle makes it easy to add any custom fields to the user or group model. Simply create a new schema in you own sprinkle and you're done. Your new profile fields will be automatically integrated in the default UserFrosting interface.
 
diff --git a/composer.json b/composer.json
index 8dc6381..a81cc2d 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.6",
-        "lcharette/uf_formgenerator": "^3.0.0-beta"
+        "lcharette/uf_formgenerator": "^2.1.0 || ^3.0.0"
     },
     "autoload": {
         "psr-4": {