diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1d9e6243b..ba5935238 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,14 @@
+<!--
+==== STOP ====================
+======== STOP ================
+============ STOP ============
+================ STOP ========
+==================== STOP ====
+
+⚠️ Before opening this pull request please review the guidelines in the checklist below.
+If this PR does not meet those guidelines it will not be accepted, and everyone will be sad.
+-->
+
 ## Proposed change
 
 <!--
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 2ac8b3e8a..006087051 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -118,7 +118,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' && !(github.event_name == 'push' && startsWith(github.ref, 'refs/heads/feature')) }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
diff --git a/.github/workflows/repo-maintenance.yml b/.github/workflows/repo-maintenance.yml
index 7cf47c51b..02f33b99a 100644
--- a/.github/workflows/repo-maintenance.yml
+++ b/.github/workflows/repo-maintenance.yml
@@ -212,9 +212,9 @@ jobs:
             }
 
             const CUTOFF_1_DAYS = 180;
-            const CUTOFF_1_COUNT = 5;
+            const CUTOFF_1_COUNT = 10;
             const CUTOFF_2_DAYS = 365;
-            const CUTOFF_2_COUNT = 10;
+            const CUTOFF_2_COUNT = 20;
 
             const cutoff1Date = new Date();
             cutoff1Date.setDate(cutoff1Date.getDate() - CUTOFF_1_DAYS);
diff --git a/README.md b/README.md
index 4f898387d..588209428 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Homepage has built-in support for Docker, and can automatically discover and add
 
 ## Service Widgets
 
-Homepage also has support for over 100 3rd party services, including all popular starr apps, and most popular self-hosted apps. Some examples include: Radarr, Sonarr, Lidarr, Bazarr, Ombi, Tautulli, Plex, Jellyfin, Emby, Transmission, qBittorrent, Deluge, Jackett, NZBGet, SABnzbd, etc. As well as service integrations, Homepage also has a number of information providers, sourcing information from a variety of external 3rd party APIs. See the [Service](https://gethomepage.dev/widgets/) page for more information.
+Homepage also has support for hundreds of 3rd-party services, including all popular \*arr apps, and most popular self-hosted apps. Some examples include: Radarr, Sonarr, Lidarr, Bazarr, Ombi, Tautulli, Plex, Jellyfin, Emby, Transmission, qBittorrent, Deluge, Jackett, NZBGet, SABnzbd, etc. As well as service integrations, Homepage also has a number of information providers, sourcing information from a variety of external 3rd-party APIs. See the [Service](https://gethomepage.dev/widgets/) page for more information.
 
 ## Information Widgets
 
diff --git a/docs/configs/docker.md b/docs/configs/docker.md
index 51f6b5238..7cea1fdce 100644
--- a/docs/configs/docker.md
+++ b/docs/configs/docker.md
@@ -153,6 +153,18 @@ labels:
   - homepage.widget.fields=["field1","field2"] # optional
 ```
 
+Multiple widgets can be specified by incrementing the index, e.g.
+
+```yaml
+labels: ...
+  - homepage.widget[0].type=emby
+  - homepage.widget[0].url=http://emby.home
+  - homepage.widget[0].key=yourembyapikeyhere
+  - homepage.widget[1].type=uptimekuma
+  - homepage.widget[1].url=http://uptimekuma.home
+  - homepage.widget[1].slug=youreventslughere
+```
+
 You can add specify fields for e.g. the [CustomAPI](../widgets/services/customapi.md) widget by using array-style dot notation:
 
 ```yaml
diff --git a/docs/configs/info-widgets.md b/docs/configs/info-widgets.md
new file mode 100644
index 000000000..763143960
--- /dev/null
+++ b/docs/configs/info-widgets.md
@@ -0,0 +1,24 @@
+---
+title: Information Widgets
+description: Homepage info widgets.
+---
+
+Information widgets are widgets that provide information about your system or environment and are displayed at the top of the homepage. You can find a list of all available info widgets under the [Info Widgets](../widgets/info/index.md) section.
+
+Info widgets are defined in the widgets.yaml
+
+Each widget has its own configuration options, which are detailed in the widget's documentation.
+
+## Layout
+
+Info widgets are displayed in the order they are defined in the `widgets.yaml` file. You can change the order by moving the widgets around in the file. However, some widgets (weather, search and datetime) are aligned to the right side of the screen which can affect the layout of the widgets.
+
+## Adding A Link
+
+You can add a link to an info widget such as the logo or text widgets by adding an `href` option, for example:
+
+```yaml
+logo:
+  href: https://example.com
+  target: _blank # Optional, can be set in settings
+```
diff --git a/docs/configs/service-widgets.md b/docs/configs/service-widgets.md
deleted file mode 100644
index 9c54964ec..000000000
--- a/docs/configs/service-widgets.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-title: Service Widgets
-description: Service Widget Configuration
----
-
-Unless otherwise noted, URLs should not end with a `/` or other API path. Each widget will handle the path on its own.
-
-Each service can have one widget attached to it (often matching the service type, but that's not forced).
-
-In addition to the href of the service, you can also specify the target location in which to open that link. See [Link Target](settings.md#link-target) for more details.
-
-Using Emby as an example, this is how you would attach the Emby service widget.
-
-```yaml
-- Emby:
-    icon: emby.png
-    href: http://emby.host.or.ip/
-    description: Movies & TV Shows
-    widget:
-      type: emby
-      url: http://emby.host.or.ip
-      key: apikeyapikeyapikeyapikeyapikey
-```
-
-## Field Visibility
-
-Each widget can optionally provide a list of which fields should be visible via the `fields` widget property. If no fields are specified, then all fields will be displayed. The `fields` property must be a valid YAML array of strings. As an example, here is the entry for Sonarr showing only a couple of fields.
-
-**In all cases a widget will work and display all fields without specifying the `fields` property.**
-
-```yaml
-- Sonarr:
-    icon: sonarr.png
-    href: http://sonarr.host.or.ip
-    widget:
-      type: sonarr
-      fields: ["wanted", "queued"]
-      url: http://sonarr.host.or.ip
-      key: apikeyapikeyapikeyapikeyapikey
-```
diff --git a/docs/configs/services.md b/docs/configs/services.md
index 9cb75177e..6ef25c39f 100644
--- a/docs/configs/services.md
+++ b/docs/configs/services.md
@@ -21,6 +21,23 @@ Groups are defined as top-level array entries.
 
 <img width="1038" alt="Service Groups" src="https://user-images.githubusercontent.com/82196/187040754-28065242-4534-4409-881c-93d1921c6141.png">
 
+### Nested Groups
+
+Groups can be nested by using the same format as the top-level groups.
+
+```yaml
+- Group A:
+    - Service A:
+        href: http://localhost/
+
+    - Group B:
+        - Service B:
+            href: http://localhost/
+
+        - Service C:
+            href: http://localhost/
+```
+
 ## Services
 
 Services are defined as array entries on groups,
@@ -43,6 +60,60 @@ Services are defined as array entries on groups,
 
 <img width="1038" alt="Service Services" src="https://user-images.githubusercontent.com/82196/187040763-038023a2-8bee-4d87-b5cc-13447e7365a4.png">
 
+### Service Widgets
+
+Each service can have widgets attached to it (often matching the service type, but that's not forced).
+
+In addition to the href of the service, you can also specify the target location in which to open that link. See [Link Target](settings.md#link-target) for more details.
+
+Using Emby as an example, this is how you would attach the Emby service widget.
+
+```yaml
+- Emby:
+    icon: emby.png
+    href: http://emby.host.or.ip/
+    description: Movies & TV Shows
+    widget:
+      type: emby
+      url: http://emby.host.or.ip
+      key: apikeyapikeyapikeyapikeyapikey
+```
+
+#### Multiple Widgets
+
+Each service can have multiple widgets attached to it, for example:
+
+```yaml
+- Emby:
+    icon: emby.png
+    href: http://emby.host.or.ip/
+    description: Movies & TV Shows
+    widgets:
+      - type: emby
+        url: http://emby.host.or.ip
+        key: apikeyapikeyapikeyapikeyapikey
+      - type: uptimekuma
+        url: http://uptimekuma.host.or.ip:port
+        slug: statuspageslug
+```
+
+#### Field Visibility
+
+Each widget can optionally provide a list of which fields should be visible via the `fields` widget property. If no fields are specified, then all fields will be displayed. The `fields` property must be a valid YAML array of strings. As an example, here is the entry for Sonarr showing only a couple of fields.
+
+**In all cases a widget will work and display all fields without specifying the `fields` property.**
+
+```yaml
+- Sonarr:
+    icon: sonarr.png
+    href: http://sonarr.host.or.ip
+    widget:
+      type: sonarr
+      fields: ["wanted", "queued"]
+      url: http://sonarr.host.or.ip
+      key: apikeyapikeyapikeyapikeyapikey
+```
+
 ## Descriptions
 
 Services may have descriptions,
diff --git a/docs/configs/settings.md b/docs/configs/settings.md
index 2f387a65b..5fe30874f 100644
--- a/docs/configs/settings.md
+++ b/docs/configs/settings.md
@@ -118,6 +118,22 @@ As an example, this would produce the following layout:
 
 <img width="1260" alt="Screenshot 2022-09-15 at 8 03 57 PM" src="https://user-images.githubusercontent.com/82196/190466646-8ca94505-0fcf-4964-9687-3a6c7cd3144f.png">
 
+### Icons-Only Layout
+
+You can also specify the an icon-only layout for bookmarks, either like so:
+
+```yaml
+layout:
+  Media:
+    iconsOnly: true
+```
+
+or globally:
+
+```yaml
+bookmarksStyle: icons
+```
+
 ### Sorting
 
 Service groups and bookmark groups can be mixed in order, **but should use different group names**. If you do not specify any bookmark groups they will all show at the bottom of the page.
@@ -137,6 +153,27 @@ layout:
       columns: 3
 ```
 
+### Nested Groups
+
+If your services config has nested groups, you can apply settings to these groups by nesting them in the layout block
+and using the same settings. For example
+
+```yaml
+layout:
+  Group A:
+    style: row
+    columns: 4
+  Group C:
+    style: row
+    columns: 2
+    Nested Group A:
+      style: row
+      columns: 2
+    Nested Group B:
+      style: row
+      columns: 2
+```
+
 ### Headers
 
 You can hide headers for each section in the layout as well by passing `header` as false, like so:
@@ -348,12 +385,12 @@ This can also be set for individual services. Note setting this at the service l
 
 ## Providers
 
-The `providers` section allows you to define shared API provider options and secrets. Currently this allows you to define your weather API keys in secret and is also the location of the Longhorn URL and credentials.
+The `providers` section allows you to define shared API provider options and secrets.
 
 ```yaml
 providers:
   openweathermap: openweathermapapikey
-  weatherapi: weatherapiapikey
+  finnhub: yourfinnhubapikeyhere
   longhorn:
     url: https://longhorn.example.com
     username: admin
@@ -363,10 +400,10 @@ providers:
 You can then pass `provider` instead of `apiKey` in your widget configuration.
 
 ```yaml
-- weatherapi:
+- openweathermap:
     latitude: 50.449684
     longitude: 30.525026
-    provider: weatherapi
+    provider: openweathermap
 ```
 
 ## Quick Launch
diff --git a/docs/installation/k8s.md b/docs/installation/k8s.md
index 6805139b6..cf0ec3c62 100644
--- a/docs/installation/k8s.md
+++ b/docs/installation/k8s.md
@@ -175,6 +175,7 @@ data:
         expanded: true
         cpu: true
         memory: true
+        network: default
     - search:
         provider: duckduckgo
         target: _blank
@@ -209,7 +210,7 @@ rules:
       - get
       - list
   - apiGroups:
-      - traefik.containo.us
+      - traefik.io
     resources:
       - ingressroutes
     verbs:
@@ -370,7 +371,7 @@ prevent unnecessary re-renders on page loads and window / tab focusing. The
 procedure for enabling sticky sessions depends on your Ingress controller. Below
 is an example using Traefik as the Ingress controller.
 
-```
+```yaml
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
diff --git a/docs/troubleshooting/index.md b/docs/troubleshooting/index.md
index 82a7381cf..bbde4cf3c 100644
--- a/docs/troubleshooting/index.md
+++ b/docs/troubleshooting/index.md
@@ -17,7 +17,7 @@ hide:
 
 All service widgets work essentially the same, that is, homepage makes a proxied call to an API made available by that service. The majority of the time widgets don't work it is a configuration issue. Of course, sometimes things do break. Some basic steps to try:
 
-1.  Ensure that you follow the rule mentioned on https://gethomepage.dev/configs/service-widgets/. **Unless otherwise noted, URLs should not end with a / or other API path. Each widget will handle the path on its own.**. This is very important as including a trailing slash can result in an error.
+1.  **URLs should not end with a / or other API path. Each widget will handle the path on its own.**. Including a trailing slash can result in an error.
 
 2.  Verify the homepage installation can connect to the IP address or host you are using for the widget `url`. This is most simply achieved by pinging the server from the homepage machine, in Docker this means _from inside the container_ itself, e.g.:
 
diff --git a/docs/widgets/authoring/getting-started.md b/docs/widgets/authoring/getting-started.md
index 4b9126ea7..dd33c21ef 100644
--- a/docs/widgets/authoring/getting-started.md
+++ b/docs/widgets/authoring/getting-started.md
@@ -55,7 +55,7 @@ self-hosted / open-source alternative, we ask that any widgets, etc. are develop
 
 To ensure cohesiveness of various widgets, the following should be used as a guide for developing new widgets:
 
-- Please only submit widgets that target a feature request discussion with at least 10 'up-votes'. The purpose of this requirement is to avoid the addition (and maintenance) of service widgets that might only benefit a small number of users.
+- Please only submit widgets that target a feature request discussion with at least 20 'up-votes'. The purpose of this requirement is to avoid the addition (and maintenance) of service widgets that might only benefit a small number of users.
 - Note that we reserve the right to decline widgets for projects that are very young (eg < ~1y) or those with a small reach (eg low GitHub stars). Again, this is in an effort to keep overall widget maintenance under control.
 - Widgets should be only one row of blocks
 - Widgets should be no more than 4 blocks wide and generally conform to the styling / design choices of other widgets
diff --git a/docs/widgets/authoring/proxies.md b/docs/widgets/authoring/proxies.md
index 15cdb6703..a8b8073e0 100644
--- a/docs/widgets/authoring/proxies.md
+++ b/docs/widgets/authoring/proxies.md
@@ -50,7 +50,7 @@ You can also pass API keys from the widget configuration to the proxy handler, f
 
 ### `credentialedProxyHandler`
 
-A proxy handler that makes authenticated by setting request headers. Credentials are pulled from the widgets configuration.
+A proxy handler that makes authenticated requests by setting request headers. Credentials are pulled from the widgets configuration.
 
 By default the key is passed as an `X-API-Key` header. If you need to pass the key as something else, either add a case to the credentialedProxyHandler or create a new proxy handler.
 
diff --git a/docs/widgets/index.md b/docs/widgets/index.md
index 8b81ee402..fbb8edc63 100644
--- a/docs/widgets/index.md
+++ b/docs/widgets/index.md
@@ -19,12 +19,17 @@ Service widgets are used to display the status of a service, often a web service
     description: Watch movies and TV shows.
     server: localhost
     container: plex
-    widget:
-      type: tautulli
-      url: http://172.16.1.1:8181
-      key: aabbccddeeffgghhiijjkkllmmnnoo
+    widgets:
+      - type: tautulli
+        url: http://172.16.1.1:8181
+        key: aabbccddeeffgghhiijjkkllmmnnoo
+      - type: uptimekuma
+        url: http://172.16.1.2:8080
+        slug: aaaaaaabbbbb
 ```
 
+More detail on configuring service widgets can be found in the [Service Widgets Config](../configs/services.md) section.
+
 ## Info Widgets
 
 Info widgets are used to display information in the header, often about your system or environment. Info widgets are defined your `widgets.yaml` file. Here's an example:
@@ -36,3 +41,5 @@ Info widgets are used to display information in the header, often about your sys
     longitude: -117.51
     cache: 5
 ```
+
+More detail on configuring info widgets can be found in the [Info Widgets Config](../configs/info-widgets.md) section.
diff --git a/docs/widgets/info/openmeteo.md b/docs/widgets/info/openmeteo.md
index fb5bb1717..ec84ab174 100644
--- a/docs/widgets/info/openmeteo.md
+++ b/docs/widgets/info/openmeteo.md
@@ -3,7 +3,7 @@ title: Open-Meteo
 description: Open-Meteo Information Widget Configuration
 ---
 
-No registration is required at all! See [https://open-meteo.com/en/docs](https://open-meteo.com/en/docs)
+Homepage's recommended weather widget. No registration is required at all! See [https://open-meteo.com/en/docs](https://open-meteo.com/en/docs)
 
 ```yaml
 - openmeteo:
diff --git a/docs/widgets/info/resources.md b/docs/widgets/info/resources.md
index 19323dc30..7fcf9c5cd 100644
--- a/docs/widgets/info/resources.md
+++ b/docs/widgets/info/resources.md
@@ -24,9 +24,10 @@ _Note: unfortunately, the package used for getting CPU temp ([systeminformation]
     tempmin: 0 # optional, minimum cpu temp
     tempmax: 100 # optional, maximum cpu temp
     uptime: true
-    units: imperial # only used by cpu temp
+    units: imperial # only used by cpu temp, options: 'imperial' or 'metric'
     refresh: 3000 # optional, in ms
     diskUnits: bytes # optional, bytes (default) or bbytes. Only applies to disk
+    network: true # optional, uses 'default' if true or specify a network interface name
 ```
 
 You can also pass a `label` option, which allows you to group resources under named sections,
diff --git a/docs/widgets/info/unifi_controller.md b/docs/widgets/info/unifi_controller.md
index b77d8ed00..e16ca40b0 100644
--- a/docs/widgets/info/unifi_controller.md
+++ b/docs/widgets/info/unifi_controller.md
@@ -7,7 +7,7 @@ _(Find the Unifi Controller service widget [here](../services/unifi-controller.m
 
 You can display general connectivity status from your Unifi (Network) Controller.
 
-!!!
+!!! warning
 
     When authenticating you will want to use a local account that has at least read privileges.
 
diff --git a/docs/widgets/info/weather.md b/docs/widgets/info/weather.md
deleted file mode 100644
index ab13b6736..000000000
--- a/docs/widgets/info/weather.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Weather API
-description: Weather API Information Widget Configuration
----
-
-**Note: this widget is considered 'deprecated' since there is no longer a free Weather API tier for new members. See the openmeteo or openweathermap widgets for alternatives.**
-
-The free tier is all that's required, you will need to [register](https://www.weatherapi.com/signup.aspx) and grab your API key.
-
-```yaml
-- weatherapi:
-    label: Kyiv # optional
-    latitude: 50.449684
-    longitude: 30.525026
-    units: metric # or imperial
-    apiKey: yourweatherapikey
-    cache: 5 # Time in minutes to cache API responses, to stay within limits
-    format: # optional, Intl.NumberFormat options
-      maximumFractionDigits: 1
-```
-
-You can optionally not pass a `latitude` and `longitude` and the widget will use your current location (requires a secure context, eg. HTTPS).
diff --git a/docs/widgets/services/beszel.md b/docs/widgets/services/beszel.md
index 6a5cc2691..c53915689 100644
--- a/docs/widgets/services/beszel.md
+++ b/docs/widgets/services/beszel.md
@@ -12,6 +12,11 @@ The `systemID` in the `id` field on the collections page of Beszel.
 Allowed fields for 'overview' mode: `["systems", "up"]`
 Allowed fields for a single system: `["name", "status", "updated", "cpu", "memory", "disk", "network"]`
 
+| Beszel Version | Homepage Widget Version |
+| -------------- | ----------------------- |
+| < 0.9.0        | 1 (default)             |
+| >= 0.9.0       | 2                       |
+
 ```yaml
 widget:
   type: beszel
@@ -19,4 +24,5 @@ widget:
   username: username # email
   password: password
   systemId: systemId # optional
+  version: 2 # optional, default is 1
 ```
diff --git a/docs/widgets/services/deluge.md b/docs/widgets/services/deluge.md
index 817ae8310..8b925a9af 100644
--- a/docs/widgets/services/deluge.md
+++ b/docs/widgets/services/deluge.md
@@ -14,4 +14,5 @@ widget:
   type: deluge
   url: http://deluge.host.or.ip
   password: password # webui password
+  enableLeechProgress: true # optional, defaults to false
 ```
diff --git a/docs/widgets/services/esphome.md b/docs/widgets/services/esphome.md
index 07e511e37..e5dacb96a 100644
--- a/docs/widgets/services/esphome.md
+++ b/docs/widgets/services/esphome.md
@@ -16,5 +16,6 @@ To group both `offline` and `unknown` devices together, users should use the `of
 widget:
   type: esphome
   url: http://esphome.host.or.ip:port
-  key: myesphomecookie # only if auth enabled, get the value from a request from the frontend e.g. `authenticated=myesphomecookie`
+  username: myesphomeuser # only if auth enabled
+  password: myesphomepass # only if auth enabled
 ```
diff --git a/docs/widgets/services/evcc.md b/docs/widgets/services/evcc.md
index 108b6eb42..1d3af2ba5 100644
--- a/docs/widgets/services/evcc.md
+++ b/docs/widgets/services/evcc.md
@@ -3,7 +3,7 @@ title: EVCC
 description: EVCC Widget Configuration
 ---
 
-Learn more about [EVSS](https://github.com/evcc-io/evcc).
+Learn more about [EVCC](https://github.com/evcc-io/evcc).
 
 Allowed fields: `["pv_power", "grid_power", "home_power", "charge_power]`.
 
diff --git a/docs/widgets/services/glances.md b/docs/widgets/services/glances.md
index 562cf57a2..d28462eb1 100644
--- a/docs/widgets/services/glances.md
+++ b/docs/widgets/services/glances.md
@@ -51,6 +51,8 @@ The metric field in the configuration determines the type of system monitoring d
 
 `process`: Top 5 processes based on CPU usage. Gives an overview of which processes are consuming the most resources.
 
+`containers`: Docker or Kubernetes containers list. Shows up to 5 containers running on the system and their resource usage.
+
 `network:<interface_name>`: Network data usage for the specified interface. Replace `<interface_name>` with the name of your network interface, e.g., `network:enp0s25`, as specified in glances.
 
 `sensor:<sensor_id>`: Temperature of the specified sensor, typically used to monitor CPU temperature. Replace `<sensor_id>` with the name of your sensor, e.g., `sensor:Package id 0` as specified in glances.
diff --git a/docs/widgets/services/qbittorrent.md b/docs/widgets/services/qbittorrent.md
index d60785e7f..103430deb 100644
--- a/docs/widgets/services/qbittorrent.md
+++ b/docs/widgets/services/qbittorrent.md
@@ -15,4 +15,5 @@ widget:
   url: http://qbittorrent.host.or.ip
   username: username
   password: password
+  enableLeechProgress: true # optional, defaults to false
 ```
diff --git a/docs/widgets/services/unifi-controller.md b/docs/widgets/services/unifi-controller.md
index d137c2a95..c5efc688e 100644
--- a/docs/widgets/services/unifi-controller.md
+++ b/docs/widgets/services/unifi-controller.md
@@ -9,7 +9,7 @@ _(Find the Unifi Controller information widget [here](../info/unifi_controller.m
 
 You can display general connectivity status from your Unifi (Network) Controller.
 
-!!!
+!!! warning
 
     When authenticating you will want to use a local account that has at least read privileges.
 
diff --git a/mkdocs.yml b/mkdocs.yml
index a19d3b839..fa2188ad5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -21,8 +21,8 @@ nav:
       - configs/index.md
       - configs/settings.md
       - configs/bookmarks.md
+      - configs/info-widgets.md
       - configs/services.md
-      - configs/service-widgets.md
       - configs/kubernetes.md
       - configs/docker.md
       - configs/custom-css-js.md
@@ -142,6 +142,7 @@ nav:
           - widgets/services/spoolman.md
           - widgets/services/stash.md
           - widgets/services/stocks.md
+          - widgets/services/suwayomi.md
           - widgets/services/swagdashboard.md
           - widgets/services/syncthing-relay-server.md
           - widgets/services/tailscale.md
@@ -177,7 +178,6 @@ nav:
           - widgets/info/search.md
           - widgets/info/stocks.md
           - widgets/info/unifi_controller.md
-          - widgets/info/weather.md
   - "Learn":
       - widgets/authoring/index.md
       - "Getting Started": widgets/authoring/getting-started.md
diff --git a/package-lock.json b/package-lock.json
index 14b7d054a..e12a62732 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "compare-versions": "^6.1.0",
         "dockerode": "^4.0.2",
         "follow-redirects": "^1.15.9",
-        "gamedig": "^5.1.2",
+        "gamedig": "^5.1.4",
         "i18next": "^21.10.0",
         "js-yaml": "^4.1.0",
         "json-rpc-2.0": "^1.7.0",
@@ -50,7 +50,7 @@
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-jsx-a11y": "^6.8.0",
         "eslint-plugin-prettier": "^5.2.1",
-        "eslint-plugin-react": "^7.37.1",
+        "eslint-plugin-react": "^7.37.2",
         "eslint-plugin-react-hooks": "^4.6.2",
         "postcss": "^8.4.47",
         "prettier": "^3.2.5",
@@ -2115,9 +2115,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -2729,9 +2729,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "version": "1.23.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.5.tgz",
+      "integrity": "sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2750,7 +2750,7 @@
         "function.prototype.name": "^1.1.6",
         "get-intrinsic": "^1.2.4",
         "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
+        "globalthis": "^1.0.4",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.2",
         "has-proto": "^1.0.3",
@@ -2766,10 +2766,10 @@
         "is-string": "^1.0.7",
         "is-typed-array": "^1.1.13",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
+        "regexp.prototype.flags": "^1.5.3",
         "safe-array-concat": "^1.1.2",
         "safe-regex-test": "^1.0.3",
         "string.prototype.trim": "^1.2.9",
@@ -2834,9 +2834,9 @@
       }
     },
     "node_modules/es-iterator-helpers": {
-      "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
-      "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz",
+      "integrity": "sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2847,12 +2847,13 @@
         "es-set-tostringtag": "^2.0.3",
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "globalthis": "^1.0.3",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.2",
         "has-proto": "^1.0.3",
         "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.7",
-        "iterator.prototype": "^1.1.2",
+        "iterator.prototype": "^1.1.3",
         "safe-array-concat": "^1.1.2"
       },
       "engines": {
@@ -3280,17 +3281,18 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.1.tgz",
-      "integrity": "sha512-xwTnwDqzbDRA8uJ7BMxPs/EXRB3i8ZfnOIp8BsxEQkT0nHPp+WWceqGgo6rKb9ctNi8GJLDT4Go5HAWELa/WMg==",
+      "version": "7.37.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz",
+      "integrity": "sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-includes": "^3.1.8",
         "array.prototype.findlast": "^1.2.5",
         "array.prototype.flatmap": "^1.3.2",
         "array.prototype.tosorted": "^1.1.4",
         "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.19",
+        "es-iterator-helpers": "^1.1.0",
         "estraverse": "^5.3.0",
         "hasown": "^2.0.2",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
@@ -3847,9 +3849,9 @@
       }
     },
     "node_modules/gamedig": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/gamedig/-/gamedig-5.1.3.tgz",
-      "integrity": "sha512-ECksJC4idM3a+P+a+j9/XHcPOsP4DUrwowK38QucDQ4x5T7mQDWErY2n8NE4kV4HKjCq16ifNMAEt+/nyCKWog==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/gamedig/-/gamedig-5.1.4.tgz",
+      "integrity": "sha512-MgSbNVGh5QMdrmRTrZ3W7W6sC5/Mx+dMgTy2uZCKQ9vns9eFXkQj61Pw2Y2FNHNMMp4DXFSUMYAPJWLcR16Wwg==",
       "license": "MIT",
       "dependencies": {
         "cheerio": "1.0.0-rc.12",
@@ -3858,7 +3860,6 @@
         "iconv-lite": "0.6.3",
         "long": "5.2.3",
         "minimist": "1.2.8",
-        "punycode": "2.3.1",
         "seek-bzip": "2.0.0",
         "varint": "6.0.0"
       },
@@ -4677,13 +4678,16 @@
       }
     },
     "node_modules/is-finalizationregistry": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
-      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.0.tgz",
+      "integrity": "sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4974,9 +4978,9 @@
       "license": "MIT"
     },
     "node_modules/iterator.prototype": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
-      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.3.tgz",
+      "integrity": "sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4985,6 +4989,9 @@
         "has-symbols": "^1.0.3",
         "reflect.getprototypeof": "^1.0.4",
         "set-function-name": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/jackspeak": {
@@ -5503,9 +5510,9 @@
       "optional": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
@@ -5758,9 +5765,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+      "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6677,19 +6684,19 @@
       }
     },
     "node_modules/reflect.getprototypeof": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz",
-      "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.7.tgz",
+      "integrity": "sha512-bMvFGIUKlc/eSfXNX+aZ+EL95/EgZzuwA0OBPTbZZDEJw/0AkentjMuM1oiRfwHrshqk4RzdgiTg5CcDalXN5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.1",
+        "es-abstract": "^1.23.5",
         "es-errors": "^1.3.0",
         "get-intrinsic": "^1.2.4",
-        "globalthis": "^1.0.3",
-        "which-builtin-type": "^1.1.3"
+        "gopd": "^1.0.1",
+        "which-builtin-type": "^1.1.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6705,16 +6712,16 @@
       "license": "MIT"
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
+      "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8337,17 +8344,18 @@
       }
     },
     "node_modules/which-builtin-type": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz",
-      "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.0.tgz",
+      "integrity": "sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "call-bind": "^1.0.7",
         "function.prototype.name": "^1.1.6",
         "has-tostringtag": "^1.0.2",
         "is-async-function": "^2.0.0",
         "is-date-object": "^1.0.5",
-        "is-finalizationregistry": "^1.0.2",
+        "is-finalizationregistry": "^1.1.0",
         "is-generator-function": "^1.0.10",
         "is-regex": "^1.1.4",
         "is-weakref": "^1.0.2",
diff --git a/package.json b/package.json
index 8be8d3623..5210b4743 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "compare-versions": "^6.1.0",
     "dockerode": "^4.0.2",
     "follow-redirects": "^1.15.9",
-    "gamedig": "^5.1.2",
+    "gamedig": "^5.1.4",
     "i18next": "^21.10.0",
     "js-yaml": "^4.1.0",
     "json-rpc-2.0": "^1.7.0",
@@ -52,7 +52,7 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.1",
+    "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^4.6.2",
     "postcss": "^8.4.47",
     "prettier": "^3.2.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d73d36c6f..e82adc746 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -30,8 +30,8 @@ importers:
         specifier: ^1.15.9
         version: 1.15.9
       gamedig:
-        specifier: ^5.1.2
-        version: 5.1.3
+        specifier: ^5.1.4
+        version: 5.1.4
       i18next:
         specifier: ^21.10.0
         version: 21.10.0
@@ -117,7 +117,7 @@ importers:
         version: 8.57.1
       eslint-config-airbnb:
         specifier: ^19.0.4
-        version: 19.0.4(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.1(eslint@8.57.1))(eslint@8.57.1)
+        version: 19.0.4(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.2(eslint@8.57.1))(eslint@8.57.1)
       eslint-config-next:
         specifier: ^14.2.3
         version: 14.2.8(eslint@8.57.1)(typescript@5.6.3)
@@ -126,7 +126,7 @@ importers:
         version: 9.1.0(eslint@8.57.1)
       eslint-plugin-import:
         specifier: ^2.31.0
-        version: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
+        version: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jsx-a11y:
         specifier: ^6.8.0
         version: 6.10.0(eslint@8.57.1)
@@ -134,8 +134,8 @@ importers:
         specifier: ^5.2.1
         version: 5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.3.3)
       eslint-plugin-react:
-        specifier: ^7.37.1
-        version: 7.37.1(eslint@8.57.1)
+        specifier: ^7.37.2
+        version: 7.37.2(eslint@8.57.1)
       eslint-plugin-react-hooks:
         specifier: ^4.6.2
         version: 4.6.2(eslint@8.57.1)
@@ -783,8 +783,8 @@ packages:
     resolution: {integrity: sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==}
     engines: {node: '>=10.0.0'}
 
-  cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
   css-select@5.1.0:
@@ -1006,6 +1006,10 @@ packages:
     resolution: {integrity: sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==}
     engines: {node: '>= 0.4'}
 
+  es-iterator-helpers@1.2.0:
+    resolution: {integrity: sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==}
+    engines: {node: '>= 0.4'}
+
   es-object-atoms@1.0.0:
     resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
     engines: {node: '>= 0.4'}
@@ -1155,8 +1159,8 @@ packages:
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
 
-  eslint-plugin-react@7.37.1:
-    resolution: {integrity: sha512-xwTnwDqzbDRA8uJ7BMxPs/EXRB3i8ZfnOIp8BsxEQkT0nHPp+WWceqGgo6rKb9ctNi8GJLDT4Go5HAWELa/WMg==}
+  eslint-plugin-react@7.37.2:
+    resolution: {integrity: sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==}
     engines: {node: '>=4'}
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
@@ -1316,8 +1320,8 @@ packages:
   functions-have-names@1.2.3:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
 
-  gamedig@5.1.3:
-    resolution: {integrity: sha512-ECksJC4idM3a+P+a+j9/XHcPOsP4DUrwowK38QucDQ4x5T7mQDWErY2n8NE4kV4HKjCq16ifNMAEt+/nyCKWog==}
+  gamedig@5.1.4:
+    resolution: {integrity: sha512-MgSbNVGh5QMdrmRTrZ3W7W6sC5/Mx+dMgTy2uZCKQ9vns9eFXkQj61Pw2Y2FNHNMMp4DXFSUMYAPJWLcR16Wwg==}
     engines: {node: '>=16.20.0'}
     hasBin: true
 
@@ -1648,6 +1652,10 @@ packages:
   iterator.prototype@1.1.2:
     resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}
 
+  iterator.prototype@1.1.3:
+    resolution: {integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==}
+    engines: {node: '>= 0.4'}
+
   jackspeak@2.3.6:
     resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
     engines: {node: '>=14'}
@@ -3454,7 +3462,7 @@ snapshots:
       nan: 2.20.0
     optional: true
 
-  cross-spawn@7.0.3:
+  cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
@@ -3757,6 +3765,24 @@ snapshots:
       iterator.prototype: 1.1.2
       safe-array-concat: 1.1.2
 
+  es-iterator-helpers@1.2.0:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-set-tostringtag: 2.0.3
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      globalthis: 1.0.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      internal-slot: 1.0.7
+      iterator.prototype: 1.1.3
+      safe-array-concat: 1.1.2
+
   es-object-atoms@1.0.0:
     dependencies:
       es-errors: 1.3.0
@@ -3785,18 +3811,18 @@ snapshots:
     dependencies:
       confusing-browser-globals: 1.0.11
       eslint: 8.57.1
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       object.assign: 4.1.5
       object.entries: 1.1.8
       semver: 6.3.1
 
-  eslint-config-airbnb@19.0.4(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.1(eslint@8.57.1))(eslint@8.57.1):
+  eslint-config-airbnb@19.0.4(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.2(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       eslint: 8.57.1
       eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.0(eslint@8.57.1)
-      eslint-plugin-react: 7.37.1(eslint@8.57.1)
+      eslint-plugin-react: 7.37.2(eslint@8.57.1)
       eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1)
       object.assign: 4.1.5
       object.entries: 1.1.8
@@ -3809,10 +3835,10 @@ snapshots:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.1)(typescript@5.6.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.0(eslint@8.57.1)
-      eslint-plugin-react: 7.37.1(eslint@8.57.1)
+      eslint-plugin-react: 7.37.2(eslint@8.57.1)
       eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1)
     optionalDependencies:
       typescript: 5.6.3
@@ -3833,48 +3859,48 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1):
+  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.3.6
       enhanced-resolve: 5.17.1
       eslint: 8.57.1
-      eslint-module-utils: 2.9.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-module-utils: 2.9.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       fast-glob: 3.3.2
       get-tsconfig: 4.8.0
       is-bun-module: 1.1.0
       is-glob: 4.0.3
     optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
     transitivePeerDependencies:
       - '@typescript-eslint/parser'
       - eslint-import-resolver-node
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.1)(typescript@5.6.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.9.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-module-utils@2.9.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.1)(typescript@5.6.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1):
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.8
@@ -3885,7 +3911,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       hasown: 2.0.2
       is-core-module: 2.15.1
       is-glob: 4.0.3
@@ -3936,14 +3962,14 @@ snapshots:
     dependencies:
       eslint: 8.57.1
 
-  eslint-plugin-react@7.37.1(eslint@8.57.1):
+  eslint-plugin-react@7.37.2(eslint@8.57.1):
     dependencies:
       array-includes: 3.1.8
       array.prototype.findlast: 1.2.5
       array.prototype.flatmap: 1.3.2
       array.prototype.tosorted: 1.1.4
       doctrine: 2.1.0
-      es-iterator-helpers: 1.0.19
+      es-iterator-helpers: 1.2.0
       eslint: 8.57.1
       estraverse: 5.3.0
       hasown: 2.0.2
@@ -3977,7 +4003,7 @@ snapshots:
       '@ungap/structured-clone': 1.2.0
       ajv: 6.12.6
       chalk: 4.1.2
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       debug: 4.3.6
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
@@ -4032,7 +4058,7 @@ snapshots:
 
   execa@5.0.0:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 6.0.1
       human-signals: 2.1.0
       is-stream: 2.0.1
@@ -4101,7 +4127,7 @@ snapshots:
 
   foreground-child@3.3.0:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
   forever-agent@0.6.1: {}
@@ -4138,7 +4164,7 @@ snapshots:
 
   functions-have-names@1.2.3: {}
 
-  gamedig@5.1.3:
+  gamedig@5.1.4:
     dependencies:
       cheerio: 1.0.0-rc.12
       gbxremote: 0.2.1
@@ -4146,7 +4172,6 @@ snapshots:
       iconv-lite: 0.6.3
       long: 5.2.3
       minimist: 1.2.8
-      punycode: 2.3.1
       seek-bzip: 2.0.0
       varint: 6.0.0
 
@@ -4496,6 +4521,14 @@ snapshots:
       reflect.getprototypeof: 1.0.6
       set-function-name: 2.0.2
 
+  iterator.prototype@1.1.3:
+    dependencies:
+      define-properties: 1.2.1
+      get-intrinsic: 1.2.4
+      has-symbols: 1.0.3
+      reflect.getprototypeof: 1.0.6
+      set-function-name: 2.0.2
+
   jackspeak@2.3.6:
     dependencies:
       '@isaacs/cliui': 8.0.2
diff --git a/public/locales/af/common.json b/public/locales/af/common.json
index 5f5f1883e..9bccf395d 100644
--- a/public/locales/af/common.json
+++ b/public/locales/af/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Rooster",
         "home_power": "Verbruik",
         "charge_power": "Laaier",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Aflaai",
@@ -990,22 +990,22 @@
         "network": "NET"
     },
     "argocd": {
-        "apps": "Apps",
-        "synced": "Synced",
-        "outOfSync": "Out Of Sync",
+        "apps": "Programme",
+        "synced": "Gesinkroniseer",
+        "outOfSync": "Nie Gesinchroniseer Nie",
         "healthy": "Gesond",
-        "degraded": "Degraded",
-        "progressing": "Progressing",
+        "degraded": "Gedegradeer",
+        "progressing": "Vorderend",
         "missing": "Vermis",
-        "suspended": "Suspended"
+        "suspended": "Geskors"
     },
     "spoolman": {
         "loading": "Laai"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Groepe",
         "issues": "Kwessies",
-        "merges": "Merge Requests",
-        "projects": "Projects"
+        "merges": "Saamvleg Versoeke",
+        "projects": "Projekte"
     }
 }
diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json
index 558de9754..df057af0e 100644
--- a/public/locales/ar/common.json
+++ b/public/locales/ar/common.json
@@ -120,7 +120,7 @@
         "grid_power": "شبكة",
         "home_power": "الاستهلاك",
         "charge_power": "شاحن",
-        "watt_hour": "واط ساعة"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "التنزيل",
diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json
index 15c38b149..4d691ce9f 100644
--- a/public/locales/bg/common.json
+++ b/public/locales/bg/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json
index 9eb7e4476..e520fd1b9 100644
--- a/public/locales/ca/common.json
+++ b/public/locales/ca/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Xarxa",
         "home_power": "Consum",
         "charge_power": "Carregador",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Descarregar",
@@ -350,7 +350,7 @@
         "queue": "Cua",
         "processed": "Processat",
         "errored": "Error",
-        "saved": "Desat"
+        "saved": "Estalviat"
     },
     "traefik": {
         "routers": "Encaminadors",
@@ -581,7 +581,7 @@
         "clientIP": "Client"
     },
     "scrutiny": {
-        "passed": "Aprobat",
+        "passed": "Aprovat",
         "failed": "Error",
         "unknown": "Desconegut"
     },
@@ -820,7 +820,7 @@
         "total": "Total",
         "running": "En execució",
         "stopped": "Aturat",
-        "passed": "Aprobat",
+        "passed": "Aprovat",
         "failed": "Error"
     },
     "openwrt": {
@@ -991,21 +991,21 @@
     },
     "argocd": {
         "apps": "Apps",
-        "synced": "Synced",
-        "outOfSync": "Out Of Sync",
+        "synced": "Sincronitzats",
+        "outOfSync": "Dessincronitzats",
         "healthy": "Saludable",
-        "degraded": "Degraded",
-        "progressing": "Progressing",
+        "degraded": "Degradats",
+        "progressing": "Progressant",
         "missing": "Falten",
-        "suspended": "Suspended"
+        "suspended": "Suspesos"
     },
     "spoolman": {
         "loading": "Carregant"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Grups",
         "issues": "Problemes",
         "merges": "Merge Requests",
-        "projects": "Projects"
+        "projects": "Projectes"
     }
 }
diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json
index 983beafe2..8e1aec976 100644
--- a/public/locales/cs/common.json
+++ b/public/locales/cs/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Mřížka",
         "home_power": "Spotřeba",
         "charge_power": "Nabíječka",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Stahování",
diff --git a/public/locales/da/common.json b/public/locales/da/common.json
index de4473977..59fdb251e 100644
--- a/public/locales/da/common.json
+++ b/public/locales/da/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Gitter",
         "home_power": "Forbrug",
         "charge_power": "Oplader",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/de/common.json b/public/locales/de/common.json
index 647e7d8a5..8e25ce210 100644
--- a/public/locales/de/common.json
+++ b/public/locales/de/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Netz",
         "home_power": "verbauch",
         "charge_power": "Ladegerät",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
@@ -1003,9 +1003,9 @@
         "loading": "Wird geladen"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Gruppen",
         "issues": "Probleme",
         "merges": "Merge Requests",
-        "projects": "Projects"
+        "projects": "Projekte"
     }
 }
diff --git a/public/locales/el/common.json b/public/locales/el/common.json
index 8ce8a7e06..bb4496e3e 100644
--- a/public/locales/el/common.json
+++ b/public/locales/el/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Πλέγμα",
         "home_power": "Κατανάλωση",
         "charge_power": "Φορτιστής",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Λήξη",
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 484f76b5c..e3670e806 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json
index fd21b9256..c44b85ee0 100644
--- a/public/locales/eo/common.json
+++ b/public/locales/eo/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Elŝuti",
diff --git a/public/locales/es/common.json b/public/locales/es/common.json
index 299307d09..84d1f8afc 100644
--- a/public/locales/es/common.json
+++ b/public/locales/es/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Red",
         "home_power": "Consumo",
         "charge_power": "Cargador",
-        "watt_hour": "vatio-hora (Wh)"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Descarga",
diff --git a/public/locales/eu/common.json b/public/locales/eu/common.json
index ef3c5262d..4bac77a99 100644
--- a/public/locales/eu/common.json
+++ b/public/locales/eu/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json
index 402aa8d30..738ca3d9c 100644
--- a/public/locales/fi/common.json
+++ b/public/locales/fi/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json
index 2f27665d9..71b4823af 100644
--- a/public/locales/fr/common.json
+++ b/public/locales/fr/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grille",
         "home_power": "Consommation",
         "charge_power": "Chargeur",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Récep.",
diff --git a/public/locales/he/common.json b/public/locales/he/common.json
index 0b8883966..50d25249c 100644
--- a/public/locales/he/common.json
+++ b/public/locales/he/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json
index 2076bce70..cc31bfd7c 100644
--- a/public/locales/hi/common.json
+++ b/public/locales/hi/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json
index 35ae8daba..6c87d725b 100644
--- a/public/locales/hr/common.json
+++ b/public/locales/hr/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Raspored",
         "home_power": "Potrošnja",
         "charge_power": "Punjač",
-        "watt_hour": "Kilovat-sat"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Preuzimanje",
diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json
index abe09fde3..a9cb2dd08 100644
--- a/public/locales/hu/common.json
+++ b/public/locales/hu/common.json
@@ -25,7 +25,7 @@
         "api_error": "API Hiba",
         "information": "Információ",
         "status": "Státusz",
-        "url": "LINK",
+        "url": "URL",
         "raw_error": "Nyers hiba",
         "response_data": "Válaszadatok"
     },
@@ -120,7 +120,7 @@
         "grid_power": "Rács",
         "home_power": "Fogyasztás",
         "charge_power": "Töltő",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Letöltés",
@@ -227,8 +227,8 @@
         "seed": "Seed"
     },
     "develancacheui": {
-        "cachehitbytes": "Cache Hit Bytes",
-        "cachemissbytes": "Cache Miss Bytes"
+        "cachehitbytes": "Gyorsítótárban Sikeres Bitek",
+        "cachemissbytes": "Gyorsítótárban Hibás Bitek"
     },
     "downloadstation": {
         "download": "Letöltés",
@@ -311,13 +311,13 @@
     },
     "suwayomi": {
         "download": "Letöltött",
-        "nondownload": "Non-Downloaded",
+        "nondownload": "Nem Letöltött",
         "read": "Olvasott",
         "unread": "Olvasatlan",
-        "downloadedread": "Downloaded & Read",
-        "downloadedunread": "Downloaded & Unread",
-        "nondownloadedread": "Non-Downloaded & Read",
-        "nondownloadedunread": "Non-Downloaded & Unread"
+        "downloadedread": "Letöltött & Olvasott",
+        "downloadedunread": "Letöltött & Olvasatlan",
+        "nondownloadedread": "Nem Letöltött & Olvasatlan",
+        "nondownloadedunread": "Nem Letöltött & Olvasatlan"
     },
     "tailscale": {
         "address": "Cím",
@@ -335,15 +335,15 @@
     },
     "technitium": {
         "totalQueries": "Lekérdezések",
-        "totalNoError": "Success",
-        "totalServerFailure": "Failures",
-        "totalNxDomain": "NX Domains",
-        "totalRefused": "Refused",
-        "totalAuthoritative": "Authoritative",
-        "totalRecursive": "Recursive",
-        "totalCached": "Cached",
+        "totalNoError": "Sikerek",
+        "totalServerFailure": "Hibák",
+        "totalNxDomain": "NX Domainek",
+        "totalRefused": "Elutasított",
+        "totalAuthoritative": "Irányadó",
+        "totalRecursive": "Rekurzív",
+        "totalCached": "Gyorsítótárazott",
         "totalBlocked": "Blokkolt",
-        "totalDropped": "Dropped",
+        "totalDropped": "Eldobott",
         "totalClients": "Kliensek"
     },
     "tdarr": {
@@ -453,7 +453,7 @@
         "search": "Keresés",
         "custom": "Egyedi",
         "visit": "Megnéz",
-        "url": "LINK",
+        "url": "URL",
         "searchsuggestion": "Javaslat"
     },
     "wmo": {
@@ -854,16 +854,16 @@
     },
     "romm": {
         "platforms": "Felület",
-        "totalRoms": "Games",
-        "saves": "Saves",
-        "states": "States",
-        "screenshots": "Screenshots",
-        "totalfilesize": "Total Size"
+        "totalRoms": "Játékok",
+        "saves": "Mentések",
+        "states": "Állapotok",
+        "screenshots": "Képernyőképek",
+        "totalfilesize": "Teljes méret"
     },
     "mailcow": {
         "domains": "Domainek",
-        "mailboxes": "Mailboxes",
-        "mails": "Mails",
+        "mailboxes": "E-mail fiókok",
+        "mails": "Mailek",
         "storage": "Tárhely"
     },
     "netdata": {
@@ -912,7 +912,7 @@
     },
     "crowdsec": {
         "alerts": "Riasztások",
-        "bans": "Bans"
+        "bans": "Kitiltások"
     },
     "wgeasy": {
         "connected": "Csatlakozva",
@@ -921,10 +921,10 @@
         "total": "Összes"
     },
     "swagdashboard": {
-        "proxied": "Proxied",
-        "auth": "With Auth",
-        "outdated": "Outdated",
-        "banned": "Banned"
+        "proxied": "Proxyzott",
+        "auth": "Hitelesítéssel",
+        "outdated": "Elavult",
+        "banned": "Kitiltott"
     },
     "myspeed": {
         "ping": "Ping",
@@ -932,29 +932,29 @@
         "upload": "Feltöltés"
     },
     "stocks": {
-        "stocks": "Stocks",
-        "loading": "Loading",
-        "open": "Open - US Market",
-        "closed": "Closed - US Market",
-        "invalidConfiguration": "Invalid Configuration"
+        "stocks": "Tőzsde",
+        "loading": "Betöltés",
+        "open": "Nyitva - US Piac",
+        "closed": "Zárva - US Piac",
+        "invalidConfiguration": "Érvénytelen konfiguráció"
     },
     "frigate": {
-        "cameras": "Cameras",
+        "cameras": "Kamerák",
         "uptime": "Üzemidő",
         "version": "Verzió"
     },
     "linkwarden": {
-        "links": "Links",
-        "collections": "Collections",
+        "links": "Linkek",
+        "collections": "Gyűjtemény",
         "tags": "Címkék"
     },
     "zabbix": {
-        "unclassified": "Not classified",
+        "unclassified": "Nem titkosított",
         "information": "Információ",
-        "warning": "Warning",
-        "average": "Average",
-        "high": "High",
-        "disaster": "Disaster"
+        "warning": "Figyelmeztetés",
+        "average": "Átlag",
+        "high": "Magas",
+        "disaster": "Katasztrófa"
     },
     "lubelogger": {
         "vehicle": "Jármű",
@@ -962,13 +962,13 @@
         "serviceRecords": "Szolgáltatások nyílvántartása",
         "reminders": "Emlékeztetők",
         "nextReminder": "Következő emlékeztető",
-        "none": "None"
+        "none": "Semmi"
     },
     "vikunja": {
-        "projects": "Active Projects",
-        "tasks7d": "Tasks Due This Week",
-        "tasksOverdue": "Overdue Tasks",
-        "tasksInProgress": "Tasks In Progress"
+        "projects": "Aktív Projektek",
+        "tasks7d": "Hátralévő feladatok a héten",
+        "tasksOverdue": "Lejárt feladatok",
+        "tasksInProgress": "Folyamatban levő Feladatok"
     },
     "headscale": {
         "name": "Név",
@@ -980,32 +980,32 @@
     },
     "beszel": {
         "name": "Név",
-        "systems": "Systems",
+        "systems": "Rendszerek",
         "up": "Fel",
         "status": "Státusz",
         "updated": "Frissített",
         "cpu": "Processzor",
         "memory": "RAM",
-        "disk": "Disk",
-        "network": "NET"
+        "disk": "Lemez",
+        "network": "Hálózat"
     },
     "argocd": {
-        "apps": "Apps",
-        "synced": "Synced",
-        "outOfSync": "Out Of Sync",
+        "apps": "Alkalmazások",
+        "synced": "Szinkronizált",
+        "outOfSync": "Nincs szinkronban",
         "healthy": "Egészséges",
-        "degraded": "Degraded",
-        "progressing": "Progressing",
+        "degraded": "Leépült",
+        "progressing": "Halad",
         "missing": "Hiányzik",
-        "suspended": "Suspended"
+        "suspended": "Felfüggesztett"
     },
     "spoolman": {
-        "loading": "Loading"
+        "loading": "Betöltés"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Csoportok",
         "issues": "Problémák",
-        "merges": "Merge Requests",
-        "projects": "Projects"
+        "merges": "Merge kérések",
+        "projects": "Projektek"
     }
 }
diff --git a/public/locales/id/common.json b/public/locales/id/common.json
index 9d65cbdf0..e0c636837 100644
--- a/public/locales/id/common.json
+++ b/public/locales/id/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Konsumsi",
         "charge_power": "Charger",
-        "watt_hour": "Watt/jam"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Unduh",
diff --git a/public/locales/it/common.json b/public/locales/it/common.json
index eca25f3f0..fae5613b7 100644
--- a/public/locales/it/common.json
+++ b/public/locales/it/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Griglia",
         "home_power": "Consumo",
         "charge_power": "Caricatore",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json
index e12ccadfa..7d17b1062 100644
--- a/public/locales/ja/common.json
+++ b/public/locales/ja/common.json
@@ -120,7 +120,7 @@
         "grid_power": "グリッド",
         "home_power": "消費",
         "charge_power": "チャージャー",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "ダウンロード",
@@ -804,7 +804,7 @@
         "ping": "Ping"
     },
     "urbackup": {
-        "ok": "はい",
+        "ok": "正常",
         "errored": "エラー",
         "noRecent": "期限切れ",
         "totalUsed": "使用済みストレージ"
@@ -957,7 +957,7 @@
         "disaster": "災害"
     },
     "lubelogger": {
-        "vehicle": "Vehicle",
+        "vehicle": "車両",
         "vehicles": "Vehicles",
         "serviceRecords": "Service Records",
         "reminders": "Reminders",
diff --git a/public/locales/ko/common.json b/public/locales/ko/common.json
index c760fe30d..327dceae0 100644
--- a/public/locales/ko/common.json
+++ b/public/locales/ko/common.json
@@ -120,7 +120,7 @@
         "grid_power": "눈금",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "다운로드",
diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json
index e15ccc089..a1f989e4e 100644
--- a/public/locales/lv/common.json
+++ b/public/locales/lv/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Lejupielāde",
diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json
index f1c4407b4..35377b415 100644
--- a/public/locales/ms/common.json
+++ b/public/locales/ms/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Penggunaan",
         "charge_power": "Pengecas",
-        "watt_hour": "Wj"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Muat turun",
diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json
index 60face07f..eb92b4898 100644
--- a/public/locales/nl/common.json
+++ b/public/locales/nl/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Netstroom",
         "home_power": "Consumptie",
         "charge_power": "Oplader",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/no/common.json b/public/locales/no/common.json
index f987aadb0..e67dfaa34 100644
--- a/public/locales/no/common.json
+++ b/public/locales/no/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Nett",
         "home_power": "Forbruk",
         "charge_power": "Lader",
-        "watt_hour": "W/t"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Last ned",
diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json
index 0d14325cc..fcca526f4 100644
--- a/public/locales/pl/common.json
+++ b/public/locales/pl/common.json
@@ -13,7 +13,7 @@
         "ms": "{{value, number}}",
         "date": "{{value, date}}",
         "relativeDate": "{{value, relativeDate}}",
-        "duration": "{{value, duration}}",
+        "duration": "{value, duration}",
         "months": "mc",
         "days": "d",
         "hours": "g",
@@ -120,7 +120,7 @@
         "grid_power": "Siatka",
         "home_power": "Zużycie",
         "charge_power": "Ładowarka",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Pobieranie",
@@ -311,13 +311,13 @@
     },
     "suwayomi": {
         "download": "Pobrano",
-        "nondownload": "Non-Downloaded",
+        "nondownload": "Niepobrane",
         "read": "Przeczytane",
         "unread": "Nieprzeczytane",
-        "downloadedread": "Downloaded & Read",
-        "downloadedunread": "Downloaded & Unread",
-        "nondownloadedread": "Non-Downloaded & Read",
-        "nondownloadedunread": "Non-Downloaded & Unread"
+        "downloadedread": "Pobrane i przeczytane",
+        "downloadedunread": "Pobrane i nieprzeczytane",
+        "nondownloadedread": "Niepobrane i przeczytane",
+        "nondownloadedunread": "Niepobrane i nieprzeczytane"
     },
     "tailscale": {
         "address": "Adres",
@@ -957,18 +957,18 @@
         "disaster": "Katastrofa"
     },
     "lubelogger": {
-        "vehicle": "Vehicle",
-        "vehicles": "Vehicles",
-        "serviceRecords": "Service Records",
-        "reminders": "Reminders",
-        "nextReminder": "Next Reminder",
-        "none": "None"
+        "vehicle": "Pojazd",
+        "vehicles": "Pojazdy",
+        "serviceRecords": "Wpisy serwisowe",
+        "reminders": "Przypomnienia",
+        "nextReminder": "Następne przypomnienie",
+        "none": "Brak"
     },
     "vikunja": {
-        "projects": "Active Projects",
-        "tasks7d": "Tasks Due This Week",
-        "tasksOverdue": "Overdue Tasks",
-        "tasksInProgress": "Tasks In Progress"
+        "projects": "Aktywne Projekty",
+        "tasks7d": "Zadania w tym tygodniu",
+        "tasksOverdue": "Zaległe zadania",
+        "tasksInProgress": "Zadania w toku"
     },
     "headscale": {
         "name": "Nazwa",
@@ -980,32 +980,32 @@
     },
     "beszel": {
         "name": "Nazwa",
-        "systems": "Systems",
+        "systems": "Systemy",
         "up": "Dostępny",
         "status": "Stan",
         "updated": "Zaktualizowane",
         "cpu": "Procesor",
         "memory": "RAM",
-        "disk": "Disk",
+        "disk": "Dysk",
         "network": "NET"
     },
     "argocd": {
-        "apps": "Apps",
-        "synced": "Synced",
-        "outOfSync": "Out Of Sync",
+        "apps": "Aplikacje",
+        "synced": "Synchronizowane",
+        "outOfSync": "Bez synchronizacji",
         "healthy": "Zdrowy",
-        "degraded": "Degraded",
-        "progressing": "Progressing",
+        "degraded": "Zdegradowane",
+        "progressing": "Postępujące",
         "missing": "Brakujące",
-        "suspended": "Suspended"
+        "suspended": "Zawieszone"
     },
     "spoolman": {
         "loading": "Wczytywanie"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Grupy",
         "issues": "Zgłoszenia",
-        "merges": "Merge Requests",
-        "projects": "Projects"
+        "merges": "Żądania scaleń",
+        "projects": "Projekty"
     }
 }
diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json
index 3d3de0a85..4bb36ed53 100644
--- a/public/locales/pt/common.json
+++ b/public/locales/pt/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grelha",
         "home_power": "Consumo",
         "charge_power": "Carregador",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Descarregar",
diff --git a/public/locales/pt_BR/common.json b/public/locales/pt_BR/common.json
index c2a2330fc..51cb38a68 100644
--- a/public/locales/pt_BR/common.json
+++ b/public/locales/pt_BR/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grade",
         "home_power": "Consumo",
         "charge_power": "Carregador",
-        "watt_hour": "Kw"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Descarregar",
diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json
index 80b6e542a..3672cb3b1 100644
--- a/public/locales/ro/common.json
+++ b/public/locales/ro/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grilă",
         "home_power": "Consum",
         "charge_power": "Încărcător",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Descarcă",
diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json
index 35894d0cf..75beea25d 100644
--- a/public/locales/ru/common.json
+++ b/public/locales/ru/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Сетка",
         "home_power": "Потребление",
         "charge_power": "Зарядка",
-        "watt_hour": "Вт/ч"
+        "kilowatt": "кВт"
     },
     "flood": {
         "download": "Скачивание",
@@ -990,22 +990,22 @@
         "network": "Сеть"
     },
     "argocd": {
-        "apps": "Apps",
-        "synced": "Synced",
-        "outOfSync": "Out Of Sync",
+        "apps": "Приложения",
+        "synced": "Синхронизированные",
+        "outOfSync": "Не синхронизированные",
         "healthy": "Здоровый",
-        "degraded": "Degraded",
-        "progressing": "Progressing",
+        "degraded": "Деградированные",
+        "progressing": "Выполняются",
         "missing": "Отсутствует",
-        "suspended": "Suspended"
+        "suspended": "Приостановленные"
     },
     "spoolman": {
         "loading": "Загрузка"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Группы",
         "issues": "Вопросы",
-        "merges": "Merge Requests",
-        "projects": "Projects"
+        "merges": "Мердж-реквесты",
+        "projects": "Проекты"
     }
 }
diff --git a/public/locales/sk/common.json b/public/locales/sk/common.json
index e93dd657e..ecdd39584 100644
--- a/public/locales/sk/common.json
+++ b/public/locales/sk/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Mriežka",
         "home_power": "Spotreba",
         "charge_power": "Nabíjačka",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Sťahovanie",
diff --git a/public/locales/sl/common.json b/public/locales/sl/common.json
index 17298acb9..8fbd02430 100644
--- a/public/locales/sl/common.json
+++ b/public/locales/sl/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Omrežje",
         "home_power": "Poraba",
         "charge_power": "Polnilec",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Prenos",
@@ -1003,9 +1003,9 @@
         "loading": "Nalaganje"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Skupine",
         "issues": "Težave",
-        "merges": "Merge Requests",
-        "projects": "Projects"
+        "merges": "Združi zahtevke",
+        "projects": "Projekti"
     }
 }
diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json
index 135d50400..83c9aa1ce 100644
--- a/public/locales/sr/common.json
+++ b/public/locales/sr/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json
index ea10eadb0..6cb060046 100644
--- a/public/locales/sv/common.json
+++ b/public/locales/sv/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/te/common.json b/public/locales/te/common.json
index f480451b6..e8a914a23 100644
--- a/public/locales/te/common.json
+++ b/public/locales/te/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/th/common.json b/public/locales/th/common.json
index 67c5804bd..e218d1f62 100644
--- a/public/locales/th/common.json
+++ b/public/locales/th/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "ดาวน์โหลด",
diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json
index e0b25666a..7dedf6379 100644
--- a/public/locales/tr/common.json
+++ b/public/locales/tr/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Güç",
         "home_power": "Tüketim",
         "charge_power": "Şarj",
-        "watt_hour": "Watt/Saat"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "İndirme",
diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json
index 6297e5704..8dd2314f8 100644
--- a/public/locales/uk/common.json
+++ b/public/locales/uk/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Сітка",
         "home_power": "Споживання",
         "charge_power": "Зарядний пристрій",
-        "watt_hour": "Вт/год"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Завантажено",
@@ -311,13 +311,13 @@
     },
     "suwayomi": {
         "download": "Завантажено",
-        "nondownload": "Non-Downloaded",
+        "nondownload": "Не завантажено",
         "read": "Прочитано",
         "unread": "Не прочитано",
-        "downloadedread": "Downloaded & Read",
-        "downloadedunread": "Downloaded & Unread",
-        "nondownloadedread": "Non-Downloaded & Read",
-        "nondownloadedunread": "Non-Downloaded & Unread"
+        "downloadedread": "Завантажено та Прочитано",
+        "downloadedunread": "Завантажено та Непрочитано",
+        "nondownloadedread": "Не завантажено та Прочитано",
+        "nondownloadedunread": "Не завантажено та Не прочитано"
     },
     "tailscale": {
         "address": "Адреса",
@@ -965,10 +965,10 @@
         "none": "Жодного"
     },
     "vikunja": {
-        "projects": "Active Projects",
-        "tasks7d": "Tasks Due This Week",
-        "tasksOverdue": "Overdue Tasks",
-        "tasksInProgress": "Tasks In Progress"
+        "projects": "Активні проекти",
+        "tasks7d": "Завдання цього тижня",
+        "tasksOverdue": "Прострочені завдання",
+        "tasksInProgress": "Завдання в процесі"
     },
     "headscale": {
         "name": "Назва",
@@ -980,32 +980,32 @@
     },
     "beszel": {
         "name": "Назва",
-        "systems": "Systems",
+        "systems": "Системи",
         "up": "Онлайн",
         "status": "Стан",
         "updated": "Оновлено",
         "cpu": "ЦП",
         "memory": "ОЗП",
-        "disk": "Disk",
-        "network": "NET"
+        "disk": "Диск",
+        "network": "МЕРЕЖА"
     },
     "argocd": {
-        "apps": "Apps",
-        "synced": "Synced",
-        "outOfSync": "Out Of Sync",
+        "apps": "Додатки",
+        "synced": "Синхронізовано",
+        "outOfSync": "Не синхронізовано",
         "healthy": "Здоровий",
-        "degraded": "Degraded",
-        "progressing": "Progressing",
+        "degraded": "Деградує",
+        "progressing": "Прогрес",
         "missing": "Відсутній",
-        "suspended": "Suspended"
+        "suspended": "Призупинено"
     },
     "spoolman": {
         "loading": "Завантажую"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Групи",
         "issues": "Питання",
-        "merges": "Merge Requests",
-        "projects": "Projects"
+        "merges": "Запити на злиття",
+        "projects": "Проєкти"
     }
 }
diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json
index 8abcdad57..59d0563aa 100644
--- a/public/locales/vi/common.json
+++ b/public/locales/vi/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "Download",
diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json
index f10269f67..a498b41fb 100644
--- a/public/locales/yue/common.json
+++ b/public/locales/yue/common.json
@@ -120,7 +120,7 @@
         "grid_power": "電網",
         "home_power": "電源使用率",
         "charge_power": "充電",
-        "watt_hour": "瓦時 (Wh)"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "下載速率",
diff --git a/public/locales/zh-Hans/common.json b/public/locales/zh-Hans/common.json
index f0d445c24..67b7cbcba 100644
--- a/public/locales/zh-Hans/common.json
+++ b/public/locales/zh-Hans/common.json
@@ -120,7 +120,7 @@
         "grid_power": "Grid",
         "home_power": "Consumption",
         "charge_power": "Charger",
-        "watt_hour": "Wh"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "下载",
diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json
index 1a497aaba..7f7e8037a 100644
--- a/public/locales/zh-Hant/common.json
+++ b/public/locales/zh-Hant/common.json
@@ -120,7 +120,7 @@
         "grid_power": "電網",
         "home_power": "電源使用率",
         "charge_power": "充電",
-        "watt_hour": "瓦時 (Wh)"
+        "kilowatt": "kW"
     },
     "flood": {
         "download": "下載速率",
diff --git a/src/components/bookmarks/group.jsx b/src/components/bookmarks/group.jsx
index 3a9f8323a..9deb1b6a2 100644
--- a/src/components/bookmarks/group.jsx
+++ b/src/components/bookmarks/group.jsx
@@ -7,7 +7,13 @@ import ErrorBoundary from "components/errorboundry";
 import List from "components/bookmarks/list";
 import ResolvedIcon from "components/resolvedicon";
 
-export default function BookmarksGroup({ bookmarks, layout, disableCollapse, groupsInitiallyCollapsed }) {
+export default function BookmarksGroup({
+  bookmarks,
+  layout,
+  disableCollapse,
+  groupsInitiallyCollapsed,
+  bookmarksStyle,
+}) {
   const panel = useRef();
 
   useEffect(() => {
@@ -64,7 +70,7 @@ export default function BookmarksGroup({ bookmarks, layout, disableCollapse, gro
             >
               <Disclosure.Panel className="transition-all overflow-hidden duration-300 ease-out" ref={panel} static>
                 <ErrorBoundary>
-                  <List bookmarks={bookmarks.bookmarks} layout={layout} />
+                  <List bookmarks={bookmarks.bookmarks} layout={layout} bookmarksStyle={bookmarksStyle} />
                 </ErrorBoundary>
               </Disclosure.Panel>
             </Transition>
diff --git a/src/components/bookmarks/item.jsx b/src/components/bookmarks/item.jsx
index 690970890..48698cc16 100644
--- a/src/components/bookmarks/item.jsx
+++ b/src/components/bookmarks/item.jsx
@@ -4,12 +4,17 @@ import classNames from "classnames";
 import { SettingsContext } from "utils/contexts/settings";
 import ResolvedIcon from "components/resolvedicon";
 
-export default function Item({ bookmark }) {
+export default function Item({ bookmark, iconOnly = false }) {
   const description = bookmark.description ?? new URL(bookmark.href).hostname;
   const { settings } = useContext(SettingsContext);
 
   return (
-    <li key={bookmark.name} id={bookmark.id} className="bookmark" data-name={bookmark.name}>
+    <li
+      key={bookmark.name}
+      id={bookmark.id}
+      className={classNames("bookmark", iconOnly && "grid")}
+      data-name={bookmark.name}
+    >
       <a
         href={bookmark.href}
         title={bookmark.name}
@@ -17,25 +22,37 @@ export default function Item({ bookmark }) {
         target={bookmark.target ?? settings.target ?? "_blank"}
         className={classNames(
           settings.cardBlur !== undefined && `backdrop-blur${settings.cardBlur.length ? "-" : ""}${settings.cardBlur}`,
-          "block w-full text-left cursor-pointer transition-all h-15 mb-3 rounded-md font-medium text-theme-700 dark:text-theme-200 dark:hover:text-theme-300 shadow-md shadow-theme-900/10 dark:shadow-theme-900/20 bg-theme-100/20 hover:bg-theme-300/20 dark:bg-white/5 dark:hover:bg-white/10",
+          "text-left cursor-pointer transition-all rounded-md font-medium text-theme-700 dark:text-theme-200 dark:hover:text-theme-300 shadow-md shadow-theme-900/10 dark:shadow-theme-900/20 bg-theme-100/20 hover:bg-theme-300/20 dark:bg-white/5 dark:hover:bg-white/10",
+          iconOnly ? "h-[60px] w-[60px] grid" : "block w-full h-15 mb-3",
         )}
       >
-        <div className="flex">
-          <div className="flex-shrink-0 flex items-center justify-center w-11 bg-theme-500/10 dark:bg-theme-900/50 text-theme-700 hover:text-theme-700 dark:text-theme-200 text-sm font-medium rounded-l-md bookmark-icon">
+        {iconOnly ? (
+          <div className="flex items-center justify-center text-theme-700 hover:text-theme-700 dark:text-theme-200 text-xl font-medium rounded-md bookmark-icon py-0.5">
             {bookmark.icon && (
-              <div className="flex-shrink-0 w-5 h-5">
+              <div className="w-7 h-7">
                 <ResolvedIcon icon={bookmark.icon} alt={bookmark.abbr} />
               </div>
             )}
             {!bookmark.icon && bookmark.abbr}
           </div>
-          <div className="flex-1 overflow-hidden flex items-center justify-between rounded-r-md bookmark-text">
-            <div className="pl-3 py-2 text-xs bookmark-name">{bookmark.name}</div>
-            <div className="shrink truncate px-2 py-2 text-theme-500 dark:text-theme-300 text-xs bookmark-description">
-              {description}
+        ) : (
+          <div className="flex">
+            <div className="flex-shrink-0 flex items-center justify-center w-11 bg-theme-500/10 dark:bg-theme-900/50 text-theme-700 hover:text-theme-700 dark:text-theme-200 text-sm font-medium rounded-l-md bookmark-icon">
+              {bookmark.icon && (
+                <div className="flex-shrink-0 w-5 h-5">
+                  <ResolvedIcon icon={bookmark.icon} alt={bookmark.abbr} />
+                </div>
+              )}
+              {!bookmark.icon && bookmark.abbr}
+            </div>
+            <div className="flex-1 overflow-hidden flex items-center justify-between rounded-r-md bookmark-text">
+              <div className="pl-3 py-2 text-xs bookmark-name">{bookmark.name}</div>
+              <div className="shrink truncate px-2 py-2 text-theme-500 dark:text-theme-300 text-xs bookmark-description">
+                {description}
+              </div>
             </div>
           </div>
-        </div>
+        )}
       </a>
     </li>
   );
diff --git a/src/components/bookmarks/list.jsx b/src/components/bookmarks/list.jsx
index 521ca7fb9..194bb43af 100644
--- a/src/components/bookmarks/list.jsx
+++ b/src/components/bookmarks/list.jsx
@@ -4,16 +4,22 @@ import { columnMap } from "../../utils/layout/columns";
 
 import Item from "components/bookmarks/item";
 
-export default function List({ bookmarks, layout }) {
+export default function List({ bookmarks, layout, bookmarksStyle }) {
+  let classes =
+    layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col mt-3 bookmark-list";
+  const style = {};
+  if (layout?.iconsOnly || bookmarksStyle === "icons") {
+    classes = "grid gap-3 mt-3 bookmark-list";
+    style.gridTemplateColumns = "repeat(auto-fill, minmax(60px, 1fr))";
+  }
   return (
-    <ul
-      className={classNames(
-        layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col",
-        "mt-3 bookmark-list",
-      )}
-    >
+    <ul className={classNames(classes)} style={style}>
       {bookmarks.map((bookmark) => (
-        <Item key={`${bookmark.name}-${bookmark.href}`} bookmark={bookmark} />
+        <Item
+          key={`${bookmark.name}-${bookmark.href}`}
+          bookmark={bookmark}
+          iconOnly={layout?.iconsOnly || bookmarksStyle === "icons"}
+        />
       ))}
     </ul>
   );
diff --git a/src/components/quicklaunch.jsx b/src/components/quicklaunch.jsx
index 9f55f973c..cf2ed813a 100644
--- a/src/components/quicklaunch.jsx
+++ b/src/components/quicklaunch.jsx
@@ -129,7 +129,7 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
   useEffect(() => {
     const abortController = new AbortController();
 
-    if (searchString.length === 0) setResults([]);
+    if (searchString.trim().length === 0) setResults([]);
     else {
       let newResults = servicesAndBookmarks.filter((r) => {
         const nameMatch = r.name.toLowerCase().includes(searchString);
diff --git a/src/components/services/group.jsx b/src/components/services/group.jsx
index cdbb89f3b..f25f7ec10 100644
--- a/src/components/services/group.jsx
+++ b/src/components/services/group.jsx
@@ -3,12 +3,13 @@ import classNames from "classnames";
 import { Disclosure, Transition } from "@headlessui/react";
 import { MdKeyboardArrowDown } from "react-icons/md";
 
+import { columnMap } from "../../utils/layout/columns";
+
 import List from "components/services/list";
 import ResolvedIcon from "components/resolvedicon";
 
 export default function ServicesGroup({
   group,
-  services,
   layout,
   fiveColumns,
   disableCollapse,
@@ -23,7 +24,7 @@ export default function ServicesGroup({
 
   return (
     <div
-      key={services.name}
+      key={group.name}
       className={classNames(
         "services-group",
         layout?.style === "row" ? "basis-full" : "basis-full md:basis-1/2 lg:basis-1/3 xl:basis-1/4",
@@ -42,7 +43,7 @@ export default function ServicesGroup({
                   </div>
                 )}
                 <h2 className="flex text-theme-800 dark:text-theme-300 text-xl font-medium service-group-name">
-                  {services.name}
+                  {group.name}
                 </h2>
                 <MdKeyboardArrowDown
                   className={classNames(
@@ -74,7 +75,31 @@ export default function ServicesGroup({
               }}
             >
               <Disclosure.Panel className="transition-all overflow-hidden duration-300 ease-out" ref={panel} static>
-                <List group={group} services={services.services} layout={layout} useEqualHeights={useEqualHeights} />
+                <List
+                  groupName={group.name}
+                  services={group.services}
+                  layout={layout}
+                  useEqualHeights={useEqualHeights}
+                />
+                {group.groups?.length > 0 && (
+                  <div
+                    className={`grid ${
+                      layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col"
+                    } gap-2`}
+                  >
+                    {group.groups.map((subgroup) => (
+                      <ServicesGroup
+                        key={subgroup.name}
+                        group={subgroup}
+                        layout={layout?.[subgroup.name]}
+                        fiveColumns={fiveColumns}
+                        disableCollapse={disableCollapse}
+                        useEqualHeights={useEqualHeights}
+                        groupsInitiallyCollapsed={groupsInitiallyCollapsed}
+                      />
+                    ))}
+                  </div>
+                )}
               </Disclosure.Panel>
             </Transition>
           </>
diff --git a/src/components/services/item.jsx b/src/components/services/item.jsx
index a38dfaa3a..adf5fc974 100644
--- a/src/components/services/item.jsx
+++ b/src/components/services/item.jsx
@@ -12,7 +12,7 @@ import Kubernetes from "widgets/kubernetes/component";
 import { SettingsContext } from "utils/contexts/settings";
 import ResolvedIcon from "components/resolvedicon";
 
-export default function Item({ service, group, useEqualHeights }) {
+export default function Item({ service, groupName, useEqualHeights }) {
   const hasLink = service.href && service.href !== "#";
   const { settings } = useContext(SettingsContext);
   const showStats = service.showStats === false ? false : settings.showStats;
@@ -90,14 +90,14 @@ export default function Item({ service, group, useEqualHeights }) {
           >
             {service.ping && (
               <div className="flex-shrink-0 flex items-center justify-center service-tag service-ping">
-                <Ping group={group} service={service.name} style={statusStyle} />
+                <Ping groupName={groupName} serviceName={service.name} style={statusStyle} />
                 <span className="sr-only">Ping status</span>
               </div>
             )}
 
             {service.siteMonitor && (
               <div className="flex-shrink-0 flex items-center justify-center service-tag service-site-monitor">
-                <SiteMonitor group={group} service={service.name} style={statusStyle} />
+                <SiteMonitor groupName={groupName} serviceName={service.name} style={statusStyle} />
                 <span className="sr-only">Site monitor status</span>
               </div>
             )}
@@ -154,7 +154,9 @@ export default function Item({ service, group, useEqualHeights }) {
           </div>
         )}
 
-        {service.widget && <Widget service={service} />}
+        {service.widgets.map((widget) => (
+          <Widget widget={widget} service={service} key={widget.index} />
+        ))}
       </div>
     </li>
   );
diff --git a/src/components/services/list.jsx b/src/components/services/list.jsx
index f3fd6e2ae..c15d6aed8 100644
--- a/src/components/services/list.jsx
+++ b/src/components/services/list.jsx
@@ -4,7 +4,7 @@ import { columnMap } from "../../utils/layout/columns";
 
 import Item from "components/services/item";
 
-export default function List({ group, services, layout, useEqualHeights }) {
+export default function List({ groupName, services, layout, useEqualHeights }) {
   return (
     <ul
       className={classNames(
@@ -16,7 +16,7 @@ export default function List({ group, services, layout, useEqualHeights }) {
         <Item
           key={[service.container, service.app, service.name].filter((s) => s).join("-")}
           service={service}
-          group={group}
+          groupName={groupName}
           useEqualHeights={layout?.useEqualHeights ?? useEqualHeights}
         />
       ))}
diff --git a/src/components/services/ping.jsx b/src/components/services/ping.jsx
index f72d40b3a..670f9d4bf 100644
--- a/src/components/services/ping.jsx
+++ b/src/components/services/ping.jsx
@@ -1,9 +1,9 @@
 import { useTranslation } from "react-i18next";
 import useSWR from "swr";
 
-export default function Ping({ group, service, style }) {
+export default function Ping({ groupName, serviceName, style }) {
   const { t } = useTranslation();
-  const { data, error } = useSWR(`/api/ping?${new URLSearchParams({ group, service }).toString()}`, {
+  const { data, error } = useSWR(`/api/ping?${new URLSearchParams({ groupName, serviceName }).toString()}`, {
     refreshInterval: 30000,
   });
 
diff --git a/src/components/services/site-monitor.jsx b/src/components/services/site-monitor.jsx
index 3d5ef79e1..4dceb44ce 100644
--- a/src/components/services/site-monitor.jsx
+++ b/src/components/services/site-monitor.jsx
@@ -1,9 +1,9 @@
 import { useTranslation } from "react-i18next";
 import useSWR from "swr";
 
-export default function SiteMonitor({ group, service, style }) {
+export default function SiteMonitor({ groupName, serviceName, style }) {
   const { t } = useTranslation();
-  const { data, error } = useSWR(`/api/siteMonitor?${new URLSearchParams({ group, service }).toString()}`, {
+  const { data, error } = useSWR(`/api/siteMonitor?${new URLSearchParams({ groupName, serviceName }).toString()}`, {
     refreshInterval: 30000,
   });
 
diff --git a/src/components/services/widget.jsx b/src/components/services/widget.jsx
index 292b2b1c5..61a21a663 100644
--- a/src/components/services/widget.jsx
+++ b/src/components/services/widget.jsx
@@ -3,22 +3,24 @@ import { useTranslation } from "next-i18next";
 import ErrorBoundary from "components/errorboundry";
 import components from "widgets/components";
 
-export default function Widget({ service }) {
+export default function Widget({ widget, service }) {
   const { t } = useTranslation("common");
 
-  const ServiceWidget = components[service.widget.type];
+  const ServiceWidget = components[widget.type];
 
+  const fullService = Object.apply({}, service);
+  fullService.widget = widget;
   if (ServiceWidget) {
     return (
       <ErrorBoundary>
-        <ServiceWidget service={service} />
+        <ServiceWidget service={fullService} />
       </ErrorBoundary>
     );
   }
 
   return (
     <div className="bg-theme-200/50 dark:bg-theme-900/20 rounded m-1 flex-1 flex flex-col items-center justify-center p-1 service-missing">
-      <div className="font-thin text-sm">{t("widget.missing_type", { type: service.widget.type })}</div>
+      <div className="font-thin text-sm">{t("widget.missing_type", { type: widget.type })}</div>
     </div>
   );
 }
diff --git a/src/components/widgets/resources/network.jsx b/src/components/widgets/resources/network.jsx
new file mode 100644
index 000000000..a2a3acac5
--- /dev/null
+++ b/src/components/widgets/resources/network.jsx
@@ -0,0 +1,47 @@
+import useSWR from "swr";
+import { FaNetworkWired } from "react-icons/fa";
+import { useTranslation } from "next-i18next";
+
+import Resource from "../widget/resource";
+import Error from "../widget/error";
+
+export default function Network({ options, refresh = 1500 }) {
+  const { t } = useTranslation();
+  // eslint-disable-next-line no-param-reassign
+  if (options.network === true) options.network = "default";
+
+  const { data, error } = useSWR(`/api/widgets/resources?type=network&interfaceName=${options.network}`, {
+    refreshInterval: refresh,
+  });
+
+  if (error || data?.error) {
+    return <Error />;
+  }
+
+  if (!data || !data.network || !data.network.rx_sec || !data.network.tx_sec) {
+    return (
+      <Resource
+        icon={FaNetworkWired}
+        value="- ↑"
+        label="- ↓"
+        expandedValue="- ↑"
+        expandedLabel="- ↓"
+        percentage="0"
+        wide
+      />
+    );
+  }
+
+  return (
+    <Resource
+      icon={FaNetworkWired}
+      value={`${t("common.byterate", { value: data.network.tx_sec })} ↑`}
+      label={`${t("common.byterate", { value: data.network.rx_sec })} ↓`}
+      expandedValue={`${t("common.bytes", { value: data.network.tx_bytes })} ↑`}
+      expandedLabel={`${t("common.bytes", { value: data.network.rx_bytes })} ↓`}
+      expanded={options.expanded}
+      wide
+      percentage={(100 * data.network.rx_sec) / (data.network.rx_sec + data.network.tx_sec)}
+    />
+  );
+}
diff --git a/src/components/widgets/resources/resources.jsx b/src/components/widgets/resources/resources.jsx
index 634e0ff53..db26caa78 100644
--- a/src/components/widgets/resources/resources.jsx
+++ b/src/components/widgets/resources/resources.jsx
@@ -6,6 +6,7 @@ import Cpu from "./cpu";
 import Memory from "./memory";
 import CpuTemp from "./cputemp";
 import Uptime from "./uptime";
+import Network from "./network";
 
 export default function Resources({ options }) {
   const { expanded, units, diskUnits, tempmin, tempmax } = options;
@@ -23,6 +24,7 @@ export default function Resources({ options }) {
                 <Disk key={disk} options={{ disk }} expanded={expanded} diskUnits={diskUnits} refresh={refresh} />
               ))
             : options.disk && <Disk options={options} expanded={expanded} diskUnits={diskUnits} refresh={refresh} />}
+          {options.network && <Network options={options} refresh={refresh} />}
           {options.cputemp && (
             <CpuTemp expanded={expanded} units={units} refresh={refresh} tempmin={tempmin} tempmax={tempmax} />
           )}
diff --git a/src/components/widgets/search/search.jsx b/src/components/widgets/search/search.jsx
index c9391d355..5a7edc04b 100644
--- a/src/components/widgets/search/search.jsx
+++ b/src/components/widgets/search/search.jsx
@@ -94,6 +94,7 @@ export default function Search({ options }) {
     if (
       options.showSearchSuggestions &&
       (selectedProvider.suggestionUrl || options.suggestionUrl) && // custom providers pass url via options
+      query.trim().length > 0 &&
       query.trim() !== searchSuggestions[0]
     ) {
       fetch(`/api/search/searchSuggestion?query=${encodeURIComponent(query)}&providerName=${selectedProvider.name}`, {
diff --git a/src/components/widgets/stocks/stocks.jsx b/src/components/widgets/stocks/stocks.jsx
index 8c2c03fd0..4214ef87b 100644
--- a/src/components/widgets/stocks/stocks.jsx
+++ b/src/components/widgets/stocks/stocks.jsx
@@ -51,7 +51,9 @@ export default function Widget({ options }) {
                       key={stock.ticker}
                       className="rounded h-full text-xs px-1 w-[4.75rem] flex flex-col items-center justify-center"
                     >
-                      <span className="text-theme-800 dark:text-theme-200 text-xs">{stock.ticker}</span>
+                      <span className="text-theme-800 dark:text-theme-200 text-xs">
+                        {stock.ticker.split(":").pop()}
+                      </span>
                       {!viewingPercentChange ? (
                         <span
                           className={
diff --git a/src/components/widgets/widget/container.jsx b/src/components/widgets/widget/container.jsx
index c9240dd3b..8675adf86 100644
--- a/src/components/widgets/widget/container.jsx
+++ b/src/components/widgets/widget/container.jsx
@@ -1,10 +1,13 @@
 import classNames from "classnames";
+import { useContext } from "react";
 
 import WidgetIcon from "./widget_icon";
 import PrimaryText from "./primary_text";
 import SecondaryText from "./secondary_text";
 import Raw from "./raw";
 
+import { SettingsContext } from "utils/contexts/settings";
+
 export function getAllClasses(options, additionalClassNames = "") {
   if (options?.style?.header === "boxedWidgets") {
     if (options?.style?.cardBlur !== undefined) {
@@ -56,7 +59,17 @@ export function getBottomBlock(children) {
 }
 
 export default function Container({ children = [], options, additionalClassNames = "" }) {
-  return (
+  const { settings } = useContext(SettingsContext);
+  return options?.href ? (
+    <a
+      href={options.href}
+      target={options.target ?? settings.target ?? "_blank"}
+      className={getAllClasses(options, `${additionalClassNames} widget-container`)}
+    >
+      {getInnerBlock(children)}
+      {getBottomBlock(children)}
+    </a>
+  ) : (
     <div className={getAllClasses(options, `${additionalClassNames} widget-container`)}>
       {getInnerBlock(children)}
       {getBottomBlock(children)}
diff --git a/src/components/widgets/widget/resource.jsx b/src/components/widgets/widget/resource.jsx
index 8c9759284..b1f737407 100644
--- a/src/components/widgets/widget/resource.jsx
+++ b/src/components/widgets/widget/resource.jsx
@@ -10,6 +10,7 @@ export default function Resource({
   percentage,
   expanded = false,
   additionalClassNames = "",
+  wide = false,
 }) {
   const Icon = icon;
 
@@ -18,7 +19,11 @@ export default function Resource({
       className={`flex-none flex flex-row items-center mr-3 py-1.5 information-widget-resource ${additionalClassNames}`}
     >
       <Icon className="text-theme-800 dark:text-theme-200 w-5 h-5 resource-icon" />
-      <div className={`flex flex-col ml-3 text-left min-w-[85px] ${expanded ? " expanded" : ""}`}>
+      <div
+        className={`flex flex-col ml-3 text-left ${expanded ? " expanded" : ""} ${
+          wide ? " min-w-[120px]" : "min-w-[85px]"
+        }`}
+      >
         <div className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
           <div className="pl-0.5">{value}</div>
           <div className="pr-1">{label}</div>
diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx
index bfe3fc933..e69ca0079 100644
--- a/src/pages/_document.jsx
+++ b/src/pages/_document.jsx
@@ -10,6 +10,8 @@ export default function Document() {
         />
         <meta name="mobile-web-app-capable" content="yes" />
         <link rel="manifest" href="/site.webmanifest?v=4" crossOrigin="use-credentials" />
+        <link rel="preload" href="/api/config/custom.css" as="style" />
+        <link rel="stylesheet" href="/api/config/custom.css" /> {/* eslint-disable-line @next/next/no-css-tags */}
       </Head>
       <body>
         <Main />
diff --git a/src/pages/api/ping.js b/src/pages/api/ping.js
index e540fa688..8ef64ffc9 100644
--- a/src/pages/api/ping.js
+++ b/src/pages/api/ping.js
@@ -6,10 +6,10 @@ import createLogger from "utils/logger";
 const logger = createLogger("ping");
 
 export default async function handler(req, res) {
-  const { group, service } = req.query;
-  const serviceItem = await getServiceItem(group, service);
+  const { groupName, serviceName } = req.query;
+  const serviceItem = await getServiceItem(groupName, serviceName);
   if (!serviceItem) {
-    logger.debug(`No service item found for group ${group} named ${service}`);
+    logger.debug(`No service item found for group ${groupName} named ${serviceName}`);
     return res.status(400).send({
       error: "Unable to find service, see log for details.",
     });
diff --git a/src/pages/api/services/proxy.js b/src/pages/api/services/proxy.js
index 90280c3dd..3f8adc883 100644
--- a/src/pages/api/services/proxy.js
+++ b/src/pages/api/services/proxy.js
@@ -9,8 +9,8 @@ const logger = createLogger("servicesProxy");
 
 export default async function handler(req, res) {
   try {
-    const { service, group } = req.query;
-    const serviceWidget = await getServiceWidget(group, service);
+    const { service, group, index } = req.query;
+    const serviceWidget = await getServiceWidget(group, service, index);
     let type = serviceWidget?.type;
 
     // exceptions
@@ -41,7 +41,7 @@ export default async function handler(req, res) {
         const endpoint = mapping?.endpoint;
         const endpointProxy = mapping?.proxyHandler || serviceProxyHandler;
 
-        if (mapping.method && mapping.method !== req.method) {
+        if (mapping?.method && mapping.method !== req.method) {
           logger.debug("Unsupported method: %s", req.method);
           return res.status(403).json({ error: "Unsupported method" });
         }
diff --git a/src/pages/api/siteMonitor.js b/src/pages/api/siteMonitor.js
index 9e030d743..072d3d4c6 100644
--- a/src/pages/api/siteMonitor.js
+++ b/src/pages/api/siteMonitor.js
@@ -7,10 +7,10 @@ import { httpProxy } from "utils/proxy/http";
 const logger = createLogger("siteMonitor");
 
 export default async function handler(req, res) {
-  const { group, service } = req.query;
-  const serviceItem = await getServiceItem(group, service);
+  const { groupName, serviceName } = req.query;
+  const serviceItem = await getServiceItem(groupName, serviceName);
   if (!serviceItem) {
-    logger.debug(`No service item found for group ${group} named ${service}`);
+    logger.debug(`No service item found for group ${groupName} named ${serviceName}`);
     return res.status(400).send({
       error: "Unable to find service, see log for details.",
     });
diff --git a/src/pages/api/widgets/resources.js b/src/pages/api/widgets/resources.js
index 66449bff0..4df544e82 100644
--- a/src/pages/api/widgets/resources.js
+++ b/src/pages/api/widgets/resources.js
@@ -7,7 +7,7 @@ const logger = createLogger("resources");
 const si = require("systeminformation");
 
 export default async function handler(req, res) {
-  const { type, target } = req.query;
+  const { type, target, interfaceName = "default" } = req.query;
 
   if (type === "cpu") {
     const load = await si.currentLoad();
@@ -57,6 +57,32 @@ export default async function handler(req, res) {
     });
   }
 
+  if (type === "network") {
+    let networkData = await si.networkStats();
+    let interfaceDefault;
+    logger.debug("networkData:", JSON.stringify(networkData));
+    if (interfaceName && interfaceName !== "default") {
+      networkData = networkData.filter((network) => network.iface === interfaceName).at(0);
+      if (!networkData) {
+        return res.status(404).json({
+          error: "Interface not found",
+        });
+      }
+    } else {
+      interfaceDefault = await si.networkInterfaceDefault();
+      networkData = networkData.filter((network) => network.iface === interfaceDefault).at(0);
+      if (!networkData) {
+        return res.status(404).json({
+          error: "Default interface not found",
+        });
+      }
+    }
+    return res.status(200).json({
+      network: networkData,
+      interface: interfaceName !== "default" ? interfaceName : interfaceDefault,
+    });
+  }
+
   return res.status(400).json({
     error: "invalid type",
   });
diff --git a/src/pages/api/widgets/stocks.js b/src/pages/api/widgets/stocks.js
index d80842e1b..3941a773d 100644
--- a/src/pages/api/widgets/stocks.js
+++ b/src/pages/api/widgets/stocks.js
@@ -1,9 +1,14 @@
 import cachedFetch from "utils/proxy/cached-fetch";
 import { getSettings } from "utils/config/config";
+import createLogger from "utils/logger";
+
+const logger = createLogger("stocks");
 
 export default async function handler(req, res) {
   const { watchlist, provider, cache } = req.query;
 
+  logger.debug("Stocks API request: %o", { watchlist, provider, cache });
+
   if (!watchlist) {
     return res.status(400).json({ error: "Missing watchlist" });
   }
@@ -56,6 +61,7 @@ export default async function handler(req, res) {
         // Finnhub free accounts allow up to 60 calls/minute
         // https://finnhub.io/pricing
         const { c, dp } = await cachedFetch(apiUrl, cache || 1);
+        logger.debug("Finnhub API response for %s: %o", ticker, { c, dp });
 
         // API sometimes returns 200, but values returned are `null`
         if (c === null || dp === null) {
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index dd0df95ff..639aab2e5 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -291,13 +291,13 @@ function Home({ initialSettings }) {
               group.services ? (
                 <ServicesGroup
                   key={group.name}
-                  group={group.name}
-                  services={group}
+                  group={group}
                   layout={settings.layout?.[group.name]}
                   fiveColumns={settings.fiveColumns}
                   disableCollapse={settings.disableCollapse}
                   useEqualHeights={settings.useEqualHeights}
                   groupsInitiallyCollapsed={settings.groupsInitiallyCollapsed}
+                  bookmarksStyle={settings.bookmarksStyle}
                 />
               ) : (
                 <BookmarksGroup
@@ -316,8 +316,7 @@ function Home({ initialSettings }) {
             {serviceGroups.map((group) => (
               <ServicesGroup
                 key={group.name}
-                group={group.name}
-                services={group}
+                group={group}
                 layout={settings.layout?.[group.name]}
                 fiveColumns={settings.fiveColumns}
                 disableCollapse={settings.disableCollapse}
@@ -335,6 +334,7 @@ function Home({ initialSettings }) {
                 layout={settings.layout?.[group.name]}
                 disableCollapse={settings.disableCollapse}
                 groupsInitiallyCollapsed={settings.groupsInitiallyCollapsed}
+                bookmarksStyle={settings.bookmarksStyle}
               />
             ))}
           </div>
@@ -352,13 +352,14 @@ function Home({ initialSettings }) {
     settings.useEqualHeights,
     settings.cardBlur,
     settings.groupsInitiallyCollapsed,
+    settings.bookmarksStyle,
     initialSettings.layout,
   ]);
 
   return (
     <>
       <Head>
-        <title>{settings.title || "Homepage"}</title>
+        <title>{initialSettings.title || "Homepage"}</title>
         {settings.base && <base href={settings.base} />}
         {settings.favicon ? (
           <>
@@ -376,8 +377,6 @@ function Home({ initialSettings }) {
         )}
         <meta name="msapplication-TileColor" content={themes[settings.color || "slate"][settings.theme || "dark"]} />
         <meta name="theme-color" content={themes[settings.color || "slate"][settings.theme || "dark"]} />
-        <link rel="preload" href="/api/config/custom.css" as="style" />
-        <link rel="stylesheet" href="/api/config/custom.css" /> {/* eslint-disable-line @next/next/no-css-tags */}
       </Head>
 
       <Script src="/api/config/custom.js" />
@@ -454,6 +453,7 @@ function Home({ initialSettings }) {
 }
 
 export default function Wrapper({ initialSettings, fallback }) {
+  const { theme } = useContext(ThemeContext);
   const wrappedStyle = {};
   let backgroundBlur = false;
   let backgroundSaturate = false;
@@ -484,8 +484,9 @@ export default function Wrapper({ initialSettings, fallback }) {
       id="page_wrapper"
       className={classNames(
         "relative",
-        initialSettings.theme && initialSettings.theme,
+        theme && theme,
         initialSettings.color && `theme-${initialSettings.color}`,
+        theme === "dark" ? "scheme-dark" : "scheme-light",
       )}
     >
       <div
diff --git a/src/skeleton/services.yaml b/src/skeleton/services.yaml
index 77626b1c8..39b379263 100644
--- a/src/skeleton/services.yaml
+++ b/src/skeleton/services.yaml
@@ -1,6 +1,6 @@
 ---
 # For configuration options and examples, please see:
-# https://gethomepage.dev/configs/services
+# https://gethomepage.dev/configs/services/
 
 - My First Group:
     - My First Service:
diff --git a/src/skeleton/settings.yaml b/src/skeleton/settings.yaml
index 141053f5b..2e828c082 100644
--- a/src/skeleton/settings.yaml
+++ b/src/skeleton/settings.yaml
@@ -1,6 +1,6 @@
 ---
 # For configuration options and examples, please see:
-# https://gethomepage.dev/configs/settings
+# https://gethomepage.dev/configs/settings/
 
 providers:
   openweathermap: openweathermapapikey
diff --git a/src/skeleton/widgets.yaml b/src/skeleton/widgets.yaml
index 23c8d6136..b1cf0f558 100644
--- a/src/skeleton/widgets.yaml
+++ b/src/skeleton/widgets.yaml
@@ -1,6 +1,6 @@
 ---
 # For configuration options and examples, please see:
-# https://gethomepage.dev/configs/service-widgets
+# https://gethomepage.dev/configs/info-widgets/
 
 - resources:
     cpu: true
diff --git a/src/styles/globals.css b/src/styles/globals.css
index f3bfec786..1e91f86ee 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -16,6 +16,7 @@ body {
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  letter-spacing: 0.1px;
 }
 
 #page_wrapper {
diff --git a/src/utils/config/api-response.js b/src/utils/config/api-response.js
index 97f61ea07..01bef3a13 100644
--- a/src/utils/config/api-response.js
+++ b/src/utils/config/api-response.js
@@ -10,6 +10,7 @@ import {
   servicesFromDocker,
   cleanServiceGroups,
   servicesFromKubernetes,
+  findGroupByName,
 } from "utils/config/service-helpers";
 import { cleanWidgetGroups, widgetsFromConfig } from "utils/config/widget-helpers";
 
@@ -84,6 +85,17 @@ export async function widgetsResponse() {
   return configuredWidgets;
 }
 
+function mergeSubgroups(configuredGroups, mergedGroup) {
+  configuredGroups.forEach((group) => {
+    if (group.name === mergedGroup.name) {
+      // eslint-disable-next-line no-param-reassign
+      group.services = mergedGroup.services;
+    } else if (group.groups) {
+      mergeSubgroups(group.groups, mergedGroup);
+    }
+  });
+}
+
 export async function servicesResponse() {
   let discoveredDockerServices;
   let discoveredKubernetesServices;
@@ -140,25 +152,29 @@ export async function servicesResponse() {
   const definedLayouts = initialSettings.layout ? Object.keys(initialSettings.layout) : null;
 
   mergedGroupsNames.forEach((groupName) => {
-    const discoveredDockerGroup = discoveredDockerServices.find((group) => group.name === groupName) || {
+    const discoveredDockerGroup = findGroupByName(discoveredDockerServices, groupName) || {
       services: [],
     };
-    const discoveredKubernetesGroup = discoveredKubernetesServices.find((group) => group.name === groupName) || {
+    const discoveredKubernetesGroup = findGroupByName(discoveredKubernetesServices, groupName) || {
       services: [],
     };
-    const configuredGroup = configuredServices.find((group) => group.name === groupName) || { services: [] };
+    const configuredGroup = findGroupByName(configuredServices, groupName) || { services: [], groups: [] };
 
     const mergedGroup = {
       name: groupName,
       services: [...discoveredDockerGroup.services, ...discoveredKubernetesGroup.services, ...configuredGroup.services]
         .filter((service) => service)
         .sort(compareServices),
+      groups: [...configuredGroup.groups],
     };
 
     if (definedLayouts) {
       const layoutIndex = definedLayouts.findIndex((layout) => layout === mergedGroup.name);
       if (layoutIndex > -1) sortedGroups[layoutIndex] = mergedGroup;
-      else unsortedGroups.push(mergedGroup);
+      else if (configuredGroup.name) {
+        // this is a nested group, so find the parent group and merge the services
+        mergeSubgroups(configuredServices, mergedGroup);
+      } else unsortedGroups.push(mergedGroup);
     } else {
       unsortedGroups.push(mergedGroup);
     }
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index ea82c7352..0e3f6e3d7 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -13,38 +13,46 @@ import * as shvl from "utils/config/shvl";
 
 const logger = createLogger("service-helpers");
 
-export async function servicesFromConfig() {
-  checkAndCopyConfig("services.yaml");
-
-  const servicesYaml = path.join(CONF_DIR, "services.yaml");
-  const rawFileContents = await fs.readFile(servicesYaml, "utf8");
-  const fileContents = substituteEnvironmentVars(rawFileContents);
-  const services = yaml.load(fileContents);
-
+function parseServicesToGroups(services) {
   if (!services) {
     return [];
   }
 
   // map easy to write YAML objects into easy to consume JS arrays
-  const servicesArray = services.map((servicesGroup) => ({
-    name: Object.keys(servicesGroup)[0],
-    services: servicesGroup[Object.keys(servicesGroup)[0]].map((entries) => ({
-      name: Object.keys(entries)[0],
-      ...entries[Object.keys(entries)[0]],
-      type: "service",
-    })),
-  }));
-
-  // add default weight to services based on their position in the configuration
-  servicesArray.forEach((group, groupIndex) => {
-    group.services.forEach((service, serviceIndex) => {
-      if (service.weight === undefined) {
-        servicesArray[groupIndex].services[serviceIndex].weight = (serviceIndex + 1) * 100;
+  return services.map((serviceGroup) => {
+    const name = Object.keys(serviceGroup)[0];
+    let groups = [];
+    const serviceGroupServices = [];
+    serviceGroup[name].forEach((entries) => {
+      const entryName = Object.keys(entries)[0];
+      if (Array.isArray(entries[entryName])) {
+        groups = groups.concat(parseServicesToGroups([{ [entryName]: entries[entryName] }]));
+      } else {
+        serviceGroupServices.push({
+          name: entryName,
+          ...entries[entryName],
+          weight: entries[entryName].weight || serviceGroupServices.length * 100, // default weight
+          type: "service",
+        });
       }
     });
+    return {
+      name,
+      type: "group",
+      services: serviceGroupServices,
+      groups,
+    };
   });
+}
 
-  return servicesArray;
+export async function servicesFromConfig() {
+  checkAndCopyConfig("services.yaml");
+
+  const servicesYaml = path.join(CONF_DIR, "services.yaml");
+  const rawFileContents = await fs.readFile(servicesYaml, "utf8");
+  const fileContents = substituteEnvironmentVars(rawFileContents);
+  const services = yaml.load(fileContents);
+  return parseServicesToGroups(services);
 }
 
 export async function servicesFromDocker() {
@@ -98,7 +106,11 @@ export async function servicesFromDocker() {
                   type: "service",
                 };
               }
-              shvl.set(constructedService, value, substituteEnvironmentVars(containerLabels[label]));
+              let substitutedVal = substituteEnvironmentVars(containerLabels[label]);
+              if (value === "widget.version") {
+                substitutedVal = parseInt(substitutedVal, 10);
+              }
+              shvl.set(constructedService, value, substitutedVal);
             }
           });
 
@@ -354,8 +366,12 @@ export function cleanServiceGroups(groups) {
       if (typeof cleanedService.weight !== "number") {
         cleanedService.weight = 0;
       }
-
+      if (!cleanedService.widgets) cleanedService.widgets = [];
       if (cleanedService.widget) {
+        cleanedService.widgets.push(cleanedService.widget);
+        delete cleanedService.widget;
+      }
+      cleanedService.widgets = cleanedService.widgets.map((widgetData, index) => {
         // whitelisted set of keys to pass to the frontend
         // alphabetical, grouped by widget(s)
         const {
@@ -390,6 +406,9 @@ export function cleanServiceGroups(groups) {
           mappings,
           display,
 
+          // deluge, qbittorrent
+          enableLeechProgress,
+
           // diskstation
           volume,
 
@@ -409,7 +428,7 @@ export function cleanServiceGroups(groups) {
           // frigate
           enableRecentEvents,
 
-          // glances, immich, mealie, pihole, pfsense
+          // beszel, glances, immich, mealie, pihole, pfsense
           version,
 
           // glances
@@ -495,7 +514,7 @@ export function cleanServiceGroups(groups) {
 
           // spoolman
           spoolIds,
-        } = cleanedService.widget;
+        } = widgetData;
 
         let fieldsList = fields;
         if (typeof fields === "string") {
@@ -507,169 +526,190 @@ export function cleanServiceGroups(groups) {
           }
         }
 
-        cleanedService.widget = {
+        const widget = {
           type,
           fields: fieldsList || null,
           hide_errors: hideErrors || false,
           service_name: service.name,
           service_group: serviceGroup.name,
+          index,
         };
 
         if (type === "azuredevops") {
-          if (userEmail) cleanedService.widget.userEmail = userEmail;
-          if (repositoryId) cleanedService.widget.repositoryId = repositoryId;
+          if (userEmail) widget.userEmail = userEmail;
+          if (repositoryId) widget.repositoryId = repositoryId;
         }
 
         if (type === "beszel") {
-          if (systemId) cleanedService.widget.systemId = systemId;
+          if (systemId) widget.systemId = systemId;
         }
 
         if (type === "coinmarketcap") {
-          if (currency) cleanedService.widget.currency = currency;
-          if (symbols) cleanedService.widget.symbols = symbols;
-          if (slugs) cleanedService.widget.slugs = slugs;
-          if (defaultinterval) cleanedService.widget.defaultinterval = defaultinterval;
+          if (currency) widget.currency = currency;
+          if (symbols) widget.symbols = symbols;
+          if (slugs) widget.slugs = slugs;
+          if (defaultinterval) widget.defaultinterval = defaultinterval;
         }
 
         if (type === "docker") {
-          if (server) cleanedService.widget.server = server;
-          if (container) cleanedService.widget.container = container;
+          if (server) widget.server = server;
+          if (container) widget.container = container;
         }
         if (type === "unifi") {
-          if (site) cleanedService.widget.site = site;
+          if (site) widget.site = site;
         }
         if (type === "proxmox") {
-          if (node) cleanedService.widget.node = node;
+          if (node) widget.node = node;
         }
         if (type === "kubernetes") {
-          if (namespace) cleanedService.widget.namespace = namespace;
-          if (app) cleanedService.widget.app = app;
-          if (podSelector) cleanedService.widget.podSelector = podSelector;
+          if (namespace) widget.namespace = namespace;
+          if (app) widget.app = app;
+          if (podSelector) widget.podSelector = podSelector;
         }
         if (type === "iframe") {
-          if (src) cleanedService.widget.src = src;
-          if (classes) cleanedService.widget.classes = classes;
-          if (referrerPolicy) cleanedService.widget.referrerPolicy = referrerPolicy;
-          if (allowPolicy) cleanedService.widget.allowPolicy = allowPolicy;
-          if (allowFullscreen) cleanedService.widget.allowFullscreen = allowFullscreen;
-          if (loadingStrategy) cleanedService.widget.loadingStrategy = loadingStrategy;
-          if (allowScrolling) cleanedService.widget.allowScrolling = allowScrolling;
-          if (refreshInterval) cleanedService.widget.refreshInterval = refreshInterval;
+          if (src) widget.src = src;
+          if (classes) widget.classes = classes;
+          if (referrerPolicy) widget.referrerPolicy = referrerPolicy;
+          if (allowPolicy) widget.allowPolicy = allowPolicy;
+          if (allowFullscreen) widget.allowFullscreen = allowFullscreen;
+          if (loadingStrategy) widget.loadingStrategy = loadingStrategy;
+          if (allowScrolling) widget.allowScrolling = allowScrolling;
+          if (refreshInterval) widget.refreshInterval = refreshInterval;
+        }
+        if (["deluge", "qbittorrent"].includes(type)) {
+          if (enableLeechProgress !== undefined) widget.enableLeechProgress = JSON.parse(enableLeechProgress);
         }
         if (["opnsense", "pfsense"].includes(type)) {
-          if (wan) cleanedService.widget.wan = wan;
+          if (wan) widget.wan = wan;
         }
         if (["emby", "jellyfin"].includes(type)) {
-          if (enableBlocks !== undefined) cleanedService.widget.enableBlocks = JSON.parse(enableBlocks);
-          if (enableNowPlaying !== undefined) cleanedService.widget.enableNowPlaying = JSON.parse(enableNowPlaying);
+          if (enableBlocks !== undefined) widget.enableBlocks = JSON.parse(enableBlocks);
+          if (enableNowPlaying !== undefined) widget.enableNowPlaying = JSON.parse(enableNowPlaying);
         }
         if (["emby", "jellyfin", "tautulli"].includes(type)) {
           if (expandOneStreamToTwoRows !== undefined)
-            cleanedService.widget.expandOneStreamToTwoRows = !!JSON.parse(expandOneStreamToTwoRows);
-          if (showEpisodeNumber !== undefined)
-            cleanedService.widget.showEpisodeNumber = !!JSON.parse(showEpisodeNumber);
-          if (enableUser !== undefined) cleanedService.widget.enableUser = !!JSON.parse(enableUser);
+            widget.expandOneStreamToTwoRows = !!JSON.parse(expandOneStreamToTwoRows);
+          if (showEpisodeNumber !== undefined) widget.showEpisodeNumber = !!JSON.parse(showEpisodeNumber);
+          if (enableUser !== undefined) widget.enableUser = !!JSON.parse(enableUser);
         }
         if (["sonarr", "radarr"].includes(type)) {
-          if (enableQueue !== undefined) cleanedService.widget.enableQueue = JSON.parse(enableQueue);
+          if (enableQueue !== undefined) widget.enableQueue = JSON.parse(enableQueue);
         }
         if (type === "truenas") {
-          if (enablePools !== undefined) cleanedService.widget.enablePools = JSON.parse(enablePools);
-          if (nasType !== undefined) cleanedService.widget.nasType = nasType;
+          if (enablePools !== undefined) widget.enablePools = JSON.parse(enablePools);
+          if (nasType !== undefined) widget.nasType = nasType;
         }
         if (["diskstation", "qnap"].includes(type)) {
-          if (volume) cleanedService.widget.volume = volume;
+          if (volume) widget.volume = volume;
         }
         if (type === "kopia") {
-          if (snapshotHost) cleanedService.widget.snapshotHost = snapshotHost;
-          if (snapshotPath) cleanedService.widget.snapshotPath = snapshotPath;
+          if (snapshotHost) widget.snapshotHost = snapshotHost;
+          if (snapshotPath) widget.snapshotPath = snapshotPath;
         }
-        if (["glances", "immich", "mealie", "pfsense", "pihole"].includes(type)) {
-          if (version) cleanedService.widget.version = parseInt(version, 10);
+        if (["beszel", "glances", "immich", "mealie", "pfsense", "pihole"].includes(type)) {
+          if (version) widget.version = parseInt(version, 10);
         }
         if (type === "glances") {
-          if (metric) cleanedService.widget.metric = metric;
+          if (metric) widget.metric = metric;
           if (chart !== undefined) {
-            cleanedService.widget.chart = chart;
+            widget.chart = chart;
           } else {
-            cleanedService.widget.chart = true;
+            widget.chart = true;
           }
-          if (refreshInterval) cleanedService.widget.refreshInterval = refreshInterval;
-          if (pointsLimit) cleanedService.widget.pointsLimit = pointsLimit;
-          if (diskUnits) cleanedService.widget.diskUnits = diskUnits;
+          if (refreshInterval) widget.refreshInterval = refreshInterval;
+          if (pointsLimit) widget.pointsLimit = pointsLimit;
+          if (diskUnits) widget.diskUnits = diskUnits;
         }
         if (type === "mjpeg") {
-          if (stream) cleanedService.widget.stream = stream;
-          if (fit) cleanedService.widget.fit = fit;
+          if (stream) widget.stream = stream;
+          if (fit) widget.fit = fit;
         }
         if (type === "openmediavault") {
-          if (method) cleanedService.widget.method = method;
+          if (method) widget.method = method;
         }
         if (type === "openwrt") {
-          if (interfaceName) cleanedService.widget.interfaceName = interfaceName;
+          if (interfaceName) widget.interfaceName = interfaceName;
         }
         if (type === "customapi") {
-          if (mappings) cleanedService.widget.mappings = mappings;
-          if (display) cleanedService.widget.display = display;
-          if (refreshInterval) cleanedService.widget.refreshInterval = refreshInterval;
+          if (mappings) widget.mappings = mappings;
+          if (display) widget.display = display;
+          if (refreshInterval) widget.refreshInterval = refreshInterval;
         }
         if (type === "calendar") {
-          if (integrations) cleanedService.widget.integrations = integrations;
-          if (firstDayInWeek) cleanedService.widget.firstDayInWeek = firstDayInWeek;
-          if (view) cleanedService.widget.view = view;
-          if (maxEvents) cleanedService.widget.maxEvents = maxEvents;
-          if (previousDays) cleanedService.widget.previousDays = previousDays;
-          if (showTime) cleanedService.widget.showTime = showTime;
-          if (timezone) cleanedService.widget.timezone = timezone;
+          if (integrations) widget.integrations = integrations;
+          if (firstDayInWeek) widget.firstDayInWeek = firstDayInWeek;
+          if (view) widget.view = view;
+          if (maxEvents) widget.maxEvents = maxEvents;
+          if (previousDays) widget.previousDays = previousDays;
+          if (showTime) widget.showTime = showTime;
+          if (timezone) widget.timezone = timezone;
         }
         if (type === "hdhomerun") {
-          if (tuner !== undefined) cleanedService.widget.tuner = tuner;
+          if (tuner !== undefined) widget.tuner = tuner;
         }
         if (type === "healthchecks") {
-          if (uuid !== undefined) cleanedService.widget.uuid = uuid;
+          if (uuid !== undefined) widget.uuid = uuid;
         }
         if (type === "speedtest") {
           if (bitratePrecision !== undefined) {
-            cleanedService.widget.bitratePrecision = parseInt(bitratePrecision, 10);
+            widget.bitratePrecision = parseInt(bitratePrecision, 10);
           }
         }
         if (type === "stocks") {
-          if (watchlist) cleanedService.widget.watchlist = watchlist;
-          if (showUSMarketStatus) cleanedService.widget.showUSMarketStatus = showUSMarketStatus;
+          if (watchlist) widget.watchlist = watchlist;
+          if (showUSMarketStatus) widget.showUSMarketStatus = showUSMarketStatus;
         }
         if (type === "wgeasy") {
-          if (threshold !== undefined) cleanedService.widget.threshold = parseInt(threshold, 10);
+          if (threshold !== undefined) widget.threshold = parseInt(threshold, 10);
         }
         if (type === "frigate") {
-          if (enableRecentEvents !== undefined) cleanedService.widget.enableRecentEvents = enableRecentEvents;
+          if (enableRecentEvents !== undefined) widget.enableRecentEvents = enableRecentEvents;
         }
         if (type === "technitium") {
-          if (range !== undefined) cleanedService.widget.range = range;
+          if (range !== undefined) widget.range = range;
         }
         if (type === "lubelogger") {
-          if (vehicleID !== undefined) cleanedService.widget.vehicleID = parseInt(vehicleID, 10);
+          if (vehicleID !== undefined) widget.vehicleID = parseInt(vehicleID, 10);
         }
         if (type === "vikunja") {
-          if (enableTaskList !== undefined) cleanedService.widget.enableTaskList = !!enableTaskList;
+          if (enableTaskList !== undefined) widget.enableTaskList = !!enableTaskList;
         }
         if (type === "prometheusmetric") {
-          if (metrics) cleanedService.widget.metrics = metrics;
-          if (refreshInterval) cleanedService.widget.refreshInterval = refreshInterval;
+          if (metrics) widget.metrics = metrics;
+          if (refreshInterval) widget.refreshInterval = refreshInterval;
         }
         if (type === "spoolman") {
-          if (spoolIds !== undefined) cleanedService.widget.spoolIds = spoolIds;
+          if (spoolIds !== undefined) widget.spoolIds = spoolIds;
         }
-      }
-
+        return widget;
+      });
       return cleanedService;
     }),
+    type: serviceGroup.type || "group",
+    groups: serviceGroup.groups ? cleanServiceGroups(serviceGroup.groups) : [],
   }));
 }
 
+export function findGroupByName(groups, name) {
+  // Deep search for a group by name. Using for loop allows for early return
+  for (let i = 0; i < groups.length; i += 1) {
+    const group = groups[i];
+    if (group.name === name) {
+      return group;
+    } else if (group.groups) {
+      const foundGroup = findGroupByName(group.groups, name);
+      if (foundGroup) {
+        return foundGroup;
+      }
+    }
+  }
+  return null;
+}
+
 export async function getServiceItem(group, service) {
   const configuredServices = await servicesFromConfig();
 
-  const serviceGroup = configuredServices.find((g) => g.name === group);
+  const serviceGroup = findGroupByName(configuredServices, group);
   if (serviceGroup) {
     const serviceEntry = serviceGroup.services.find((s) => s.name === service);
     if (serviceEntry) return serviceEntry;
@@ -677,14 +717,14 @@ export async function getServiceItem(group, service) {
 
   const discoveredServices = await servicesFromDocker();
 
-  const dockerServiceGroup = discoveredServices.find((g) => g.name === group);
+  const dockerServiceGroup = findGroupByName(discoveredServices, group);
   if (dockerServiceGroup) {
     const dockerServiceEntry = dockerServiceGroup.services.find((s) => s.name === service);
     if (dockerServiceEntry) return dockerServiceEntry;
   }
 
   const kubernetesServices = await servicesFromKubernetes();
-  const kubernetesServiceGroup = kubernetesServices.find((g) => g.name === group);
+  const kubernetesServiceGroup = findGroupByName(kubernetesServices, group);
   if (kubernetesServiceGroup) {
     const kubernetesServiceEntry = kubernetesServiceGroup.services.find((s) => s.name === service);
     if (kubernetesServiceEntry) return kubernetesServiceEntry;
@@ -693,12 +733,11 @@ export async function getServiceItem(group, service) {
   return false;
 }
 
-export default async function getServiceWidget(group, service) {
+export default async function getServiceWidget(group, service, index) {
   const serviceItem = await getServiceItem(group, service);
   if (serviceItem) {
-    const { widget } = serviceItem;
-    return widget;
+    const { widget, widgets } = serviceItem;
+    return index > -1 && widgets ? widgets[index] : widget;
   }
-
   return false;
 }
diff --git a/src/utils/proxy/api-helpers.js b/src/utils/proxy/api-helpers.js
index 8e0682dbc..a02ea6233 100644
--- a/src/utils/proxy/api-helpers.js
+++ b/src/utils/proxy/api-helpers.js
@@ -12,6 +12,7 @@ export function getURLSearchParams(widget, endpoint) {
   const params = new URLSearchParams({
     group: widget.service_group,
     service: widget.service_name,
+    index: widget.index,
   });
   if (endpoint) {
     params.append("endpoint", endpoint);
diff --git a/src/utils/proxy/handlers/credentialed.js b/src/utils/proxy/handlers/credentialed.js
index cbe0422ae..01fb313b1 100644
--- a/src/utils/proxy/handlers/credentialed.js
+++ b/src/utils/proxy/handlers/credentialed.js
@@ -9,10 +9,10 @@ import widgets from "widgets/widgets";
 const logger = createLogger("credentialedProxyHandler");
 
 export default async function credentialedProxyHandler(req, res, map) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service);
+    const widget = await getServiceWidget(group, service, index);
 
     if (!widgets?.[widget.type]?.api) {
       return res.status(403).json({ error: "Service does not support API calls" });
@@ -89,7 +89,9 @@ export default async function credentialedProxyHandler(req, res, map) {
       } else if (widget.type === "myspeed") {
         headers.Password = `${widget.password}`;
       } else if (widget.type === "esphome") {
-        if (widget.key) {
+        if (widget.username && widget.password) {
+          headers.Authorization = `Basic ${Buffer.from(`${widget.username}:${widget.password}`).toString("base64")}`;
+        } else if (widget.key) {
           headers.Cookie = `authenticated=${widget.key}`;
         }
       } else if (widget.type === "wgeasy") {
diff --git a/src/utils/proxy/handlers/generic.js b/src/utils/proxy/handlers/generic.js
index c6b9236b3..2e788a98c 100644
--- a/src/utils/proxy/handlers/generic.js
+++ b/src/utils/proxy/handlers/generic.js
@@ -8,10 +8,10 @@ import widgets from "widgets/widgets";
 const logger = createLogger("genericProxyHandler");
 
 export default async function genericProxyHandler(req, res, map) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service);
+    const widget = await getServiceWidget(group, service, index);
 
     if (!widgets?.[widget.type]?.api) {
       return res.status(403).json({ error: "Service does not support API calls" });
diff --git a/src/utils/proxy/handlers/jsonrpc.js b/src/utils/proxy/handlers/jsonrpc.js
index 3974dbdc3..f9fb18832 100644
--- a/src/utils/proxy/handlers/jsonrpc.js
+++ b/src/utils/proxy/handlers/jsonrpc.js
@@ -65,10 +65,10 @@ export async function sendJsonRpcRequest(url, method, params, widget) {
 }
 
 export default async function jsonrpcProxyHandler(req, res) {
-  const { group, service, endpoint: method } = req.query;
+  const { group, service, endpoint: method, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service);
+    const widget = await getServiceWidget(group, service, index);
     const api = widgets?.[widget.type]?.api;
 
     const [, mapping] = Object.entries(widgets?.[widget.type]?.mappings).find(([, value]) => value.endpoint === method);
diff --git a/src/utils/proxy/handlers/synology.js b/src/utils/proxy/handlers/synology.js
index be44e810a..030e53bad 100644
--- a/src/utils/proxy/handlers/synology.js
+++ b/src/utils/proxy/handlers/synology.js
@@ -131,13 +131,13 @@ function toError(url, synologyError) {
 }
 
 export default async function synologyProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const serviceWidget = await getServiceWidget(group, service);
+  const serviceWidget = await getServiceWidget(group, service, index);
   const widget = widgets?.[serviceWidget.type];
   const mapping = widget?.mappings?.[endpoint];
   if (!widget.api || !mapping) {
diff --git a/src/widgets/audiobookshelf/proxy.js b/src/widgets/audiobookshelf/proxy.js
index 9701c1feb..1a89736b1 100644
--- a/src/widgets/audiobookshelf/proxy.js
+++ b/src/widgets/audiobookshelf/proxy.js
@@ -23,14 +23,14 @@ async function retrieveFromAPI(url, key) {
 }
 
 export default async function audiobookshelfProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/beszel/proxy.js b/src/widgets/beszel/proxy.js
index 04083e420..7af70bd34 100644
--- a/src/widgets/beszel/proxy.js
+++ b/src/widgets/beszel/proxy.js
@@ -34,10 +34,10 @@ async function login(loginUrl, username, password, service) {
 }
 
 export default async function beszelProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service);
+    const widget = await getServiceWidget(group, service, index);
 
     if (!widgets?.[widget.type]?.api) {
       return res.status(403).json({ error: "Service does not support API calls" });
@@ -45,7 +45,12 @@ export default async function beszelProxyHandler(req, res) {
 
     if (widget) {
       const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint, ...widget }));
-      const loginUrl = formatApiCall(widgets[widget.type].api, { endpoint: "admins/auth-with-password", ...widget });
+      let authEndpointVersion = "authv1";
+      if (widget.version === 2) authEndpointVersion = "authv2";
+      const loginUrl = formatApiCall(widgets[widget.type].api, {
+        endpoint: widgets[widget.type].mappings[authEndpointVersion].endpoint,
+        ...widget,
+      });
 
       let status;
       let data;
@@ -54,7 +59,7 @@ export default async function beszelProxyHandler(req, res) {
       if (!token) {
         [status, token] = await login(loginUrl, widget.username, widget.password, service);
         if (status !== 200) {
-          logger.debug(`HTTP ${status} logging into npm api: ${token}`);
+          logger.debug(`HTTP ${status} logging into Beszel: ${token}`);
           return res.status(status).send(token);
         }
       }
@@ -68,12 +73,12 @@ export default async function beszelProxyHandler(req, res) {
       });
 
       if (status === 403) {
-        logger.debug(`HTTP ${status} retrieving data from npm api, logging in and trying again.`);
+        logger.debug(`HTTP ${status} retrieving data from Beszel, logging in and trying again.`);
         cache.del(`${tokenCacheKey}.${service}`);
         [status, token] = await login(loginUrl, widget.username, widget.password, service);
 
         if (status !== 200) {
-          logger.debug(`HTTP ${status} logging into npm api: ${data}`);
+          logger.debug(`HTTP ${status} logging into Beszel: ${data}`);
           return res.status(status).send(data);
         }
 
diff --git a/src/widgets/beszel/widget.js b/src/widgets/beszel/widget.js
index 508c1debb..d1496daa6 100644
--- a/src/widgets/beszel/widget.js
+++ b/src/widgets/beszel/widget.js
@@ -5,6 +5,12 @@ const widget = {
   proxyHandler: beszelProxyHandler,
 
   mappings: {
+    authv1: {
+      endpoint: "admins/auth-with-password",
+    },
+    authv2: {
+      endpoint: "collections/_superusers/auth-with-password",
+    },
     systems: {
       endpoint: "collections/systems/records?page=1&perPage=500&sort=%2Bcreated",
     },
diff --git a/src/widgets/calendar/proxy.js b/src/widgets/calendar/proxy.js
index cf754424f..d36f30c90 100644
--- a/src/widgets/calendar/proxy.js
+++ b/src/widgets/calendar/proxy.js
@@ -5,10 +5,10 @@ import createLogger from "utils/logger";
 const logger = createLogger("calendarProxyHandler");
 
 export default async function calendarProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service);
+    const widget = await getServiceWidget(group, service, index);
     const integration = widget.integrations?.find((i) => i.name === endpoint);
 
     if (integration) {
diff --git a/src/widgets/crowdsec/proxy.js b/src/widgets/crowdsec/proxy.js
index e78fbc5ef..85803845b 100644
--- a/src/widgets/crowdsec/proxy.js
+++ b/src/widgets/crowdsec/proxy.js
@@ -35,14 +35,14 @@ async function login(widget, service) {
 }
 
 export default async function crowdsecProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.error("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget || !widgets[widget.type].api) {
     logger.error("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid widget configuration" });
diff --git a/src/widgets/deluge/component.jsx b/src/widgets/deluge/component.jsx
index 0d7190d47..231f69ab7 100644
--- a/src/widgets/deluge/component.jsx
+++ b/src/widgets/deluge/component.jsx
@@ -1,5 +1,7 @@
 import { useTranslation } from "next-i18next";
 
+import QueueEntry from "../../components/widgets/queue/queueEntry";
+
 import Container from "components/services/widget/container";
 import Block from "components/services/widget/block";
 import useWidgetAPI from "utils/proxy/use-widget-api";
@@ -32,21 +34,38 @@ export default function Component({ service }) {
   let rateDl = 0;
   let rateUl = 0;
   let completed = 0;
+  const leechTorrents = [];
+
   for (let i = 0; i < keys.length; i += 1) {
     const torrent = torrents[keys[i]];
     rateDl += torrent.download_payload_rate;
     rateUl += torrent.upload_payload_rate;
     completed += torrent.total_remaining === 0 ? 1 : 0;
+    if (torrent.state === "Downloading") {
+      leechTorrents.push(torrent);
+    }
   }
 
   const leech = keys.length - completed || 0;
 
   return (
-    <Container service={service}>
-      <Block label="deluge.leech" value={t("common.number", { value: leech })} />
-      <Block label="deluge.download" value={t("common.byterate", { value: rateDl })} />
-      <Block label="deluge.seed" value={t("common.number", { value: completed })} />
-      <Block label="deluge.upload" value={t("common.byterate", { value: rateUl })} />
-    </Container>
+    <>
+      <Container service={service}>
+        <Block label="deluge.leech" value={t("common.number", { value: leech })} />
+        <Block label="deluge.download" value={t("common.byterate", { value: rateDl })} />
+        <Block label="deluge.seed" value={t("common.number", { value: completed })} />
+        <Block label="deluge.upload" value={t("common.byterate", { value: rateUl })} />
+      </Container>
+      {widget?.enableLeechProgress &&
+        leechTorrents.map((queueEntry) => (
+          <QueueEntry
+            progress={queueEntry.progress}
+            timeLeft={t("common.duration", { value: queueEntry.eta })}
+            title={queueEntry.name}
+            activity={queueEntry.state}
+            key={`${queueEntry.name}-${queueEntry.total_remaining}`}
+          />
+        ))}
+    </>
   );
 }
diff --git a/src/widgets/deluge/proxy.js b/src/widgets/deluge/proxy.js
index b86873a89..0430a6ac8 100644
--- a/src/widgets/deluge/proxy.js
+++ b/src/widgets/deluge/proxy.js
@@ -17,6 +17,7 @@ const dataParams = [
     "download_payload_rate",
     "upload_payload_rate",
     "total_remaining",
+    "eta",
   ],
   {},
 ];
@@ -40,14 +41,14 @@ function login(url, password) {
 }
 
 export default async function delugeProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/evcc/component.jsx b/src/widgets/evcc/component.jsx
index 9f5d4c4d5..09a8ffe4f 100644
--- a/src/widgets/evcc/component.jsx
+++ b/src/widgets/evcc/component.jsx
@@ -4,6 +4,10 @@ import Container from "components/services/widget/container";
 import Block from "components/services/widget/block";
 import useWidgetAPI from "utils/proxy/use-widget-api";
 
+function toKilowatts(t, value) {
+  return value > 0 ? t("common.number", { value: value / 1000, maximumFractionDigits: 1 }) : 0;
+}
+
 export default function Component({ service }) {
   const { t } = useTranslation();
 
@@ -27,21 +31,12 @@ export default function Component({ service }) {
 
   return (
     <Container service={service}>
-      <Block
-        label="evcc.pv_power"
-        value={`${t("common.number", { value: stateData.result.pvPower })} ${t("evcc.watt_hour")}`}
-      />
-      <Block
-        label="evcc.grid_power"
-        value={`${t("common.number", { value: stateData.result.gridPower })} ${t("evcc.watt_hour")}`}
-      />
-      <Block
-        label="evcc.home_power"
-        value={`${t("common.number", { value: stateData.result.homePower })} ${t("evcc.watt_hour")}`}
-      />
+      <Block label="evcc.pv_power" value={`${toKilowatts(t, stateData.result.pvPower)} ${t("evcc.kilowatt")}`} />
+      <Block label="evcc.grid_power" value={`${toKilowatts(t, stateData.result.gridPower)} ${t("evcc.kilowatt")}`} />
+      <Block label="evcc.home_power" value={`${toKilowatts(t, stateData.result.homePower)} ${t("evcc.kilowatt")}`} />
       <Block
         label="evcc.charge_power"
-        value={`${t("common.number", { value: stateData.result.loadpoints[0].chargePower })} ${t("evcc.watt_hour")}`}
+        value={`${toKilowatts(t, stateData.result.loadpoints[0].chargePower)} ${t("evcc.kilowatt")}`}
       />
     </Container>
   );
diff --git a/src/widgets/flood/proxy.js b/src/widgets/flood/proxy.js
index 3345ad7b2..e0c101731 100644
--- a/src/widgets/flood/proxy.js
+++ b/src/widgets/flood/proxy.js
@@ -28,14 +28,14 @@ async function login(widget) {
 }
 
 export default async function floodProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/freshrss/proxy.js b/src/widgets/freshrss/proxy.js
index c08e5c871..881094bd7 100644
--- a/src/widgets/freshrss/proxy.js
+++ b/src/widgets/freshrss/proxy.js
@@ -74,14 +74,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function freshrssProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
diff --git a/src/widgets/fritzbox/proxy.js b/src/widgets/fritzbox/proxy.js
index a0a22d8b5..d1a66d979 100644
--- a/src/widgets/fritzbox/proxy.js
+++ b/src/widgets/fritzbox/proxy.js
@@ -46,8 +46,8 @@ async function requestEndpoint(apiBaseUrl, service, action) {
 }
 
 export default async function fritzboxProxyHandler(req, res) {
-  const { group, service } = req.query;
-  const serviceWidget = await getServiceWidget(group, service);
+  const { group, service, index } = req.query;
+  const serviceWidget = await getServiceWidget(group, service, index);
 
   if (!serviceWidget) {
     res.status(500).json({ error: { message: "Service widget not found" } });
diff --git a/src/widgets/gamedig/proxy.js b/src/widgets/gamedig/proxy.js
index 05fa615c1..ecf6e4c68 100644
--- a/src/widgets/gamedig/proxy.js
+++ b/src/widgets/gamedig/proxy.js
@@ -7,8 +7,8 @@ const proxyName = "gamedigProxyHandler";
 const logger = createLogger(proxyName);
 
 export default async function gamedigProxyHandler(req, res) {
-  const { group, service } = req.query;
-  const serviceWidget = await getServiceWidget(group, service);
+  const { group, service, index } = req.query;
+  const serviceWidget = await getServiceWidget(group, service, index);
   const url = new URL(serviceWidget.url);
 
   try {
diff --git a/src/widgets/glances/component.jsx b/src/widgets/glances/component.jsx
index df916b4ba..bff31ac16 100644
--- a/src/widgets/glances/component.jsx
+++ b/src/widgets/glances/component.jsx
@@ -7,6 +7,7 @@ import Disk from "./metrics/disk";
 import GPU from "./metrics/gpu";
 import Info from "./metrics/info";
 import Fs from "./metrics/fs";
+import Containers from "./metrics/containers";
 
 export default function Component({ service }) {
   const { widget } = service;
@@ -23,6 +24,10 @@ export default function Component({ service }) {
     return <Process service={service} />;
   }
 
+  if (widget.metric === "containers") {
+    return <Containers service={service} />;
+  }
+
   if (widget.metric === "cpu") {
     return <Cpu service={service} />;
   }
diff --git a/src/widgets/glances/components/container.jsx b/src/widgets/glances/components/container.jsx
index ebbe3d986..3e9e8b5a7 100644
--- a/src/widgets/glances/components/container.jsx
+++ b/src/widgets/glances/components/container.jsx
@@ -1,4 +1,5 @@
 import { useContext } from "react";
+import classNames from "classnames";
 
 import Error from "./error";
 
@@ -17,10 +18,10 @@ export default function Container({ children, widget, error = null, chart = true
   }
 
   return (
-    <div>
+    <div className={classNames("service-container relative", chart ? "h-[120px]" : "")}>
       {children}
       <div className={`absolute top-0 right-0 bottom-0 left-0 overflow-clip pointer-events-none ${className}`} />
-      {chart && <div className="h-[68px] overflow-clip" />}
+      {chart && <div className="chart h-[68px] overflow-clip" />}
       {!chart && <div className="h-[16px] overflow-clip" />}
     </div>
   );
diff --git a/src/widgets/glances/metrics/containers.jsx b/src/widgets/glances/metrics/containers.jsx
new file mode 100644
index 000000000..dac52be3c
--- /dev/null
+++ b/src/widgets/glances/metrics/containers.jsx
@@ -0,0 +1,73 @@
+import { useTranslation } from "next-i18next";
+
+import Container from "../components/container";
+import Block from "../components/block";
+
+import useWidgetAPI from "utils/proxy/use-widget-api";
+import ResolvedIcon from "components/resolvedicon";
+
+const statusMap = {
+  running: <ResolvedIcon icon="mdi-circle" width={32} height={32} />,
+  paused: <ResolvedIcon icon="mdi-circle-outline" width={32} height={32} />,
+};
+
+const defaultInterval = 1000;
+
+export default function Component({ service }) {
+  const { t } = useTranslation();
+  const { widget } = service;
+  const { chart, refreshInterval = defaultInterval, version = 3 } = widget;
+
+  const idKey = version === 3 ? "Id" : "id";
+  const statusKey = version === 3 ? "Status" : "status";
+
+  const { data, error } = useWidgetAPI(service.widget, `${version}/containers`, {
+    refreshInterval: Math.max(defaultInterval, refreshInterval),
+  });
+
+  if (error) {
+    return <Container service={service} widget={widget} />;
+  }
+
+  if (!data) {
+    return (
+      <Container chart={chart}>
+        <Block position="bottom-3 left-3">-</Block>
+      </Container>
+    );
+  }
+
+  data.splice(chart ? 5 : 1);
+
+  return (
+    <Container chart={chart}>
+      <Block position="top-4 right-3 left-3">
+        <div className="flex items-center text-xs">
+          <div className="grow" />
+          <div className="w-14 text-right italic">{t("resources.cpu")}</div>
+          <div className="w-14 text-right">{t("resources.mem")}</div>
+        </div>
+      </Block>
+
+      <Block position="bottom-4 right-3 left-3">
+        <div className="pointer-events-none text-theme-900 dark:text-theme-200">
+          {data.map((item) => (
+            <div key={item[idKey]} className="text-[0.75rem] h-[0.8rem]">
+              <div className="flex items-center">
+                <div className="w-3 h-3 mr-1.5 opacity-50">{statusMap[item[statusKey]]}</div>
+                <div className="opacity-75 grow truncate">{item.name}</div>
+                <div className="opacity-25 w-14 text-right">{item.cpu_percent.toFixed(1)}%</div>
+                <div className="opacity-25 w-14 text-right">
+                  {t("common.bytes", {
+                    value: item.memory.usage,
+                    maximumFractionDigits: 0,
+                  })}
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      </Block>
+    </Container>
+  );
+}
diff --git a/src/widgets/glances/metrics/process.jsx b/src/widgets/glances/metrics/process.jsx
index b997a5689..b20b4c634 100644
--- a/src/widgets/glances/metrics/process.jsx
+++ b/src/widgets/glances/metrics/process.jsx
@@ -63,7 +63,7 @@ export default function Component({ service }) {
                 <div className="opacity-25 w-14 text-right">{item.cpu_percent.toFixed(1)}%</div>
                 <div className="opacity-25 w-14 text-right">
                   {t("common.bytes", {
-                    value: item.memory_info[memoryInfoKey],
+                    value: item.memory_info[memoryInfoKey] ?? item.memory_info.wset,
                     maximumFractionDigits: 0,
                   })}
                 </div>
diff --git a/src/widgets/glances/widget.js b/src/widgets/glances/widget.js
index 00d3ac5ad..38da4fd79 100644
--- a/src/widgets/glances/widget.js
+++ b/src/widgets/glances/widget.js
@@ -3,7 +3,7 @@ import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
 const widget = {
   api: "{url}/api/{endpoint}",
   proxyHandler: credentialedProxyHandler,
-  allowedEndpoints: /\d\/quicklook|diskio|cpu|fs|gpu|system|mem|network|processlist|sensors/,
+  allowedEndpoints: /\d\/quicklook|diskio|cpu|fs|gpu|system|mem|network|processlist|sensors|containers/,
 };
 
 export default widget;
diff --git a/src/widgets/homeassistant/proxy.js b/src/widgets/homeassistant/proxy.js
index fe488f86b..e1f02ddbb 100644
--- a/src/widgets/homeassistant/proxy.js
+++ b/src/widgets/homeassistant/proxy.js
@@ -62,14 +62,14 @@ async function getQuery(query, { url, key }) {
 }
 
 export default async function homeassistantProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
diff --git a/src/widgets/homebox/proxy.js b/src/widgets/homebox/proxy.js
index 0d6fdf13c..c91ce5528 100644
--- a/src/widgets/homebox/proxy.js
+++ b/src/widgets/homebox/proxy.js
@@ -68,14 +68,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function homeboxProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
diff --git a/src/widgets/homebridge/proxy.js b/src/widgets/homebridge/proxy.js
index 17dc8635c..4da9197b0 100644
--- a/src/widgets/homebridge/proxy.js
+++ b/src/widgets/homebridge/proxy.js
@@ -71,14 +71,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function homebridgeProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/jackett/proxy.js b/src/widgets/jackett/proxy.js
index 5292695fc..035309b36 100644
--- a/src/widgets/jackett/proxy.js
+++ b/src/widgets/jackett/proxy.js
@@ -25,14 +25,14 @@ async function fetchJackettCookie(widget, loginURL) {
 }
 
 export default async function jackettProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.error("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget || !widgets[widget.type].api) {
     logger.error("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid widget configuration" });
diff --git a/src/widgets/jdownloader/proxy.js b/src/widgets/jdownloader/proxy.js
index 88a92d95d..ae8c845ca 100644
--- a/src/widgets/jdownloader/proxy.js
+++ b/src/widgets/jdownloader/proxy.js
@@ -12,12 +12,12 @@ const proxyName = "jdownloaderProxyHandler";
 const logger = createLogger(proxyName);
 
 async function getWidget(req) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return null;
   }
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return null;
diff --git a/src/widgets/kavita/proxy.js b/src/widgets/kavita/proxy.js
index b8e9813f8..1c41c45f1 100644
--- a/src/widgets/kavita/proxy.js
+++ b/src/widgets/kavita/proxy.js
@@ -70,14 +70,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function KavitaProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
diff --git a/src/widgets/minecraft/proxy.js b/src/widgets/minecraft/proxy.js
index f7bac9d45..98d1be88c 100644
--- a/src/widgets/minecraft/proxy.js
+++ b/src/widgets/minecraft/proxy.js
@@ -7,8 +7,8 @@ const proxyName = "minecraftProxyHandler";
 const logger = createLogger(proxyName);
 
 export default async function minecraftProxyHandler(req, res) {
-  const { group, service } = req.query;
-  const serviceWidget = await getServiceWidget(group, service);
+  const { group, service, index } = req.query;
+  const serviceWidget = await getServiceWidget(group, service, index);
   const url = new URL(serviceWidget.url);
   try {
     const pingResponse = await pingWithPromise(url.hostname, url.port || 25565);
diff --git a/src/widgets/npm/proxy.js b/src/widgets/npm/proxy.js
index 978254f81..6c7ba09ef 100644
--- a/src/widgets/npm/proxy.js
+++ b/src/widgets/npm/proxy.js
@@ -36,10 +36,10 @@ async function login(loginUrl, username, password, service) {
 }
 
 export default async function npmProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service);
+    const widget = await getServiceWidget(group, service, index);
 
     if (!widgets?.[widget.type]?.api) {
       return res.status(403).json({ error: "Service does not support API calls" });
diff --git a/src/widgets/omada/proxy.js b/src/widgets/omada/proxy.js
index 8e8994a5b..f4da12936 100644
--- a/src/widgets/omada/proxy.js
+++ b/src/widgets/omada/proxy.js
@@ -33,10 +33,10 @@ async function login(loginUrl, username, password, controllerVersionMajor) {
 }
 
 export default async function omadaProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service);
+    const widget = await getServiceWidget(group, service, index);
 
     if (widget) {
       const { url } = widget;
diff --git a/src/widgets/openmediavault/proxy.js b/src/widgets/openmediavault/proxy.js
index e1f97a56e..9cda42e86 100644
--- a/src/widgets/openmediavault/proxy.js
+++ b/src/widgets/openmediavault/proxy.js
@@ -12,14 +12,14 @@ const BG_POLL_PERIOD = 500;
 const logger = createLogger(PROXY_NAME);
 
 async function getWidget(req) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return null;
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/openwrt/proxy.js b/src/widgets/openwrt/proxy.js
index 977db8ca9..0a0da3ff5 100644
--- a/src/widgets/openwrt/proxy.js
+++ b/src/widgets/openwrt/proxy.js
@@ -17,14 +17,14 @@ const PARAMS = {
 };
 
 async function getWidget(req) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return null;
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/photoprism/proxy.js b/src/widgets/photoprism/proxy.js
index 509bfa0c7..fe5096b3a 100644
--- a/src/widgets/photoprism/proxy.js
+++ b/src/widgets/photoprism/proxy.js
@@ -6,14 +6,14 @@ import createLogger from "utils/logger";
 const logger = createLogger("photoprismProxyHandler");
 
 export default async function photoprismProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/pihole/proxy.js b/src/widgets/pihole/proxy.js
index 35873fa92..bf24624d4 100644
--- a/src/widgets/pihole/proxy.js
+++ b/src/widgets/pihole/proxy.js
@@ -33,7 +33,7 @@ async function login(widget, service) {
 }
 
 export default async function piholeProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
   let endpoint = "stats/summary";
 
   if (!group || !service) {
@@ -41,7 +41,7 @@ export default async function piholeProxyHandler(req, res) {
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.error("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid widget configuration" });
diff --git a/src/widgets/plex/proxy.js b/src/widgets/plex/proxy.js
index d80330654..2956f2809 100644
--- a/src/widgets/plex/proxy.js
+++ b/src/widgets/plex/proxy.js
@@ -16,14 +16,14 @@ const tvCacheKey = `${proxyName}__tv`;
 const logger = createLogger(proxyName);
 
 async function getWidget(req) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return null;
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/pyload/proxy.js b/src/widgets/pyload/proxy.js
index d9469d1cb..a380c865d 100644
--- a/src/widgets/pyload/proxy.js
+++ b/src/widgets/pyload/proxy.js
@@ -67,11 +67,11 @@ async function login(loginUrl, service, username, password = "") {
 }
 
 export default async function pyloadProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   try {
     if (group && service) {
-      const widget = await getServiceWidget(group, service);
+      const widget = await getServiceWidget(group, service, index);
 
       if (widget) {
         const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint, ...widget }));
diff --git a/src/widgets/qbittorrent/component.jsx b/src/widgets/qbittorrent/component.jsx
index e88b26227..d7fb8bf75 100644
--- a/src/widgets/qbittorrent/component.jsx
+++ b/src/widgets/qbittorrent/component.jsx
@@ -1,12 +1,13 @@
 import { useTranslation } from "next-i18next";
 
+import QueueEntry from "../../components/widgets/queue/queueEntry";
+
 import Container from "components/services/widget/container";
 import Block from "components/services/widget/block";
 import useWidgetAPI from "utils/proxy/use-widget-api";
 
 export default function Component({ service }) {
   const { t } = useTranslation();
-
   const { widget } = service;
 
   const { data: torrentData, error: torrentError } = useWidgetAPI(widget, "torrents");
@@ -29,6 +30,7 @@ export default function Component({ service }) {
   let rateDl = 0;
   let rateUl = 0;
   let completed = 0;
+  const leechTorrents = [];
 
   for (let i = 0; i < torrentData.length; i += 1) {
     const torrent = torrentData[i];
@@ -37,16 +39,31 @@ export default function Component({ service }) {
     if (torrent.progress === 1) {
       completed += 1;
     }
+    if (torrent.state.includes("DL") || torrent.state === "downloading") {
+      leechTorrents.push(torrent);
+    }
   }
 
   const leech = torrentData.length - completed;
 
   return (
-    <Container service={service}>
-      <Block label="qbittorrent.leech" value={t("common.number", { value: leech })} />
-      <Block label="qbittorrent.download" value={t("common.bibyterate", { value: rateDl, decimals: 1 })} />
-      <Block label="qbittorrent.seed" value={t("common.number", { value: completed })} />
-      <Block label="qbittorrent.upload" value={t("common.bibyterate", { value: rateUl, decimals: 1 })} />
-    </Container>
+    <>
+      <Container service={service}>
+        <Block label="qbittorrent.leech" value={t("common.number", { value: leech })} />
+        <Block label="qbittorrent.download" value={t("common.bibyterate", { value: rateDl, decimals: 1 })} />
+        <Block label="qbittorrent.seed" value={t("common.number", { value: completed })} />
+        <Block label="qbittorrent.upload" value={t("common.bibyterate", { value: rateUl, decimals: 1 })} />
+      </Container>
+      {widget?.enableLeechProgress &&
+        leechTorrents.map((queueEntry) => (
+          <QueueEntry
+            progress={queueEntry.progress * 100}
+            timeLeft={t("common.duration", { value: queueEntry.eta })}
+            title={queueEntry.name}
+            activity={queueEntry.state}
+            key={`${queueEntry.name}-${queueEntry.amount_left}`}
+          />
+        ))}
+    </>
   );
 }
diff --git a/src/widgets/qbittorrent/proxy.js b/src/widgets/qbittorrent/proxy.js
index e1a0f0552..aead75820 100644
--- a/src/widgets/qbittorrent/proxy.js
+++ b/src/widgets/qbittorrent/proxy.js
@@ -21,14 +21,14 @@ async function login(widget) {
 }
 
 export default async function qbittorrentProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/qnap/proxy.js b/src/widgets/qnap/proxy.js
index 508c8a46f..07917d28c 100644
--- a/src/widgets/qnap/proxy.js
+++ b/src/widgets/qnap/proxy.js
@@ -77,14 +77,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function qnapProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
diff --git a/src/widgets/rutorrent/proxy.js b/src/widgets/rutorrent/proxy.js
index 47c761916..e0ae44fec 100644
--- a/src/widgets/rutorrent/proxy.js
+++ b/src/widgets/rutorrent/proxy.js
@@ -45,10 +45,10 @@ const getTorrentInfo = (data) => ({
 });
 
 export default async function rutorrentProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service);
+    const widget = await getServiceWidget(group, service, index);
 
     if (widget) {
       const api = widgets?.[widget.type]?.api;
diff --git a/src/widgets/suwayomi/proxy.js b/src/widgets/suwayomi/proxy.js
index d4d716752..def811ccf 100644
--- a/src/widgets/suwayomi/proxy.js
+++ b/src/widgets/suwayomi/proxy.js
@@ -114,14 +114,14 @@ function extractCounts(responseJSON, fields) {
 }
 
 export default async function suwayomiProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/tailscale/component.jsx b/src/widgets/tailscale/component.jsx
index 3929b2ed1..d3c937d5d 100644
--- a/src/widgets/tailscale/component.jsx
+++ b/src/widgets/tailscale/component.jsx
@@ -11,8 +11,8 @@ export default function Component({ service }) {
 
   const { data: statsData, error: statsError } = useWidgetAPI(widget, "device");
 
-  if (statsError) {
-    return <Container service={service} error={statsError} />;
+  if (statsError || statsData?.message) {
+    return <Container service={service} error={statsError ?? statsData} />;
   }
 
   if (!statsData) {
diff --git a/src/widgets/tdarr/proxy.js b/src/widgets/tdarr/proxy.js
index 9e26fdc06..88da30fdf 100644
--- a/src/widgets/tdarr/proxy.js
+++ b/src/widgets/tdarr/proxy.js
@@ -8,14 +8,14 @@ const proxyName = "tdarrProxyHandler";
 const logger = createLogger(proxyName);
 
 export default async function tdarrProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/transmission/proxy.js b/src/widgets/transmission/proxy.js
index 823def054..8b8049bc8 100644
--- a/src/widgets/transmission/proxy.js
+++ b/src/widgets/transmission/proxy.js
@@ -11,14 +11,14 @@ const headerCacheKey = `${proxyName}__headers`;
 const logger = createLogger(proxyName);
 
 export default async function transmissionProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/unifi/proxy.js b/src/widgets/unifi/proxy.js
index 98c98f377..559065e33 100644
--- a/src/widgets/unifi/proxy.js
+++ b/src/widgets/unifi/proxy.js
@@ -14,13 +14,13 @@ const prefixCacheKey = `${proxyName}__prefix`;
 const logger = createLogger(proxyName);
 
 async function getWidget(req) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   let widget = null;
   if (group === "unifi_console" && service === "unifi_console") {
     // info widget
-    const index = req.query?.query ? JSON.parse(req.query.query).index : undefined;
-    widget = await getPrivateWidgetOptions("unifi_console", index);
+    const infowidgetIndex = req.query?.query ? JSON.parse(req.query.query).index : undefined;
+    widget = await getPrivateWidgetOptions("unifi_console", infowidgetIndex);
     if (!widget) {
       logger.debug("Error retrieving settings for this Unifi widget");
       return null;
@@ -32,7 +32,7 @@ async function getWidget(req) {
       return null;
     }
 
-    widget = await getServiceWidget(group, service);
+    widget = await getServiceWidget(group, service, index);
 
     if (!widget) {
       logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/urbackup/proxy.js b/src/widgets/urbackup/proxy.js
index 94b8eeff6..4e7a0a8d5 100644
--- a/src/widgets/urbackup/proxy.js
+++ b/src/widgets/urbackup/proxy.js
@@ -3,8 +3,8 @@ import { UrbackupServer } from "urbackup-server-api";
 import getServiceWidget from "utils/config/service-helpers";
 
 export default async function urbackupProxyHandler(req, res) {
-  const { group, service } = req.query;
-  const serviceWidget = await getServiceWidget(group, service);
+  const { group, service, index } = req.query;
+  const serviceWidget = await getServiceWidget(group, service, index);
 
   const server = new UrbackupServer({
     url: serviceWidget.url,
diff --git a/src/widgets/watchtower/proxy.js b/src/widgets/watchtower/proxy.js
index b3155a1e9..588d08ee0 100644
--- a/src/widgets/watchtower/proxy.js
+++ b/src/widgets/watchtower/proxy.js
@@ -8,14 +8,14 @@ const proxyName = "watchtowerProxyHandler";
 const logger = createLogger(proxyName);
 
 export default async function watchtowerProxyHandler(req, res) {
-  const { group, service, endpoint } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
diff --git a/src/widgets/xteve/proxy.js b/src/widgets/xteve/proxy.js
index 421f2b499..453e36456 100644
--- a/src/widgets/xteve/proxy.js
+++ b/src/widgets/xteve/proxy.js
@@ -7,13 +7,13 @@ import getServiceWidget from "utils/config/service-helpers";
 const logger = createLogger("xteveProxyHandler");
 
 export default async function xteveProxyHandler(req, res) {
-  const { group, service } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service);
+  const widget = await getServiceWidget(group, service, index);
   const api = widgets?.[widget.type]?.api;
   if (!api) {
     return res.status(403).json({ error: "Service does not support API calls" });