diff --git a/.ssh/config b/.ssh/config
index 6605618..f9f5258 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -13,7 +13,7 @@
 
 Include ~/.ssh/config.d/*
 
-Host git.mike-ochmann.de box mikoc miko
+Host git.mike-ochmann.de box mikob miko
 	IdentityFile ~/.ssh/mikohosting_rsa
 
 Host git.mike-ochmann.de
@@ -24,7 +24,7 @@ Host box
 	User miko
 	HostName box.mike-ochmann.de
 
-Host mikoc
+Host mikob
 	User miko
 	HostName bus.uberspace.de
 	ServerAliveInterval 30
diff --git a/.ssh/config.d/maschinendeck b/.ssh/config.d/maschinendeck
index 2fb782b..2bd9a87 100644
--- a/.ssh/config.d/maschinendeck
+++ b/.ssh/config.d/maschinendeck
@@ -10,7 +10,7 @@
 #   Version 1,0,0                                                             #
 #                                                                             #
 ###############################################################################
-host mdeck.new mdeck asgard tuer bridge mdeck.uber.space
+host mdeck.new asgard tuer bridge mdeck.uber.space
 	IdentityFile /Users/mochmann/.ssh/maschinendeck_rsa
 	User miko
 
@@ -23,8 +23,9 @@ host mdeck.uber.space
 	User mdeck
 
 host mdeck
-	Hostname mdeck.uber.space
+	Hostname hamal.uberspace.de
 	User mdeck
+	IdentityFile /Users/mochmann/.ssh/maschinendeck_rsa
 
 host asgard
 	Hostname tuer.maschinendeck.org
diff --git a/.ssh/maschinendeck_rsa.pub b/.ssh/maschinendeck_rsa.pub
index 30757ba..91c3976 100644
--- a/.ssh/maschinendeck_rsa.pub
+++ b/.ssh/maschinendeck_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDECnI6AsuApECguWuLTQHdnshqylRGLg/d7Sm6wneuaVtVDnsbS8n07wPkvOcpVWiUjwMMW6ACtjJJUBFAVbBp1ahNGWnjAPmskyTuNcQV6kJUNFLxGxbOFsyBDVgO6ZfdDJdM5Gp9OtQ2oZTwf8/IvdLqWw3n43vZd5H92rZ1P5XPHm8QlxGWgnQV7c1XOdWqdybYprDXVyXvOWR+7oxPSNE0ZsY/plGx7RUG3sw9eTAHTGtFD98jd1fNkh+abgg2BSSVeTP7aW1IHboO4IdX0kx8JqumrjBOcnxLOGCxCBfnlRHbXdPKZ3IZ2P5731z2zAnHp8G0hhC7hO7dECg6zgr0Vo0Zabv3uwg0Oi4ltlrH5c4+DoB+JwHZaoLIlRxe+zE+lYt9CL6rMCBYFiixglX2cXJGen9UMopoq5bzzZEvBbIgF6PZChHsCOi4FtItsYGnADBZpVf8znteDYzqbBv+7hO0gqfUt6IWj5bF3aE6sacjPjDryQg6DN+MBt80tyfCaDJfJY1lRtS4zkoZnf1b/FwX0y94lwnE8giJ/6H01KBdN4SwfiQmsn5FT3K//OSZ1q2nzDKr43dj6Gym7GD7sHQRM3zFi602MihphuF6ZAyYD1DWXiLjS4RW0iVcEBk7s2Q2C8dJCJB1mSCPutRX3pmAxtEZEESIEBdpPw== miko@massivedynamic.eu
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCywDQmGsc5EKFi58jMkh7iYlLt/NKK+WeB7Uu4a4pbRUDMYS5dfJVEjZyb+ohuOEwbOBnrkklyKpzCp+/Em2rRDa9uwiVPW1X11DQyDc6TaAW0cHvkuX7BL/PK8K5ZSn8gJ7a1xN97K2VI6zMjIj2sL3V6MiO8ia8i2YbcxOxoW3WycdxllC0/9+MmoOS+tD/a49AYzrJBUtSmF6b0+db0iPNyo48Mlxq+/MHJfSGa8NzMebr3m6iMj5joJoyoSqYpnIZaTMh6/eSeYfPRwzh7SCLBW3BlsdSAtmZhMQp12bk6MHLvAOOd+lcln0EtSmd4aGXlV1BIpXNtuy2A83EPfDiFkbBjbqCbOMfFAF89vzcLRqpuFc4Itvu+geAfNsIFIfbNx88HLPrSP9v9Gpc6xpBFk0De5V1ULoDTEnvDfKJoHTTkEKOAdDdzzdi+FG2fDuGRpvRgvHG3LgZvGhk5JTFldwOAHeeIqVYa7SPfZ9oeGrusY+pTUkk9oQbXiKa9L78nbd+oDTIcvaappBhhBZQtiTfncQlI5ejQIY71zjZ/LaknINWC3A63N5mSGrnspdhbsOpX2XTds5rrJ9i/bzj7y92wigPLHmhWNAUebK3g3Wv8HNBrSDDBpSw8V1REd35S31o7/vLZjGqc2uWhwykl2QL/WMNSr8oGJXkUiQ== miko@maschinendeck.org
diff --git a/.ssh/mikohosting_rsa.pub b/.ssh/mikohosting_rsa.pub
index a38fe30..89e33ec 100644
--- a/.ssh/mikohosting_rsa.pub
+++ b/.ssh/mikohosting_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCPEU3tgWKotlkx05cMcPaYI+7Ibbf4aU1yw5ztl1iQIQcfasBRLqiJAZBRpIy6FgUCpHN36ojAj5DpPWFteaKW1AvZHAxXbZ2otDcYqV3YYyww4ybQ/VLWu4x6pxKODnF6NqCa2G7A96fObi/eyQ95qTpUEZxtV0mMLMM+D5KqXNpRD3bCsANjEBOOWqlNmQzniinXewzF1oh/XPWsV17dkdjAMZUAgGaHnHTmUmRhZiHl+tS/aCTnEDeRkGCCBOlkEz5MQfxWJ3b7ZL9vg0k8IAhGKx/o+kjq4+tPh/a+Iptpgd+lzUrcuyiX0+zkD/Ie1TXosDHc6fOvA76UtlkwuzgAd3T6ytAlvU+P/ozNA8Z/gdzlc5ubQ62PZoCDzdSEtMxTpcmiX3VSB6YWvLQCn3vJfLeVT7HF5bx3fwt4An2t6OsWT+lK4P8sSWG+gzmmYLAEdNxHh68hUs/+fbXh3X5bBEqXoN9yfpMDKdnRkzTVsS69OrfdkFQcpTAxGklXnH7wrx0HrPGPkpp33Ijr7c09MtvBs7DhzCD1a/G85l2x9PvML56fQKJQMQQUWs2xX29pukCJ02dB58Y1ELCZmjKmqQo8o5XmHkxQj3bW5c8Itt4nNypnTWDDO0QAmpr2H38IVqZmTpAOWVGC9SRtOhXbW/6C/Rhb+HzDwq5sQ== miko@massivedynamic.eu
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBhR4v322LKfPMKwc5yv2I9VZ45PiObmDK3W/41yhSxYLLi7U8N+9h3atMy+6er2dw4YjBa4wzVjY+ueCD7PYUJToRApkBFcsDGjQ0xqArXKHGJ9zF6gGJ8sAdY4pEGMsrwE1f7GaKlcGysIZ0CI9tu6X8Xly/2idRxXBNvAkH7PTwPEo6ENuA1nAMLJzF9qhWhhUK4KIepSAuuhpESOZ5+AYXTBBrAV6/VyIlfhENFbFqni9/+j5QGZaLHpSDhSTntwoxddrJTMhk9LL2r9h6Wi3p/gYc/wtoSEy/xfQFrZXAAzBmG7SPFYcrFSHph1boW+1Hax6JUsuXzo5CNyVFZ0V9i6U+DFU+PT4ruOrffSVUHwvFvfstR6M2D6FAwAVr6swVzk33FWkwONrI7BmKS8lbQRH7DrNrPuGPe3V4HO1SvLSX6j+MNTf1xae/TN1fO32537/8rKftvKsW0KKgs70MBCnjh0cJTeVhAW1/dPHT9+nhkH86pnRuHm81FG8pSAw+07sV11bcDmSvTVsD9sLRdh2F3mh+vlAJJ62B6KVZR4nZV2Ed36MvZhwrLM/on9DF0U7N3ekMXDx0M23K3hHUB6h2Vtw0+CQv7PvFecUS4cg2oG85avjwsWO/m+LCk1L/FHVXNBG5khjoDmX3K4PVQ1Xy/T0sq6wv9elTsQ== miko@massivedynamic.eu
diff --git a/.ssh/propeller_rsa.pub b/.ssh/propeller_rsa.pub
index c25d705..235140a 100644
--- a/.ssh/propeller_rsa.pub
+++ b/.ssh/propeller_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC801PO/aWAPs5CUvu/1yhTxWH+E7NpYxWpJo6Bo3/kvmYwZIkGBvlLWY1btdbkeLA9Jaw5RCHzEVB03V5vVYlwA/RSkV090FJ/AN2rGyJpzb3VAKWFYjcXAHq0LX71oXrpf7SM6TebJR8UUtlMjcge1qnM62RE+3qaTpj89+LcCSSDNs9r7e52VxXVf5nmjB4Xou5GCNzB4e0Ej0nWb5YpNjK6uuc1QtgDWT4+9a+Z8AKaJQnwLLspWDcBZbk2+t++G2rIt9Hs1Jt8RliSxsxjiD9v/5nrNQNZCzgPaSH1FV3RNUGi54mMQIOJ3CBxU4zAAa5JICT7tlUpFZ3mBhxLtwHvLFT/oA12QKylX7v+lA9unqNvav6GRJSF0kn7bIQq3RZjyz4OMF9iKMFnP36BT8GDxDdM3H6bobOVUumNoHydbrAemrFXUZHKGoQIxlyMAyG9Hgda+/KnwNzWIYV8zZJ6B27yfMXAriApBEQwUbWX8/kUZadri9NskCPVdtgBYZtgNN4/7BdlAjT69vGDzpY3Wc69Eccdxj1UqZoILclARkbKKUZBSlPC5bI0Q7F4yA0u0q9FIueVzn9E9Wli3Iuc26Bueba4jfKJe8WwaOI+tehIlxIfG+n4Q/BnJ0YPD0hWfT42V+5pMt3wwwchFovMLmvs4+g3xer5Qd5M2Q== michael.ochmann@propeller.de
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKQW1uxwvVl0xw3Qfk9HcexW7xYL/Ss5pJHWGo80gYjnLzqzyl2iU1RnW52yhHn1JIUlOKLlXk0oXJAP6hU+SRTkvHM49syx/qTXkbdthJJ4mYLBq54sy8fVsJi74jHJHdkqmIsZdTfG2xU0ZJjlrXV6uEiVAd7c7ZJvqFLajDWYBonmjzCs7F96Lbf8nIFbZcqkfXb//O3dIA2szNKqgDZN1LK7GV1bII0OvySfb/f+fSRaLD2QU6xjAIpSuOOLuuIAMxNDhFXVzr6m6BrbLLIyBK1FLgOvDYHahMGGB5qp5A4I7cv8Ueky73VbOhIp5csiOj8JxxVcXK3I8WtceQIqvFv+IfKntVma/8saALLXNF6EYYoKRBDUB0Nbd7QRjBmZFu2JwhQ0kWNVbyJupBdEj2IIkPlms4uKT+M5F/fE1ndDA9/O3EB9tOPDBSqLxfUiIsngG+acxk34eh6WkVH8SVVZuUcAP0A7H7bv38u3tGrmloPVXzlACghKTvTT6gBtIupZoAhJa8kJnqbSD474lZFWmHVnNPy86p6lIVgsNCPr8bPEkYzTVWtmH9dxfnrLVOjJ7B7tLG4f1kD8hz+oZQtS3Brcu1IEeMTHDE+J8dMWpk/M57hHE0mW3MPxsrQwQLwJDbCP2uhMyyOgkFJKQM/u7f9p9NljqyK9EQYw== michael.ochmann@propeller.de
diff --git a/.ssh/propeller_rsaV2.pub b/.ssh/propeller_rsaV2.pub
deleted file mode 100644
index 235140a..0000000
--- a/.ssh/propeller_rsaV2.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKQW1uxwvVl0xw3Qfk9HcexW7xYL/Ss5pJHWGo80gYjnLzqzyl2iU1RnW52yhHn1JIUlOKLlXk0oXJAP6hU+SRTkvHM49syx/qTXkbdthJJ4mYLBq54sy8fVsJi74jHJHdkqmIsZdTfG2xU0ZJjlrXV6uEiVAd7c7ZJvqFLajDWYBonmjzCs7F96Lbf8nIFbZcqkfXb//O3dIA2szNKqgDZN1LK7GV1bII0OvySfb/f+fSRaLD2QU6xjAIpSuOOLuuIAMxNDhFXVzr6m6BrbLLIyBK1FLgOvDYHahMGGB5qp5A4I7cv8Ueky73VbOhIp5csiOj8JxxVcXK3I8WtceQIqvFv+IfKntVma/8saALLXNF6EYYoKRBDUB0Nbd7QRjBmZFu2JwhQ0kWNVbyJupBdEj2IIkPlms4uKT+M5F/fE1ndDA9/O3EB9tOPDBSqLxfUiIsngG+acxk34eh6WkVH8SVVZuUcAP0A7H7bv38u3tGrmloPVXzlACghKTvTT6gBtIupZoAhJa8kJnqbSD474lZFWmHVnNPy86p6lIVgsNCPr8bPEkYzTVWtmH9dxfnrLVOjJ7B7tLG4f1kD8hz+oZQtS3Brcu1IEeMTHDE+J8dMWpk/M57hHE0mW3MPxsrQwQLwJDbCP2uhMyyOgkFJKQM/u7f9p9NljqyK9EQYw== michael.ochmann@propeller.de
diff --git a/.ssh/uni_rsa.pub b/.ssh/uni_rsa.pub
index 28db866..14b332d 100644
--- a/.ssh/uni_rsa.pub
+++ b/.ssh/uni_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQQ+a9Hel9PvoBmPOPN3m9yunjCya9Q0ZAraSCESF8UDTtsORCg0Olr7Cmu4H+G2VW5p5d7jPFFljKsFoWqAk5p94aX2OuywKX9swr4NoSESJTEib/WS105bsem3KzW3BtxNW/7e91tZcWQa4jV5yLCxXb/jVPCp+u9K2twBAg2Zy9Tv7GCmOcKuojHtOUTpYipnYy6OlrSidmfMaQYDdsqY+nqKpLc/e6lyjxfc/6V0cYLWTaUxoJD3wiMHAL4VhgxNZlYKMqpwKNbZDFhkB3vxhYoQ6YLaUqHdCnFJyDKF0L7TuDTjfCzmZq7+aB0nM4GuByi+r6uFyaGnxE/opdDbKpiMzbyjZlAPz/uQqSfC1MiFlxpwmxZ17dPP3vlhDs+LWshYuLZz8l2Bk+QAgS6wn2bZ6lFQMgwGWlJfGAY6N7/upLCyPXo/+kJUoE0U7exzedcRWKer7vFrO5S+lUY1Ff+zEI6yoyMStVqT2OKsmZx/z8LF60Bf3fcXxxYiPb4g5UQhImQQK/JBdQRJrobCpn1AZ6gfnxuKxPUbdIkZWYM7Hcy3frX4ObUT3ZqeewywVBm5RBqrko7U9vBaksW2Or8QWwn4Ng9j1r4R+ljyukdG5LZ3D+6BPWnbBn02x6fTBTQ6Zah7l8efM6aHThzSIdpKzzMq8i4xRUvy7VNQ== Mike Macbook HS
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/JwIaa9ZkFfhMrnVQ/Gr2rrHyB2rXBK38HeSH9DGxx1T2l7H8cF5fNkG0R2+8we4Ih8Nk38G2tnrxeL4aTC02LEZcnFfdbloHIjy+ZAWzFbGzQH9ejwcXk+xVD9na7xuxZiHjuH6k+GEE3cok3NPNV3AtqiiYf7G3bnVU1skcoFwCV6EOOh18Vt0nOnbdCy5e4rRhKj3vvSfWlbzhxXWS+Q+qjjZIyTalsIlWcegPylN5OKUeX/vmHSiuUMB/D1KMKoK8dqAmvUczOKs0eu7Z7Abc9W2HlYDoB/Ni3TVzl54rcScZkFUd3J7rrTMOMZUyzsXN+qbdym9jNiUfIzzBEFSL+BjI+CbPBPIv7tk3EpR7pX4NjvW76R04SWCSUDV8Isfjshm8vl19aonqDNcU8b1lQTgjJRruArb10AXpAEN1IfDIbk25V97Rk3uwK8CTLyLt/hXv0J4NdQp7P2ds3aNaNRJzr1p4uok4f/3BWQIfSwpGd34gtiaYTqAODBMunxiCzgLgjY0tAGnOrTpxA8WxFX6i5uQMtwyed2COj5STr3A9le3cpJZuYWoe8oJWrG2SOPQkCT2TPkf3YHV7SE/iDLJGeULoCNXIyYzorypkFnu94B5W6+w9dvlhEX3M2zrqla6wx/ihxScTWLqpAcD9I5FP1x8ev11eZEQxPQ== ochmannm@hochschule-trier.de
diff --git a/.ssh/wurst_rsa.pub b/.ssh/wurst_rsa.pub
deleted file mode 100644
index e11282b..0000000
Binary files a/.ssh/wurst_rsa.pub and /dev/null differ