diff --git a/package-lock.json b/package-lock.json
index 0691562c..2e2a3e13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,6 @@
         "minecraft-ping-js": "^1.0.2",
         "next": "^12.3.1",
         "next-i18next": "^12.0.1",
-        "osx-temperature-sensor": "*",
         "pretty-bytes": "^6.0.0",
         "raw-body": "^2.5.1",
         "react": "^18.2.0",
diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json
index a1bf5578..2f80f21a 100644
--- a/public/locales/ar/common.json
+++ b/public/locales/ar/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json
index 35dd13f4..594d2870 100644
--- a/public/locales/bg/common.json
+++ b/public/locales/bg/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json
index 3842feec..5d4082da 100644
--- a/public/locales/ca/common.json
+++ b/public/locales/ca/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json
index 4e16a37a..164cc194 100644
--- a/public/locales/cs/common.json
+++ b/public/locales/cs/common.json
@@ -650,5 +650,9 @@
         "downloadCount": "Queue Count",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/da/common.json b/public/locales/da/common.json
index 76ff86dd..3ff03563 100644
--- a/public/locales/da/common.json
+++ b/public/locales/da/common.json
@@ -650,5 +650,9 @@
         "downloadCount": "Queue Count",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/de/common.json b/public/locales/de/common.json
index 521e2cec..8b5dca93 100644
--- a/public/locales/de/common.json
+++ b/public/locales/de/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/el/common.json b/public/locales/el/common.json
index b36b43f6..a3be18f2 100644
--- a/public/locales/el/common.json
+++ b/public/locales/el/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json
index 908169cb..c3c1c87d 100644
--- a/public/locales/eo/common.json
+++ b/public/locales/eo/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/es/common.json b/public/locales/es/common.json
index fcd470cd..eb42b75e 100644
--- a/public/locales/es/common.json
+++ b/public/locales/es/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Velocidad",
         "downloadBytesRemaining": "Restante",
         "downloadTotalBytes": "Tamaño"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json
index c3875b21..306c5b2b 100644
--- a/public/locales/fi/common.json
+++ b/public/locales/fi/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json
index 7e268e67..b513e6b9 100644
--- a/public/locales/fr/common.json
+++ b/public/locales/fr/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Vitesse de téléchargement",
         "downloadBytesRemaining": "Restant",
         "downloadTotalBytes": "Taille"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/he/common.json b/public/locales/he/common.json
index 41e5746b..6fa54751 100644
--- a/public/locales/he/common.json
+++ b/public/locales/he/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json
index 155235a9..88a100c3 100644
--- a/public/locales/hi/common.json
+++ b/public/locales/hi/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json
index 94dfae26..6fb77826 100644
--- a/public/locales/hr/common.json
+++ b/public/locales/hr/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json
index 108ba54d..f4b1509c 100644
--- a/public/locales/hu/common.json
+++ b/public/locales/hu/common.json
@@ -650,5 +650,9 @@
         "downloadCount": "Queue Count",
         "downloadTotalBytes": "Size",
         "downloadBytesRemaining": "Remaining"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/id/common.json b/public/locales/id/common.json
index 0be279a5..51daa4f1 100644
--- a/public/locales/id/common.json
+++ b/public/locales/id/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/it/common.json b/public/locales/it/common.json
index 677e1b70..a066c531 100644
--- a/public/locales/it/common.json
+++ b/public/locales/it/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json
index 1bc37e96..84f56b12 100644
--- a/public/locales/ja/common.json
+++ b/public/locales/ja/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/ko/common.json b/public/locales/ko/common.json
index f9037f52..a3a1d9e6 100644
--- a/public/locales/ko/common.json
+++ b/public/locales/ko/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json
index 70361ee2..8022ec13 100644
--- a/public/locales/lv/common.json
+++ b/public/locales/lv/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json
index 70fd66e3..77b3a759 100644
--- a/public/locales/ms/common.json
+++ b/public/locales/ms/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/nb-NO/common.json b/public/locales/nb-NO/common.json
index 79124218..a633028c 100644
--- a/public/locales/nb-NO/common.json
+++ b/public/locales/nb-NO/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json
index 139e9051..88c809a9 100644
--- a/public/locales/nl/common.json
+++ b/public/locales/nl/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json
index 6af51828..5df12a52 100644
--- a/public/locales/pl/common.json
+++ b/public/locales/pl/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/pt-BR/common.json b/public/locales/pt-BR/common.json
index d2146d2c..57e524fe 100644
--- a/public/locales/pt-BR/common.json
+++ b/public/locales/pt-BR/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json
index 5c84e6c5..3bfb6df8 100644
--- a/public/locales/pt/common.json
+++ b/public/locales/pt/common.json
@@ -659,5 +659,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json
index e8bf9ac7..3fc07bff 100644
--- a/public/locales/ro/common.json
+++ b/public/locales/ro/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json
index d3cd6d48..ded1be07 100644
--- a/public/locales/ru/common.json
+++ b/public/locales/ru/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/sk/common.json b/public/locales/sk/common.json
index 5f95889c..8d3a80ec 100644
--- a/public/locales/sk/common.json
+++ b/public/locales/sk/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/sl/common.json b/public/locales/sl/common.json
index 24d4b8f7..c4a9e317 100644
--- a/public/locales/sl/common.json
+++ b/public/locales/sl/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json
index 9ef56193..f60d3e22 100644
--- a/public/locales/sr/common.json
+++ b/public/locales/sr/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json
index c3325844..0d61d400 100644
--- a/public/locales/sv/common.json
+++ b/public/locales/sv/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "totalFiles": "Files",
+        "seriesCount": "Series"
     }
 }
diff --git a/public/locales/te/common.json b/public/locales/te/common.json
index b7d11223..9957fc7d 100644
--- a/public/locales/te/common.json
+++ b/public/locales/te/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "totalFiles": "Files",
+        "seriesCount": "Series"
     }
 }
diff --git a/public/locales/th/common.json b/public/locales/th/common.json
index 2afb51f2..6122992f 100644
--- a/public/locales/th/common.json
+++ b/public/locales/th/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json
index b152e0f7..bb98d412 100644
--- a/public/locales/tr/common.json
+++ b/public/locales/tr/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json
index 14fc5a04..8f4b180c 100644
--- a/public/locales/uk/common.json
+++ b/public/locales/uk/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Швидкість",
         "downloadBytesRemaining": "Залишилося",
         "downloadTotalBytes": "Розмір"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json
index 069eaff2..1fe186c9 100644
--- a/public/locales/vi/common.json
+++ b/public/locales/vi/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json
index 4e360b26..48accfc0 100644
--- a/public/locales/yue/common.json
+++ b/public/locales/yue/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json
index a1f0dfda..2506671c 100644
--- a/public/locales/zh-CN/common.json
+++ b/public/locales/zh-CN/common.json
@@ -632,7 +632,7 @@
         "requests_failed": "失败请求"
     },
     "evcc": {
-        "pv_power": "Production",
+        "pv_power": "正式环境",
         "battery_soc": "Battery",
         "grid_power": "Grid",
         "home_power": "Consumption",
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json
index 7c0cb9fe..e4f96dd3 100644
--- a/public/locales/zh-Hant/common.json
+++ b/public/locales/zh-Hant/common.json
@@ -650,5 +650,9 @@
         "downloadSpeed": "Download Speed",
         "downloadBytesRemaining": "Remaining",
         "downloadTotalBytes": "Size"
+    },
+    "kavita": {
+        "seriesCount": "Series",
+        "totalFiles": "Files"
     }
 }
diff --git a/src/components/bookmarks/group.jsx b/src/components/bookmarks/group.jsx
index 2910245c..ef0a5ab8 100644
--- a/src/components/bookmarks/group.jsx
+++ b/src/components/bookmarks/group.jsx
@@ -1,13 +1,41 @@
+import classNames from "classnames";
+import { Disclosure, Transition } from '@headlessui/react';
+import { MdKeyboardArrowDown } from "react-icons/md";
+
 import ErrorBoundary from "components/errorboundry";
 import List from "components/bookmarks/list";
 
-export default function BookmarksGroup({ group }) {
+export default function BookmarksGroup({ group, disableCollapse }) {
   return (
     <div key={group.name} className="flex-1">
-      <h2 className="text-theme-800 dark:text-theme-300 text-xl font-medium">{group.name}</h2>
-      <ErrorBoundary>
-        <List bookmarks={group.bookmarks} />
-      </ErrorBoundary>
+    <Disclosure defaultOpen>
+    {({ open }) => (
+      <>
+        <Disclosure.Button disabled={disableCollapse} className="flex w-full select-none items-center group">
+          <h2 className="text-theme-800 dark:text-theme-300 text-xl font-medium">{group.name}</h2>
+          <MdKeyboardArrowDown className={classNames(
+            disableCollapse ? 'hidden' : '',
+            'transition-opacity opacity-0 group-hover:opacity-100 ml-auto text-theme-800 dark:text-theme-300 text-xl',
+            open ? 'rotate-180 transform' : ''
+            )} />
+        </Disclosure.Button>
+        <Transition
+          enter="transition duration-200 ease-out"
+          enterFrom="transform scale-75 opacity-0"
+          enterTo="transform scale-100 opacity-100"
+          leave="transition duration-75 ease-out"
+          leaveFrom="transform scale-100 opacity-100"
+          leaveTo="transform scale-75 opacity-0"
+          >
+            <Disclosure.Panel>
+              <ErrorBoundary>
+                <List bookmarks={group.bookmarks} />
+              </ErrorBoundary>
+            </Disclosure.Panel>
+        </Transition>
+      </>
+    )}
+    </Disclosure>
     </div>
   );
 }
diff --git a/src/components/services/group.jsx b/src/components/services/group.jsx
index 94557064..eb64cc3d 100644
--- a/src/components/services/group.jsx
+++ b/src/components/services/group.jsx
@@ -1,9 +1,12 @@
 import classNames from "classnames";
+import { Disclosure, Transition } from '@headlessui/react';
+import { MdKeyboardArrowDown } from "react-icons/md";
 
 import List from "components/services/list";
 import ResolvedIcon from "components/resolvedicon";
 
-export default function ServicesGroup({ group, services, layout, fiveColumns }) {
+export default function ServicesGroup({ group, services, layout, fiveColumns, disableCollapse }) {
+
   return (
     <div
       key={services.name}
@@ -13,15 +16,37 @@ export default function ServicesGroup({ group, services, layout, fiveColumns })
         "flex-1 p-1"
       )}
     >
-      <div className="flex select-none items-center">
-        {layout?.icon &&
-          <div className="flex-shrink-0 mr-2 w-7 h-7">
-            <ResolvedIcon icon={layout.icon} />
-          </div>
-        }
-        <h2 className="text-theme-800 dark:text-theme-300 text-xl font-medium">{services.name}</h2>
-      </div>
-      <List group={group} services={services.services} layout={layout} />
+      <Disclosure defaultOpen>
+      {({ open }) => (
+        <>
+        <Disclosure.Button disabled={disableCollapse} className="flex w-full select-none items-center group">
+          {layout?.icon &&
+            <div className="flex-shrink-0 mr-2 w-7 h-7">
+              <ResolvedIcon icon={layout.icon} />
+            </div>
+          }
+          <h2 className="flex text-theme-800 dark:text-theme-300 text-xl font-medium">{services.name}</h2>
+          <MdKeyboardArrowDown className={classNames(
+            disableCollapse ? 'hidden' : '',
+            'transition-opacity opacity-0 group-hover:opacity-100 ml-auto text-theme-800 dark:text-theme-300 text-xl',
+            open ? 'rotate-180 transform' : ''
+            )} />
+        </Disclosure.Button>
+        <Transition
+          enter="transition duration-200 ease-out"
+          enterFrom="transform scale-75 opacity-0"
+          enterTo="transform scale-100 opacity-100"
+          leave="transition duration-75 ease-out"
+          leaveFrom="transform scale-100 opacity-100"
+          leaveTo="transform scale-75 opacity-0"
+          >
+            <Disclosure.Panel>
+              <List group={group} services={services.services} layout={layout} />
+            </Disclosure.Panel>
+        </Transition>
+        </>
+      )}
+      </Disclosure>
     </div>
   );
 }
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index d91a8339..a2993b1a 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -294,7 +294,13 @@ function Home({ initialSettings }) {
         {services?.length > 0 && (
           <div className="flex flex-wrap p-4 sm:p-8 sm:pt-4 items-start pb-2">
             {services.map((group) => (
-              <ServicesGroup key={group.name} group={group.name} services={group} layout={initialSettings.layout?.[group.name]} fiveColumns={settings.fiveColumns} />
+              <ServicesGroup 
+                key={group.name}
+                group={group.name}
+                services={group}
+                layout={initialSettings.layout?.[group.name]}
+                fiveColumns={settings.fiveColumns} 
+                disableCollapse={settings.disableCollapse} />
             ))}
           </div>
         )}
@@ -302,7 +308,10 @@ function Home({ initialSettings }) {
         {bookmarks?.length > 0 && (
           <div className={`grow flex flex-wrap pt-0 p-4 sm:p-8 gap-2 grid-cols-1 lg:grid-cols-2 lg:grid-cols-${Math.min(6, bookmarks.length)}`}>
             {bookmarks.map((group) => (
-              <BookmarksGroup key={group.name} group={group} />
+              <BookmarksGroup
+                key={group.name}
+                group={group}
+                disableCollapse={settings.disableCollapse} />
             ))}
           </div>
         )}
diff --git a/tailwind.config.js b/tailwind.config.js
index b981051b..a075f6e9 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -9,6 +9,11 @@ module.exports = {
     "./src/components/**/*.{js,ts,jsx,tsx}",
     "./src/widgets/**/*.{js,ts,jsx,tsx}",
   ],
+  variants: {
+    extend: {
+        display: ["group-hover"],
+    },
+  },
   theme: {
     extend: {
       colors: {