diff --git a/services.yaml b/services.yaml
index e08267c..6d809db 100644
--- a/services.yaml
+++ b/services.yaml
@@ -4,68 +4,68 @@
 
 - Virtualization:
     - Proxmox:
-        href: "{{HOMEPAGE_VAR_PROXMOX_URL}}"
+        href: "{{ HOMEPAGE_VAR_PROXMOX_URL }}"
         description: Lenovo P520
         icon: proxmox
         widget:
             type: proxmox
-            url: "{{HOMEPAGE_VAR_PROXMOX_URL}}"
-            username: "{{HOMEPAGE_VAR_PROXMOX_PAM}}"
-            password: "{{HOMEPAGE_VAR_PROXMOX_SECRET}}"
+            url: "{{ HOMEPAGE_VAR_PROXMOX_URL }}"
+            username: "{{ HOMEPAGE_VAR_PROXMOX_PAM }}"
+            password: "{{ HOMEPAGE_VAR_PROXMOX_SECRET }}"
     - Docker:
         - Apps:
-            href: "{{HOMEPAGE_VAR_PORTAINER_URL}}"
+            href: "{{ HOMEPAGE_VAR_PORTAINER_URL }}"
             description: Portainer
             icon: portainer
             widget:
                 type: portainer
-                url: "{{HOMEPAGE_VAR_PORTAINER_URL}}"
+                url: "{{ HOMEPAGE_VAR_PORTAINER_URL }}"
                 env: 18
-                key: "{{HOMEPAGE_VAR_PORTAINER_KEY}}"
+                key: "{{ HOMEPAGE_VAR_PORTAINER_KEY }}"
 
         - Cloud:
-            href: "{{HOMEPAGE_VAR_PORTAINER_URL}}"
+            href: "{{ HOMEPAGE_VAR_PORTAINER_URL }}"
             description: Portainer
             icon: portainer
             widget:
                 type: portainer
-                url: "{{HOMEPAGE_VAR_PORTAINER_URL}}"
+                url: "{{ HOMEPAGE_VAR_PORTAINER_URL }}"
                 env: 16
-                key: "{{HOMEPAGE_VAR_PORTAINER_KEY}}"
+                key: "{{ HOMEPAGE_VAR_PORTAINER_KEY }}"
 
 - Files:
     - TrueNAS:
-        href: "{{HOMEPAGE_VAR_TRUENAS_URL}}"
+        href: "{{ HOMEPAGE_VAR_TRUENAS_URL }}"
         #description: Storage
         icon: truenas
         widget:
             type: truenas
-            url: "{{HOMEPAGE_VAR_TRUENAS_URL}}"
-            key: "{{HOMEPAGE_VAR_TRUENAS_KEY}}"
+            url: "{{ HOMEPAGE_VAR_TRUENAS_URL }}"
+            key: "{{ HOMEPAGE_VAR_TRUENAS_KEY }}"
             enablePools: true
 
     - Transmission:
-        href: "{{HOMEPAGE_VAR_TRANSMISSION_URL}}/"
+        href: "{{ HOMEPAGE_VAR_TRANSMISSION_URL }}/"
         #description: Transmission
         icon: transmission
         server: apps
         container: transmission-openvpn
         widget:
             type: transmission
-            url: "{{HOMEPAGE_VAR_TRANSMISSION_URL}}"
+            url: "{{ HOMEPAGE_VAR_TRANSMISSION_URL }}"
 
     - Immich:
-        href: "{{HOMEPAGE_VAR_IMMICH_URL}}/photos"
+        href: "{{ HOMEPAGE_VAR_IMMICH_URL }}/photos"
         #description: Photos
         icon: immich
         widget:
             type: immich
-            url: "{{HOMEPAGE_VAR_IMMICH_URL}}"
-            key: "{{HOMEPAGE_VAR_IMMICH_KEY}}"
+            url: "{{ HOMEPAGE_VAR_IMMICH_URL }}"
+            key: "{{ HOMEPAGE_VAR_IMMICH_KEY }}"
             version: 2
 
     - Seafile:
-        href: "{{HOMEPAGE_VAR_SEAFILE_URL}}"
+        href: "{{ HOMEPAGE_VAR_SEAFILE_URL }}"
         description: Documents
         icon: seafile
         server: cloud
@@ -73,130 +73,82 @@
 
 - Networking:
     - Nginx Proxy Manager:
-        href: "{{HOMEPAGE_VAR_NPM_URL}}/nginx/proxy"
+        href: "{{ HOMEPAGE_VAR_NPM_URL }}/nginx/proxy"
         description: Services proxying
         icon: nginx-proxy-manager
         widget:
             type: npm
-            url: "{{HOMEPAGE_VAR_NPM_URL}}"
-            username: "{{HOMEPAGE_VAR_NPM_USER}}"
-            password: "{{HOMEPAGE_VAR_NPM_PASS}}"
+            url: "{{ HOMEPAGE_VAR_NPM_URL }}"
+            username: "{{ HOMEPAGE_VAR_NPM_USER }}"
+            password: "{{ HOMEPAGE_VAR_NPM_PASS }}"
         server: apps
         container: nginx-proxy-manager
 
     - AdGuard:
-        href: "{{HOMEPAGE_VAR_ADGUARD_URL}}"
+        href: "{{ HOMEPAGE_VAR_ADGUARD_URL }}"
         icon: adguard-home
         widget:
             type: adguard
-            url: "{{HOMEPAGE_VAR_ADGUARD_URL}}"
-            username: "{{HOMEPAGE_VAR_ADGUARD_USER}}"
-            password: "{{HOMEPAGE_VAR_ADGUARD_PASS}}"
+            url: "{{ HOMEPAGE_VAR_ADGUARD_URL }}"
+            username: "{{ HOMEPAGE_VAR_ADGUARD_USER }}"
+            password: "{{ HOMEPAGE_VAR_ADGUARD_PASS }}"
 
     - Remote:
         - Guacamole:
-            href: "{{HOMEPAGE_VAR_GUACAMOLE_URL}}"
+            href: "{{ HOMEPAGE_VAR_GUACAMOLE_URL }}"
             icon: guacamole
             server: apps
             container: guacamole
 
         - Webtop:
-            href: "{{HOMEPAGE_VAR_WEBTOP_URL}}"
+            href: "{{ HOMEPAGE_VAR_WEBTOP_URL }}"
             icon: webtop
             server: apps
             container: webtop
 
         - Lenovo AMT:
             description: Intel AMT remote management for Lenovo
-            href: "{{HOMEPAGE_VAR_LENOVO_AMT_URL}}"
+            href: "{{ HOMEPAGE_VAR_LENOVO_AMT_URL }}"
             icon: si-intel-#0071C5
- #           siteMonitor: "{{HOMEPAGE_VAR_LENOVO_AMT_URL}}"
-        
-
-    #    - PgAdmin Oracle:
-    #        href: https://pgadmin.xopek.co.uk/browser/
-    #        icon: pgadmin
-    #        siteMonitor: https://pgadmin.xopek.co.uk/browser/
-
-- Tools & Utilities:
-    # - LXC exit node:
-    #     href: https://login.tailscale.com
-    #     description: Tailscale
-    #     icon: tailscale
-    #     widget:
-    #         type: tailscale
-    #         deviceid: nACs2ShCZP11CNTRL
-    #         key: tskey-api-kV3NU1LSkh11CNTRL-1n4NHxXvsFSAgWHkzd6iFSKnbcn2S76W2
-            
-    # - Docker Apps:
-    #     href: https://login.tailscale.com
-    #     description: Tailscale
-    #     icon: tailscale
-    #     widget:
-    #         type: tailscale
-    #         deviceid: ner9S4TCW211CNTRL
-    #         key: tskey-api-kV3NU1LSkh11CNTRL-1n4NHxXvsFSAgWHkzd6iFSKnbcn2S76W2            
-        
-    # - Oracle Ampere:
-    #     href: https://login.tailscale.com
-    #     description: Tailscale
-    #     icon: tailscale
-    #     widget:
-    #         type: tailscale
-    #         deviceid: n6h62FUCS321CNTRL
-    #         key: tskey-api-kV3NU1LSkh11CNTRL-1n4NHxXvsFSAgWHkzd6iFSKnbcn2S76W2        
+ #           siteMonitor: "{{ HOMEPAGE_VAR_LENOVO_AMT_URL }}"
 
+- Tools & Utilities:  
     - Zabbix Oracle:
-        href: "{{HOMEPAGE_VAR_ZABBIX_URL}}/"
+        href: "{{ HOMEPAGE_VAR_ZABBIX_URL }}/"
         icon: zabbix
-        siteMonitor: "{{HOMEPAGE_VAR_ZABBIX_URL}}"
+        siteMonitor: "{{ HOMEPAGE_VAR_ZABBIX_URL }}"
         widget:
             type: zabbix
-            url: "{{HOMEPAGE_VAR_ZABBIX_URL}}"
-            key: "{{HOMEPAGE_VAR_ZABBIX_KEY}}"
-
-    # - '7.0':
-    #     href: http://10.0.0.107/zabbix/
-    #     icon: zabbix
-    #     siteMonitor: http://10.0.0.107/zabbix/
-
-    # - '6.0':
-    #     href: http://10.0.0.106/zabbix/
-    #     icon: zabbix
-    #     siteMonitor: http://10.0.0.106/zabbix/
-
-    # - '5.0':
-    #     href: http://10.0.0.105/zabbix/
-    #     icon: zabbix
-    #     siteMonitor: http://10.0.0.105/zabbix/
+            url: "{{ HOMEPAGE_VAR_ZABBIX_URL }}"
+            key: "{{ HOMEPAGE_VAR_ZABBIX_KEY }}"
 
     - Grafana:
-        href: "{{HOMEPAGE_VAR_GRAFANA_URL}}/login"
+        href: "{{ HOMEPAGE_VAR_GRAFANA_URL }}/login"
         description: Grafana
         icon: grafana
-        siteMonitor: "{{HOMEPAGE_VAR_GRAFANA_URL}}"
+        siteMonitor: "{{ HOMEPAGE_VAR_GRAFANA_URL }}"
 
     - IT Tools:
-        href: "{{HOMEPAGE_VAR_IT_TOOLS_URL}}"
+        href: "{{ HOMEPAGE_VAR_IT_TOOLS_URL }}"
         description: Handy things for work
         icon: it-tools
         server: apps
         container: it-tools
 
     - Vaultwarden:
-        href: "{{HOMEPAGE_VAR_VAULTWARDEN_URL}}"
+        href: "{{ HOMEPAGE_VAR_VAULTWARDEN_URL }}"
         description: Password manager
         icon: vaultwarden
         server: apps
         container: vaultwarden
 
     - Gitea:
-        href: "{{HOMEPAGE_VAR_GITEA_URL}}/"
+        href: "{{ HOMEPAGE_VAR_GITEA_URL }}/"
         description: Local Git server
         icon: gitea
-        siteMonitor: "{{HOMEPAGE_VAR_GITEA_URL}}/"
+        siteMonitor: "{{ HOMEPAGE_VAR_GITEA_URL }}/"
         widget:
             type: gitea
-            url: "{{HOMEPAGE_VAR_GITEA_URL}}"
-            key: "{{HOMEPAGE_VAR_GITEA_KEY}}"
+            url: "{{ HOMEPAGE_VAR_GITEA_URL }}"
+            key: "{{ HOMEPAGE_VAR_GITEA_KEY }}"