diff --git a/homelab/server/config/calibre-web/docker-compose.yml b/homelab/server/config/calibre-web/docker-compose.yml
index 253256b3..db4edf70 100644
--- a/homelab/server/config/calibre-web/docker-compose.yml
+++ b/homelab/server/config/calibre-web/docker-compose.yml
@@ -30,7 +30,7 @@ services:
     labels:
       - traefik.http.routers.calibre-sff.rule=Host(`sff.calibre.jafner.net`)
       - traefik.http.routers.calibre-sff.tls.certresolver=lets-encrypt
-      #- traefik.http.routers.calibre-sff.middlewares=authentik@file
+      - traefik.http.routers.calibre-sff.middlewares=authentik@file,securityheaders@file
     networks:
       - web
 
@@ -47,27 +47,10 @@ services:
     labels:
       - traefik.http.routers.calibre-ace.rule=Host(`ace.calibre.jafner.net`)
       - traefik.http.routers.calibre-ace.tls.certresolver=lets-encrypt
-      #- traefik.http.routers.calibre-ace.middlewares=authentik@file
+      - traefik.http.routers.calibre-ace.middlewares=authentik@file,securityheaders@file
     networks:
       - web
 
-  #calibre-web-dev:
-  #  image: linuxserver/calibre-web
-  #  container_name: calibre-web_dev
-  #  environment:
-  #    - PUID=1000
-  #    - PGID=1000
-  #    - TZ=America/Los_Angeles
-  #  volumes:
-  #    - calibre-web-dev_data:/config
-  #    - /mnt/md0/calibre/dev:/books
-  #  labels:
-  #    - traefik.http.routers.calibre-dev.rule=Host(`calibre-dev.jafner.net`)
-  #    - traefik.http.routers.calibre-dev.tls.certresolver=lets-encrypt
-  #    #- traefik.http.routers.calibre-dev.middlewares=authentik@file
-  #  networks:
-  #    - web
-
 networks:
   web:
     external: true
@@ -75,4 +58,3 @@ volumes:
   calibre-web-rpg_data:
   calibre-web-sff_data:
   calibre-web-ace_data:
-  #calibre-web-dev_data:
diff --git a/homelab/server/config/homer/assets/config.yml b/homelab/server/config/homer/assets/config.yml
index 87687a67..fe208ea7 100644
--- a/homelab/server/config/homer/assets/config.yml
+++ b/homelab/server/config/homer/assets/config.yml
@@ -108,7 +108,7 @@ services:
         url: "https://bitwarden.jafner.tools"
       - name: "Uptime Kuma"
         logo: assets/icons/uptimekuma-512.png
-        subtitle: "Web monitoring dashboard"
+        subtitle: "Fancy self-hosted monitoring tool "
         url: "https://uptime.jafner.tools/dashboard"
       - name: "Xbackbone"
         logo: assets/icons/xbackbone.png
@@ -240,12 +240,32 @@ services:
       - name: "Calibre RPG"
         logo: assets/icons/calibre-1024.png
         subtitle: "Calibre-web instance serving a collection of Dungeons & Dragons books"
-        url: "https://sff.calibre.jafner.net"
+        url: "https://rpg.calibre.jafner.net"
       - name: "Calibre Ace"
         logo: assets/icons/calibre-1024.png
         subtitle: "Calibre-web instance serving a collection of whatever Ace wants to put on it"
         url: "https://ace.calibre.jafner.net"
 
+      - name: "Navidrome"
+        logo: assets/icons/navidrome.png
+        subtitle: "Music library"
+        url: "https://navidrome.jafner.net"
+
+      - name: "Librespeed"
+        logo: assets/icons/librespeed.svg
+        subtitle: "Speedtest for HTML5 and more"
+        url: "https://speedtest.jafner.net"
+
+      - name: "WG Easy"
+        logo: assets/icons/wireguard.svg
+        subtitle: "Admin UI for Wireguard peer management"
+        url: "https://vpn.jafner.net"
+
+      - name: "Uptime Kuma"
+        logo: assets/icons/uptimekuma-512.png
+        subtitle: "Fancy self-hosted monitoring tool "
+        url: "https://uptime.jafner.net"
+
       - name: "Stash"
         logo: assets/icons/stash.svg
         subtitle: "Password-protected media vault"
diff --git a/homelab/server/config/homer/assets/icons/librespeed.svg b/homelab/server/config/homer/assets/icons/librespeed.svg
new file mode 100644
index 00000000..66bc5201
--- /dev/null
+++ b/homelab/server/config/homer/assets/icons/librespeed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 43.303 43.301" height="163.657" width="163.665"><defs><linearGradient id="A" gradientUnits="userSpaceOnUse" x1="74.831" y1="86.738" x2="74.915" y2="75.556"><stop offset="0" stop-color="#1b75bc"/><stop offset="1" stop-color="#00aeef"/><stop offset="1"/></linearGradient></defs><path d="M43.28 20.7c.53 11.933-8.73 22.066-20.7 22.57A21.62 21.62 0 0 1 .022 22.588C-.508 10.656 8.753.522 20.712.02c11.933-.503 22.04 8.758 22.57 20.7z" fill="#d1d3d4"/><path d="M20.87 3.724c9.895-.423 18.283 7.25 18.733 17.145.423 9.895-7.25 18.283-17.145 18.732-9.895.423-18.283-7.25-18.732-17.145-.45-9.922 7.223-18.31 17.145-18.732z"/><path d="M37.143 23.514l-2.408-.317a12.48 12.48 0 0 0 0-3.44l2.408-.317a17.49 17.49 0 0 1 0 4.075z" fill="#ed1c24"/><path d="M35.502 14.254c.635 1.217 1.11 2.514 1.402 3.836l-2.38.53c-.238-1.11-.635-2.196-1.164-3.228z" fill="#ef4136"/><path d="M35.502 28.7l-2.17-1.11c.53-1.032.926-2.117 1.19-3.228l2.38.53c-.29 1.296-.767 2.593-1.402 3.8z" fill="#be1e2d"/><path d="M34.814 13.1l-2.037 1.296c-.61-.953-1.35-1.852-2.222-2.646l1.64-1.8a15.49 15.49 0 0 1 2.619 3.149z" fill="#f15a29"/><path d="M31.163 9.068L29.68 11a12.52 12.52 0 0 0-2.99-1.72l.926-2.25c1.244.53 2.434 1.19 3.545 2.037z" fill="#f7941d"/><path d="M26.215 31.108h1.826v1.826h-1.826zm-3.65 0H24.4v1.826h-1.826zm-.238-25.24a14.94 14.94 0 0 1 4.022.714l-.74 2.328c-1.032-.317-2.117-.53-3.2-.582l-.16-1.032z" fill="#d1d3d4"/><path d="M21.638 20.736c.556 0 1.032.45 1.032 1.032 0 .556-.45 1.032-1.032 1.032-.556 0-1.032-.45-1.032-1.032.026-.582.476-1.032 1.032-1.032z" fill="#e6e7e8"/><path d="M77.128 92.89c0 1.826-1.032 3.307-2.302 3.307s-2.302-1.482-2.302-3.307l.185-1.35 2.1-14.26 2.1 14.26zm-1.27.185c0-.556-.45-1.032-1.032-1.032-.556 0-1.032.45-1.032 1.032 0 .556.45 1.032 1.032 1.032s1.032-.45 1.032-1.032z" fill="url(#A)" transform="translate(-53.188 -71.332)"/><path d="M16.928 6.555c1.296-.397 2.646-.635 4.022-.714l.053 1.455-.132.98c-1.085.053-2.17.265-3.2.582zm1.958 24.553h1.826v1.826h-1.826zm-3.65 0h1.826v1.826h-1.826zm-3.122-22.04c1.1-.847 2.302-1.535 3.545-2.037l.926 2.25a12.52 12.52 0 0 0-2.99 1.72zm-1.033.9l1.64 1.8-.82.82a12.79 12.79 0 0 0-1.402 1.826l-2.064-1.296c.476-.767 1.032-1.482 1.667-2.17.318-.37.635-.688.98-.98zM9.917 27.6l-2.17 1.1a15.59 15.59 0 0 1-1.402-3.836l2.38-.53c.265 1.1.66 2.222 1.2 3.254zM8.54 23.197l-2.408.317a15.01 15.01 0 0 1 0-4.075l2.408.317a12.48 12.48 0 0 0 0 3.44zM6.372 18.1a15.48 15.48 0 0 1 1.402-3.836l2.17 1.1a14.3 14.3 0 0 0-1.19 3.228z" fill="#d1d3d4"/></svg>
\ No newline at end of file
diff --git a/homelab/server/config/homer/assets/icons/navidrome.png b/homelab/server/config/homer/assets/icons/navidrome.png
new file mode 100644
index 00000000..c2430c62
Binary files /dev/null and b/homelab/server/config/homer/assets/icons/navidrome.png differ
diff --git a/homelab/server/config/homer/assets/icons/wireguard.svg b/homelab/server/config/homer/assets/icons/wireguard.svg
new file mode 100644
index 00000000..02a7d430
--- /dev/null
+++ b/homelab/server/config/homer/assets/icons/wireguard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="800" width="1200" viewBox="-45.0006 -75 390.0052 450"><g fill="#88171A"><path d="M299.745 145.56S306.685 0 146.705 0C5.225 0 .805 139.63.805 139.63S-20.005 300 149.965 300c163.02 0 149.78-154.44 149.78-154.44zm-197.8-50.863c30.017-18.364 68.366-7.14 82.735 20.476 2.724 5.234 3.07 13.291 1.345 18.782-5.955 18.956-20.014 29.587-39.312 34.103 5.69-4.87 10.218-10.394 11.659-18.025a26.402 26.402 0 00-4.543-20.956 26.76 26.76 0 00-30.81-9.39c-11.882 4.512-18.39 15.355-17.217 28.684 1.09 12.38 10.484 20.405 28.061 23.453-2.627 1.39-4.65 2.414-6.63 3.517a63.918 63.918 0 00-20.543 17.868c-1.784 2.408-3.01 2.602-5.727.941-35.338-21.61-37.61-75.844.982-99.453zm-26.449 133.53c-5.677 1.441-11.178 3.574-16.98 5.478 2.838-19.152 25.264-36.789 44.23-34.777a48.881 48.881 0 00-9.243 25.893c-6.302 1.161-12.24 1.942-18.007 3.405zm120.79-186.98c5.61.206 11.23.12 16.844.254 1.402.092 2.794.286 4.168.58a40.607 40.607 0 01-4.236 5.434c-2.007 1.87-4.275 3.698-7.166.856-.696-.684-2.339-.527-3.549-.543-5.582-.073-11.172-.252-16.746-.041a104.04 104.04 0 00-14.425 1.473c-.894.16-2.23 3.131-1.819 4.227.97 2.585 2.383 5.436 4.478 7.09 7.74 6.11 15.972 11.595 23.748 17.663 7.556 5.897 14.589 12.358 18.875 21.253 5.584 11.59 5.747 23.743 3.339 35.95-4.02 20.378-14.333 37.261-31.032 49.524-6.729 4.941-15.06 7.746-22.767 11.295-6.778 3.123-13.755 5.812-20.55 8.901-12.248 5.57-19.132 18.865-17.107 32.688 1.858 12.685 12.987 23.271 25.735 25.456 15.292 2.622 31.07-7.316 34.812-22.86 4.206-17.478-5.29-33.083-23.065-37.813-.783-.208-1.569-.405-3.201-.827 4.754-2.124 8.861-3.638 12.653-5.724a347.934 347.934 0 0019.48-11.562c1.875-1.2 2.887-1.2 4.486.182 12.225 10.57 19.518 23.718 21.563 39.84 3.384 26.683-9.247 51.197-33.072 63.761-36.86 19.44-81.965-2.686-90.106-43.552-6.974-35.003 17.73-66.754 47.462-72.884 12.787-2.636 24.48-7.96 33.57-17.807 5.865-6.354 8.708-11.806 9.677-14.266a39.565 39.565 0 002.721-14.469 33.867 33.867 0 00-2.965-12.398c-3.104-7.075-14.995-18.33-17.94-20.704l-28-21.92c-.987-.813-2.099-.754-4.507-.591-2.861.194-10.175.599-13.331-.228 2.553-1.933 9.513-4.746 12.502-7.007-9.074-6.13-19.43-3.916-28.941-5.747 2.199-4.095 13.08-10.39 19.27-11.09a91.533 91.533 0 00-1.688-10.282c-.378-1.391-1.931-2.74-3.286-3.535-3.286-1.927-6.77-3.517-10.55-5.433a21.936 21.936 0 0111.333-3.505A42.316 42.316 0 01134.3 23.99c6.742 1.54 12.124.535 17.488-4.048-4.222-1.7-8.444-3.253-12.538-5.09a123.04 123.04 0 01-11.78-6.159c10.623 1.476 20.897 5.459 31.758 4.004l.277-1.481-25.229-5.873c15.04-1.376 29.042-1.604 42.301 4.855 3.731 1.817 7.635 3.321 11.211 5.397 1.744 1.012 2.919 3.008 4.35 4.56 1.136 1.232 2.05 2.883 3.446 3.626 5.3 2.818 11.134 2.929 17.078 2.787l.13-1.993c5.983 1.87 12.715 8.768 12.704 13.806-9.69 0-19.374-.037-29.056.054-1.034.01-2.062.766-3.093 1.175.98.571 1.943 1.6 2.942 1.637z"/><path d="M183.785 26.906a1.48 1.48 0 00-.189 2.369 2.233 2.233 0 003.072.821c.933-.47 1.848-.97 2.975-1.566-.908-.775-1.636-1.415-2.385-2.032-1.318-1.086-2.411-.404-3.473.408z"/></g></svg>
\ No newline at end of file