diff --git a/al.ert.space b/al.ert.space
index 7006374..15843db 100644
--- a/al.ert.space
+++ b/al.ert.space
@@ -26,7 +26,6 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
 }
 
 server {
@@ -34,12 +33,10 @@ server {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
-     
     listen 80;     
     listen [::]:80;     
     
     server_name al.ert.space;
     return 404; # managed by Certbot
+}
 
-
-}
\ No newline at end of file
diff --git a/conc.ert.space b/conc.ert.space
index 1b9ba46..aa4d947 100644
--- a/conc.ert.space
+++ b/conc.ert.space
@@ -1,6 +1,6 @@
 upstream fw {
     # depending on your setup, you may want to update this
-    server 0.0.0.0:5678;
+    server 0.0.0.0:5000;
 }
 map $http_upgrade $connection_upgrade {
     default upgrade;
@@ -25,21 +25,16 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
 }
 
-
-
 server {
     if ($host = conc.ert.space) {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
-
     listen 80;
     listen [::]:80;
     server_name conc.ert.space;
     return 404; # managed by Certbot
+}
 
-
-}
\ No newline at end of file
diff --git a/ert.space b/ert.space
index 7c6f877..eeb6e42 100644
--- a/ert.space
+++ b/ert.space
@@ -4,6 +4,7 @@ server {
     location / {
         try_files $uri $uri/ =404;
     }
+    server_name ert.space;
 
     listen [::]:443 ssl ipv6only=on; # managed by Certbot
     listen 443 ssl; # managed by Certbot
@@ -19,11 +20,11 @@ server {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
+    server_name ert.space;
 
     listen 80;
     listen [::]:80;
     server_name ert.space;
     return 404; # managed by Certbot
+}
 
-
-}
\ No newline at end of file
diff --git a/ex.ert.space b/ex.ert.space
index a0c7b36..2f34af0 100644
--- a/ex.ert.space
+++ b/ex.ert.space
@@ -7,6 +7,14 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
     }
 
+    location = /.well-known/carddav {
+        return 301 http://localhost:8080/remote.php/dav;
+    }
+    location = /.well-known/caldav {
+        return 301 http://localhost:8080/remote.php/dav;
+    }
+    server_name ex.ert.space;
+
     listen [::]:443 ssl; # managed by Certbot
     listen 443 ssl; # managed by Certbot
     ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
@@ -21,11 +29,11 @@ server {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
+    server_name ex.ert.space;
 
     listen 80;
     listen [::]:80;
     server_name ex.ert.space;
     return 404; # managed by Certbot
+}
 
-
-}
\ No newline at end of file
diff --git a/gitb.ert.space b/gitb.ert.space
index e48f395..36ed708 100644
--- a/gitb.ert.space
+++ b/gitb.ert.space
@@ -5,6 +5,7 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
+    server_name gitb.ert.space;
 
     listen [::]:443 ssl; # managed by Certbot
     listen 443 ssl; # managed by Certbot
@@ -12,7 +13,6 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
 }
 
 server {
@@ -20,11 +20,11 @@ server {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
+    server_name gitb.ert.space;
 
     listen 80;
     listen [::]:80;
     server_name gitb.ert.space;
     return 404; # managed by Certbot
+}
 
-
-}
\ No newline at end of file
diff --git a/hilb.ert.space b/hilb.ert.space
index b7e3277..1b6a7d6 100644
--- a/hilb.ert.space
+++ b/hilb.ert.space
@@ -1,11 +1,11 @@
 server {     
     server_name hilb.ert.space;     
     client_max_body_size 5M;
-    location / {         
-        proxy_pass http://localhost:2368; 
-        proxy_set_header Host $host;         
-        proxy_set_header X-Real-IP $remote_addr;     
-    } 
+    root /srv/www/hilb.ert.space;
+    location / {
+        try_files $uri $uri/ =404;
+    }
+    server_name hilb.ert.space;
 
     listen [::]:443 ssl; # managed by Certbot
     listen 443 ssl; # managed by Certbot
@@ -13,7 +13,6 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
 }
 
 server {
@@ -21,11 +20,11 @@ server {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
-     
+    server_name hilb.ert.space;
+
     listen 80;     
     listen [::]:80;     
     server_name hilb.ert.space;
     return 404; # managed by Certbot
+}
 
-
-}
\ No newline at end of file
diff --git a/in.ert.space b/in.ert.space
index 76061d1..4d22daf 100644
--- a/in.ert.space
+++ b/in.ert.space
@@ -12,7 +12,6 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
 }
 
 server {
@@ -20,12 +19,9 @@ server {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
-
     listen 80;
     listen [::]:80;
     server_name in.ert.space;
     return 404; # managed by Certbot
-
-
 }
 
diff --git a/pix.ert.space b/pix.ert.space
index 2444bbd..f204d52 100644
--- a/pix.ert.space
+++ b/pix.ert.space
@@ -8,11 +8,10 @@ server {
 
     listen [::]:443 ssl; # managed by Certbot
     listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
+    ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
 }
 
 server {
@@ -25,6 +24,5 @@ server {
     listen [::]:80;
     server_name pix.ert.space;
     return 404; # managed by Certbot
+}
 
-
-}
\ No newline at end of file
diff --git a/ress.ert.space b/ress.ert.space
index a77ec77..ac15fc4 100644
--- a/ress.ert.space
+++ b/ress.ert.space
@@ -5,6 +5,7 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
+    server_name ress.ert.space;
 
     listen [::]:443 ssl; # managed by Certbot
     listen 443 ssl; # managed by Certbot
@@ -12,19 +13,17 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
 }
 
 server {
     if ($host = ress.ert.space) {
         return 301 https://$host$request_uri;
     } # managed by Certbot
-
+    server_name ress.ert.space;
 
     listen 80;
     listen [::]:80;
     server_name ress.ert.space;
     return 404; # managed by Certbot
+}
 
-
-}
\ No newline at end of file
diff --git a/stand.ert.space b/stand.ert.space
index 9a2c656..5e5b530 100644
--- a/stand.ert.space
+++ b/stand.ert.space
@@ -12,7 +12,6 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
 }
 
 server {
@@ -20,11 +19,8 @@ server {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
-
     listen 80;
     listen [::]:80;
     server_name stand.ert.space;
     return 404; # managed by Certbot
-
-
-}
\ No newline at end of file
+}
diff --git a/wiki.ert.space b/wiki.ert.space
new file mode 100644
index 0000000..8d0f7f6
--- /dev/null
+++ b/wiki.ert.space
@@ -0,0 +1,27 @@
+server {
+    server_name wiki.ert.space;
+    location / {
+        proxy_pass https://ionchypedia.readthedocs.io:443;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+    }
+
+    listen [::]:443 ssl; # managed by Certbot
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+}
+
+server {
+    if ($host = wiki.ert.space) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+    listen 80;
+    listen [::]:80;
+    server_name wiki.ert.space;
+    return 404; # managed by Certbot
+}
+