diff --git a/conf/.env b/conf/.env
index a09f37d6..09d0d722 100644
--- a/conf/.env
+++ b/conf/.env
@@ -1,17 +1,68 @@
+## Crypto
+APP_KEY=__APP_KEY__
+
+## General Settings
 APP_NAME=__APP__
 APP_ENV=production
-APP_KEY=__APP_KEY__
 APP_DEBUG=false
-
 APP_URL=https://__DOMAIN__
 ADMIN_DOMAIN="__DOMAIN__"
 APP_DOMAIN="__DOMAIN__"
 SESSION_DOMAIN="${APP_DOMAIN}"
-SESSION_SECURE_COOKIE=true
-TRUST_PROXIES="*"
 
-LOG_CHANNEL=stack
+OPEN_REGISTRATION=true
+ENFORCE_EMAIL_VERIFICATION=true
+PF_MAX_USERS=1000
+OAUTH_ENABLED=true
 
+APP_TIMEZONE=UTC
+APP_LOCALE=en
+
+## Pixelfed Tweaks
+LIMIT_ACCOUNT_SIZE=true
+MAX_ACCOUNT_SIZE=1000000
+MAX_PHOTO_SIZE=15000
+MAX_AVATAR_SIZE=2000
+MAX_CAPTION_LENGTH=500
+MAX_BIO_LENGTH=125
+MAX_NAME_LENGTH=30
+MAX_ALBUM_LENGTH=4
+IMAGE_QUALITY=80
+PF_OPTIMIZE_IMAGES=true
+PF_OPTIMIZE_VIDEOS=true
+ADMIN_ENV_EDITOR=true
+ACCOUNT_DELETION=true
+ACCOUNT_DELETE_AFTER=false
+MAX_LINKS_PER_POST=0
+
+## Instance
+#INSTANCE_DESCRIPTION=
+INSTANCE_PUBLIC_HASHTAGS=false
+#INSTANCE_CONTACT_EMAIL=
+INSTANCE_PUBLIC_LOCAL_TIMELINE=false
+#BANNED_USERNAMES=
+STORIES_ENABLED=false
+RESTRICTED_INSTANCE=false
+
+## Mail
+MAIL_DRIVER=smtp
+MAIL_HOST=localhost
+MAIL_PORT=25
+MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__"
+MAIL_FROM_NAME="Pixelfed"
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+## Databases (MySQL)
+#DB_CONNECTION=mysql
+#DB_HOST=127.0.0.1
+#DB_PORT=3306
+#DB_DATABASE=pixelfed
+#DB_USERNAME=pixelfed
+#DB_PASSWORD=pixelfed
+
+## Databases (Postgres)
 DB_CONNECTION=pgsql
 DB_HOST=127.0.0.1
 DB_PORT=5432
@@ -19,51 +70,76 @@ DB_DATABASE=__DB_NAME__
 DB_USERNAME=__DB_USER__
 DB_PASSWORD=__DB_PWD__
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=redis
-SESSION_DRIVER=redis
-QUEUE_DRIVER=redis
-
+## Cache (Redis)
+REDIS_CLIENT=phpredis
 REDIS_SCHEME=tcp
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
-MAIL_HOST=localhost
-MAIL_PORT=25
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__"
-MAIL_FROM_NAME="Pixelfed"
-
-OPEN_REGISTRATION=true
-ENFORCE_EMAIL_VERIFICATION=true
-PF_MAX_USERS=1000
-
-MAX_PHOTO_SIZE=15000
-MAX_CAPTION_LENGTH=150
-MAX_ALBUM_LENGTH=4
+## EXPERIMENTS 
+EXP_LC=false
+EXP_REC=false
+EXP_LOOPS=false
 
+## ActivityPub Federation
 ACTIVITY_PUB=true
 AP_REMOTE_FOLLOW=true
 AP_INBOX=true
 AP_SHAREDINBOX=true
+AP_OUTBOX=true
+ATOM_FEEDS=true
+NODEINFO=true
+WEBFINGER=true
 
-# Set these "true" to enable federation.
-# You might need to also run:
-#   php artisan cache:clear
-#   php artisan optimize:clear
-#   php artisan optimize
+## S3
+FILESYSTEM_DRIVER=local
+FILESYSTEM_CLOUD=s3
+PF_ENABLE_CLOUD=false
+#AWS_ACCESS_KEY_ID=
+#AWS_SECRET_ACCESS_KEY=
+#AWS_DEFAULT_REGION=
+#AWS_BUCKET=
+#AWS_URL=
+#AWS_ENDPOINT=
+#AWS_USE_PATH_STYLE_ENDPOINT=false
 
+## Horizon
+HORIZON_DARKMODE=false
+
+## COSTAR - Confirm Object Sentiment Transform and Reduce
 PF_COSTAR_ENABLED=true
 CS_BLOCKED_DOMAINS='gab.com,gab.ai,develop.gab.com'
 CS_CW_DOMAINS='switter.at'
 CS_UNLISTED_DOMAINS='example.org,example.net,example.com'
 
-## Optional 
-#HORIZON_DARKMODE=false  # Horizon theme darkmode
-#HORIZON_EMBED=false  # Single Docker Container mode 
+# Media
+MEDIA_EXIF_DATABASE=false
 
-ADMIN_ENV_EDITOR=true
+## Logging
+LOG_CHANNEL=stack
+
+## Image
+IMAGE_DRIVER=imagick
+
+## Broadcasting
+BROADCAST_DRIVER=log  # log driver for local development
+
+## Cache
+CACHE_DRIVER=redis
+
+## Purify
+RESTRICT_HTML_TYPES=true
+
+## Queue
+QUEUE_DRIVER=redis
+
+## Session
+SESSION_DRIVER=redis
+
+## Trusted Proxy
+TRUST_PROXIES="*"
+
+## Passport
+#PASSPORT_PRIVATE_KEY=
+#PASSPORT_PUBLIC_KEY=