From bf51882a6d2fa6e99ab830b9eaee9660c6c75919 Mon Sep 17 00:00:00 2001
From: mrtg <mrtg@br0tkasten.de>
Date: Fri, 14 Jan 2022 11:56:41 +0100
Subject: [PATCH] cleanup

---
 config/br0tkasten.cfg                        |  17 +-
 config/br0tkasten.ok                         | 154 ++++++-----
 config/lxc.cfg                               | 253 ++++++++++---------
 config/nas.ok                                |   0
 htdocs/index.html                            |  35 +--
 htdocs/lxc.html                              |  70 ++---
 scripts/crypto.csv                           |   1 +
 scripts/cryptoReport.pl                      |   9 +-
 scripts/getCryptocurrencies.sh               |   5 +-
 scripts/lxc_index.sh                         |   2 +-
 scripts/lxc_rrd-tmpl.sh                      |  24 +-
 tmpl/br0tkasten.br0.tmpl                     |   4 +-
 tmpl/br0tkasten.tap0.tmpl                    |  16 --
 tmpl/cryptoReport.tmpl                       |  10 +-
 tmpl/kodi.cpu.tmpl                           |  10 -
 tmpl/kodi.eth0.tmpl                          |  16 --
 tmpl/kodi.memtotal.tmpl                      |  10 -
 tmpl/kodi.swap.tmpl                          |  10 -
 tmpl/kodi.tap0.tmpl                          |  16 --
 tmpl/kodi.temp.tmpl                          |  15 --
 tmpl/kodi.tv.tmpl                            |  10 -
 tmpl/lxc-cloud.cpu.tmpl                      |  10 -
 tmpl/lxc-cloud.memory.tmpl                   |  10 -
 tmpl/lxc-cloud.net.tmpl                      |  22 --
 tmpl/lxc-db.cpu.tmpl                         |   5 +-
 tmpl/lxc-gitea.cpu.tmpl                      |   5 +-
 tmpl/lxc-grav-dev.cpu.tmpl                   |   5 +-
 tmpl/lxc-home-assistant.cpu.tmpl             |   5 +-
 tmpl/lxc-jitsi.cpu.tmpl                      |   5 +-
 tmpl/lxc-mail.cpu.tmpl                       |   5 +-
 tmpl/lxc-matrix.cpu.tmpl                     |   5 +-
 tmpl/lxc-motion.cpu.tmpl                     |   5 +-
 tmpl/lxc-mqtt.cpu.tmpl                       |   5 +-
 tmpl/lxc-mrtg.cpu.tmpl                       |   5 +-
 tmpl/lxc-somachtstefaniedas.cpu.tmpl         |   5 +-
 tmpl/lxc-webmail.cpu.tmpl                    |   5 +-
 tmpl/lxc-wireguard.cpu.tmpl                  |   5 +-
 tmpl/lxc-www-familienhilfe-baeumler.cpu.tmpl |   5 +-
 tmpl/lxc-www.cpu.tmpl                        |  10 -
 tmpl/lxc-www.memory.tmpl                     |  10 -
 tmpl/lxc-www.net.tmpl                        |  22 --
 tmpl/nas.cpu.tmpl                            |  10 -
 tmpl/nas.eth0.tmpl                           |  16 --
 tmpl/nas.memtotal.tmpl                       |  10 -
 tmpl/nas.swap.tmpl                           |  10 -
 tmpl/nas.tap0.tmpl                           |  16 --
 tmpl/nas.temp.tmpl                           |  15 --
 tmpl/roof.cpu.tmpl                           |  10 -
 tmpl/roof.memtotal.tmpl                      |  12 -
 tmpl/roof.ram.tmpl                           |  10 -
 tmpl/roof.swap.tmpl                          |  12 -
 tmpl/roof.tap0.tmpl                          |  16 --
 tmpl/roof.temp.tmpl                          |  15 --
 tmpl/roof.tv.tmpl                            |  10 -
 tmpl/roof.wlan0.tmpl                         |  16 --
 tmpl/wdr4300.arp.tmpl                        |  10 -
 tmpl/wdr4300.wan.tmpl                        |  16 --
 tmpl/wrt1200ac.arp.tmpl                      |  10 -
 tmpl/wrt1200ac.wan.tmpl                      |  16 --
 tmpl/wrt54.br0.tmpl                          |  16 --
 tmpl/wrt54.numclients.tmpl                   |  10 -
 61 files changed, 357 insertions(+), 740 deletions(-)
 delete mode 100644 config/nas.ok
 delete mode 100644 tmpl/br0tkasten.tap0.tmpl
 delete mode 100644 tmpl/kodi.cpu.tmpl
 delete mode 100644 tmpl/kodi.eth0.tmpl
 delete mode 100644 tmpl/kodi.memtotal.tmpl
 delete mode 100644 tmpl/kodi.swap.tmpl
 delete mode 100644 tmpl/kodi.tap0.tmpl
 delete mode 100644 tmpl/kodi.temp.tmpl
 delete mode 100644 tmpl/kodi.tv.tmpl
 delete mode 100644 tmpl/lxc-cloud.cpu.tmpl
 delete mode 100644 tmpl/lxc-cloud.memory.tmpl
 delete mode 100644 tmpl/lxc-cloud.net.tmpl
 delete mode 100644 tmpl/lxc-www.cpu.tmpl
 delete mode 100644 tmpl/lxc-www.memory.tmpl
 delete mode 100644 tmpl/lxc-www.net.tmpl
 delete mode 100644 tmpl/nas.cpu.tmpl
 delete mode 100644 tmpl/nas.eth0.tmpl
 delete mode 100644 tmpl/nas.memtotal.tmpl
 delete mode 100644 tmpl/nas.swap.tmpl
 delete mode 100644 tmpl/nas.tap0.tmpl
 delete mode 100644 tmpl/nas.temp.tmpl
 delete mode 100644 tmpl/roof.cpu.tmpl
 delete mode 100644 tmpl/roof.memtotal.tmpl
 delete mode 100644 tmpl/roof.ram.tmpl
 delete mode 100644 tmpl/roof.swap.tmpl
 delete mode 100644 tmpl/roof.tap0.tmpl
 delete mode 100644 tmpl/roof.temp.tmpl
 delete mode 100644 tmpl/roof.tv.tmpl
 delete mode 100644 tmpl/roof.wlan0.tmpl
 delete mode 100644 tmpl/wdr4300.arp.tmpl
 delete mode 100644 tmpl/wdr4300.wan.tmpl
 delete mode 100644 tmpl/wrt1200ac.arp.tmpl
 delete mode 100644 tmpl/wrt1200ac.wan.tmpl
 delete mode 100644 tmpl/wrt54.br0.tmpl
 delete mode 100644 tmpl/wrt54.numclients.tmpl

diff --git a/config/br0tkasten.cfg b/config/br0tkasten.cfg
index ba06341..e71cf58 100644
--- a/config/br0tkasten.cfg
+++ b/config/br0tkasten.cfg
@@ -8,7 +8,14 @@ MaxBytes[br0tkasten.eth0]: 4294967295
 
 Target[br0tkasten.br0]: #br0:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1:
 Title[br0tkasten.br0]: [br0tkasten] br0 
-MaxBytes[br0tkasten.br0]: 42949672950000000
+#MaxBytes[br0tkasten.br0]: 42949672950000000
+MaxBytes[br0tkasten.br0]: 12500000000
+
+Target[br0tkasten.lxd]: #lxd:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1:
+Title[br0tkasten.lxd]: [br0tkasten] lxd
+#MaxBytes[br0tkasten.lxd]: 42949672950000000
+MaxBytes[br0tkasten.lxd]: 12500000000
+Options[br0tkasten.lxd]: gauge
 
 Target[br0tkasten.cpu]:ssCpuRawUser.0&ssCpuRawUser.0:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1 + ssCpuRawSystem.0&ssCpuRawSystem.0:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1 + ssCpuRawNice.0&ssCpuRawNice.0:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1
 Title[br0tkasten.cpu]: [br0tkasten] CPU Load
@@ -19,10 +26,10 @@ Target[br0tkasten.memtotal]: ( .1.3.6.1.4.1.2021.4.5.0&.1.3.6.1.4.1.2021.4.5.0:o
 MaxBytes[br0tkasten.memtotal]: 4096000000
 Options[br0tkasten.memtotal]: gauge
 
-#Title[br0tkasten.io]: [br0tkasten] IO Stats
-#Target[br0tkasten.io]: ( .1.3.6.1.4.1.2021.11.57&.1.3.6.1.4.1.2021.11.58:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1 )
-#MaxBytes[br0tkasten.io]: 4096000000
-#Options[br0tkasten.io]: gauge
+Title[br0tkasten.io]: [br0tkasten] IO Stats
+Target[br0tkasten.io]: .1.3.6.1.4.1.2021.11.57.0&.1.3.6.1.4.1.2021.11.58.0:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1
+MaxBytes[br0tkasten.io]: 4096000000
+Options[br0tkasten.io]: gauge
 
 Target[br0tkasten.swap]:( .1.3.6.1.4.1.2021.4.3.0&.1.3.6.1.4.1.2021.4.3.0:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1 ) - ( .1.3.6.1.4.1.2021.4.4.0&.1.3.6.1.4.1.2021.4.4.0:oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1)
 Title[br0tkasten.swap]: [br0tkasten] Swap Usage
diff --git a/config/br0tkasten.ok b/config/br0tkasten.ok
index 7f8513b..cd57a34 100644
--- a/config/br0tkasten.ok
+++ b/config/br0tkasten.ok
@@ -1,77 +1,105 @@
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	Red Hat, Inc. Device 0001	2
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	br0	3
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	lo	1
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth0HG9MK	37
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth2KIROT	25
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth30AYM2	17
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth4YY6AL	41
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth7J8A8I	7
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth7TP0GE	23
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth8BMS0Q	39
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth8IGEVI	43
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethBA82OR	5
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethH9O4V0	31
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethL0LHD0	29
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethMNHLDL	11
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethNQDD2G	33
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethP18Q9E	19
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethQF9Y3O	35
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethQS5U8R	27
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethS2C4ZI	45
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethTL9JTY	15
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethU74VOK	9
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethWD25NA	21
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethYRSB3U	13
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	lxd	4
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth0d3117f7	44
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth1710bcb0	28
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth1d00c410	31
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth22aac9fb	18
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth2a81a286	16
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth2afebabc	33
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth3d117b55	40
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth5f8c1ce9	38
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth6a5ed10c	10
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth7b1023e3	30
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth7cc92e97	8
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth96f8b960	32
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth9a3d4ba8	42
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth9c96e251	41
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	veth9ceff58a	35
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethad5efe3f	14
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethb6669d8e	36
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethb7c0b1fe	43
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethc3396da9	24
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethc48f2dd7	37
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethc84f2b54	26
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethc91ac02d	22
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethce3b9687	20
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethde038bbd	27
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethe840155d	39
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethec34788c	6
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethf00755ee	29
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethff56b6c9	12
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Descr	vethffd78ca5	34
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth		1
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-02-c3-f1	37
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-3a-bb-55	27
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-3f-53-79	35
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-5c-ce-82	39
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-69-cf-28	4
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-71-9f-b4	31
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-7a-6a-00	43
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-ba-b4-47	29
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-c5-f3-47	41
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	00-16-3e-f2-5d-d0	33
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	06-c6-c0-b7-31-58	14
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	0a-49-bf-55-12-b1	36
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	0e-25-4a-23-1a-3c	8
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	12-30-ad-10-fb-01	12
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	22-83-71-32-af-31	32
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	3a-66-32-71-2d-e3	26
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	46-86-b0-b9-16-61	16
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	5a-4e-f8-61-59-e4	10
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	5a-92-d3-60-04-70	38
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	76-57-af-60-74-f4	2
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	7e-9f-2c-73-e1-42	22
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	82-06-9b-67-08-1c	42
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	8a-24-d7-f3-0d-98	30
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	a6-c9-de-69-27-68	44
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	c6-fb-40-a6-b2-c7	24
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	d6-81-f7-a2-3d-24	40
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	da-0d-ae-db-b1-65	18
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	de-99-99-39-5f-9d	6
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	ea-1e-01-7f-12-56	28
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	f6-0b-47-f6-e5-76	3
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-05-ec-09-e0-e1	41
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-0d-63-78-cf-9c	11
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-0e-fb-e5-17-e4	25
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-1d-92-b0-d8-3c	35
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-27-d1-cc-16-9d	15
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-2d-05-3d-81-5f	37
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-49-68-4b-79-59	5
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-4d-4d-5e-43-73	27
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-5d-cb-2d-61-53	17
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-60-c6-f3-8d-28	13
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-7e-65-11-ec-39	33
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-85-5a-09-c7-a0	23
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-92-8b-44-58-2c	9
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-b8-79-bf-3d-57	39
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-c3-ef-dc-29-d6	31
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-c9-26-82-d8-bc	29
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-d6-f4-25-78-aa	19
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-de-81-d3-46-c2	43
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-e0-e5-f9-28-79	21
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-f2-16-68-d1-d5	7
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-f2-eb-9b-d9-bc	45
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	f6-e1-db-42-4b-46	34
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Eth	fe-86-63-8e-40-65	20
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Ip	10.3.0.1	3
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Ip	10.4.0.1	4
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Ip	127.0.0.1	1
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Ip	185.170.112.162	2
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	br0	3
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	eth0	2
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	lo	1
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth0HG9MK	37
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth2KIROT	25
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth30AYM2	17
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth4YY6AL	41
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth7J8A8I	7
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth7TP0GE	23
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth8BMS0Q	39
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth8IGEVI	43
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethBA82OR	5
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethH9O4V0	31
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethL0LHD0	29
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethMNHLDL	11
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethNQDD2G	33
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethP18Q9E	19
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethQF9Y3O	35
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethQS5U8R	27
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethS2C4ZI	45
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethTL9JTY	15
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethU74VOK	9
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethWD25NA	21
-oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethYRSB3U	13
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	lxd	4
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth0d3117f7	44
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth1710bcb0	28
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth1d00c410	31
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth22aac9fb	18
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth2a81a286	16
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth2afebabc	33
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth3d117b55	40
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth5f8c1ce9	38
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth6a5ed10c	10
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth7b1023e3	30
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth7cc92e97	8
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth96f8b960	32
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth9a3d4ba8	42
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth9c96e251	41
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	veth9ceff58a	35
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethad5efe3f	14
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethb6669d8e	36
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethb7c0b1fe	43
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethc3396da9	24
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethc48f2dd7	37
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethc84f2b54	26
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethc91ac02d	22
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethce3b9687	20
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethde038bbd	27
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethe840155d	39
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethec34788c	6
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethf00755ee	29
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethff56b6c9	12
+oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Name	vethffd78ca5	34
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Type	24	1
 oom6faayaTosh0nizoepoonahCohhahy@10.3.0.1_	Type	6	Dup
diff --git a/config/lxc.cfg b/config/lxc.cfg
index 7e159dd..60b5f96 100644
--- a/config/lxc.cfg
+++ b/config/lxc.cfg
@@ -1,16 +1,5 @@
 WorkDir: /var/www/mrtg/rrd
 LogFormat: rrdtool
-# cloud
-Target[lxc-cloud.cpu]: `curl -s http://10.3.0.1/cloud/CPU; echo 0`
-Title[lxc-cloud.cpu]: [CPU] cloud
-MaxBytes[lxc-cloud.cpu]: 42949672950000000
-Target[lxc-cloud.memory]: `curl -s http://10.3.0.1/cloud/Memory; echo 0`
-Title[lxc-cloud.memory]: [Memory] cloud
-MaxBytes[lxc-cloud.memory]: 42949672950000000
-Target[lxc-cloud.net]: `curl -s http://10.3.0.1/cloud/RX http://10.3.0.1/cloud/TX`
-Title[lxc-cloud.net]: [Net] cloud
-MaxBytes[lxc-cloud.net]: 42949672950000000
-
 # db
 Target[lxc-db.cpu]: `curl -s http://10.3.0.1/db/CPU; echo 0`
 Title[lxc-db.cpu]: [CPU] db
@@ -44,17 +33,6 @@ Target[lxc-grav-dev.net]: `curl -s http://10.3.0.1/grav-dev/RX http://10.3.0.1/g
 Title[lxc-grav-dev.net]: [Net] grav-dev
 MaxBytes[lxc-grav-dev.net]: 42949672950000000
 
-# home-assistant
-Target[lxc-home-assistant.cpu]: `curl -s http://10.3.0.1/home-assistant/CPU; echo 0`
-Title[lxc-home-assistant.cpu]: [CPU] home-assistant
-MaxBytes[lxc-home-assistant.cpu]: 42949672950000000
-Target[lxc-home-assistant.memory]: `curl -s http://10.3.0.1/home-assistant/Memory; echo 0`
-Title[lxc-home-assistant.memory]: [Memory] home-assistant
-MaxBytes[lxc-home-assistant.memory]: 42949672950000000
-Target[lxc-home-assistant.net]: `curl -s http://10.3.0.1/home-assistant/RX http://10.3.0.1/home-assistant/TX`
-Title[lxc-home-assistant.net]: [Net] home-assistant
-MaxBytes[lxc-home-assistant.net]: 42949672950000000
-
 # jitsi
 Target[lxc-jitsi.cpu]: `curl -s http://10.3.0.1/jitsi/CPU; echo 0`
 Title[lxc-jitsi.cpu]: [CPU] jitsi
@@ -66,28 +44,6 @@ Target[lxc-jitsi.net]: `curl -s http://10.3.0.1/jitsi/RX http://10.3.0.1/jitsi/T
 Title[lxc-jitsi.net]: [Net] jitsi
 MaxBytes[lxc-jitsi.net]: 42949672950000000
 
-# mail
-Target[lxc-mail.cpu]: `curl -s http://10.3.0.1/mail/CPU; echo 0`
-Title[lxc-mail.cpu]: [CPU] mail
-MaxBytes[lxc-mail.cpu]: 42949672950000000
-Target[lxc-mail.memory]: `curl -s http://10.3.0.1/mail/Memory; echo 0`
-Title[lxc-mail.memory]: [Memory] mail
-MaxBytes[lxc-mail.memory]: 42949672950000000
-Target[lxc-mail.net]: `curl -s http://10.3.0.1/mail/RX http://10.3.0.1/mail/TX`
-Title[lxc-mail.net]: [Net] mail
-MaxBytes[lxc-mail.net]: 42949672950000000
-
-# matrix
-Target[lxc-matrix.cpu]: `curl -s http://10.3.0.1/matrix/CPU; echo 0`
-Title[lxc-matrix.cpu]: [CPU] matrix
-MaxBytes[lxc-matrix.cpu]: 42949672950000000
-Target[lxc-matrix.memory]: `curl -s http://10.3.0.1/matrix/Memory; echo 0`
-Title[lxc-matrix.memory]: [Memory] matrix
-MaxBytes[lxc-matrix.memory]: 42949672950000000
-Target[lxc-matrix.net]: `curl -s http://10.3.0.1/matrix/RX http://10.3.0.1/matrix/TX`
-Title[lxc-matrix.net]: [Net] matrix
-MaxBytes[lxc-matrix.net]: 42949672950000000
-
 # motion
 Target[lxc-motion.cpu]: `curl -s http://10.3.0.1/motion/CPU; echo 0`
 Title[lxc-motion.cpu]: [CPU] motion
@@ -110,50 +66,6 @@ Target[lxc-mqtt.net]: `curl -s http://10.3.0.1/mqtt/RX http://10.3.0.1/mqtt/TX`
 Title[lxc-mqtt.net]: [Net] mqtt
 MaxBytes[lxc-mqtt.net]: 42949672950000000
 
-# mrtg
-Target[lxc-mrtg.cpu]: `curl -s http://10.3.0.1/mrtg/CPU; echo 0`
-Title[lxc-mrtg.cpu]: [CPU] mrtg
-MaxBytes[lxc-mrtg.cpu]: 42949672950000000
-Target[lxc-mrtg.memory]: `curl -s http://10.3.0.1/mrtg/Memory; echo 0`
-Title[lxc-mrtg.memory]: [Memory] mrtg
-MaxBytes[lxc-mrtg.memory]: 42949672950000000
-Target[lxc-mrtg.net]: `curl -s http://10.3.0.1/mrtg/RX http://10.3.0.1/mrtg/TX`
-Title[lxc-mrtg.net]: [Net] mrtg
-MaxBytes[lxc-mrtg.net]: 42949672950000000
-
-# node-red
-Target[lxc-node-red.cpu]: `curl -s http://10.3.0.1/node-red/CPU; echo 0`
-Title[lxc-node-red.cpu]: [CPU] node-red
-MaxBytes[lxc-node-red.cpu]: 42949672950000000
-Target[lxc-node-red.memory]: `curl -s http://10.3.0.1/node-red/Memory; echo 0`
-Title[lxc-node-red.memory]: [Memory] node-red
-MaxBytes[lxc-node-red.memory]: 42949672950000000
-Target[lxc-node-red.net]: `curl -s http://10.3.0.1/node-red/RX http://10.3.0.1/node-red/TX`
-Title[lxc-node-red.net]: [Net] node-red
-MaxBytes[lxc-node-red.net]: 42949672950000000
-
-# pihole
-Target[lxc-pihole.cpu]: `curl -s http://10.3.0.1/pihole/CPU; echo 0`
-Title[lxc-pihole.cpu]: [CPU] pihole
-MaxBytes[lxc-pihole.cpu]: 42949672950000000
-Target[lxc-pihole.memory]: `curl -s http://10.3.0.1/pihole/Memory; echo 0`
-Title[lxc-pihole.memory]: [Memory] pihole
-MaxBytes[lxc-pihole.memory]: 42949672950000000
-Target[lxc-pihole.net]: `curl -s http://10.3.0.1/pihole/RX http://10.3.0.1/pihole/TX`
-Title[lxc-pihole.net]: [Net] pihole
-MaxBytes[lxc-pihole.net]: 42949672950000000
-
-# redis
-Target[lxc-redis.cpu]: `curl -s http://10.3.0.1/redis/CPU; echo 0`
-Title[lxc-redis.cpu]: [CPU] redis
-MaxBytes[lxc-redis.cpu]: 42949672950000000
-Target[lxc-redis.memory]: `curl -s http://10.3.0.1/redis/Memory; echo 0`
-Title[lxc-redis.memory]: [Memory] redis
-MaxBytes[lxc-redis.memory]: 42949672950000000
-Target[lxc-redis.net]: `curl -s http://10.3.0.1/redis/RX http://10.3.0.1/redis/TX`
-Title[lxc-redis.net]: [Net] redis
-MaxBytes[lxc-redis.net]: 42949672950000000
-
 # somachtstefaniedas
 Target[lxc-somachtstefaniedas.cpu]: `curl -s http://10.3.0.1/somachtstefaniedas/CPU; echo 0`
 Title[lxc-somachtstefaniedas.cpu]: [CPU] somachtstefaniedas
@@ -165,28 +77,6 @@ Target[lxc-somachtstefaniedas.net]: `curl -s http://10.3.0.1/somachtstefaniedas/
 Title[lxc-somachtstefaniedas.net]: [Net] somachtstefaniedas
 MaxBytes[lxc-somachtstefaniedas.net]: 42949672950000000
 
-# traccar
-Target[lxc-traccar.cpu]: `curl -s http://10.3.0.1/traccar/CPU; echo 0`
-Title[lxc-traccar.cpu]: [CPU] traccar
-MaxBytes[lxc-traccar.cpu]: 42949672950000000
-Target[lxc-traccar.memory]: `curl -s http://10.3.0.1/traccar/Memory; echo 0`
-Title[lxc-traccar.memory]: [Memory] traccar
-MaxBytes[lxc-traccar.memory]: 42949672950000000
-Target[lxc-traccar.net]: `curl -s http://10.3.0.1/traccar/RX http://10.3.0.1/traccar/TX`
-Title[lxc-traccar.net]: [Net] traccar
-MaxBytes[lxc-traccar.net]: 42949672950000000
-
-# webmail
-Target[lxc-webmail.cpu]: `curl -s http://10.3.0.1/webmail/CPU; echo 0`
-Title[lxc-webmail.cpu]: [CPU] webmail
-MaxBytes[lxc-webmail.cpu]: 42949672950000000
-Target[lxc-webmail.memory]: `curl -s http://10.3.0.1/webmail/Memory; echo 0`
-Title[lxc-webmail.memory]: [Memory] webmail
-MaxBytes[lxc-webmail.memory]: 42949672950000000
-Target[lxc-webmail.net]: `curl -s http://10.3.0.1/webmail/RX http://10.3.0.1/webmail/TX`
-Title[lxc-webmail.net]: [Net] webmail
-MaxBytes[lxc-webmail.net]: 42949672950000000
-
 # wireguard
 Target[lxc-wireguard.cpu]: `curl -s http://10.3.0.1/wireguard/CPU; echo 0`
 Title[lxc-wireguard.cpu]: [CPU] wireguard
@@ -198,17 +88,6 @@ Target[lxc-wireguard.net]: `curl -s http://10.3.0.1/wireguard/RX http://10.3.0.1
 Title[lxc-wireguard.net]: [Net] wireguard
 MaxBytes[lxc-wireguard.net]: 42949672950000000
 
-# www
-Target[lxc-www.cpu]: `curl -s http://10.3.0.1/www/CPU; echo 0`
-Title[lxc-www.cpu]: [CPU] www
-MaxBytes[lxc-www.cpu]: 42949672950000000
-Target[lxc-www.memory]: `curl -s http://10.3.0.1/www/Memory; echo 0`
-Title[lxc-www.memory]: [Memory] www
-MaxBytes[lxc-www.memory]: 42949672950000000
-Target[lxc-www.net]: `curl -s http://10.3.0.1/www/RX http://10.3.0.1/www/TX`
-Title[lxc-www.net]: [Net] www
-MaxBytes[lxc-www.net]: 42949672950000000
-
 # www-familienhilfe-baeumler
 Target[lxc-www-familienhilfe-baeumler.cpu]: `curl -s http://10.3.0.1/www-familienhilfe-baeumler/CPU; echo 0`
 Title[lxc-www-familienhilfe-baeumler.cpu]: [CPU] www-familienhilfe-baeumler
@@ -220,3 +99,135 @@ Target[lxc-www-familienhilfe-baeumler.net]: `curl -s http://10.3.0.1/www-familie
 Title[lxc-www-familienhilfe-baeumler.net]: [Net] www-familienhilfe-baeumler
 MaxBytes[lxc-www-familienhilfe-baeumler.net]: 42949672950000000
 
+# nextcloud
+Target[lxc-nextcloud.cpu]: `curl -s http://10.3.0.1/nextcloud/CPU; echo 0`
+Title[lxc-nextcloud.cpu]: [CPU] nextcloud
+MaxBytes[lxc-nextcloud.cpu]: 42949672950000000
+Target[lxc-nextcloud.memory]: `curl -s http://10.3.0.1/nextcloud/Memory; echo 0`
+Title[lxc-nextcloud.memory]: [Memory] nextcloud
+MaxBytes[lxc-nextcloud.memory]: 42949672950000000
+Target[lxc-nextcloud.net]: `curl -s http://10.3.0.1/nextcloud/RX http://10.3.0.1/nextcloud/TX`
+Title[lxc-nextcloud.net]: [Net] nextcloud
+MaxBytes[lxc-nextcloud.net]: 42949672950000000
+
+# mrtg
+Target[lxc-mrtg.cpu]: `curl -s http://10.3.0.1/mrtg/CPU; echo 0`
+Title[lxc-mrtg.cpu]: [CPU] mrtg
+MaxBytes[lxc-mrtg.cpu]: 42949672950000000
+Target[lxc-mrtg.memory]: `curl -s http://10.3.0.1/mrtg/Memory; echo 0`
+Title[lxc-mrtg.memory]: [Memory] mrtg
+MaxBytes[lxc-mrtg.memory]: 42949672950000000
+Target[lxc-mrtg.net]: `curl -s http://10.3.0.1/mrtg/RX http://10.3.0.1/mrtg/TX`
+Title[lxc-mrtg.net]: [Net] mrtg
+MaxBytes[lxc-mrtg.net]: 42949672950000000
+
+# home-assistant
+Target[lxc-home-assistant.cpu]: `curl -s http://10.3.0.1/home-assistant/CPU; echo 0`
+Title[lxc-home-assistant.cpu]: [CPU] home-assistant
+MaxBytes[lxc-home-assistant.cpu]: 42949672950000000
+Target[lxc-home-assistant.memory]: `curl -s http://10.3.0.1/home-assistant/Memory; echo 0`
+Title[lxc-home-assistant.memory]: [Memory] home-assistant
+MaxBytes[lxc-home-assistant.memory]: 42949672950000000
+Target[lxc-home-assistant.net]: `curl -s http://10.3.0.1/home-assistant/RX http://10.3.0.1/home-assistant/TX`
+Title[lxc-home-assistant.net]: [Net] home-assistant
+MaxBytes[lxc-home-assistant.net]: 42949672950000000
+
+# webmail
+Target[lxc-webmail.cpu]: `curl -s http://10.3.0.1/webmail/CPU; echo 0`
+Title[lxc-webmail.cpu]: [CPU] webmail
+MaxBytes[lxc-webmail.cpu]: 42949672950000000
+Target[lxc-webmail.memory]: `curl -s http://10.3.0.1/webmail/Memory; echo 0`
+Title[lxc-webmail.memory]: [Memory] webmail
+MaxBytes[lxc-webmail.memory]: 42949672950000000
+Target[lxc-webmail.net]: `curl -s http://10.3.0.1/webmail/RX http://10.3.0.1/webmail/TX`
+Title[lxc-webmail.net]: [Net] webmail
+MaxBytes[lxc-webmail.net]: 42949672950000000
+
+# matrix
+Target[lxc-matrix.cpu]: `curl -s http://10.3.0.1/matrix/CPU; echo 0`
+Title[lxc-matrix.cpu]: [CPU] matrix
+MaxBytes[lxc-matrix.cpu]: 42949672950000000
+Target[lxc-matrix.memory]: `curl -s http://10.3.0.1/matrix/Memory; echo 0`
+Title[lxc-matrix.memory]: [Memory] matrix
+MaxBytes[lxc-matrix.memory]: 42949672950000000
+Target[lxc-matrix.net]: `curl -s http://10.3.0.1/matrix/RX http://10.3.0.1/matrix/TX`
+Title[lxc-matrix.net]: [Net] matrix
+MaxBytes[lxc-matrix.net]: 42949672950000000
+
+# homeschooling
+Target[lxc-homeschooling.cpu]: `curl -s http://10.3.0.1/homeschooling/CPU; echo 0`
+Title[lxc-homeschooling.cpu]: [CPU] homeschooling
+MaxBytes[lxc-homeschooling.cpu]: 42949672950000000
+Target[lxc-homeschooling.memory]: `curl -s http://10.3.0.1/homeschooling/Memory; echo 0`
+Title[lxc-homeschooling.memory]: [Memory] homeschooling
+MaxBytes[lxc-homeschooling.memory]: 42949672950000000
+Target[lxc-homeschooling.net]: `curl -s http://10.3.0.1/homeschooling/RX http://10.3.0.1/homeschooling/TX`
+Title[lxc-homeschooling.net]: [Net] homeschooling
+MaxBytes[lxc-homeschooling.net]: 42949672950000000
+
+# mail
+Target[lxc-mail.cpu]: `curl -s http://10.3.0.1/mail/CPU; echo 0`
+Title[lxc-mail.cpu]: [CPU] mail
+MaxBytes[lxc-mail.cpu]: 42949672950000000
+Target[lxc-mail.memory]: `curl -s http://10.3.0.1/mail/Memory; echo 0`
+Title[lxc-mail.memory]: [Memory] mail
+MaxBytes[lxc-mail.memory]: 42949672950000000
+Target[lxc-mail.net]: `curl -s http://10.3.0.1/mail/RX http://10.3.0.1/mail/TX`
+Title[lxc-mail.net]: [Net] mail
+MaxBytes[lxc-mail.net]: 42949672950000000
+
+# www-br0tkasten-de
+Target[lxc-www-br0tkasten-de.cpu]: `curl -s http://10.3.0.1/www-br0tkasten-de/CPU; echo 0`
+Title[lxc-www-br0tkasten-de.cpu]: [CPU] www-br0tkasten-de
+MaxBytes[lxc-www-br0tkasten-de.cpu]: 42949672950000000
+Target[lxc-www-br0tkasten-de.memory]: `curl -s http://10.3.0.1/www-br0tkasten-de/Memory; echo 0`
+Title[lxc-www-br0tkasten-de.memory]: [Memory] www-br0tkasten-de
+MaxBytes[lxc-www-br0tkasten-de.memory]: 42949672950000000
+Target[lxc-www-br0tkasten-de.net]: `curl -s http://10.3.0.1/www-br0tkasten-de/RX http://10.3.0.1/www-br0tkasten-de/TX`
+Title[lxc-www-br0tkasten-de.net]: [Net] www-br0tkasten-de
+MaxBytes[lxc-www-br0tkasten-de.net]: 42949672950000000
+
+# genieacs
+Target[lxc-genieacs.cpu]: `curl -s http://10.3.0.1/genieacs/CPU; echo 0`
+Title[lxc-genieacs.cpu]: [CPU] genieacs
+MaxBytes[lxc-genieacs.cpu]: 42949672950000000
+Target[lxc-genieacs.memory]: `curl -s http://10.3.0.1/genieacs/Memory; echo 0`
+Title[lxc-genieacs.memory]: [Memory] genieacs
+MaxBytes[lxc-genieacs.memory]: 42949672950000000
+Target[lxc-genieacs.net]: `curl -s http://10.3.0.1/genieacs/RX http://10.3.0.1/genieacs/TX`
+Title[lxc-genieacs.net]: [Net] genieacs
+MaxBytes[lxc-genieacs.net]: 42949672950000000
+
+# www-br0tcraft-de
+Target[lxc-www-br0tcraft-de.cpu]: `curl -s http://10.3.0.1/www-br0tcraft-de/CPU; echo 0`
+Title[lxc-www-br0tcraft-de.cpu]: [CPU] www-br0tcraft-de
+MaxBytes[lxc-www-br0tcraft-de.cpu]: 42949672950000000
+Target[lxc-www-br0tcraft-de.memory]: `curl -s http://10.3.0.1/www-br0tcraft-de/Memory; echo 0`
+Title[lxc-www-br0tcraft-de.memory]: [Memory] www-br0tcraft-de
+MaxBytes[lxc-www-br0tcraft-de.memory]: 42949672950000000
+Target[lxc-www-br0tcraft-de.net]: `curl -s http://10.3.0.1/www-br0tcraft-de/RX http://10.3.0.1/www-br0tcraft-de/TX`
+Title[lxc-www-br0tcraft-de.net]: [Net] www-br0tcraft-de
+MaxBytes[lxc-www-br0tcraft-de.net]: 42949672950000000
+
+# dns
+Target[lxc-dns.cpu]: `curl -s http://10.3.0.1/dns/CPU; echo 0`
+Title[lxc-dns.cpu]: [CPU] dns
+MaxBytes[lxc-dns.cpu]: 42949672950000000
+Target[lxc-dns.memory]: `curl -s http://10.3.0.1/dns/Memory; echo 0`
+Title[lxc-dns.memory]: [Memory] dns
+MaxBytes[lxc-dns.memory]: 42949672950000000
+Target[lxc-dns.net]: `curl -s http://10.3.0.1/dns/RX http://10.3.0.1/dns/TX`
+Title[lxc-dns.net]: [Net] dns
+MaxBytes[lxc-dns.net]: 42949672950000000
+
+# dendrite
+Target[lxc-dendrite.cpu]: `curl -s http://10.3.0.1/dendrite/CPU; echo 0`
+Title[lxc-dendrite.cpu]: [CPU] dendrite
+MaxBytes[lxc-dendrite.cpu]: 42949672950000000
+Target[lxc-dendrite.memory]: `curl -s http://10.3.0.1/dendrite/Memory; echo 0`
+Title[lxc-dendrite.memory]: [Memory] dendrite
+MaxBytes[lxc-dendrite.memory]: 42949672950000000
+Target[lxc-dendrite.net]: `curl -s http://10.3.0.1/dendrite/RX http://10.3.0.1/dendrite/TX`
+Title[lxc-dendrite.net]: [Net] dendrite
+MaxBytes[lxc-dendrite.net]: 42949672950000000
+
diff --git a/config/nas.ok b/config/nas.ok
deleted file mode 100644
index e69de29..0000000
diff --git a/htdocs/index.html b/htdocs/index.html
index 9aa9e2e..b9f4463 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -21,8 +21,8 @@
 	<A HREF="/cgi-bin/details.pl?graph=br0tkasten.eth0"><IMG ALT="br0tkasten.eth0 Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=br0tkasten.eth0"></A>
 </div>
 <div>
-	<b>[br0tkasten.de] tap0</b><br/>
-	<A HREF="/cgi-bin/details.pl?graph=br0tkasten.tap0"><IMG ALT="br0tkasten.tap0 Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=br0tkasten.tap0"></A>
+	<b>[br0tkasten.de] lxd</b><br/>
+	<A HREF="/cgi-bin/details.pl?graph=br0tkasten.lxd"><IMG ALT="br0tkasten.lxd Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=br0tkasten.lxd"></A>
 </div>
 <div>
 	<b>[br0tkasten.de] br0</b><br/>
@@ -47,36 +47,7 @@
 </div>
 
 <br/>
-<h2>NAS</h2>
-<div>
-<div>
-	<b>[nas] eth0</b><br/>
-	<A HREF="/cgi-bin/details.pl?graph=nas.eth0"><IMG ALT="nas.eth0 Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=nas.eth0"></A>
-</div>
-<div>
-	<b>[nas] tap0</b><br/>
-	<A HREF="/cgi-bin/details.pl?graph=nas.tap0"><IMG ALT="nas.tap0 Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=nas.tap0"></A>
-</div>
-<div>
-	<b>[nas] Active CPU Load %</b><br/>
-	<A HREF="/cgi-bin/details.pl?graph=nas.cpu"><IMG ALT="nas.cpu Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=nas.cpu"></A>
-</div>
-<div>
-	<b>[nas] Memory Usage</b><br/>
-	<A HREF="/cgi-bin/details.pl?graph=nas.memtotal"><IMG ALT="nas.memtotal Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=nas.memtotal"></A>
-</div>
-<div>
-	<b>[nas] Swap Usage</b><br/>
-	<A HREF="/cgi-bin/details.pl?graph=nas.swap"><IMG ALT="nas.swap Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=nas.swap"></A>
-</div>
-<div>
-	<b>[nas] CPU Temperature</b><br/>
-	<A HREF="/cgi-bin/details.pl?graph=nas.temp"><IMG ALT="nas.temp Traffic Graph" SRC="/cgi-bin/graph.pl?width=680&height=200&graph=nas.temp"></A>
-</div>
-</div>
-
-<br/>
-<h2>FritzBox 7490</h2>                                                                                                                                                    
+<h2>FritzBox 7590</h2>                                                                                                                                                    
 <div>                                                                                                                                                                         
 <div>                                                                                                                                                                         
         <b>[FritzBox] WAN Interface</b><br/>                                                                                                                                 
diff --git a/htdocs/lxc.html b/htdocs/lxc.html
index b56d4d7..6a0276a 100644
--- a/htdocs/lxc.html
+++ b/htdocs/lxc.html
@@ -14,18 +14,30 @@
 <H1><a href="/">home</a>&nbsp;<a href="/lxc.html">lxc</a>&nbsp;<a href="/crypto.html">crypto</a>&nbspLXC - Monitoring</H1>
 <DIV>
 
-<DIV>
-        <B>[cloud]</B><BR/>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-cloud.net"><IMG ALT="lxc-cloud.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-cloud.net"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-cloud.cpu"><IMG ALT="lxc-cloud.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-cloud.cpu"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-cloud.memory"><IMG ALT="lxc-cloud.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-cloud.memory"></A>
-</DIV>
 <DIV>
         <B>[db]</B><BR/>
         <A HREF="/cgi-bin/details.pl?graph=lxc-db.net"><IMG ALT="lxc-db.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-db.net"></A>
         <A HREF="/cgi-bin/details.pl?graph=lxc-db.cpu"><IMG ALT="lxc-db.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-db.cpu"></A>
         <A HREF="/cgi-bin/details.pl?graph=lxc-db.memory"><IMG ALT="lxc-db.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-db.memory"></A>
 </DIV>
+<DIV>
+        <B>[dendrite]</B><BR/>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-dendrite.net"><IMG ALT="lxc-dendrite.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-dendrite.net"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-dendrite.cpu"><IMG ALT="lxc-dendrite.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-dendrite.cpu"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-dendrite.memory"><IMG ALT="lxc-dendrite.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-dendrite.memory"></A>
+</DIV>
+<DIV>
+        <B>[dns]</B><BR/>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-dns.net"><IMG ALT="lxc-dns.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-dns.net"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-dns.cpu"><IMG ALT="lxc-dns.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-dns.cpu"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-dns.memory"><IMG ALT="lxc-dns.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-dns.memory"></A>
+</DIV>
+<DIV>
+        <B>[genieacs]</B><BR/>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-genieacs.net"><IMG ALT="lxc-genieacs.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-genieacs.net"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-genieacs.cpu"><IMG ALT="lxc-genieacs.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-genieacs.cpu"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-genieacs.memory"><IMG ALT="lxc-genieacs.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-genieacs.memory"></A>
+</DIV>
 <DIV>
         <B>[gitea]</B><BR/>
         <A HREF="/cgi-bin/details.pl?graph=lxc-gitea.net"><IMG ALT="lxc-gitea.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-gitea.net"></A>
@@ -44,6 +56,12 @@
         <A HREF="/cgi-bin/details.pl?graph=lxc-home-assistant.cpu"><IMG ALT="lxc-home-assistant.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-home-assistant.cpu"></A>
         <A HREF="/cgi-bin/details.pl?graph=lxc-home-assistant.memory"><IMG ALT="lxc-home-assistant.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-home-assistant.memory"></A>
 </DIV>
+<DIV>
+        <B>[homeschooling]</B><BR/>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-homeschooling.net"><IMG ALT="lxc-homeschooling.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-homeschooling.net"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-homeschooling.cpu"><IMG ALT="lxc-homeschooling.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-homeschooling.cpu"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-homeschooling.memory"><IMG ALT="lxc-homeschooling.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-homeschooling.memory"></A>
+</DIV>
 <DIV>
         <B>[jitsi]</B><BR/>
         <A HREF="/cgi-bin/details.pl?graph=lxc-jitsi.net"><IMG ALT="lxc-jitsi.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-jitsi.net"></A>
@@ -81,22 +99,10 @@
         <A HREF="/cgi-bin/details.pl?graph=lxc-mrtg.memory"><IMG ALT="lxc-mrtg.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-mrtg.memory"></A>
 </DIV>
 <DIV>
-        <B>[node-red]</B><BR/>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-node-red.net"><IMG ALT="lxc-node-red.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-node-red.net"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-node-red.cpu"><IMG ALT="lxc-node-red.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-node-red.cpu"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-node-red.memory"><IMG ALT="lxc-node-red.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-node-red.memory"></A>
-</DIV>
-<DIV>
-        <B>[pihole]</B><BR/>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-pihole.net"><IMG ALT="lxc-pihole.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-pihole.net"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-pihole.cpu"><IMG ALT="lxc-pihole.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-pihole.cpu"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-pihole.memory"><IMG ALT="lxc-pihole.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-pihole.memory"></A>
-</DIV>
-<DIV>
-        <B>[redis]</B><BR/>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-redis.net"><IMG ALT="lxc-redis.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-redis.net"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-redis.cpu"><IMG ALT="lxc-redis.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-redis.cpu"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-redis.memory"><IMG ALT="lxc-redis.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-redis.memory"></A>
+        <B>[nextcloud]</B><BR/>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-nextcloud.net"><IMG ALT="lxc-nextcloud.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-nextcloud.net"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-nextcloud.cpu"><IMG ALT="lxc-nextcloud.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-nextcloud.cpu"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-nextcloud.memory"><IMG ALT="lxc-nextcloud.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-nextcloud.memory"></A>
 </DIV>
 <DIV>
         <B>[somachtstefaniedas]</B><BR/>
@@ -104,12 +110,6 @@
         <A HREF="/cgi-bin/details.pl?graph=lxc-somachtstefaniedas.cpu"><IMG ALT="lxc-somachtstefaniedas.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-somachtstefaniedas.cpu"></A>
         <A HREF="/cgi-bin/details.pl?graph=lxc-somachtstefaniedas.memory"><IMG ALT="lxc-somachtstefaniedas.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-somachtstefaniedas.memory"></A>
 </DIV>
-<DIV>
-        <B>[traccar]</B><BR/>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-traccar.net"><IMG ALT="lxc-traccar.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-traccar.net"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-traccar.cpu"><IMG ALT="lxc-traccar.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-traccar.cpu"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-traccar.memory"><IMG ALT="lxc-traccar.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-traccar.memory"></A>
-</DIV>
 <DIV>
         <B>[webmail]</B><BR/>
         <A HREF="/cgi-bin/details.pl?graph=lxc-webmail.net"><IMG ALT="lxc-webmail.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-webmail.net"></A>
@@ -123,10 +123,16 @@
         <A HREF="/cgi-bin/details.pl?graph=lxc-wireguard.memory"><IMG ALT="lxc-wireguard.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-wireguard.memory"></A>
 </DIV>
 <DIV>
-        <B>[www]</B><BR/>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-www.net"><IMG ALT="lxc-www.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www.net"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-www.cpu"><IMG ALT="lxc-www.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www.cpu"></A>
-        <A HREF="/cgi-bin/details.pl?graph=lxc-www.memory"><IMG ALT="lxc-www.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www.memory"></A>
+        <B>[www-br0tcraft-de]</B><BR/>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-www-br0tcraft-de.net"><IMG ALT="lxc-www-br0tcraft-de.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www-br0tcraft-de.net"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-www-br0tcraft-de.cpu"><IMG ALT="lxc-www-br0tcraft-de.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www-br0tcraft-de.cpu"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-www-br0tcraft-de.memory"><IMG ALT="lxc-www-br0tcraft-de.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www-br0tcraft-de.memory"></A>
+</DIV>
+<DIV>
+        <B>[www-br0tkasten-de]</B><BR/>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-www-br0tkasten-de.net"><IMG ALT="lxc-www-br0tkasten-de.net" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www-br0tkasten-de.net"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-www-br0tkasten-de.cpu"><IMG ALT="lxc-www-br0tkasten-de.cpu" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www-br0tkasten-de.cpu"></A>
+        <A HREF="/cgi-bin/details.pl?graph=lxc-www-br0tkasten-de.memory"><IMG ALT="lxc-www-br0tkasten-de.memory" SRC="/cgi-bin/graph.pl?width=540&height=200&graph=lxc-www-br0tkasten-de.memory"></A>
 </DIV>
 <DIV>
         <B>[www-familienhilfe-baeumler]</B><BR/>
diff --git a/scripts/crypto.csv b/scripts/crypto.csv
index 09be7fa..d8ed6ee 100644
--- a/scripts/crypto.csv
+++ b/scripts/crypto.csv
@@ -12,3 +12,4 @@
 2021-01-14;XLM;380.6974577;100;2.99;0.2548;10
 2021-01-14;ETH;0.48874273;500;7.34;1008.01;10
 2021-02-03;EGLD;35.12583900;2000;6.00;56.8242654;50
+2021-04-21;EGLD;27.34081182;4000;6.00;144.90;50
diff --git a/scripts/cryptoReport.pl b/scripts/cryptoReport.pl
index e82f4b6..8d827ef 100755
--- a/scripts/cryptoReport.pl
+++ b/scripts/cryptoReport.pl
@@ -15,13 +15,18 @@ my $cryptoMap = {
 	"BTC"  => "Bitcoin",
 	"CVC"  => "Civic",
 	"DNT"  => "district0x",
+	"DOGE" => "Dogecoin",
 	"EGLD" => "Elrond eGold",
 	"ETH"  => "Etherium",
+	"EOS"  => "EOS",
 	"LRC"  => "Loopring",
+	"RAD"  => "Radicle",
 	"REN"  => "REN",
+	"SHIB" => "Shiba Inu",
 	"SNX"  => "Synthetix",
 	"XLM"  => "Stellar Lumen",
-	"XTZ"  => "Tezos"
+	"XTZ"  => "Tezos",
+	"ZRX"  => "Ox",
 };
 my $v;
 
@@ -54,7 +59,7 @@ while (<CSV>) {
 	};
 	$x->{CURRENT_PRICE}   = &getCurrentPrice($currency);
 	$x->{LAST_WEEK_PRICE} = &getLastWeekValue($currency);
-	$x->{IMAGE} = `curl -s 'http://localhost/cgi-bin/graph.pl?width=540&height=200&graph=crypto-${currency}&start=-14d' --output - | base64 -w 0`;
+	$x->{IMAGE} = `curl -s 'http://localhost/cgi-bin/graph.pl?width=540&height=200&graph=crypto-${currency}&start=-14d' --output - | base64`;
 	push @{$v->{DATA}},$x;
 }
 
diff --git a/scripts/getCryptocurrencies.sh b/scripts/getCryptocurrencies.sh
index 5c56535..4ae7939 100755
--- a/scripts/getCryptocurrencies.sh
+++ b/scripts/getCryptocurrencies.sh
@@ -4,7 +4,7 @@ RRDDIR="/var/www/localhost/rrd"
 RRDPREFIX="crypto-"
 TMPLDIR="/var/www/localhost/tmpl"
 
-for c in AAVE ALGO BTC CVC DNT EOS ETH LRC LTC REN SNX XLM XTZ;
+for c in AAVE ALGO BTC CVC DOGE DNT EOS ETH LRC LTC RAD REN SNX XLM XTZ ZRX;
 do
 	if [[ ! -f "${RRDDIR}/${RRDPREFIX}${c}.rrd" ]];
 	then
@@ -40,3 +40,6 @@ GPRINT:sell:LAST:%6.4lf %sEUR\n
 EOF
 	fi
 done
+
+SELL=$(curl -s https://api.coinbase.com/v2/prices/SHIB-EUR/spot | jq .data.amount | sed 's/"//g')
+rrdtool update "${RRDDIR}/${RRDPREFIX}SHIB.rrd" N:${SELL}
diff --git a/scripts/lxc_index.sh b/scripts/lxc_index.sh
index 17289cd..b722a32 100755
--- a/scripts/lxc_index.sh
+++ b/scripts/lxc_index.sh
@@ -16,7 +16,7 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www
 <H1><a href="/">home</a>&nbsp;<a href="/lxc.html">lxc</a>&nbsp;<a href="/crypto.html">crypto</a>&nbspLXC - Monitoring</H1>
 <DIV>
 '
-curl -s http://10.3.0.1 | while read c;
+curl -s http://10.3.0.1 | sort | while read c;
 do
 echo "<DIV>
         <B>[$c]</B><BR/>
diff --git a/scripts/lxc_rrd-tmpl.sh b/scripts/lxc_rrd-tmpl.sh
index ffa5991..faf8b85 100755
--- a/scripts/lxc_rrd-tmpl.sh
+++ b/scripts/lxc_rrd-tmpl.sh
@@ -1,23 +1,33 @@
 #!/bin/sh
 
 DIR="/var/www/mrtg/tmpl"
+cpuCount=$(grep processor /proc/cpuinfo | wc -l)
 
 curl -s http://10.3.0.1 | while read c;
 do
 
-for m in cpu memory
-do
-echo "-v $m 
--t [$c] $m
+echo "-v memory 
+-t [$c] memory
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-$c.$m.rrd:ds0:AVERAGE
+DEF:in=/var/www/mrtg/rrd/lxc-$c.memory.rrd:ds0:AVERAGE
 AREA:in#CC9A5780
-LINE1:in#CC9A57" > "$DIR/lxc-$c.$m.tmpl"
-done
+LINE1:in#CC9A57" > "$DIR/lxc-$c.memory.tmpl"
+
+echo "-v cpu perc
+-t [$c] cpu
+--full-size-mode
+--color=BACK#343637
+--color=CANVAS#F0F0F0
+--color=FONT#F0F0F0
+--font=TITLE:12:DejaVu Bold
+DEF:i=/var/www/mrtg/rrd/lxc-$c.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,$cpuCount,/,10000000,/
+AREA:in#CC9A5780
+LINE1:in#CC9A57" > "$DIR/lxc-$c.cpu.tmpl"
 
 echo "-v in/up bps 
 -t [$c] net
diff --git a/tmpl/br0tkasten.br0.tmpl b/tmpl/br0tkasten.br0.tmpl
index 05006df..e961c66 100644
--- a/tmpl/br0tkasten.br0.tmpl
+++ b/tmpl/br0tkasten.br0.tmpl
@@ -9,8 +9,8 @@ DEF:d=/var/www/mrtg/rrd/br0tkasten.br0.rrd:ds0:AVERAGE
 DEF:u=/var/www/mrtg/rrd/br0tkasten.br0.rrd:ds1:AVERAGE
 CDEF:down=d,8,*
 CDEF:up=u,-8,*
-AREA:down#CC9A578060:Down
-AREA:up#2EA3496060:Up
+AREA:down#CC9A5780:Down
+AREA:up#2EA34960:Up
 LINE1:down#CC9A57
 LINE1:up#2EA349
 LINE1:0#000000
diff --git a/tmpl/br0tkasten.tap0.tmpl b/tmpl/br0tkasten.tap0.tmpl
deleted file mode 100644
index 3185eda..0000000
--- a/tmpl/br0tkasten.tap0.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up bps 
--t [br0tkasten] tap0
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/br0tkasten.tap0.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/br0tkasten.tap0.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A578060:Down
-AREA:up#2EA3496060:Up
-LINE1:down#CC9A57
-LINE1:up#2EA349
-LINE1:0#000000
diff --git a/tmpl/cryptoReport.tmpl b/tmpl/cryptoReport.tmpl
index b904844..4277ea4 100644
--- a/tmpl/cryptoReport.tmpl
+++ b/tmpl/cryptoReport.tmpl
@@ -1,4 +1,4 @@
-[% USE f2 = format('%.2f') %]
+[% USE f2 = format('%.6f') %]
 <html>
 	<head>
 		<style>
@@ -32,12 +32,13 @@
 	</head>
 	<body>
 		<h1>Report vom [% GENERATED %]</h1>
-		<h4><a href="https://mrtg.br0tkasten.de/cryptoPortfolio.html">Aktueller Report</a></h4>
 		<table>
 [% totalProfit = 0 %]
+[% totalValue  = 0 %]
 [% FOREACH c IN DATA %]
 [% gain = f2(c.CURRENT_PRICE / c.LAST_WEEK_PRICE * 100 - 100) %]
 [% cur_value = f2(c.CURRENT_PRICE * c.COIN) %]
+[% totalValue = totalValue + cur_value %]
 [% cur_profit_value = f2((c.CURRENT_PRICE * c.COIN) - c.PRICE) %]
 [% cur_profit_perc = f2(cur_profit_value / c.PRICE * 100) %]
 			<tr>
@@ -51,17 +52,20 @@
 						<tr><th>aktueller Kurs</th><td>[% f2(c.CURRENT_PRICE) %] Euro/[% c.CURRENCY %]</td></tr>
 						<tr><th>aktueller Wert</th><td>[% cur_value %] Euro</td></tr>
 						<tr><th>aktueller Profit</th><td><b>[% cur_profit_value %] Euro ([% cur_profit_perc %]%)</b></td></tr>
+						<!--
 [% IF gain > 0 %]
 						<tr class="green"><td>7 Tage Gewinn</td><td>+[% gain %]%</td></tr>
 [% ELSE %]
 						<tr class="red"><td>7 Tage Verlust</td><td>[% gain %]%</td></tr>
 [% END %]
+						-->
 					</table>
 				</td>
 			</tr>
 [% totalProfit = totalProfit + cur_profit_value %]
 [% END %]
 		</table>
-		<h2>Gewinn (gesamt) ca.  [% totalProfit %] Euro</h2>
+		<h2>Wert (gesamt) ca. [% totalValue %] Euro</h2>
+		<h2>Gewinn (gesamt) ca. [% totalProfit %] Euro</h2>
 	</body>
 </html>
diff --git a/tmpl/kodi.cpu.tmpl b/tmpl/kodi.cpu.tmpl
deleted file mode 100644
index 0e6c0d8..0000000
--- a/tmpl/kodi.cpu.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v utilization 
--t [kodi] CPU
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/kodi.cpu.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/kodi.eth0.tmpl b/tmpl/kodi.eth0.tmpl
deleted file mode 100644
index db8ae15..0000000
--- a/tmpl/kodi.eth0.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up 
--t [kodi] eth0
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/kodi.eth0.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/kodi.eth0.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#CC9A57
-LINE1:up#2EA349
-LINE1:0#000000
diff --git a/tmpl/kodi.memtotal.tmpl b/tmpl/kodi.memtotal.tmpl
deleted file mode 100644
index c38b340..0000000
--- a/tmpl/kodi.memtotal.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v RAM 
--t [kodi] memory utilization
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/kodi.memtotal.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/kodi.swap.tmpl b/tmpl/kodi.swap.tmpl
deleted file mode 100644
index c0a7660..0000000
--- a/tmpl/kodi.swap.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v swap
--t [kodi] swap utilization
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/kodi.swap.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/kodi.tap0.tmpl b/tmpl/kodi.tap0.tmpl
deleted file mode 100644
index 335d577..0000000
--- a/tmpl/kodi.tap0.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up 
--t [kodi] tap0
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/kodi.tap0.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/kodi.tap0.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#CC9A57
-LINE1:up#2EA349
-LINE1:0#000000
diff --git a/tmpl/kodi.temp.tmpl b/tmpl/kodi.temp.tmpl
deleted file mode 100644
index 9f06af1..0000000
--- a/tmpl/kodi.temp.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
--v Celsius
--t [kodi] Temperature
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/kodi.temp.rrd:ds0:AVERAGE
-CDEF:red=in,54,GT,in,UNKN,IF
-CDEF:green=in,54,GT,54,in,IF
-AREA:red#C7424EC0
-AREA:green#FFFFFF
-AREA:green#2EA34960
-LINE1:green#2EA349
-LINE1:red#C7424E
diff --git a/tmpl/kodi.tv.tmpl b/tmpl/kodi.tv.tmpl
deleted file mode 100644
index a885492..0000000
--- a/tmpl/kodi.tv.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v on/off
--t [kodi] TV stats
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/kodi.tv.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/lxc-cloud.cpu.tmpl b/tmpl/lxc-cloud.cpu.tmpl
deleted file mode 100644
index 7dcfe13..0000000
--- a/tmpl/lxc-cloud.cpu.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v cpu 
--t [cloud] cpu
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-cloud.cpu.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/lxc-cloud.memory.tmpl b/tmpl/lxc-cloud.memory.tmpl
deleted file mode 100644
index 5b046c4..0000000
--- a/tmpl/lxc-cloud.memory.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v memory 
--t [cloud] memory
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-cloud.memory.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/lxc-cloud.net.tmpl b/tmpl/lxc-cloud.net.tmpl
deleted file mode 100644
index 716271b..0000000
--- a/tmpl/lxc-cloud.net.tmpl
+++ /dev/null
@@ -1,22 +0,0 @@
--v in/up bps 
--t [cloud] net
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:rx=/var/www/mrtg/rrd/lxc-cloud.net.rrd:ds0:AVERAGE
-DEF:tx=/var/www/mrtg/rrd/lxc-cloud.net.rrd:ds1:AVERAGE
-CDEF:RX=rx,8,*
-CDEF:TX=tx,8,*
-COMMENT:        max.          avg.         min.         cur.\n
-AREA:RX#CC9A5760:Rx
-GPRINT:RX:MAX:%6.2lf %sbps
-GPRINT:RX:AVERAGE:%6.2lf %sbps
-GPRINT:RX:MIN:%6.2lf %sbps
-GPRINT:RX:LAST:%6.2lf %sbps\n
-LINE1:TX#2EA349:Tx
-GPRINT:TX:MAX:%6.2lf %sbps
-GPRINT:TX:AVERAGE:%6.2lf %sbps
-GPRINT:TX:MIN:%6.2lf %sbps
-GPRINT:TX:LAST:%6.2lf %sbps\n
diff --git a/tmpl/lxc-db.cpu.tmpl b/tmpl/lxc-db.cpu.tmpl
index 28c6517..f072032 100644
--- a/tmpl/lxc-db.cpu.tmpl
+++ b/tmpl/lxc-db.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [db] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-db.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-db.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-gitea.cpu.tmpl b/tmpl/lxc-gitea.cpu.tmpl
index dd5a9d6..2a3b171 100644
--- a/tmpl/lxc-gitea.cpu.tmpl
+++ b/tmpl/lxc-gitea.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [gitea] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-gitea.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-gitea.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-grav-dev.cpu.tmpl b/tmpl/lxc-grav-dev.cpu.tmpl
index 58d0116..3c0692a 100644
--- a/tmpl/lxc-grav-dev.cpu.tmpl
+++ b/tmpl/lxc-grav-dev.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [grav-dev] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-grav-dev.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-grav-dev.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-home-assistant.cpu.tmpl b/tmpl/lxc-home-assistant.cpu.tmpl
index c8cf10a..498f315 100644
--- a/tmpl/lxc-home-assistant.cpu.tmpl
+++ b/tmpl/lxc-home-assistant.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [home-assistant] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-home-assistant.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-home-assistant.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-jitsi.cpu.tmpl b/tmpl/lxc-jitsi.cpu.tmpl
index 1070e63..f0be406 100644
--- a/tmpl/lxc-jitsi.cpu.tmpl
+++ b/tmpl/lxc-jitsi.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [jitsi] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-jitsi.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-jitsi.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-mail.cpu.tmpl b/tmpl/lxc-mail.cpu.tmpl
index 76f8670..70270c2 100644
--- a/tmpl/lxc-mail.cpu.tmpl
+++ b/tmpl/lxc-mail.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [mail] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-mail.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-mail.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-matrix.cpu.tmpl b/tmpl/lxc-matrix.cpu.tmpl
index b27bf22..904c42a 100644
--- a/tmpl/lxc-matrix.cpu.tmpl
+++ b/tmpl/lxc-matrix.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [matrix] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-matrix.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-matrix.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-motion.cpu.tmpl b/tmpl/lxc-motion.cpu.tmpl
index 3c124cf..5262172 100644
--- a/tmpl/lxc-motion.cpu.tmpl
+++ b/tmpl/lxc-motion.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [motion] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-motion.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-motion.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-mqtt.cpu.tmpl b/tmpl/lxc-mqtt.cpu.tmpl
index b0f1161..2a3209a 100644
--- a/tmpl/lxc-mqtt.cpu.tmpl
+++ b/tmpl/lxc-mqtt.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [mqtt] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-mqtt.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-mqtt.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-mrtg.cpu.tmpl b/tmpl/lxc-mrtg.cpu.tmpl
index 0ca9499..81b7621 100644
--- a/tmpl/lxc-mrtg.cpu.tmpl
+++ b/tmpl/lxc-mrtg.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [mrtg] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-mrtg.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-mrtg.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-somachtstefaniedas.cpu.tmpl b/tmpl/lxc-somachtstefaniedas.cpu.tmpl
index a7f1166..dda3b16 100644
--- a/tmpl/lxc-somachtstefaniedas.cpu.tmpl
+++ b/tmpl/lxc-somachtstefaniedas.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [somachtstefaniedas] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-somachtstefaniedas.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-somachtstefaniedas.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-webmail.cpu.tmpl b/tmpl/lxc-webmail.cpu.tmpl
index 3d7e972..61c2d19 100644
--- a/tmpl/lxc-webmail.cpu.tmpl
+++ b/tmpl/lxc-webmail.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [webmail] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-webmail.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-webmail.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-wireguard.cpu.tmpl b/tmpl/lxc-wireguard.cpu.tmpl
index 1783f8f..2e5909a 100644
--- a/tmpl/lxc-wireguard.cpu.tmpl
+++ b/tmpl/lxc-wireguard.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [wireguard] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-wireguard.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-wireguard.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-www-familienhilfe-baeumler.cpu.tmpl b/tmpl/lxc-www-familienhilfe-baeumler.cpu.tmpl
index da75d45..14ebfa9 100644
--- a/tmpl/lxc-www-familienhilfe-baeumler.cpu.tmpl
+++ b/tmpl/lxc-www-familienhilfe-baeumler.cpu.tmpl
@@ -1,10 +1,11 @@
--v cpu 
+-v cpu perc
 -t [www-familienhilfe-baeumler] cpu
 --full-size-mode
 --color=BACK#343637
 --color=CANVAS#F0F0F0
 --color=FONT#F0F0F0
 --font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-www-familienhilfe-baeumler.cpu.rrd:ds0:AVERAGE
+DEF:i=/var/www/mrtg/rrd/lxc-www-familienhilfe-baeumler.cpu.rrd:ds0:AVERAGE
+CDEF:in=i,4,/,10000000,/
 AREA:in#CC9A5780
 LINE1:in#CC9A57
diff --git a/tmpl/lxc-www.cpu.tmpl b/tmpl/lxc-www.cpu.tmpl
deleted file mode 100644
index 142041d..0000000
--- a/tmpl/lxc-www.cpu.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v cpu 
--t [www] cpu
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-www.cpu.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/lxc-www.memory.tmpl b/tmpl/lxc-www.memory.tmpl
deleted file mode 100644
index 73fdffe..0000000
--- a/tmpl/lxc-www.memory.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v memory 
--t [www] memory
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/lxc-www.memory.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/lxc-www.net.tmpl b/tmpl/lxc-www.net.tmpl
deleted file mode 100644
index 0baf8c1..0000000
--- a/tmpl/lxc-www.net.tmpl
+++ /dev/null
@@ -1,22 +0,0 @@
--v in/up bps 
--t [www] net
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:rx=/var/www/mrtg/rrd/lxc-www.net.rrd:ds0:AVERAGE
-DEF:tx=/var/www/mrtg/rrd/lxc-www.net.rrd:ds1:AVERAGE
-CDEF:RX=rx,8,*
-CDEF:TX=tx,8,*
-COMMENT:        max.          avg.         min.         cur.\n
-AREA:RX#CC9A5760:Rx
-GPRINT:RX:MAX:%6.2lf %sbps
-GPRINT:RX:AVERAGE:%6.2lf %sbps
-GPRINT:RX:MIN:%6.2lf %sbps
-GPRINT:RX:LAST:%6.2lf %sbps\n
-LINE1:TX#2EA349:Tx
-GPRINT:TX:MAX:%6.2lf %sbps
-GPRINT:TX:AVERAGE:%6.2lf %sbps
-GPRINT:TX:MIN:%6.2lf %sbps
-GPRINT:TX:LAST:%6.2lf %sbps\n
diff --git a/tmpl/nas.cpu.tmpl b/tmpl/nas.cpu.tmpl
deleted file mode 100644
index 1e12916..0000000
--- a/tmpl/nas.cpu.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v utilization 
--t [nas] CPU
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/nas.cpu.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/nas.eth0.tmpl b/tmpl/nas.eth0.tmpl
deleted file mode 100644
index 8023ff3..0000000
--- a/tmpl/nas.eth0.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up
--t [nas] eth0
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:u=/var/www/mrtg/rrd/nas.eth0.rrd:ds0:AVERAGE
-DEF:d=/var/www/mrtg/rrd/nas.eth0.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#662C00
-LINE1:up#005A66
-LINE1:0#000000
diff --git a/tmpl/nas.memtotal.tmpl b/tmpl/nas.memtotal.tmpl
deleted file mode 100644
index 05a6654..0000000
--- a/tmpl/nas.memtotal.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v RAM 
--t [nas] memory
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/nas.memtotal.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/nas.swap.tmpl b/tmpl/nas.swap.tmpl
deleted file mode 100644
index daa48c8..0000000
--- a/tmpl/nas.swap.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v utilization
--t [nas] Swap
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/nas.swap.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/nas.tap0.tmpl b/tmpl/nas.tap0.tmpl
deleted file mode 100644
index 2d4d1b9..0000000
--- a/tmpl/nas.tap0.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up
--t [nas] tap0
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/nas.tap0.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/nas.tap0.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#CC9A57
-LINE1:up#2EA349
-LINE1:0#000000
diff --git a/tmpl/nas.temp.tmpl b/tmpl/nas.temp.tmpl
deleted file mode 100644
index b4d8a81..0000000
--- a/tmpl/nas.temp.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
--v Celsius
--t [nas] Temperature
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/nas.temp.rrd:ds0:AVERAGE
-CDEF:red=in,54,GT,in,UNKN,IF
-CDEF:green=in,54,GT,54,in,IF
-AREA:red#C7424EC0
-AREA:green#FFFFFF
-AREA:green#2EA34960
-LINE1:green#2EA349
-LINE1:red#C7424E
diff --git a/tmpl/roof.cpu.tmpl b/tmpl/roof.cpu.tmpl
deleted file mode 100644
index 97af075..0000000
--- a/tmpl/roof.cpu.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v utilization 
--t [roof] CPU
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/roof.cpu.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/roof.memtotal.tmpl b/tmpl/roof.memtotal.tmpl
deleted file mode 100644
index db696f3..0000000
--- a/tmpl/roof.memtotal.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
--v RAM 
--t [roof] memory utilization
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:total=/var/www/mrtg/rrd/roof.memtotal.rrd:ds0:AVERAGE
-DEF:used=/var/www/mrtg/rrd/roof.memtotal.rrd:ds1:AVERAGE
-AREA:total#CC9A5780
-LINE1:total#CC9A57
-AREA:used#C7424E
diff --git a/tmpl/roof.ram.tmpl b/tmpl/roof.ram.tmpl
deleted file mode 100644
index 6e24e20..0000000
--- a/tmpl/roof.ram.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v ram
--t [roof] ram utilization
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/roof.ram.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/roof.swap.tmpl b/tmpl/roof.swap.tmpl
deleted file mode 100644
index 23967ba..0000000
--- a/tmpl/roof.swap.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
--v swap
--t [roof] swap utilization
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:total=/var/www/mrtg/rrd/roof.swap.rrd:ds0:AVERAGE
-DEF:avail=/var/www/mrtg/rrd/roof.swap.rrd:ds1:AVERAGE
-AREA:total#CC9A5780
-AREA:avail#2EA349
-LINE1:total#CC9A57
diff --git a/tmpl/roof.tap0.tmpl b/tmpl/roof.tap0.tmpl
deleted file mode 100644
index 3e676a7..0000000
--- a/tmpl/roof.tap0.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up 
--t [roof] tap0
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/roof.tap0.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/roof.tap0.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#CC9A57
-LINE1:up#2EA349
-LINE1:0#000000
diff --git a/tmpl/roof.temp.tmpl b/tmpl/roof.temp.tmpl
deleted file mode 100644
index 822e034..0000000
--- a/tmpl/roof.temp.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
--v Celsius
--t [roof] Temperature
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/roof.temp.rrd:ds0:AVERAGE
-CDEF:red=in,54,GT,in,UNKN,IF
-CDEF:green=in,54,GT,54,in,IF
-AREA:red#C7424EC0
-AREA:green#FFFFFF
-AREA:green#2EA34960
-LINE1:green#2EA349
-LINE1:red#C7424E
diff --git a/tmpl/roof.tv.tmpl b/tmpl/roof.tv.tmpl
deleted file mode 100644
index 80c642b..0000000
--- a/tmpl/roof.tv.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v on/off
--t [roof] TV stats
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/roof.tv.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/roof.wlan0.tmpl b/tmpl/roof.wlan0.tmpl
deleted file mode 100644
index 41e76ed..0000000
--- a/tmpl/roof.wlan0.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up 
--t [roof] wlan0
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/roof.wlan0.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/roof.wlan0.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#CC9A57
-LINE1:up#2EA349
-LINE1:0#000000
diff --git a/tmpl/wdr4300.arp.tmpl b/tmpl/wdr4300.arp.tmpl
deleted file mode 100644
index a01456f..0000000
--- a/tmpl/wdr4300.arp.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v clients connected 
--t [TL-WDR4300] ARP table
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/wdr4300.arp.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/wdr4300.wan.tmpl b/tmpl/wdr4300.wan.tmpl
deleted file mode 100644
index 192144f..0000000
--- a/tmpl/wdr4300.wan.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up bps 
--t [TL-WDR4300] WAN interface
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/wdr4300.wan.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/wdr4300.wan.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#CC9A57
-LINE1:up#045C55
-LINE1:0#000000
diff --git a/tmpl/wrt1200ac.arp.tmpl b/tmpl/wrt1200ac.arp.tmpl
deleted file mode 100644
index 2f1f631..0000000
--- a/tmpl/wrt1200ac.arp.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v clients connected 
--t [WRT1200AC] ARP table
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/wrt1200ac.arp.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57
diff --git a/tmpl/wrt1200ac.wan.tmpl b/tmpl/wrt1200ac.wan.tmpl
deleted file mode 100644
index e4df142..0000000
--- a/tmpl/wrt1200ac.wan.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up bps 
--t [WRT1200AC] WAN interface
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/wrt1200ac.wan.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/wrt1200ac.wan.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#CC9A57
-LINE1:up#045C55
-LINE1:0#000000
diff --git a/tmpl/wrt54.br0.tmpl b/tmpl/wrt54.br0.tmpl
deleted file mode 100644
index 89ead6b..0000000
--- a/tmpl/wrt54.br0.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
--v in/up bps 
--t [WRT54] br0
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:d=/var/www/mrtg/rrd/wrt54.br0.rrd:ds0:AVERAGE
-DEF:u=/var/www/mrtg/rrd/wrt54.br0.rrd:ds1:AVERAGE
-CDEF:down=d,8,*
-CDEF:up=u,-8,*
-AREA:down#CC9A5780:Down
-AREA:up#2EA34960:Up
-LINE1:down#CC9A57
-LINE1:up#045C55
-LINE1:0#000000
diff --git a/tmpl/wrt54.numclients.tmpl b/tmpl/wrt54.numclients.tmpl
deleted file mode 100644
index b174990..0000000
--- a/tmpl/wrt54.numclients.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
--v clients connected 
--t [WRT54] Number of wifi clients
---full-size-mode
---color=BACK#343637
---color=CANVAS#F0F0F0
---color=FONT#F0F0F0
---font=TITLE:12:DejaVu Bold
-DEF:in=/var/www/mrtg/rrd/wrt54.numclients.rrd:ds0:AVERAGE
-AREA:in#CC9A5780
-LINE1:in#CC9A57