diff --git a/.env b/.env
old mode 100755
new mode 100644
index 416a088..569b305
--- a/.env
+++ b/.env
@@ -13,18 +13,6 @@ TZ=America/Chicago
 ADMIN_USERNAME=akanealw
 ADMIN_PASSWORD=8ung1e1!
 
-# COLLABORA CODE
-COLLABORA_DOMAIN=collabora.akanealw.com
-COLLABORA_USERNAME=akanealw
-COLLABORA_PASSWORD=rET7trWieaYVPCft*zLR
-
-#OWNCLOUD
-OWNCLOUD_VERSION=latest
-OWNCLOUD_DOMAIN=192.168.1.4:8092
-OWNCLOUD_TRUSTED_DOMAINS=192.168.1.4,owncloud.akanealw.com
-ADMIN_USERNAME=akanealw
-ADMIN_PASSWORD=pknFeqRqFc3RA5N6!rDL
-
 #PIHOLE
 FTLCONF_LOCAL_IPV4=192.168.1.4
 REV_SERVER=false
@@ -37,9 +25,6 @@ PIHOLE_WEBPORT=8000
 WEBTHEME=default-dark
 WEBPASSWORD=8PVkCY4FbyKWEACiG22^
 
-#SEARXNG
-SEARXNG_HOSTNAME=search.akanealw.com
-
 #WIREGUARD
-WG_HOST=162.222.10.80
-WG_PASSWORD=wBJz7wuazWWmbfTGhM7v
+WG_HOST=akanealw.com
+WG_PASSWORD=wBJz7wuazWWmbfTGhM7v
\ No newline at end of file
diff --git a/proxy/authelia/add-to-protected-domains.conf b/authelia/add-to-protected-domains.conf
similarity index 100%
rename from proxy/authelia/add-to-protected-domains.conf
rename to authelia/add-to-protected-domains.conf
diff --git a/proxy/authelia/auth.domain.conf b/authelia/auth.domain.conf
similarity index 100%
rename from proxy/authelia/auth.domain.conf
rename to authelia/auth.domain.conf
diff --git a/proxy/authelia/configuration.yml b/authelia/configuration.yml
similarity index 100%
rename from proxy/authelia/configuration.yml
rename to authelia/configuration.yml
diff --git a/proxy/authelia/users_database.yml b/authelia/users_database.yml
similarity index 100%
rename from proxy/authelia/users_database.yml
rename to authelia/users_database.yml
diff --git a/compose.yml b/compose.yml
index 3a9d0d5..f5b11b5 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,289 +1,205 @@
 version: '3'
 
 services:
-  collabora:
-    container_name: collabora
-    image: collabora/code:22.05.14.3.1
+  archivebox:
+    container_name: archivebox
+    image: archivebox/archivebox:dev
+    command: server --quick-init 0.0.0.0:8000
     environment:
-      - alias_group1=${COLLABORA_DOMAIN}
-      - username=${COLLABORA_USERNAME}
-      - password=${COLLABORA_PASSWORD}
+      - ALLOWED_HOSTS=*
+      - MEDIA_MAX_SIZE=750m
+      - PUBLIC_ADD_VIEW=True
+      - PUBLIC_INDEX=True
+      - PUBLIC_SNAPSHOTS=False
+      - SAVE_TITLE=True
+      - SAVE_FAVICON=True
+      - SAVE_WGET=False
+      - SAVE_WARC=False
+      - SAVE_PDF=True
+      - SAVE_SCREENSHOT=True
+      - SAVE_DOM=False
+      - SAVE_SINGLEFILE=True
+      - SAVE_READABILITY=True
+      - SAVE_MERCURY=False
+      - SAVE_GIT=False
+      - SAVE_MEDIA=False
+      - SAVE_ARCHIVE_DOT_ORG=False
     ports:
-      - 9980:9980
+      - 8000:8000
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/collabora/code:/etc/loolwsd
+      - ${DOCKER_CONFIGS}/archivebox/data:/data
 
-  freshrss:
-    container_name: freshrss
-    image: freshrss/freshrss:latest
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - CRON_MIN=*/20
-      - TZ=${TZ}
-    depends_on:
-      - freshrss-db
-    ports:
-      - 8088:80
-    restart: unless-stopped
-    volumes:
-      - ${DOCKER_CONFIGS}/freshrss/data:/var/www/FreshRSS/data
-      - ${DOCKER_CONFIGS}/freshrss/extensions:/var/www/FreshRSS/extensions
-      - /etc/localtime:/etc/localtime:ro
-
-  freshrss-db:
-    container_name: freshrss-db
-    image: postgres:12-alpine
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - POSTGRES_USER=freshrss
-      - POSTGRES_PASSWORD=freshrss
-      - POSTGRES_DB=freshrss
-    restart: unless-stopped
-    volumes:
-      - ${DOCKER_CONFIGS}/freshrss/db/data:/var/lib/postgresql/data
-      - /etc/localtime:/etc/localtime:ro
-
-  hbbr:
-    container_name: hbbr
-    image: rustdesk/rustdesk-server:latest
-    command: hbbr -k _
-    ports:
-      - 21117:21117
-      - 21119:21119
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/rustdesk/hbbr:/root
-
-  hbbs:
-    container_name: hbbs
-    image: rustdesk/rustdesk-server:latest
-    command: hbbs -r rustdesk.akanealw.com:21117 -k _
-    depends_on:
-      - hbbr
-    ports:
-      - 21115:21115
-      - 21116:21116
-      - 21116:21116/udp
-      - 21118:21118
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/rustdesk/hbbs:/root
-
-  olivetin:
-    container_name: olivetin
-    image: jamesread/olivetin:latest
-    user: root
-    ports:
-      - 1337:1337
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/olivetin/config:/config
-      - /home/akanealw/scripts:/scripts:ro
-      - /home/akanealw/.ssh/proxmox2:/root/.ssh/proxmox2:ro
-      - /home/akanealw/.ssh/dockerserver:/root/.ssh/dockerserver:ro
-
-  owncloud:
-    container_name: owncloud
-    image: owncloud/server:latest
-    environment:
-      - OWNCLOUD_DOMAIN=${OWNCLOUD_DOMAIN}
-      - OWNCLOUD_TRUSTED_DOMAINS=${OWNCLOUD_TRUSTED_DOMAINS}
-      - OWNCLOUD_DB_TYPE=mysql
-      - OWNCLOUD_DB_NAME=owncloud
-      - OWNCLOUD_DB_USERNAME=owncloud
-      - OWNCLOUD_DB_PASSWORD=owncloud
-      - OWNCLOUD_DB_HOST=owncloud-mariadb
-      - OWNCLOUD_ADMIN_USERNAME=${ADMIN_USERNAME}
-      - OWNCLOUD_ADMIN_PASSWORD=${ADMIN_PASSWORD}
-      - OWNCLOUD_MYSQL_UTF8MB4=true
-      - OWNCLOUD_REDIS_ENABLED=true
-      - OWNCLOUD_REDIS_HOST=owncloud-redis
-    healthcheck:
-      test: ["CMD", "/usr/bin/healthcheck"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    depends_on:
-      - owncloud-mariadb
-      - owncloud-redis
-    ports:
-      - 8092:8080
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/owncloud/files:/mnt/data
-
-  owncloud-mariadb:
-    container_name: owncloud-mariadb
-    image: mariadb:10.6
-    environment:
-      - MYSQL_ROOT_PASSWORD=owncloud
-      - MYSQL_USER=owncloud
-      - MYSQL_PASSWORD=owncloud
-      - MYSQL_DATABASE=owncloud
-    command: ["--max-allowed-packet=128M", "--innodb-log-file-size=64M"]
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-u", "root", "--password=owncloud"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/owncloud/mariadb/mysql:/var/lib/mysql
-
-  owncloud-redis:
-    container_name: owncloud-redis
-    image: redis:6
-    command: ["--databases", "1"]
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/owncloud/redis:/data
-
-  piped:
-    container_name: piped
-    image: 1337kavin/piped:latest
-    depends_on:
-      - piped-postgres
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/piped/config/config.properties:/app/config.properties:ro
-
-  piped-frontend:
-    container_name: piped-frontend
-    image: 1337kavin/piped-frontend:latest
-    entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/pipedapi.akanealw.com/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g "daemon off;"'
-    depends_on:
-      - piped
-    restart: always
-
-  piped-nginx:
-    container_name: piped-nginx
-    image: nginx:mainline-alpine
-    depends_on:
-      - piped
-      - piped-proxy
-      - piped-frontend
-    ports:
-      - 8585:80
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/piped/config/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ${DOCKER_CONFIGS}/piped/config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro
-      - ${DOCKER_CONFIGS}/piped/config/pipedproxy.conf:/etc/nginx/conf.d/pipedproxy.conf:ro
-      - ${DOCKER_CONFIGS}/piped/config/pipedfrontend.conf:/etc/nginx/conf.d/pipedfrontend.conf:ro
-      - ${DOCKER_CONFIGS}/piped/config/ytproxy.conf:/etc/nginx/snippets/ytproxy.conf:ro
-      - ${DOCKER_CONFIGS}/piped/piped-proxy:/var/run/ytproxy
-
-  piped-postgres:
-    container_name: piped-postgres
-    image: postgres:15
-    environment:
-      - POSTGRES_DB=piped
-      - POSTGRES_USER=piped
-      - POSTGRES_PASSWORD=Vee0caiv8ieceeDae1aepheirophai
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/piped/data/db:/var/lib/postgresql/data
-
-  piped-proxy:
-    container_name: piped-proxy
-    image: 1337kavin/piped-proxy:latest
-    environment:
-      - UDS=1
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/piped/piped-proxy:/app/socket
-
-  rss-bridge:
-    container_name: rss-bridge
-    image: rssbridge/rss-bridge:latest
-    ports:
-      - 3005:80
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/rss-bridge/config:/config
-
-  shlink-server:
-    container_name: shlink-server
-    image: shlinkio/shlink:stable
+  authelia:
+    container_name: authelia
+    image: authelia/authelia
     environment:
       - TZ=${TZ}
-      - DEFAULT_DOMAIN=aknlw.com
-      - IS_HTTPS_ENABLED=true
-      - GEOLITE_LICENSE_KEY=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
-      - DB_DRIVER=maria
-      - DB_USER=shlink
-      - DB_NAME=shlink
-      - DB_PASSWORD=OoDahdohv6
-      - DB_HOST=shlink-database
-      - INITIAL_API_KEY=eiy5ees0AiVoh8eeWa7U
+    ports:
+      - 9091:9091
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/authelia/config:/config
+
+  cronicle:
+    container_name: cronicle
+    hostname: cronicle
+    image: bluet/cronicle-docker:latest
+    environment:
+     - TZ=${TZ}
+     - CRONICLE_base_app_url=http://192.168.1.4
+     - CRONICLE_master 1
+    network_mode: "host"
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /root/.ssh:/root/.ssh
+      - /home/akanealw/scripts/cronicle:/scripts
+      - ${DOCKER_CONFIGS}/cronicle/data:/opt/cronicle/data
+      - ${DOCKER_CONFIGS}/cronicle/logs:/opt/cronicle/logs
+      - ${DOCKER_CONFIGS}/cronicle/plugins:/opt/cronicle/plugins
+      - ${DOCKER_CONFIGS}/cronicle/workloads/app:/app
+      - ${DOCKER_CONFIGS}/cronicle/data/config.json:/opt/cronicle/conf/config.json
+
+  crowdsec:
+    container_name: crowdsec
+    image: crowdsecurity/crowdsec
+    environment:
+      - COLLECTIONS=crowdsecurity/sshd crowdsecurity/nginx crowdsecurity/nginx-proxy-manager
+      - BOUNCER_KEY_OPENWRT=e5eafa00ff6db5164b12426c6cfb6b62
+    ports:
+      - 8280:8080
+      - 6260:6060
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/crowdsec/config:/etc/crowdsec
+      - ${DOCKER_CONFIGS}/crowdsec/config/acquis.d:/etc/crowdsec/acquis.d
+      - ${DOCKER_CONFIGS}/crowdsec/config/acquis.yaml:/etc/crowdsec/acquis.yaml
+      - ${DOCKER_CONFIGS}/crowdsec/data:/var/lib/crowdsec/data
+      - ${DOCKER_CONFIGS}/nginxproxymanager/data/logs:/logs/nginx:ro
+      - /var/log/auth.log:/logs/auth.log:ro
+      - /var/log/syslog:/logs/syslog:ro
+
+  nginxproxymanager:
+    container_name: nginxproxymanager
+    image: jc21/nginx-proxy-manager:2.10.4
+    environment:
+      - X_FRAME_OPTIONS=sameorigin
+      - DB_SQLITE_FILE=/data/database.sqlite
+    ports:
+      - 443:443/tcp
+      - 80:80/tcp
+      - 81:81/tcp
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/nginxproxymanager/data:/data
+      - ${DOCKER_CONFIGS}/nginxproxymanager/letsencrypt:/etc/letsencrypt
+      - ${DOCKER_CONFIGS}/nginxproxymanager/snippets:/snippets:ro
+      - /etc/localtime:/etc/localtime:ro
+
+  orbital-sync:
+    container_name: orbital-sync
+    image: mattwebbio/orbital-sync:1
+    environment:
+      - PRIMARY_HOST_BASE_URL=http://192.168.1.2:80
+      - PRIMARY_HOST_PASSWORD=${WEBPASSWORD}
+      - SECONDARY_HOST_1_BASE_URL=http://192.168.1.3:80
+      - SECONDARY_HOST_1_PASSWORD=${WEBPASSWORD}
+      - SECONDARY_HOST_2_BASE_URL=http://192.168.1.4:8180
+      - SECONDARY_HOST_2_PASSWORD=${WEBPASSWORD}
+      - INTERVAL_MINUTES=30
+    restart: always
+
+  pihole:
+    container_name: pihole
+    image: cbcrowe/pihole-unbound:latest
+    hostname: ${HOSTNAME}
+    domainname: ${DOMAIN_NAME}
+    environment:
+      - FTLCONF_LOCAL_IPV4=${FTLCONF_LOCAL_IPV4}
+      - TZ=${TZ}
+      - WEBPASSWORD=${WEBPASSWORD}
+      - WEBTHEME=${WEBTHEME:-default-dark}
+      - REV_SERVER=${REV_SERVER:-false}
+      - REV_SERVER_TARGET=${REV_SERVER_TARGET}
+      - REV_SERVER_DOMAIN=${REV_SERVER_DOMAIN}
+      - REV_SERVER_CIDR=${REV_SERVER_CIDR}
+      - PIHOLE_DNS_=127.0.0.1#5335
+      - DNSSEC="true"
+      - DNSMASQ_LISTENING=single
+    ports:
+      - 53:53
+      - 53:53/udp
+      - 8180:80
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/pihole/unbound:/etc/pihole:rw
+      - ${DOCKER_CONFIGS}/pihole/dnsmasq-unbound:/etc/dnsmasq.d:rw
+
+  vaultwarden:
+    container_name: vaultwarden
+    image: vaultwarden/server:latest
+    environment:
+      - TZ=${TZ}
+      - ADMIN_TOKEN=h/oRssGu83I1E1WQGiSchYMAJnM0JcDXmjeI/A3QgMCasn/IK9zZldH5FXim0rSi
+      - DATABASE_URL=data/db.sqlite3
+      - DISABLE_ADMIN_TOKEN=false
+      - DOMAIN=https://bitwarden.akanealw.com
+      - ENABLE_DB_WAL=true
+      - INVITATIONS_ALLOWED=false
+      - SHOW_PASSWORD_HINT=false
+      - SIGNUPS_ALLOWED=false
+      - SIGNUPS_VERIFY=false
+      - SMTP_PORT=587
+      - SMTP_SSL=true
+    ports:
+      - 8089:80
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/vaultwarden:/data
+      - /etc/localtime:/etc/localtime:ro
+
+  vaultwarden-backup:
+    container_name: vaultwarden-backup
+    image: bruceforce/vaultwarden-backup
+    environment:
+      - BACKUP_DIR=/data/backups
+      - CRON_TIME=15 * * * *
+      - TIMESTAMP=true
+      - UID=${PUID}
+      - GID=${PGID}
     depends_on:
-      - shlink-database
-    ports:
-      - 8380:8080
+      - vaultwarden
+    init: true
     restart: always
+    volumes:
+      - /home/akanealw/docker/appdata/vaultwarden:/data
+      - /home/akanealw/backups/vaultwardenbackups:/data/backups
 
-  shlink-database:
-    container_name: shlink-database
-    image: mariadb:10.8
+  wg-easy:
+    container_name: wg-easy      
+    image: weejewel/wg-easy
     environment:
-      - MARIADB_ROOT_PASSWORD=coo6Pooch2
-      - MARIADB_DATABASE=shlink
-      - MARIADB_USER=shlink
-      - MARIADB_PASSWORD=OoDahdohv6
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/shlink/mariadb/db_data:/var/lib/mysql
-
-  shlink-web-client:
-    container_name: shlink-web-client
-    image: shlinkio/shlink-web-client
+      - WG_HOST=${WG_HOST}
+      - PASSWORD=${WG_PASSWORD}
+      - WG_DEFAULT_DNS=162.222.10.80, 9.9.9.9
+      - WG_PORT=51830
+      - WG_PERSISTENT_KEEPALIVE=25
+      - WG_DEFAULT_ADDRESS=10.8.0.x
+      - WG_MTU=1420
+      - WG_ALLOWED_IPS=10.8.0.0/24
+    cap_add:
+      - NET_ADMIN
+      - SYS_MODULE
+    sysctls:
+      - net.ipv4.ip_forward=1
+      - net.ipv4.conf.all.src_valid_mark=1
     ports:
-      - 8381:80
+      - 51830:51820/udp
+      - 51831:51821
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/shlink/servers.json:/usr/share/nginx/html/servers.json
-
-  syncthing-relay-discovery:
-    container_name: syncthing-relay-discovery
-    image: t4skforce/syncthing-relay-discovery:latest
-    environment:
-      RELAY_OPTS:
-      DISC_OPTS: 
-      POOLS:
-    ports:
-      - 22067:22067
-      - 22026:22026
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/syncthing-relay-discovery:/home/syncthing/certs
-
-  trilium:
-    container_name: trilium
-    image: zadam/trilium
-    environment:
-      - TRILIUM_DATA_DIR=/home/node/trilium-data
-    ports:
-      - 8055:8080
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/trilium/data:/home/node/trilium-data
-
-  uptime-kuma:
-    container_name: uptime-kuma
-    image: louislam/uptime-kuma:1
-    ports:
-      - 3001:3001
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/uptimekuma/data:/app/data
+      - ${DOCKER_CONFIGS}/wireguard:/etc/wireguard
 
 networks:
-  default:
+  proxy:
diff --git a/proxy/crowdsec/acquis.yaml b/crowdsec/acquis.yaml
similarity index 100%
rename from proxy/crowdsec/acquis.yaml
rename to crowdsec/acquis.yaml
diff --git a/proxy/ddclient/ddclient.conf b/ddclient/ddclient.conf
similarity index 100%
rename from proxy/ddclient/ddclient.conf
rename to ddclient/ddclient.conf
diff --git a/proxy/npmsnippets/authelia-authrequest.conf b/npmsnippets/authelia-authrequest.conf
similarity index 100%
rename from proxy/npmsnippets/authelia-authrequest.conf
rename to npmsnippets/authelia-authrequest.conf
diff --git a/proxy/npmsnippets/authelia-location.conf b/npmsnippets/authelia-location.conf
similarity index 100%
rename from proxy/npmsnippets/authelia-location.conf
rename to npmsnippets/authelia-location.conf
diff --git a/proxy/npmsnippets/authelia-proxy.conf b/npmsnippets/authelia-proxy.conf
similarity index 100%
rename from proxy/npmsnippets/authelia-proxy.conf
rename to npmsnippets/authelia-proxy.conf
diff --git a/olivetin/config.yaml b/olivetin/config.yaml
deleted file mode 100644
index 7a5700f..0000000
--- a/olivetin/config.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-  - title: "Restart Gluetun and Services"
-    shell: /scripts/olivetin/restart-gluetun-and-services.sh
-    timeout: 75
-
-  - title: "Restart qBittorrent"
-    shell: /scripts/olivetin/restart-qbittorrent.sh
-    timeout: 15
-
-  - title: "Restart SABnzbd"
-    shell: /scripts/olivetin/restart-sabnzbd.sh
-    timeout: 15
-
-  - title: "Restart JDownloader"
-    shell: /scripts/olivetin/restart-jdownloader.sh
-    timeout: 15
-
-  - title: "Shutdown Proxmox1"
-    shell: /scripts/olivetin/shutdown-proxmox1.sh
-    timeout: 15
-
-  - title: "Wake Proxmox1"
-    shell: /scripts/olivetin/wake-proxmox1.sh
-    timeout: 15
diff --git a/piped/config.properties b/piped/config.properties
deleted file mode 100644
index 13e9419..0000000
--- a/piped/config.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# The port to Listen on.
-PORT: 8080
-
-# The number of workers to use for the server
-HTTP_WORKERS: 2
-
-# Proxy
-PROXY_PART: https://pipedproxy.akanealw.com
-
-# Outgoing HTTP Proxy - eg: 127.0.0.1:8118
-#HTTP_PROXY: 127.0.0.1:8118
-
-# Captcha Parameters
-CAPTCHA_BASE_URL: https://api.capmonster.cloud/
-CAPTCHA_API_KEY: INSERT_HERE
-
-# Public API URL
-API_URL: https://pipedapi.akanealw.com
-
-# Public Frontend URL
-FRONTEND_URL: https://piped.akanealw.com
-
-# Enable haveibeenpwned compromised password API
-COMPROMISED_PASSWORD_CHECK: true
-
-# Disable Registration
-DISABLE_REGISTRATION: false
-
-# Feed Retention Time in Days
-FEED_RETENTION: 30
-
-# Hibernate properties
-hibernate.connection.url: jdbc:postgresql://piped-postgres:5432/piped
-hibernate.connection.driver_class: org.postgresql.Driver
-hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
-hibernate.connection.username: piped
-hibernate.connection.password: Vee0caiv8ieceeDae1aepheirophai
diff --git a/piped/nginx.conf b/piped/nginx.conf
deleted file mode 100644
index 2ba7091..0000000
--- a/piped/nginx.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-user root;
-worker_processes auto;
-
-error_log /var/log/nginx/error.log notice;
-pid /var/run/nginx.pid;
-
-
-events {
-    worker_connections 1024;
-}
-
-
-http {
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    server_names_hash_bucket_size 128;
-
-    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-    '$status $body_bytes_sent "$http_referer" '
-    '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log /var/log/nginx/access.log main;
-
-    sendfile on;
-    tcp_nodelay on;
-
-    keepalive_timeout 65;
-
-    resolver 127.0.0.11 ipv6=off valid=10s;
-
-    include /etc/nginx/conf.d/*.conf;
-}
diff --git a/piped/pipedapi.conf b/piped/pipedapi.conf
deleted file mode 100644
index c8e136c..0000000
--- a/piped/pipedapi.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-proxy_cache_path /tmp/pipedapi_cache levels=1:2 keys_zone=pipedapi:4m max_size=2g inactive=60m use_temp_path=off;
-
-server {
-    listen 80;
-    server_name pipedapi.akanealw.com;
-
-    set $backend "http://piped:8080";
-
-    location / {
-        proxy_cache pipedapi;
-        proxy_pass $backend;
-        proxy_http_version 1.1;
-        proxy_set_header Connection "keep-alive";
-    }
-}
diff --git a/piped/pipedfrontend.conf b/piped/pipedfrontend.conf
deleted file mode 100644
index e9d8de2..0000000
--- a/piped/pipedfrontend.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-server {
-    listen 80;
-    server_name piped.akanealw.com;
-
-    set $backend "http://piped-frontend:80";
-
-    location / {
-        proxy_pass $backend;
-        proxy_http_version 1.1;
-        proxy_set_header Connection "keep-alive";
-    }
-}
diff --git a/piped/pipedproxy.conf b/piped/pipedproxy.conf
deleted file mode 100644
index 3dbdb3d..0000000
--- a/piped/pipedproxy.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-server {
-    listen 80;
-    server_name pipedproxy.akanealw.com;
-
-    location ~ (/videoplayback|/api/v4/|/api/manifest/) {
-        include snippets/ytproxy.conf;
-        add_header Cache-Control private always;
-    }
-
-    location / {
-        include snippets/ytproxy.conf;
-        add_header Cache-Control "public, max-age=604800";
-    }
-}
diff --git a/piped/ytproxy.conf b/piped/ytproxy.conf
deleted file mode 100644
index 4fd36f1..0000000
--- a/piped/ytproxy.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-proxy_buffering on;
-proxy_buffers 1024 16k;
-proxy_set_header X-Forwarded-For "";
-proxy_set_header CF-Connecting-IP "";
-proxy_hide_header "alt-svc";
-sendfile on;
-sendfile_max_chunk 512k;
-tcp_nopush on;
-aio threads=default;
-aio_write on;
-directio 16m;
-proxy_hide_header Cache-Control;
-proxy_hide_header etag;
-proxy_http_version 1.1;
-proxy_set_header Connection keep-alive;
-proxy_max_temp_file_size 32m;
-access_log off;
-proxy_pass http://unix:/var/run/ytproxy/actix.sock;
diff --git a/proxy/.env b/proxy/.env
deleted file mode 100644
index 569b305..0000000
--- a/proxy/.env
+++ /dev/null
@@ -1,30 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=./appdata
-DOCKERGID=999
-DOCKERHOSTNAME=ProxyServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-ADMIN_USERNAME=akanealw
-ADMIN_PASSWORD=8ung1e1!
-
-#PIHOLE
-FTLCONF_LOCAL_IPV4=192.168.1.4
-REV_SERVER=false
-REV_SERVER_DOMAIN=
-REV_SERVER_TARGET=
-REV_SERVER_CIDR=
-HOSTNAME=piholeserver3
-DOMAIN_NAME=piholeserver3.lan
-PIHOLE_WEBPORT=8000
-WEBTHEME=default-dark
-WEBPASSWORD=8PVkCY4FbyKWEACiG22^
-
-#WIREGUARD
-WG_HOST=akanealw.com
-WG_PASSWORD=wBJz7wuazWWmbfTGhM7v
\ No newline at end of file
diff --git a/proxy/compose.yml b/proxy/compose.yml
deleted file mode 100644
index f5b11b5..0000000
--- a/proxy/compose.yml
+++ /dev/null
@@ -1,205 +0,0 @@
-version: '3'
-
-services:
-  archivebox:
-    container_name: archivebox
-    image: archivebox/archivebox:dev
-    command: server --quick-init 0.0.0.0:8000
-    environment:
-      - ALLOWED_HOSTS=*
-      - MEDIA_MAX_SIZE=750m
-      - PUBLIC_ADD_VIEW=True
-      - PUBLIC_INDEX=True
-      - PUBLIC_SNAPSHOTS=False
-      - SAVE_TITLE=True
-      - SAVE_FAVICON=True
-      - SAVE_WGET=False
-      - SAVE_WARC=False
-      - SAVE_PDF=True
-      - SAVE_SCREENSHOT=True
-      - SAVE_DOM=False
-      - SAVE_SINGLEFILE=True
-      - SAVE_READABILITY=True
-      - SAVE_MERCURY=False
-      - SAVE_GIT=False
-      - SAVE_MEDIA=False
-      - SAVE_ARCHIVE_DOT_ORG=False
-    ports:
-      - 8000:8000
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/archivebox/data:/data
-
-  authelia:
-    container_name: authelia
-    image: authelia/authelia
-    environment:
-      - TZ=${TZ}
-    ports:
-      - 9091:9091
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/authelia/config:/config
-
-  cronicle:
-    container_name: cronicle
-    hostname: cronicle
-    image: bluet/cronicle-docker:latest
-    environment:
-     - TZ=${TZ}
-     - CRONICLE_base_app_url=http://192.168.1.4
-     - CRONICLE_master 1
-    network_mode: "host"
-    restart: always
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /root/.ssh:/root/.ssh
-      - /home/akanealw/scripts/cronicle:/scripts
-      - ${DOCKER_CONFIGS}/cronicle/data:/opt/cronicle/data
-      - ${DOCKER_CONFIGS}/cronicle/logs:/opt/cronicle/logs
-      - ${DOCKER_CONFIGS}/cronicle/plugins:/opt/cronicle/plugins
-      - ${DOCKER_CONFIGS}/cronicle/workloads/app:/app
-      - ${DOCKER_CONFIGS}/cronicle/data/config.json:/opt/cronicle/conf/config.json
-
-  crowdsec:
-    container_name: crowdsec
-    image: crowdsecurity/crowdsec
-    environment:
-      - COLLECTIONS=crowdsecurity/sshd crowdsecurity/nginx crowdsecurity/nginx-proxy-manager
-      - BOUNCER_KEY_OPENWRT=e5eafa00ff6db5164b12426c6cfb6b62
-    ports:
-      - 8280:8080
-      - 6260:6060
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/crowdsec/config:/etc/crowdsec
-      - ${DOCKER_CONFIGS}/crowdsec/config/acquis.d:/etc/crowdsec/acquis.d
-      - ${DOCKER_CONFIGS}/crowdsec/config/acquis.yaml:/etc/crowdsec/acquis.yaml
-      - ${DOCKER_CONFIGS}/crowdsec/data:/var/lib/crowdsec/data
-      - ${DOCKER_CONFIGS}/nginxproxymanager/data/logs:/logs/nginx:ro
-      - /var/log/auth.log:/logs/auth.log:ro
-      - /var/log/syslog:/logs/syslog:ro
-
-  nginxproxymanager:
-    container_name: nginxproxymanager
-    image: jc21/nginx-proxy-manager:2.10.4
-    environment:
-      - X_FRAME_OPTIONS=sameorigin
-      - DB_SQLITE_FILE=/data/database.sqlite
-    ports:
-      - 443:443/tcp
-      - 80:80/tcp
-      - 81:81/tcp
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/nginxproxymanager/data:/data
-      - ${DOCKER_CONFIGS}/nginxproxymanager/letsencrypt:/etc/letsencrypt
-      - ${DOCKER_CONFIGS}/nginxproxymanager/snippets:/snippets:ro
-      - /etc/localtime:/etc/localtime:ro
-
-  orbital-sync:
-    container_name: orbital-sync
-    image: mattwebbio/orbital-sync:1
-    environment:
-      - PRIMARY_HOST_BASE_URL=http://192.168.1.2:80
-      - PRIMARY_HOST_PASSWORD=${WEBPASSWORD}
-      - SECONDARY_HOST_1_BASE_URL=http://192.168.1.3:80
-      - SECONDARY_HOST_1_PASSWORD=${WEBPASSWORD}
-      - SECONDARY_HOST_2_BASE_URL=http://192.168.1.4:8180
-      - SECONDARY_HOST_2_PASSWORD=${WEBPASSWORD}
-      - INTERVAL_MINUTES=30
-    restart: always
-
-  pihole:
-    container_name: pihole
-    image: cbcrowe/pihole-unbound:latest
-    hostname: ${HOSTNAME}
-    domainname: ${DOMAIN_NAME}
-    environment:
-      - FTLCONF_LOCAL_IPV4=${FTLCONF_LOCAL_IPV4}
-      - TZ=${TZ}
-      - WEBPASSWORD=${WEBPASSWORD}
-      - WEBTHEME=${WEBTHEME:-default-dark}
-      - REV_SERVER=${REV_SERVER:-false}
-      - REV_SERVER_TARGET=${REV_SERVER_TARGET}
-      - REV_SERVER_DOMAIN=${REV_SERVER_DOMAIN}
-      - REV_SERVER_CIDR=${REV_SERVER_CIDR}
-      - PIHOLE_DNS_=127.0.0.1#5335
-      - DNSSEC="true"
-      - DNSMASQ_LISTENING=single
-    ports:
-      - 53:53
-      - 53:53/udp
-      - 8180:80
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/pihole/unbound:/etc/pihole:rw
-      - ${DOCKER_CONFIGS}/pihole/dnsmasq-unbound:/etc/dnsmasq.d:rw
-
-  vaultwarden:
-    container_name: vaultwarden
-    image: vaultwarden/server:latest
-    environment:
-      - TZ=${TZ}
-      - ADMIN_TOKEN=h/oRssGu83I1E1WQGiSchYMAJnM0JcDXmjeI/A3QgMCasn/IK9zZldH5FXim0rSi
-      - DATABASE_URL=data/db.sqlite3
-      - DISABLE_ADMIN_TOKEN=false
-      - DOMAIN=https://bitwarden.akanealw.com
-      - ENABLE_DB_WAL=true
-      - INVITATIONS_ALLOWED=false
-      - SHOW_PASSWORD_HINT=false
-      - SIGNUPS_ALLOWED=false
-      - SIGNUPS_VERIFY=false
-      - SMTP_PORT=587
-      - SMTP_SSL=true
-    ports:
-      - 8089:80
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/vaultwarden:/data
-      - /etc/localtime:/etc/localtime:ro
-
-  vaultwarden-backup:
-    container_name: vaultwarden-backup
-    image: bruceforce/vaultwarden-backup
-    environment:
-      - BACKUP_DIR=/data/backups
-      - CRON_TIME=15 * * * *
-      - TIMESTAMP=true
-      - UID=${PUID}
-      - GID=${PGID}
-    depends_on:
-      - vaultwarden
-    init: true
-    restart: always
-    volumes:
-      - /home/akanealw/docker/appdata/vaultwarden:/data
-      - /home/akanealw/backups/vaultwardenbackups:/data/backups
-
-  wg-easy:
-    container_name: wg-easy      
-    image: weejewel/wg-easy
-    environment:
-      - WG_HOST=${WG_HOST}
-      - PASSWORD=${WG_PASSWORD}
-      - WG_DEFAULT_DNS=162.222.10.80, 9.9.9.9
-      - WG_PORT=51830
-      - WG_PERSISTENT_KEEPALIVE=25
-      - WG_DEFAULT_ADDRESS=10.8.0.x
-      - WG_MTU=1420
-      - WG_ALLOWED_IPS=10.8.0.0/24
-    cap_add:
-      - NET_ADMIN
-      - SYS_MODULE
-    sysctls:
-      - net.ipv4.ip_forward=1
-      - net.ipv4.conf.all.src_valid_mark=1
-    ports:
-      - 51830:51820/udp
-      - 51831:51821
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/wireguard:/etc/wireguard
-
-networks:
-  proxy:
diff --git a/rss-bridge/config.ini.php b/rss-bridge/config.ini.php
deleted file mode 100644
index 9499c60..0000000
--- a/rss-bridge/config.ini.php
+++ /dev/null
@@ -1,152 +0,0 @@
-; <?php exit; ?> DO NOT REMOVE THIS LINE
-
-; This file contains the default settings for RSS-Bridge. Do not change this
-; file, it will be replaced on the next update of RSS-Bridge! You can specify
-; your own configuration in 'config.ini.php' (copy this file).
-
-[system]
-
-; Only these bridges are available for feed production
-; How to enable all bridges: enabled_bridges[] = *
-enabled_bridges[] = CssSelectorBridge
-enabled_bridges[] = FeedMerge
-enabled_bridges[] = FeedReducerBridge
-enabled_bridges[] = Filter
-enabled_bridges[] = PCGamer
-enabled_bridges[] = Reddit
-enabled_bridges[] = SoundcloudBridge
-enabled_bridges[] = Telegram
-enabled_bridges[] = ThePirateBay
-enabled_bridges[] = TikTokBridge
-enabled_bridges[] = Twitch
-enabled_bridges[] = Twitter
-enabled_bridges[] = Youtube
-enabled_bridges[] = YouTubeCommunityTabBridge
-
-; Defines the timezone used by RSS-Bridge
-; Find a list of supported timezones at
-; https://www.php.net/manual/en/timezones.php
-; timezone = "UTC" (default)
-timezone = "UTC"
-
-; Display a system message to users.
-message = ""
-
-; Whether to enable debug mode.
-enable_debug_mode = false
-
-; Enable debug mode only for these permitted ip addresses
-; debug_mode_whitelist[] = 127.0.0.1
-; debug_mode_whitelist[] = 192.168.1.10
-
-; Whether to enable maintenance mode. If enabled, feed requests receive 503 Service Unavailable
-enable_maintenance_mode = false
-
-[http]
-timeout = 60
-useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0"
-
-; Max http response size in MB
-max_filesize = 20
-
-[cache]
-
-; Cache type: file, sqlite, memcached, array, null
-type = "file"
-
-; Allow users to specify custom timeout for specific requests.
-; true  = enabled
-; false = disabled (default)
-custom_timeout = false
-
-[admin]
-; Advertise an email address where people can reach the administrator.
-; This address is displayed on the main page, visible to everyone!
-; ""    = Disabled (default)
-email = ""
-
-; Advertise a contact Telegram url e.g. "https://t.me/elegantobjects"
-telegram = ""
-
-; Show Donation information for bridges if available.
-; This will display a 'Donate' link on the bridge view
-; and a "Donate" button in the HTML view of the bridges feed.
-; true  = enabled (default)
-; false = disabled
-donations = true
-
-[proxy]
-
-; Sets the proxy url (i.e. "tcp://192.168.0.0:32")
-; ""    = Proxy disabled (default)
-url = ""
-
-; Sets the proxy name that is shown on the bridge instead of the proxy url.
-; ""    = Show proxy url
-name = "Hidden proxy name"
-
-; Allow users to disable proxy usage for specific requests.
-; true  = enabled
-; false = disabled (default)
-by_bridge = false
-
-[authentication]
-
-; Enables basic authentication for all requests to this RSS-Bridge instance.
-;
-; Warning: You'll have to upgrade existing feeds after enabling this option!
-;
-; true  = enabled
-; false = disabled (default)
-enable = false
-
-username = "admin"
-
-; The password cannot be the empty string if authentication is enabled.
-password = ""
-
-; This will be used only for actions that require privileged access
-access_token = ""
-
-[error]
-
-; Defines how error messages are returned by RSS-Bridge
-;
-; "feed" = As part of the feed (default)
-; "http" = As HTTP error message
-; "none" = No errors are reported
-output = "feed"
-
-; Defines how often an error must occur before it is reported to the user
-report_limit = 1
-
-; --- Cache specific configuration ---------------------------------------------
-
-[FileCache]
-; The root folder to store files in.
-; "" = Use the cache folder in the repository (default)
-path = ""
-; Whether to actually delete files when purging. Can be useful to turn off to increase performance.
-enable_purge = true
-
-[SQLiteCache]
-; Filepath of the sqlite db file
-file = "cache.sqlite"
-; Whether to actually delete data when purging
-enable_purge = true
-; Busy wait in ms before timing out
-timeout = 5000
-
-[MemcachedCache]
-host = "localhost"
-port = 11211
-
-; --- Bridge specific configuration ------
-
-[DiscogsBridge]
-
-; Sets the personal access token for interactions with Discogs. When
-; provided, images can be included in generated feeds.
-;
-; "" = no token used (default)
-personal_access_token = ""
diff --git a/shlink/servers.json b/shlink/servers.json
deleted file mode 100644
index ef53c72..0000000
--- a/shlink/servers.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-    {
-      "name": "aknlw.com",
-      "url": "https://aknlw.com",
-      "apiKey": "eiy5ees0AiVoh8eeWa7U"
-    }
-]