merged site.conf improvements from tiefpunkt