diff --git a/Dockerfile b/Dockerfile
index 578429a..2cf9e9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM squidfunk/mkdocs-material:${tag-latest}
+FROM squidfunk/mkdocs-material:${TAG-latest}
 
 COPY requirements.txt /docs/requirements.txt
 RUN pip install -U -r /docs/requirements.txt
\ No newline at end of file
diff --git a/docs/portainer-stacks/Airsonic.md b/docs/portainer-stacks/Airsonic.md
index 3eddc56..8a0e5ff 100644
--- a/docs/portainer-stacks/Airsonic.md
+++ b/docs/portainer-stacks/Airsonic.md
@@ -12,12 +12,12 @@ services:
       - TZ=${TZ-Europe/Amsterdam}
     volumes:
       - ${DOCKER_FOLDER}/airsonic/config:/config
-      - ${DOCKER_FOLDER}/airsonic/music:/music
+      - ${HTPC_FOLDER}/airsonic/music:/music
       - ${DOCKER_FOLDER}/airsonic/playlists:/playlists
       - ${DOCKER_FOLDER}/airsonic/podcasts:/podcasts
-      - ${DOCKER_FOLDER}/airsonic/media:/media
+      - ${HTPC_FOLDER}/airsonic/media:/media
     ports:
-      - 4040:4040
+      - ${PORT-4040}:4040
     devices:
       - /dev/snd:/dev/snd
     restart: unless-stopped
@@ -31,6 +31,9 @@ NET=bridge
 TAG=latest
 PUID=1000
 PGID=1000
+PORT=4040
 TZ=Europe/Amsterdam
 AutoUpdate=true
-DOCKER_FOLDER=
\ No newline at end of file
+DOCKER_FOLDER=
+HTPC_FOLDER=
+```
\ No newline at end of file
diff --git a/docs/portainer-stacks/Bitwarden.md b/docs/portainer-stacks/Bitwarden.md
index d94fff9..257a2f5 100644
--- a/docs/portainer-stacks/Bitwarden.md
+++ b/docs/portainer-stacks/Bitwarden.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   bitwarden:
-    image: bitwardenrs/server:${tag-latest}
+    image: bitwardenrs/server:${TAG-latest}
     restart: ${RST-unless-stopped}
     container_name: bitwarden
     network_mode: ${NET-bridge}
@@ -23,7 +23,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Dillinger.md b/docs/portainer-stacks/Dillinger.md
index 5156494..0750562 100644
--- a/docs/portainer-stacks/Dillinger.md
+++ b/docs/portainer-stacks/Dillinger.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   dillinger:
-    image: lscr.io/linuxserver/dillinger:${tag-latest}
+    image: lscr.io/linuxserver/dillinger:${TAG-latest}
     container_name: dillinger
     environment:
       - PUID=${PUID-1000}
@@ -24,7 +24,7 @@ volumes:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Drone.md b/docs/portainer-stacks/Drone.md
index 670c125..73185e1 100644
--- a/docs/portainer-stacks/Drone.md
+++ b/docs/portainer-stacks/Drone.md
@@ -58,7 +58,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Gitea.md b/docs/portainer-stacks/Gitea.md
index db1f2a3..ca70d87 100644
--- a/docs/portainer-stacks/Gitea.md
+++ b/docs/portainer-stacks/Gitea.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   gitea:
-    image: gitea/gitea:${tag-latest}
+    image: gitea/gitea:${TAG-latest}
     container_name: gitea
     environment:
       - USER_UID=${PUID-1000}
@@ -26,7 +26,7 @@ services:
       - com.centurylinklabs.watchtower.enable=${AutoUpdate-true}
 
   gitea_db:
-    image: lscr.io/linuxserver/mariadb:${tag-latest}
+    image: lscr.io/linuxserver/mariadb:${TAG-latest}
     container_name: gitea_db
     environment:
       - PUID=${PUID-1000}
@@ -46,7 +46,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/LibrePhotos.md b/docs/portainer-stacks/LibrePhotos.md
index 4eb61b7..0ea6ced 100644
--- a/docs/portainer-stacks/LibrePhotos.md
+++ b/docs/portainer-stacks/LibrePhotos.md
@@ -87,7 +87,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Librespeed.md b/docs/portainer-stacks/Librespeed.md
index 456f58c..61e39e7 100644
--- a/docs/portainer-stacks/Librespeed.md
+++ b/docs/portainer-stacks/Librespeed.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   librespeed:
-    image: lscr.io/linuxserver/librespeed:${tag-latest}
+    image: lscr.io/linuxserver/librespeed:${TAG-latest}
     container_name: librespeed
     network_mode: ${NET-bridge}
     environment:
@@ -26,7 +26,7 @@ volumes:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/MQTT-Mosquitto.md b/docs/portainer-stacks/MQTT-Mosquitto.md
index 89a6426..14e0812 100644
--- a/docs/portainer-stacks/MQTT-Mosquitto.md
+++ b/docs/portainer-stacks/MQTT-Mosquitto.md
@@ -6,7 +6,7 @@ services:
   mqtt:
     container_name: mqtt
     hostname: mqtt
-    image: eclipse-mosquitto:${tag-latest}
+    image: eclipse-mosquitto:${TAG-latest}
     restart: ${RST-unless-stopped}
     network_mode: ${NET-bridge}
     user: "1000:1000"
@@ -27,7 +27,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Nextcloud.md b/docs/portainer-stacks/Nextcloud.md
index 1032c60..80be437 100644
--- a/docs/portainer-stacks/Nextcloud.md
+++ b/docs/portainer-stacks/Nextcloud.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   nextcloud:
-    image: lscr.io/linuxserver/nextcloud:${tag-latest}
+    image: lscr.io/linuxserver/nextcloud:${TAG-latest}
     container_name: nextcloud
     environment:
       - PUID=${PUID-1000}
@@ -23,7 +23,7 @@ services:
       - com.centurylinklabs.watchtower.enable=${AutoUpdate-true}
 
   nextcloud_db:
-    image: lscr.io/linuxserver/mariadb:${tag-latest}
+    image: lscr.io/linuxserver/mariadb:${TAG-latest}
     container_name: nextcloud_db
     network_mode: ${NET-bridge}
     environment:
@@ -45,7 +45,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/PhotoView.md b/docs/portainer-stacks/PhotoView.md
index ed55590..7fd3401 100644
--- a/docs/portainer-stacks/PhotoView.md
+++ b/docs/portainer-stacks/PhotoView.md
@@ -39,7 +39,7 @@ services:
       - com.centurylinklabs.watchtower.enable=${AutoUpdate-true}
 
   photoview_db:
-    image: lscr.io/linuxserver/mariadb:${tag-latest}
+    image: lscr.io/linuxserver/mariadb:${TAG-latest}
     restart: ${RST-unless-stopped}
     environment:
       - TZ=${TZ-Europe/Amsterdam}
@@ -61,7 +61,7 @@ volumes:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Prowlarr.md b/docs/portainer-stacks/Prowlarr.md
index 35a76ea..1814286 100644
--- a/docs/portainer-stacks/Prowlarr.md
+++ b/docs/portainer-stacks/Prowlarr.md
@@ -22,7 +22,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Swag/Swag.md b/docs/portainer-stacks/Swag/Swag.md
index 37a8a21..602fb59 100644
--- a/docs/portainer-stacks/Swag/Swag.md
+++ b/docs/portainer-stacks/Swag/Swag.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   swag:
-    image: lscr.io/linuxserver/swag:${tag-latest}
+    image: lscr.io/linuxserver/swag:${TAG-latest}
     container_name: swag
     network_mode: ${NET-bridge}
     cap_add:
@@ -32,7 +32,7 @@ services:
       - com.centurylinklabs.watchtower.enable=${AutoUpdate-true}
 
   dockerproxy:
-    image: ghcr.io/tecnativa/docker-socket-proxy:${tag-latest}
+    image: ghcr.io/tecnativa/docker-socket-proxy:${TAG-latest}
     container_name: dockerproxy
     network_mode: ${NET-bridge}
     volumes:
@@ -58,7 +58,7 @@ EMAIL=your_real@email.com
 
 RST=unless-stopped
 AutoUpdate=true
-tag=latest
+TAG=latest
 ```
 [More LinuxServer MODS](https://mods.linuxserver.io/?mod=swag)
 
diff --git a/docs/portainer-stacks/Swag/authelia.md b/docs/portainer-stacks/Swag/authelia.md
index 7ff6a0e..a1365d4 100644
--- a/docs/portainer-stacks/Swag/authelia.md
+++ b/docs/portainer-stacks/Swag/authelia.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   authelia:
-    image: authelia/authelia:${tag-latest}
+    image: authelia/authelia:${TAG-latest}
     container_name: authelia
     network_mode: ${NET-bridge}
     environment:
@@ -18,7 +18,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 NET=bridge
 TZ=Europe/Lisbon
 RST=unless-stopped
diff --git a/docs/portainer-stacks/TasmoBackup.md b/docs/portainer-stacks/TasmoBackup.md
index 893a836..17f634a 100644
--- a/docs/portainer-stacks/TasmoBackup.md
+++ b/docs/portainer-stacks/TasmoBackup.md
@@ -21,7 +21,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Tasmota-Device-Manager.md b/docs/portainer-stacks/Tasmota-Device-Manager.md
index 9014127..4a36529 100644
--- a/docs/portainer-stacks/Tasmota-Device-Manager.md
+++ b/docs/portainer-stacks/Tasmota-Device-Manager.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   tasmota-device-manager:
-    image: ghcr.io/sirgoodenough/tdmdock:${tag-latest}
+    image: ghcr.io/sirgoodenough/tdmdock:${TAG-latest}
     container_name: tasmota-device-manager
     network_mode: ${NET-bridge}
     volumes:
@@ -21,7 +21,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 AutoUpdate=true
diff --git a/docs/portainer-stacks/VSCode.md b/docs/portainer-stacks/VSCode.md
index 09ce331..89f533d 100644
--- a/docs/portainer-stacks/VSCode.md
+++ b/docs/portainer-stacks/VSCode.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   vscode:
-    image: lscr.io/linuxserver/code-server:${tag-latest}
+    image: lscr.io/linuxserver/code-server:${TAG-latest}
     container_name: vscode
     environment:
       - PUID=${PUID-1000}
@@ -28,7 +28,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/Zigbee2MQTT.md b/docs/portainer-stacks/Zigbee2MQTT.md
index f16cbec..8bb0944 100644
--- a/docs/portainer-stacks/Zigbee2MQTT.md
+++ b/docs/portainer-stacks/Zigbee2MQTT.md
@@ -6,7 +6,7 @@ services:
   zigbee2mqtt:
     container_name: zigbee2mqtt
     hostname: zigbee2mqtt
-    image: koenkk/zigbee2mqtt:${tag-latest}
+    image: koenkk/zigbee2mqtt:${TAG-latest}
     user: "1000:1000"
     volumes:
       - /zigbee2mqtt:/app/data
@@ -23,7 +23,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/bazarr.md b/docs/portainer-stacks/bazarr.md
index 01e3575..95dc9ad 100644
--- a/docs/portainer-stacks/bazarr.md
+++ b/docs/portainer-stacks/bazarr.md
@@ -3,7 +3,7 @@ Portainer Stack:
 version: "3.8"
 services:
   bazarr:
-    image: linuxserver/bazarr:${tag-latest}
+    image: linuxserver/bazarr:${TAG-latest}
     container_name: bazarr
     network_mode: ${NET-bridge}
     environment:
@@ -12,12 +12,12 @@ services:
       - TZ={TZ-Europe/Amsterdam}
       - UMASK_SET=022
     volumes:
-      - /htpc/bazarr:/config
-      - /media/movies:/movies
-      - /media/tvshows:/tv
-      - /media/kids:/kids
+      - ${DOCKER_FOLDER}/htpc/bazarr:/config
+      - ${HTPC_FOLDER}/media/movies:/movies
+      - ${HTPC_FOLDER}/media/tvshows:/tv
+      - ${HTPC_FOLDER}/media/kids:/kids
     ports:
-      - 6767:6767
+      - ${PORT-6767}:6767
     restart: ${RST-unless-stopped}
     labels:
       - com.centurylinklabs.watchtower.enable=${AutoUpdate-true}
@@ -25,11 +25,14 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
 PGID=${PGID-1000}
 TZ=Europe/Lisbon
 AutoUpdate=true
+PORT=6767
+DOCKER_FOLDER=
+HTPC_FOLDER=
 ```
\ No newline at end of file
diff --git a/docs/portainer-stacks/dashy.md b/docs/portainer-stacks/dashy.md
index 59c09a3..a10e497 100644
--- a/docs/portainer-stacks/dashy.md
+++ b/docs/portainer-stacks/dashy.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   dashy:
-    image: lissy93/dashy:${tag-latest}
+    image: lissy93/dashy:${TAG-latest}
     container_name: dashy
     network_mode: ${NET-bridge}
     ports:
@@ -26,7 +26,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/digiKam.md b/docs/portainer-stacks/digiKam.md
index 2c7d650..72ab0d1 100644
--- a/docs/portainer-stacks/digiKam.md
+++ b/docs/portainer-stacks/digiKam.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   digikam:
-    image: lscr.io/linuxserver/digikam:${tag-latest}
+    image: lscr.io/linuxserver/digikam:${TAG-latest}
     container_name: digikam
     network_mode: ${NET-bridge}
     environment:
@@ -27,7 +27,7 @@ volumes:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/heimdall.md b/docs/portainer-stacks/heimdall.md
index 47c82ec..83665dc 100644
--- a/docs/portainer-stacks/heimdall.md
+++ b/docs/portainer-stacks/heimdall.md
@@ -4,7 +4,7 @@ Portainer Stack:
 version: "3.8"
 services:
   heimdall:
-    image: lscr.io/linuxserver/heimdall:${tag-latest}
+    image: lscr.io/linuxserver/heimdall:${TAG-latest}
     container_name: heimdall
     network_mode: ${NET-bridge}
     environment:
@@ -22,7 +22,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/jellyfin.md b/docs/portainer-stacks/jellyfin.md
index f817dd7..7f5b1e5 100644
--- a/docs/portainer-stacks/jellyfin.md
+++ b/docs/portainer-stacks/jellyfin.md
@@ -3,7 +3,7 @@ Portainer Stack:
 version: "3.8"
 services:
   jellyfin:
-    image: linuxserver/jellyfin:${tag-latest}
+    image: linuxserver/jellyfin:${TAG-latest}
     container_name: jellyfin
     network_mode: ${NET-bridge}
     environment:
@@ -27,7 +27,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/mqtt-explorer.md b/docs/portainer-stacks/mqtt-explorer.md
index 75639f5..37bb489 100644
--- a/docs/portainer-stacks/mqtt-explorer.md
+++ b/docs/portainer-stacks/mqtt-explorer.md
@@ -6,7 +6,7 @@ volumes:
   mqttexplorer:
 services:
   mqtt-explorer:
-    image: smeagolworms4/mqtt-explorer:${tag-latest}
+    image: smeagolworms4/mqtt-explorer:${TAG-latest}
     container_name: mqtt-explorer
     network_mode: ${NET-bridge}
     environment:
@@ -26,7 +26,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/qbittorrent.md b/docs/portainer-stacks/qbittorrent.md
index 894b9cc..8a7dd5d 100644
--- a/docs/portainer-stacks/qbittorrent.md
+++ b/docs/portainer-stacks/qbittorrent.md
@@ -3,7 +3,7 @@ Portainer Stack:
 version: "3.8"
 services:
   qbittorrent:
-    image: linuxserver/qbittorrent:${tag-latest}
+    image: linuxserver/qbittorrent:${TAG-latest}
     container_name: qbittorrent
     network_mode: ${NET-bridge}
     volumes:
@@ -26,7 +26,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/samba.md b/docs/portainer-stacks/samba.md
index 1a7a77f..d7cc5cd 100644
--- a/docs/portainer-stacks/samba.md
+++ b/docs/portainer-stacks/samba.md
@@ -16,7 +16,7 @@ Portainer Stack:
 version: "3.8"
 services:
   samba:
-    image: elswork/samba:${tag-latest}
+    image: elswork/samba:${TAG-latest}
     container_name: samba
     hostname: samba
     network_mode: ${NET-bridge}
@@ -34,7 +34,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/template.md b/docs/portainer-stacks/template.md
index a462a66..078ab4a 100644
--- a/docs/portainer-stacks/template.md
+++ b/docs/portainer-stacks/template.md
@@ -5,7 +5,7 @@ Portainer Stack:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}
diff --git a/docs/portainer-stacks/uptime-kuma.md b/docs/portainer-stacks/uptime-kuma.md
index eecc656..eea44b3 100644
--- a/docs/portainer-stacks/uptime-kuma.md
+++ b/docs/portainer-stacks/uptime-kuma.md
@@ -17,7 +17,7 @@ services:
 
 Environments:
 ```
-tag=latest
+TAG=latest
 RST=unless-stopped
 NET=bridge
 PUID=${PUID-1000}