diff --git a/_inventory/fraese.md b/_inventory/fraese.md
index 56439983147b5034defded4f28903bfbd54d936a..2adcda14ca98798fda5d86ddf857d440cec3a35b 100644
--- a/_inventory/fraese.md
+++ b/_inventory/fraese.md
@@ -8,7 +8,7 @@ wikilink: https://wiki.chaotikum.org/hackspace:infrastruktur:cncfraese
 calcolor: "#96aa3d"
 imagetag: cncfraese
 contact:
- - TVLuke
+ - toxicity
 sets: 
  - werkstatt
  - holzundmetal
diff --git a/_inventory/heatpress.md b/_inventory/heatpress.md
index e6ef154d9585a859c945065ea091b987d80eb56b..56f5c9b93f0d562f7bd3bd819dc8847b0a918b38 100644
--- a/_inventory/heatpress.md
+++ b/_inventory/heatpress.md
@@ -6,6 +6,8 @@ uid: 59698f81-b91b-4ee3-97d2-4c7e8fa05355
 imagetag: heatpress
 wikilink: https://wiki.chaotikum.org/hackspace:werkstatt:heatpress
 calcolor: "#87612d"
+contact:
+ - faabe
 sets: 
  - werkstatt
  - textilverarbeitung
diff --git a/_inventory/labornetzteil66332A.md b/_inventory/labornetzteil66332A.md
index c8a775815355231b537a1a06a0786f9baaab4e89..dc85f53818034e317b40605b149e1ab9f0f748c8 100644
--- a/_inventory/labornetzteil66332A.md
+++ b/_inventory/labornetzteil66332A.md
@@ -5,6 +5,8 @@ name: "Labornetzteil Agilent Model 66332A"
 uid: a51708b2-7a7d-4b32-9a53-9928a324f216
 wikilink: https://wiki.chaotikum.org/hackspace:werkstatt:labornetzteil
 calcolor: "#85b2a2"
+contact:
+ - leob
 sets: 
  - werkstatt
  - elektronik
diff --git a/_inventory/loetstationen.md b/_inventory/loetstationen.md
index 2e963910452152034a5002b2cc4dc80563cf1792..927ab68a9bf3bbcbb714a865b9016a211638f997 100644
--- a/_inventory/loetstationen.md
+++ b/_inventory/loetstationen.md
@@ -5,6 +5,8 @@ name: "Lötstationen"
 uid: eadee3ae-82b9-480d-9766-8a408cf84193
 wikilink: https://wiki.chaotikum.org/hackspace:werkstatt:loetstationen
 calcolor: "#123456"
+contact:
+ - leob
 sets: 
  - werkstatt
  - elektronik
diff --git a/_inventory/osziloskop.md b/_inventory/osziloskop.md
index 28b669bdd44a6f0c887dac57511a849bd94f7557..6f81628d08f5a27ac596d533ecff98b41981a82f 100644
--- a/_inventory/osziloskop.md
+++ b/_inventory/osziloskop.md
@@ -5,6 +5,8 @@ name: "Oszilloskop"
 uid: 810acaa5-3c81-4224-b6ba-5c8d990283be
 wikilink: https://wiki.chaotikum.org/hackspace:infrastruktur:oszilloskop
 calcolor: "#123456"
+contact:
+ - leob
 sets: 
  - werkstatt
  - elektronik
diff --git a/_inventory/schneidplotter.md b/_inventory/schneidplotter.md
index 50f705f11a65cf81da258bc22cfff55d94769c40..16dbbb8ec223a85064326fe4369c6249576ecc34 100644
--- a/_inventory/schneidplotter.md
+++ b/_inventory/schneidplotter.md
@@ -5,6 +5,8 @@ name: "Schneidplotter"
 uid: 637ee8d8-105c-418b-b81d-96d8afce596f
 wikilink: https://wiki.chaotikum.org/hackspace:werkstatt:schneideplotter
 calcolor: "#123456"
+contact:
+ - faabe
 sets: 
  - werkstatt
  - textilverarbeitung
diff --git a/_inventory/stickmaschine.md b/_inventory/stickmaschine.md
index 31bdd5337e16a213517565128dbaba96d0f48147..28e19882fc349de1b9a77cc348193e269a742cb2 100644
--- a/_inventory/stickmaschine.md
+++ b/_inventory/stickmaschine.md
@@ -5,6 +5,8 @@ name: "CNC-Stickmaschine"
 uid: 6171339f-382b-4ae2-90a2-b161951e7f11
 wikilink: https://wiki.chaotikum.org/hackspace:werkstatt:stickmaschine
 calcolor: "#eae1e5"
+contact:
+ - faabe
 sets: 
  - werkstatt
  - textilverarbeitung
diff --git a/_inventory/ultimaker.md b/_inventory/ultimaker.md
index 66173871e7a8a3c974ba4617f61defd102be4f2c..5a9c22db84e1eea36a7d818c4ce705ee965fc7f5 100644
--- a/_inventory/ultimaker.md
+++ b/_inventory/ultimaker.md
@@ -6,6 +6,8 @@ uid: 40873e89-1515-412c-9a40-c27daf4e9894
 wikilink: https://wiki.chaotikum.org/hackspace:infrastruktur:3ddrucker
 imagetag: 3dprinterpic
 calcolor: "#af97a6"
+contact:
+ - leob
 sets: 
  - werkstatt
  - 3ddruck
diff --git a/_layouts/device.html b/_layouts/device.html
index 52cff1c2eca4a55a078375548744cc72bdaa6ed3..c253534d72051342d7856284a35001608ab76dcf 100644
--- a/_layouts/device.html
+++ b/_layouts/device.html
@@ -9,7 +9,8 @@ layout: default
     <article class="article--page  typeset">
       <h4 id="{{page.uid}}">{{page.name}}</h4>
       {% if page.safetybriefing -%}
-            {% include {{site.einweisung}} tool=page %}
+        {% assign tuid = page.uid %}
+        {% include {{site.einweisung}} tuid=tuid %}
       {% endif -%}
       {% if page.contact -%}
       Ansprechpersonen:
diff --git a/_people/toxicity.md b/_people/toxicity.md
new file mode 100644
index 0000000000000000000000000000000000000000..89d41b941dc89d05576c4de50a4954cc75aba1f4
--- /dev/null
+++ b/_people/toxicity.md
@@ -0,0 +1,5 @@
+---
+layout: entities
+person_id: "toxicity"
+name: "Toxicity"
+---