diff --git a/http.d/auth.shad.moe b/http.d/auth.shad.moe
index 1200b64..3961216 100644
--- a/http.d/auth.shad.moe
+++ b/http.d/auth.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name auth.shad.moe www.auth.shad.moe;
diff --git a/http.d/axoblu.konpeki.solutions b/http.d/axoblu.konpeki.solutions
index 11a061f..659ae47 100644
--- a/http.d/axoblu.konpeki.solutions
+++ b/http.d/axoblu.konpeki.solutions
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name axoblu.konpeki.solutions www.axoblu.konpeki.solutions;
diff --git a/http.d/dash.shad.moe b/http.d/dash.shad.moe
index 3cfdf5f..951956f 100644
--- a/http.d/dash.shad.moe
+++ b/http.d/dash.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name dash.shad.moe www.dash.shad.moe;
diff --git a/http.d/docs.shad.moe b/http.d/docs.shad.moe
index 90f9a79..60447c7 100644
--- a/http.d/docs.shad.moe
+++ b/http.d/docs.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name docs.shad.moe www.docs.shad.moe;
diff --git a/http.d/git.shad.moe b/http.d/git.shad.moe
index f328abf..cad0baf 100644
--- a/http.d/git.shad.moe
+++ b/http.d/git.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name git.shad.moe www.git.shad.moe;
diff --git a/http.d/graph.shad.moe b/http.d/graph.shad.moe
index 6d34b8e..30a6ed7 100644
--- a/http.d/graph.shad.moe
+++ b/http.d/graph.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name graph.shad.moe www.graph.shad.moe;
diff --git a/http.d/internal.shad.moe b/http.d/internal.shad.moe
index d925068..cdcb06b 100644
--- a/http.d/internal.shad.moe
+++ b/http.d/internal.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name internal.shad.moe www.internal.shad.moe;
diff --git a/http.d/konpeki.solutions b/http.d/konpeki.solutions
index 3274b72..df1b9ef 100644
--- a/http.d/konpeki.solutions
+++ b/http.d/konpeki.solutions
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name konpeki.solutions www.konpeki.solutions;
diff --git a/http.d/link.gpoc.konpeki.solutions b/http.d/link.gpoc.konpeki.solutions
index bc625a9..00fd790 100644
--- a/http.d/link.gpoc.konpeki.solutions
+++ b/http.d/link.gpoc.konpeki.solutions
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name link.gpoc.shad.moe www.link.gpoc.shad.moe;
diff --git a/http.d/map.gpoc.konpeki.solutions b/http.d/map.gpoc.konpeki.solutions
index 636dc1b..30d9481 100644
--- a/http.d/map.gpoc.konpeki.solutions
+++ b/http.d/map.gpoc.konpeki.solutions
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 proxy_cache_path  /var/www/cache levels=1:2 keys_zone=map:8m max_size=1g inactive=24h;
 
 server {
diff --git a/http.d/nxt.shad.moe b/http.d/nxt.shad.moe
index 7613c18..fa7a11d 100644
--- a/http.d/nxt.shad.moe
+++ b/http.d/nxt.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name nxt.shad.moe www.nxt.shad.moe;
diff --git a/http.d/play.gpoc-modded.konpeki.solutions b/http.d/play.gpoc-modded.konpeki.solutions
index 0144117..bb0f1d0 100644
--- a/http.d/play.gpoc-modded.konpeki.solutions
+++ b/http.d/play.gpoc-modded.konpeki.solutions
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name play.gpoc-modded.shad.moe www.play.gpoc-modded.shad.moe;
diff --git a/http.d/play.gpoc.konpeki.solutions b/http.d/play.gpoc.konpeki.solutions
index 51043f8..1c8c72b 100644
--- a/http.d/play.gpoc.konpeki.solutions
+++ b/http.d/play.gpoc.konpeki.solutions
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name play.gpoc.shad.moe www.play.gpoc.shad.moe;
diff --git a/http.d/rss.shad.moe b/http.d/rss.shad.moe
index 4f08266..de7817a 100644
--- a/http.d/rss.shad.moe
+++ b/http.d/rss.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name rss.shad.moe www.rss.shad.moe;
diff --git a/http.d/theshadoweevee.konpeki.solutions b/http.d/theshadoweevee.konpeki.solutions
index eac973b..f09b4ae 100644
--- a/http.d/theshadoweevee.konpeki.solutions
+++ b/http.d/theshadoweevee.konpeki.solutions
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name theshadoweevee.konpeki.solutions www.theshadoweevee.konpeki.solutions;
diff --git a/http.d/vault.shad.moe b/http.d/vault.shad.moe
index a9b633b..643c333 100644
--- a/http.d/vault.shad.moe
+++ b/http.d/vault.shad.moe
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name vault.shad.moe www.vault.shad.moe;
diff --git a/http.d/wc.konpeki.solutions b/http.d/wc.konpeki.solutions
index 9c865b1..95a4dee 100644
--- a/http.d/wc.konpeki.solutions
+++ b/http.d/wc.konpeki.solutions
@@ -1,6 +1,3 @@
-# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
-include snippets/global/common-boilerplate.conf;
-
 server {
 
     server_name *.konpeki.solutions;
diff --git a/nginx.conf b/nginx.conf
index e671c85..17513c5 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -24,6 +24,10 @@ events {
 }
 
 http {
+
+	# Include a common header (Upgrade Websockets, Add Upstreams, Upgrade HTTP to HTTPS)
+	include snippets/global/common-boilerplate.conf;
+
 	# Includes mapping of file name extensions to MIME types of responses
 	# and defines the default type.
 	include /etc/nginx/mime.types;
@@ -38,7 +42,7 @@ http {
 	# error code 413. Set to 0 to disable. Default is '1m'.
 	client_max_body_size 1G;
 
-	client_body_timeout 120s
+	client_body_timeout 120s;
 
 	# Sendfile copies data between one FD and other from within the kernel,
 	# which is more efficient than read() + write(). Default is off.
diff --git a/snippets/global/common-boilerplate.conf b/snippets/global/common-boilerplate.conf
index 3cfdbfd..d0eb53f 100644
--- a/snippets/global/common-boilerplate.conf
+++ b/snippets/global/common-boilerplate.conf
@@ -1,8 +1,8 @@
 # Upgrade Websocket Connections
-include snippets/websocket-upgrade.conf;
+include snippets/global/websocket-upgrade.conf;
 
 # Add Upstreams Master List
-include snippets/upstreams-list.conf;
+include snippets/proxy/upstreams-list.conf;
 
 # Upgrade HTTP Connections to HTTPS
-include snippets/upgrade-http.conf;
\ No newline at end of file
+include snippets/global/upgrade-http.conf;
\ No newline at end of file
diff --git a/snippets/global/common-ssl.conf b/snippets/global/common-ssl.conf
index ea90a59..ff54e5c 100644
--- a/snippets/global/common-ssl.conf
+++ b/snippets/global/common-ssl.conf
@@ -5,18 +5,18 @@ listen 443      ssl;
 listen [::]:443 ssl;
 
 # Listen on port 443 with quic (IPv4/IPv6)
-listen 443      quic reuseport;                     
-listen [::]:443 quic reuseport;
+#listen 443      quic reuseport;                     
+#listen [::]:443 quic reuseport;
 
 # Enable http2
 http2 on;
 
 # Enable http3
-http3 on;
+#http3 on;
 
 # Enable QUIC Functions
-quic_retry on;
-add_header Alt-Svc 'h3=":443"; ma=86400';
+#quic_retry on;
+#add_header Alt-Svc 'h3=":443"; ma=86400';
 
 # Set SSL Session Parameters
 ssl_session_timeout 1d;
@@ -39,4 +39,4 @@ ssl_stapling on;
 ssl_stapling_verify on;
 
 # Include a resolver for OSCP Stapling
-include snippets/resolver.conf;
\ No newline at end of file
+include snippets/global/resolver.conf;
\ No newline at end of file
diff --git a/snippets/global/errors/http-cat-error-pages.conf b/snippets/global/errors/http-cat-error-pages.conf
index ff3b84b..2f87072 100644
--- a/snippets/global/errors/http-cat-error-pages.conf
+++ b/snippets/global/errors/http-cat-error-pages.conf
@@ -27,4 +27,4 @@ location ~ ^/test-status-cats/(?<cat>.*)$ {
 }
 
 # Include a resolver for domain resolution
-include snippets/resolver.conf;
\ No newline at end of file
+include snippets/global/resolver.conf;
\ No newline at end of file
diff --git a/snippets/global/upgrade-http.conf b/snippets/global/upgrade-http.conf
index f231a61..2ab60e9 100644
--- a/snippets/global/upgrade-http.conf
+++ b/snippets/global/upgrade-http.conf
@@ -2,7 +2,7 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name *;
+    server_name _;
 
     location / {
         return 301 https://$host$request_uri;
diff --git a/snippets/proxy/upstreams-list.conf b/snippets/proxy/upstreams-list.conf
index 1325c9c..5ab12b0 100644
--- a/snippets/proxy/upstreams-list.conf
+++ b/snippets/proxy/upstreams-list.conf
@@ -14,7 +14,7 @@ upstream bsky {
 }
 
 upstream dash {
-    server 192.168.1.210:3000
+    server 192.168.1.210:3000;
 }
 
 upstream freshrss {