diff --git a/README.md b/README.md
index 1902019f..2a4eeeec 100644
--- a/README.md
+++ b/README.md
@@ -936,10 +936,10 @@ SOFTWARE.
 [nginxproxymanager-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [nginxproxymanager-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [nginxproxymanager-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-node-red]: https://github.com/hassio-addons/addon-node-red/tree/v8.2.1
-[addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/v8.2.1/README.md
+[addon-node-red]: https://github.com/hassio-addons/addon-node-red/tree/v9.0.0
+[addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/v9.0.0/README.md
 [node-red-issue]: https://github.com/hassio-addons/addon-node-red/issues
-[node-red-version-shield]: https://img.shields.io/badge/version-v8.2.1-blue.svg
+[node-red-version-shield]: https://img.shields.io/badge/version-v9.0.0-blue.svg
 [node-red-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [node-red-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [node-red-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/node-red/CHANGELOG.md b/node-red/CHANGELOG.md
index 47625ba3..15e0ca43 100644
--- a/node-red/CHANGELOG.md
+++ b/node-red/CHANGELOG.md
@@ -1,12 +1,49 @@
 ## What’s changed
 
+⚠️ Breaking change: The `dark_mode` option is now deprecated. Instead, the add-on now provides a `theme` option, that can be used to enable either of 6 different color schemas.
+
+Thanks, @bonanitech for creating those wonderful themes and adding the option to the add-on 👍 
+
+## ✨ New features
+
+- Add support for the theme collection @bonanitech (#970)
+
+## 🐛 Bug fixes
+
+- Fix node-red deployment slug @frenck (#990)
+
+## 🧰 Maintenance
+
+- Apply updated repository structure & CI workflow @frenck (#987)
+- Fix node-red CI slug @frenck (#988)
+
+## 📚 Documentation
+
+- Remove note about secrets, generic feature now @frenck (#974)
+- 📚 Update screenshot link @sinclairpaul (#984)
+
 ## ⬆️ Dependency updates
 
-- ⬆️ Bump node-red-contrib-time-range-switch from 1.0.1 to 1.1.0 in /node-red @dependabot (#944)
-- ⬆️ Bump node-red-dashboard from 2.28.1 to 2.28.2 in /node-red @dependabot (#945)
-- ⬆️ Bump node-red-contrib-sunevents from 3.0.2 to 3.0.3 in /node-red @dependabot (#946)
-- ⬆️ Bump frenck/action-addon-linter from v2.0.0 to v2.1 @dependabot (#947)
-- ⬆️ Upgrades openssh-client to 8.4_p1-r3 @frenck (#951)
-- ⬆️ Upgrades add-on base image to v9.1.6 @frenck (#952)
-- Bump node-red-node-feedparser from 0.2.0 to 0.2.1 in /node-red @dependabot (#949)
-- Bump node-red-node-email from 1.9.0 to 1.10.1 in /node-red @dependabot (#950)
+- Bump ludeeus/action-shellcheck from 1.0.0 to 1.1.0 @dependabot (#953)
+- Bump node-red-node-email from 1.10.1 to 1.10.2 in /node-red @dependabot (#954)
+- Bump node-red-node-email from 1.10.2 to 1.11.0 @dependabot (#955)
+- Bump docker/build-push-action from v2.3.0 to v2.4.0 @dependabot (#959)
+- Bump node-red-contrib-influxdb from 0.5.4 to 0.6.0 in /node-red @dependabot (#957)
+- Bump docker/setup-qemu-action from v1.0.1 to v1.0.2 @dependabot (#962)
+- Bump docker/setup-buildx-action from v1.1.1 to v1.1.2 @dependabot (#963)
+- ⬆️ Upgrades nodejs to 14.16.1-r0 @frenck (#965)
+- ⬆️ Upgrades add-on base image to v9.1.7 @frenck (#966)
+- Bump node-red-node-ping from 0.3.0 to 0.3.1 in /node-red @dependabot (#969)
+- Bump @node-red-contrib-themes/midnight-red from 1.4.7 to 1.5.0 in /node-red @dependabot (#967)
+- Bump node-red from 1.2.9 to 1.3.1 in /node-red @dependabot (#968)
+- ⬆️ Upgrades nodejs to 14.16.1-r1 @frenck (#975)
+- Bump node-red-contrib-modbus from 5.13.3 to 5.14.0 in /node-red @dependabot (#976)
+- Bump actions/cache from v2.1.4 to v2.1.5 @dependabot (#977)
+- Bump node-red from 1.3.1 to 1.3.2 @dependabot (#978)
+- Bump js-yaml from 4.0.0 to 4.1.0 in /node-red @dependabot (#979)
+- Bump node-red-node-email from 1.11.0 to 1.12.0 in /node-red @dependabot (#980)
+- Bump brpaz/hadolint-action from v1.3.1 to v1.4.0 @dependabot (#981)
+- Bump node-red-contrib-bigtimer from 2.7.3 to 2.7.5 in /node-red @dependabot (#985)
+- Upgrades add-on base image to v9.2.0 @frenck (#986)
+- ⬆️ Upgrades Node-RED to v1.3.3 @frenck (#989)
+- Bump @node-red-contrib-themes/theme-collection from 1.0.0 to 1.0.1 @bonanitech (#991)
diff --git a/node-red/DOCS.md b/node-red/DOCS.md
index 3ef6961b..d2a146a6 100644
--- a/node-red/DOCS.md
+++ b/node-red/DOCS.md
@@ -110,15 +110,16 @@ You might need it in the future! (e.g., When restoring a backup).
 Node-RED from being able to decrypt your existing credentials and they will be
 lost._
 
-**Note**: _This option support secrets, e.g., `!secret red_secret`._
+### Option: `theme`
 
-### Option: `dark_mode`
+Sets one of the Node-RED themes. Currently available options:
 
-When set to `true`, the Midnight Node-RED theme by [Mauricio Bonani][bonanitech]
-will be enabled. For more information and a glance at how it looks,
-see the GitHub repository of this theme:
-
-<https://github.com/node-red-contrib-themes/midnight-red>
+- `default`
+- `dark`
+- `midnight-red`
+- `oled`
+- `solarized-dark`
+- `solarized-light`
 
 ### Option: `http_node`
 
@@ -128,8 +129,6 @@ the following properties can be used:
 - `username`
 - `password`
 
-**Note**: _These options support secrets, e.g., `!secret red_password`._
-
 **Note**: _In order to use the `http_node` you will need to expose Node-RED using
 a network port in addition to ingress. The HTTP nodes will also be presented
 under `/endpoint/` as shown in the UI. If using the `node-red-dashboard` module
@@ -143,8 +142,6 @@ properties can be used:
 - `username`
 - `password`
 
-**Note**: _These options support secrets, e.g., `!secret red_password`._
-
 ### Option: `system_packages`
 
 Allows you to specify additional [Alpine packages][alpine-packages] to be
@@ -288,7 +285,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 [alpine-packages]: https://pkgs.alpinelinux.org/packages
-[bonanitech]: https://github.com/bonanitech
 [contributors]: https://github.com/hassio-addons/addon-node-red/graphs/contributors
 [discord-ha]: https://discord.gg/c5DvZ4e
 [discord]: https://discord.me/hassioaddons
diff --git a/node-red/README.md b/node-red/README.md
index 4c280dc5..515947f9 100644
--- a/node-red/README.md
+++ b/node-red/README.md
@@ -47,6 +47,6 @@ If you are more interested in stable releases of our add-ons:
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v8.2.1-blue.svg
-[release]: https://github.com/hassio-addons/addon-node-red/tree/v8.2.1
-[screenshot]: https://github.com/hassio-addons/addon-node-red/raw/master/images/screenshot.png
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-v9.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-node-red/tree/v9.0.0
+[screenshot]: https://github.com/hassio-addons/addon-node-red/raw/main/images/screenshot.png
\ No newline at end of file
diff --git a/node-red/config.json b/node-red/config.json
index d04117b0..d6127ee8 100644
--- a/node-red/config.json
+++ b/node-red/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Node-RED",
-  "version": "8.2.1",
+  "version": "9.0.0",
   "slug": "nodered",
   "description": "Flow-based programming for the Internet of Things",
   "url": "https://github.com/hassio-addons/addon-node-red",
@@ -44,7 +44,7 @@
   ],
   "options": {
     "credential_secret": "",
-    "dark_mode": false,
+    "theme": "default",
     "http_node": {
       "username": "",
       "password": ""
@@ -64,7 +64,8 @@
   "schema": {
     "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
     "credential_secret": "password",
-    "dark_mode": "bool",
+    "dark_mode": "bool?",
+    "theme": "list(default|dark|midnight-red|oled|solarized-dark|solarized-light)?",
     "http_node": {
       "username": "str",
       "password": "password"