diff --git a/web_dark_mode/README.rst b/web_dark_mode/README.rst
index 18e6f16196e..7f741859adf 100644
--- a/web_dark_mode/README.rst
+++ b/web_dark_mode/README.rst
@@ -63,6 +63,7 @@ Contributors
 ------------
 
 - Florian Kantelberg <florian.kantelberg@initos.com>
+- Ruchir Shukla <ruchir@bizzappdev.com>
 
 Maintainers
 -----------
diff --git a/web_dark_mode/__manifest__.py b/web_dark_mode/__manifest__.py
index 2095c58e9d5..e4c0bb092b5 100644
--- a/web_dark_mode/__manifest__.py
+++ b/web_dark_mode/__manifest__.py
@@ -5,17 +5,14 @@
     "name": "Dark Mode",
     "summary": "Enabled Dark Mode for the Odoo Backend",
     "license": "AGPL-3",
-    "version": "16.0.1.0.2",
+    "version": "17.0.1.0.0",
     "website": "https://github.com/OCA/web",
     "author": "initOS GmbH, Odoo Community Association (OCA)",
     "depends": ["web"],
     "excludes": ["web_enterprise"],
     "installable": True,
     "assets": {
-        "web.dark_mode_assets_common": [
-            ("prepend", "web_dark_mode/static/src/scss/variables.scss"),
-        ],
-        "web.dark_mode_assets_backend": [
+        "web.assets_web_dark": [
             ("prepend", "web_dark_mode/static/src/scss/variables.scss"),
         ],
         "web.assets_backend": [
diff --git a/web_dark_mode/readme/CONTRIBUTORS.md b/web_dark_mode/readme/CONTRIBUTORS.md
index 64b8141b38e..643ce60b551 100644
--- a/web_dark_mode/readme/CONTRIBUTORS.md
+++ b/web_dark_mode/readme/CONTRIBUTORS.md
@@ -1 +1,2 @@
 - Florian Kantelberg \<<florian.kantelberg@initos.com>\>
+- Ruchir Shukla \<<ruchir@bizzappdev.com>\>
diff --git a/web_dark_mode/static/description/index.html b/web_dark_mode/static/description/index.html
index bbc6fb6c90d..c12d80eaef5 100644
--- a/web_dark_mode/static/description/index.html
+++ b/web_dark_mode/static/description/index.html
@@ -411,6 +411,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
 <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Florian Kantelberg &lt;<a class="reference external" href="mailto:florian.kantelberg&#64;initos.com">florian.kantelberg&#64;initos.com</a>&gt;</li>
+<li>Ruchir Shukla &lt;<a class="reference external" href="mailto:ruchir&#64;bizzappdev.com">ruchir&#64;bizzappdev.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/web_dark_mode/static/src/js/switch_item.esm.js b/web_dark_mode/static/src/js/switch_item.esm.js
index 1eb67e77e45..77c6fdc1cfd 100644
--- a/web_dark_mode/static/src/js/switch_item.esm.js
+++ b/web_dark_mode/static/src/js/switch_item.esm.js
@@ -1,39 +1,42 @@
 /** @odoo-module **/
 
+import {_t} from "@web/core/l10n/translation";
 import {browser} from "@web/core/browser/browser";
+import {cookie} from "@web/core/browser/cookie";
 import {registry} from "@web/core/registry";
 
 export function darkModeSwitchItem(env) {
     return {
         type: "switch",
         id: "color_scheme.switch",
-        description: env._t("Dark Mode"),
+        description: _t("Dark Mode"),
         callback: () => {
             env.services.color_scheme.switchColorScheme();
         },
-        isChecked: env.services.cookie.current.color_scheme === "dark",
+        isChecked: cookie.get("color_scheme") === "dark",
         sequence: 40,
     };
 }
 
 export const colorSchemeService = {
-    dependencies: ["cookie", "orm", "ui", "user"],
+    dependencies: ["orm", "ui", "user"],
 
-    async start(env, {cookie, orm, ui, user}) {
+    async start(env, {orm, ui, user}) {
         registry.category("user_menuitems").add("darkmode", darkModeSwitchItem);
 
-        if (!cookie.current.color_scheme) {
+        if (!cookie.get("color_scheme")) {
             const match_media = window.matchMedia("(prefers-color-scheme: dark)");
             const dark_mode = match_media.matches;
-            cookie.setCookie("color_scheme", dark_mode ? "dark" : "light");
+
+            cookie.set("color_scheme", dark_mode ? "dark" : "light");
             if (dark_mode) browser.location.reload();
         }
 
         return {
             async switchColorScheme() {
-                const scheme =
-                    cookie.current.color_scheme === "dark" ? "light" : "dark";
-                cookie.setCookie("color_scheme", scheme);
+                const scheme = cookie.get("color_scheme") === "dark" ? "light" : "dark";
+
+                cookie.set("color_scheme", scheme);
 
                 await orm.write("res.users", [user.userId], {
                     dark_mode: scheme === "dark",