12 files changed, 287 insertions, 299 deletions
diff --git a/docs/configuration/accounts.md b/docs/configuration/accounts.md
index e77bc92fc..edb647a1b 100644
--- a/docs/configuration/accounts.md
+++ b/docs/configuration/accounts.md
@@ -8,20 +8,19 @@
 ###########################
 
 # Config pertaining to creation and maintenance of accounts on the server, as well as defaults for new accounts.
-accounts:
 
-  # Bool. Do we want people to be able to just submit sign up requests, or do we want invite only?
-  # Options: [true, false]
-  # Default: true
-  openRegistration: true
+# Bool. Do we want people to be able to just submit sign up requests, or do we want invite only?
+# Options: [true, false]
+# Default: true
+accounts-registration-open: true
 
-  # Bool. Do sign up requests require approval from an admin/moderator before an account can sign in/use the server?
-  # Options: [true, false]
-  # Default: true
-  requireApproval: true
+# Bool. Do sign up requests require approval from an admin/moderator before an account can sign in/use the server?
+# Options: [true, false]
+# Default: true
+accounts-approval-required: true
 
-  # Bool. Are sign up requests required to submit a reason for the request (eg., an explanation of why they want to join the instance)?
-  # Options: [true, false]
-  # Default: true
-  reasonRequired: true
+# Bool. Are sign up requests required to submit a reason for the request (eg., an explanation of why they want to join the instance)?
+# Options: [true, false]
+# Default: true
+accounts-reason-required: true
 ```
diff --git a/docs/configuration/database.md b/docs/configuration/database.md
index 0c6cf692e..6acc2e9ec 100644
--- a/docs/configuration/database.md
+++ b/docs/configuration/database.md
@@ -8,7 +8,7 @@ By default, GoToSocial will use Postgres, but this is easy to change.
 
 SQLite, as the name implies, is the lightest database type that GoToSocial can use. It stores entries in a simple file format, usually in the same directory as the GoToSocial binary itself. SQLite is great for small instances and lower-powered machines like Raspberry Pi, where a dedicated database would be overkill.
 
-To configure GoToSocial to use SQLite, change `db.type` to `sqlite`. The `address` setting will then be a filename instead of an address, so you might want to change it to `sqlite.db` or something similar.
+To configure GoToSocial to use SQLite, change `db-type` to `sqlite`. The `address` setting will then be a filename instead of an address, so you might want to change it to `sqlite.db` or something similar.
 
 Note that the `:memory:` setting will use an *in-memory database* which will be wiped when your GoToSocial instance stops running. This is for testing only and is absolutely not suitable for running a proper instance, so *don't do this*.
 
@@ -18,7 +18,7 @@ Postgres is a heavier database format, which is useful for larger instances wher
 
 GoToSocial supports connecting to Postgres using SSL/TLS. If you're running Postgres on a different machine from GoToSocial, and connecting to it via an IP address or hostname (as opposed to just running on localhost), then SSL/TLS is **CRUCIAL** to avoid leaking data all over the place!
 
-When you're using Postgres, GoToSocial expects whatever you've set for `db.user` to already be created in the database, and to have ownership of whatever you've set for `db.database`.
+When you're using Postgres, GoToSocial expects whatever you've set for `db-user` to already be created in the database, and to have ownership of whatever you've set for `db-database`.
 
 For example, if you set:
 
@@ -48,51 +48,50 @@ grant all privileges on database gotosocial to gotosocial;
 ############################
 
 # Config pertaining to the Gotosocial database connection
-db:
 
-  # String. Database type.
-  # Options: ["postgres","sqlite"]
-  # Default: "postgres"
-  type: "postgres"
-
-  # String. Database address or parameters.
-  # Examples: ["localhost","my.db.host","127.0.0.1","192.111.39.110",":memory:"]
-  # Default: "localhost"
-  address: "127.0.0.1"
-
-  # Int. Port for database connection.
-  # Examples: [5432, 1234, 6969]
-  # Default: 5432
-  port: 5432
-
-  # String. Username for the database connection.
-  # Examples: ["mydbuser","postgres","gotosocial"]
-  # Default: "postgres"
-  user: "postgres"
-
-  # REQUIRED
-  # String. Password to use for the database connection
-  # Examples: ["password123","verysafepassword","postgres"]
-  # Default: "postgres"
-  password: "postgres"
-
-  # String. Name of the database to use within the provided database type.
-  # Examples: ["mydb","postgres","gotosocial"]
-  # Default: "postgres"
-  database: "postgres"
-
-  # String. Disable, enable, or require SSL/TLS connection to the database.
-  # If "disable" then no TLS connection will be attempted.
-  # If "enable" then TLS will be tried, but the database certificate won't be checked (for self-signed certs).
-  # If "require" then TLS will be required to make a connection, and a valid certificate must be presented.
-  # Options: ["disable", "enable", "require"]
-  # Default: "disable"
-  tlsMode: "disable"
-
-  # String. Path to a CA certificate on the host machine for db certificate validation.
-  # If this is left empty, just the host certificates will be used.
-  # If filled in, the certificate will be loaded and added to host certificates.
-  # Examples: ["/path/to/some/cert.crt"]
-  # Default: ""
-  tlsCACert: ""
+# String. Database type.
+# Options: ["postgres","sqlite"]
+# Default: "postgres"
+db-type: "postgres"
+
+# String. Database address or parameters.
+# Examples: ["localhost","my.db.host","127.0.0.1","192.111.39.110",":memory:"]
+# Default: "localhost"
+db-address: "127.0.0.1"
+
+# Int. Port for database connection.
+# Examples: [5432, 1234, 6969]
+# Default: 5432
+db-port: 5432
+
+# String. Username for the database connection.
+# Examples: ["mydbuser","postgres","gotosocial"]
+# Default: "postgres"
+db-user: "postgres"
+
+# REQUIRED
+# String. Password to use for the database connection
+# Examples: ["password123","verysafepassword","postgres"]
+# Default: "postgres"
+db-password: "postgres"
+
+# String. Name of the database to use within the provided database type.
+# Examples: ["mydb","postgres","gotosocial"]
+# Default: "postgres"
+db-database: "postgres"
+
+# String. Disable, enable, or require SSL/TLS connection to the database.
+# If "disable" then no TLS connection will be attempted.
+# If "enable" then TLS will be tried, but the database certificate won't be checked (for self-signed certs).
+# If "require" then TLS will be required to make a connection, and a valid certificate must be presented.
+# Options: ["disable", "enable", "require"]
+# Default: "disable"
+db-tls-mode: "disable"
+
+# String. Path to a CA certificate on the host machine for db certificate validation.
+# If this is left empty, just the host certificates will be used.
+# If filled in, the certificate will be loaded and added to host certificates.
+# Examples: ["/path/to/some/cert.crt"]
+# Default: ""
+db-tls-ca-cert: ""
 ```
diff --git a/docs/configuration/general.md b/docs/configuration/general.md
index be27095d1..5e23d4699 100644
--- a/docs/configuration/general.md
+++ b/docs/configuration/general.md
@@ -14,12 +14,12 @@ The only things you *really* need to set here are `host`, which should be the ho
 # String. Log level to use throughout the application. Must be lower-case.
 # Options: ["trace","debug","info","warn","error","fatal"]
 # Default: "info"
-logLevel: "info"
+log-level: "info"
 
 # String. Application name to use internally.
 # Examples: ["My Application","gotosocial"]
 # Default: "gotosocial"
-applicationName: "gotosocial"
+application-name: "gotosocial"
 
 # String. Hostname that this server will be reachable at. Defaults to localhost for local testing,
 # but you should *definitely* change this when running for real, or your server won't work at all.
@@ -38,7 +38,7 @@ host: "localhost"
 # DO NOT change this after your server has already run once, or you will break things!
 # Examples: ["example.org","server.com"]
 # Default: ""
-accountDomain: ""
+account-domain: ""
 
 # String. Protocol to use for the server. Only change to http for local testing!
 # This should be the protocol part of the URI that your server is actually reachable on. So even if you're
@@ -55,7 +55,7 @@ protocol: "https"
 # you have specific networking requirements.
 # Examples: ["0.0.0.0", "172.128.0.16", "localhost", "[::]", "[2001:db8::fed1]"]
 # Default: "0.0.0.0"
-bindAddress: "0.0.0.0"
+bind-address: "0.0.0.0"
 
 # Int. Listen port for the GoToSocial webserver + API. If you're running behind a reverse proxy and/or in a docker,
 # container, just set this to whatever you like (or leave the default), and make sure it's forwarded properly.
@@ -71,6 +71,6 @@ port: 8080
 # or the gateway of the docker network, and/or the address of the reverse proxy (if it's not running on the host network).
 # Example: ["127.0.0.1/32", "172.20.0.1"]
 # Default: ["127.0.0.1/32"] (localhost)
-trustedProxies:
+trusted-proxies:
   - "127.0.0.1/32"
 ```
diff --git a/docs/configuration/index.md b/docs/configuration/index.md
index ef27a0725..ed36505ec 100644
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -4,8 +4,6 @@ GoToSocial aims to be as configurable as possible, to fit lots of different use
 
 We try to provide sensible defaults wherever possible, but you can't run a GoToSocial instance without managing *some* configuration.
 
-In this section, we describe the different methods available for configuring GoToSocial, 
-
 ## Configuration Methods
 
 There are three different methods for configuring a GoToSocial instance, which can be combined depending on your setup.
@@ -15,41 +13,39 @@ There are three different methods for configuring a GoToSocial instance, which c
 The easiest way to configure GoToSocial is to pass a configuration file to to the `gotosocial server start` command, for example:
 
 ```bash
-gotosocial --config-path ./config.yaml server start
+gotosocial server start --config-path ./config.yaml
 ```
 
-The command expects a file in [YAML](https://en.wikipedia.org/wiki/YAML) format.
+The command expects a file in [YAML](https://en.wikipedia.org/wiki/YAML) or [JSON](https://en.wikipedia.org/wiki/JSON) format.
 
 An example configuration file, with an explanation of each of the config fields, with default and example values, can be found [here](https://github.com/superseriousbusiness/gotosocial/blob/main/example/config.yaml).
 
-This example file is included with release downloads, so you can just copy it and edit it to your needs without having to worry too much about what the hell YAML is.
+This example file is included with release downloads, so you can just copy it and edit it to your needs without having to worry too much about what the hell YAML or JSON is.
 
 ### Environment Variables
 
-You can also configure GoToSocial by setting [environment variables](https://en.wikipedia.org/wiki/Environment_variable). These environment variables generally follow the format:
+You can also configure GoToSocial by setting [environment variables](https://en.wikipedia.org/wiki/Environment_variable). These environment variables follow the format:
 
-```text
-GTS_[CONFIG_SECTION]_[FIELD_NAME]
-```
+1. Prepend `GTS_` to the config flag.
+2. Uppercase-all.
+3. Replace dash (`-`) with underscore (`_`).
 
-So for example, instead of setting `media.maxImageSize` to `2097152` in your config.yaml, you could set the environment variable:
+So for example, instead of setting `media-image-max-size` to `2097152` in your config.yaml, you could set the environment variable:
 
 ```text
-GTS_MEDIA_MAX_IMAGE_SIZE=2097152
+GTS_MEDIA_IMAGE_MAX_SIZE=2097152
 ```
 
-If you're in doubt about any of the names of these environment variables, just check `gotosocial --help`. They're all listed there.
+If you're in doubt about any of the names of these environment variables, just check the `--help` for the subcommand you're using.
 
 ### Command Line Flags
 
-Finally, you can set configuration values using command-line flags, which you pass directly when you're running a `gotosocial` command. For example, instead of setting `media.maxImageSize` in your config.yaml, or with an environment variable, you can pass the value directly through the command line:
+Finally, you can set configuration values using command-line flags, which you pass directly when you're running a `gotosocial` command. For example, instead of setting `media-image-max-size` in your config.yaml, or with an environment variable, you can pass the value directly through the command line:
 
 ```bash
-gotosocial --media-max-image-size 2097152 server start
+gotosocial server start --media-image-max-size 2097152 
 ```
 
-Note the weird order of the above command; `gotosocial` first, then all global variables (like the ones in the config.yaml), then the command you want to execute.
-
 If you're in doubt about which flags are available, check `gotosocial --help`.
 
 ## Priority
@@ -60,9 +56,9 @@ The above configuration methods override each other in the order in which they w
 command line flags > environment variables > config file
 ```
 
-That is, if you set `media.maxImageSize` to `2097152` in your config file, but then *ALSO* set the environment variable `GTS_MEDIA_MAX_IMAGE_SIZE=9999999`, then the final value will be `9999999`, because environment variables have a *higher priority* than values set in config.yaml.
+That is, if you set `media-image-max-size` to `2097152` in your config file, but then *ALSO* set the environment variable `GTS_MEDIA_MAX_IMAGE_SIZE=9999999`, then the final value will be `9999999`, because environment variables have a *higher priority* than values set in config.yaml.
 
-Command line flags have the highest priority, so if you set `--media-max-image-size 13121312`, then the final value will be `13121312` regardless of what you've set elsewhere.
+Command line flags have the highest priority, so if you set `--media-image-max-size 13121312`, then the final value will be `13121312` regardless of what you've set elsewhere.
 
 This means in cases where you want to just try changing one thing, but don't want to edit your config file, you can temporarily use an environment variable or a command line flag to set that one thing.
 
diff --git a/docs/configuration/letsencrypt.md b/docs/configuration/letsencrypt.md
index 05953cbb7..4e3a6d59b 100644
--- a/docs/configuration/letsencrypt.md
+++ b/docs/configuration/letsencrypt.md
@@ -8,36 +8,35 @@
 ##############################
 
 # Config pertaining to the automatic acquisition and use of LetsEncrypt HTTPS certificates.
-letsEncrypt:
 
-  # Bool. Whether or not letsencrypt should be enabled for the server.
-  # If false, the rest of the settings here will be ignored.
-  # You should only change this if you want to serve GoToSocial behind a reverse proxy
-  # like Traefik, HAProxy, or Nginx.
-  # Options: [true, false]
-  # Default: true
-  enabled: true
+# Bool. Whether or not letsencrypt should be enabled for the server.
+# If false, the rest of the settings here will be ignored.
+# You should only change this if you want to serve GoToSocial behind a reverse proxy
+# like Traefik, HAProxy, or Nginx.
+# Options: [true, false]
+# Default: true
+letsencrypt-enabled: true
 
-  # Int. Port to listen for letsencrypt certificate challenges on.
-  # If letsencrypt is enabled, this port must be reachable or you won't be able to obtain certs.
-  # If letsencrypt is disabled, this port will not be used.
-  # This *must not* be the same as the webserver/API port specified above.
-  # Examples: [80, 8000, 1312]
-  # Default: 80
-  port: 80
+# Int. Port to listen for letsencrypt certificate challenges on.
+# If letsencrypt is enabled, this port must be reachable or you won't be able to obtain certs.
+# If letsencrypt is disabled, this port will not be used.
+# This *must not* be the same as the webserver/API port specified above.
+# Examples: [80, 8000, 1312]
+# Default: 80
+letsencrypt-port: 80
 
-  # String. Directory in which to store LetsEncrypt certificates.
-  # It is a good move to make this a sub-path within your storage directory, as it makes
-  # backup easier, but you might wish to move them elsewhere if they're also accessed by other services.
-  # In any case, make sure GoToSocial has permissions to write to / read from this directory.
-  # Examples: ["/home/gotosocial/storage/certs", "/acmecerts"]
-  # Default: "/gotosocial/storage/certs"
-  certDir: "/gotosocial/storage/certs"
+# String. Directory in which to store LetsEncrypt certificates.
+# It is a good move to make this a sub-path within your storage directory, as it makes
+# backup easier, but you might wish to move them elsewhere if they're also accessed by other services.
+# In any case, make sure GoToSocial has permissions to write to / read from this directory.
+# Examples: ["/home/gotosocial/storage/certs", "/acmecerts"]
+# Default: "/gotosocial/storage/certs"
+letsencrypt-cert-dir: "/gotosocial/storage/certs"
 
-  # String. Email address to use when registering LetsEncrypt certs.
-  # Most likely, this will be the email address of the instance administrator.
-  # LetsEncrypt will send notifications about expiring certificates etc to this address.
-  # Examples: ["admin@example.org"]
-  # Default: ""
-  emailAddress: ""
+# String. Email address to use when registering LetsEncrypt certs.
+# Most likely, this will be the email address of the instance administrator.
+# LetsEncrypt will send notifications about expiring certificates etc to this address.
+# Examples: ["admin@example.org"]
+# Default: ""
+letsencrypt-email-address: ""
 ```
diff --git a/docs/configuration/media.md b/docs/configuration/media.md
index 2c5e778f7..393274726 100644
--- a/docs/configuration/media.md
+++ b/docs/configuration/media.md
@@ -8,25 +8,24 @@
 ########################
 
 # Config pertaining to user media uploads (videos, image, image descriptions).
-media:
 
-  # Int. Maximum allowed image upload size in bytes.
-  # Examples: [2097152, 10485760]
-  # Default: 2097152 -- aka 2MB
-  maxImageSize: 2097152
+# Int. Maximum allowed image upload size in bytes.
+# Examples: [2097152, 10485760]
+# Default: 2097152 -- aka 2MB
+media-image-max-size: 2097152
 
-  # Int. Maximum allowed video upload size in bytes.
-  # Examples: [2097152, 10485760]
-  # Default: 10485760 -- aka 10MB
-  maxVideoSize: 10485760
+# Int. Maximum allowed video upload size in bytes.
+# Examples: [2097152, 10485760]
+# Default: 10485760 -- aka 10MB
+media-video-max-size: 10485760
 
-  # Int. Minimum amount of characters required as an image or video description.
-  # Examples: [500, 1000, 1500]
-  # Default: 0 (not required)
-  minDescriptionChars: 0
+# Int. Minimum amount of characters required as an image or video description.
+# Examples: [500, 1000, 1500]
+# Default: 0 (not required)
+media-description-min-chars: 0
 
-  # Int. Maximum amount of characters permitted in an image or video description.
-  # Examples: [500, 1000, 1500]
-  # Default: 500
-  maxDescriptionChars: 500
+# Int. Maximum amount of characters permitted in an image or video description.
+# Examples: [500, 1000, 1500]
+# Default: 500
+media-description-max-chars: 500
 ```
diff --git a/docs/configuration/oidc.md b/docs/configuration/oidc.md
index 6c6bbe94b..e373e48d9 100644
--- a/docs/configuration/oidc.md
+++ b/docs/configuration/oidc.md
@@ -20,55 +20,54 @@ GoToSocial exposes the following configuration settings for OIDC, shown below wi
 #######################
 
 # Config for authentication with an external OIDC provider (Dex, Google, Auth0, etc).
-oidc:
-
-  # Bool. Enable authentication with external OIDC provider. If set to true, then
-  # the other OIDC options must be set as well. If this is set to false, then the standard
-  # internal oauth flow will be used, where users sign in to GtS with username/password.
-  # Options: [true, false]
-  # Default: false
-  enabled: false
-
-  # String. Name of the oidc idp (identity provider). This will be shown to users when
-  # they log in.
-  # Examples: ["Google", "Dex", "Auth0"]
-  # Default: ""
-  idpName: ""
-
-  # Bool. Skip the normal verification flow of tokens returned from the OIDC provider, ie.,
-  # don't check the expiry or signature. This should only be used in debugging or testing,
-  # never ever in a production environment as it's extremely unsafe!
-  # Options: [true, false]
-  # Default: false
-  skipVerification: false
 
-  # String. The OIDC issuer URI. This is where GtS will redirect users to for login.
-  # Typically this will look like a standard web URL.
-  # Examples: ["https://auth.example.org", "https://example.org/auth"]
-  # Default: ""
-  issuer: ""
-
-  # String. The ID for this client as registered with the OIDC provider.
-  # Examples: ["some-client-id", "fda3772a-ad35-41c9-9a59-f1943ad18f54"]
-  # Default: ""
-  clientID: ""
-
-  # String. The secret for this client as registered with the OIDC provider.
-  # Examples: ["super-secret-business", "79379cf5-8057-426d-bb83-af504d98a7b0"]
-  # Default: ""
-  clientSecret: ""
-
-  # Array of string. Scopes to request from the OIDC provider. The returned values will be used to
-  # populate users created in GtS as a result of the authentication flow. 'openid' and 'email' are required.
-  # 'profile' is used to extract a username for the newly created user.
-  # 'groups' is optional and can be used to determine if a user is an admin (if they're in the group 'admin' or 'admins').
-  # Examples: See eg., https://auth0.com/docs/scopes/openid-connect-scopes
-  # Default: ["openid", "email", "profile", "groups"]
-  scopes:
-    - "openid"
-    - "email"
-    - "profile"
-    - "groups"
+# Bool. Enable authentication with external OIDC provider. If set to true, then
+# the other OIDC options must be set as well. If this is set to false, then the standard
+# internal oauth flow will be used, where users sign in to GtS with username/password.
+# Options: [true, false]
+# Default: false
+oidc-enabled: false
+
+# String. Name of the oidc idp (identity provider). This will be shown to users when
+# they log in.
+# Examples: ["Google", "Dex", "Auth0"]
+# Default: ""
+oidc-idp-name: ""
+
+# Bool. Skip the normal verification flow of tokens returned from the OIDC provider, ie.,
+# don't check the expiry or signature. This should only be used in debugging or testing,
+# never ever in a production environment as it's extremely unsafe!
+# Options: [true, false]
+# Default: false
+oidc-skip-verification: false
+
+# String. The OIDC issuer URI. This is where GtS will redirect users to for login.
+# Typically this will look like a standard web URL.
+# Examples: ["https://auth.example.org", "https://example.org/auth"]
+# Default: ""
+oidc-issuer: ""
+
+# String. The ID for this client as registered with the OIDC provider.
+# Examples: ["some-client-id", "fda3772a-ad35-41c9-9a59-f1943ad18f54"]
+# Default: ""
+oidc-client-id: ""
+
+# String. The secret for this client as registered with the OIDC provider.
+# Examples: ["super-secret-business", "79379cf5-8057-426d-bb83-af504d98a7b0"]
+# Default: ""
+oidc-client-secret: ""
+
+# Array of string. Scopes to request from the OIDC provider. The returned values will be used to
+# populate users created in GtS as a result of the authentication flow. 'openid' and 'email' are required.
+# 'profile' is used to extract a username for the newly created user.
+# 'groups' is optional and can be used to determine if a user is an admin (if they're in the group 'admin' or 'admins').
+# Examples: See eg., https://auth0.com/docs/scopes/openid-connect-scopes
+# Default: ["openid", "email", "profile", "groups"]
+oidc-scopes:
+  - "openid"
+  - "email"
+  - "profile"
+  - "groups"
 ```
 
 ## Behavior
diff --git a/docs/configuration/smtp.md b/docs/configuration/smtp.md
index d191be3c8..b87847abd 100644
--- a/docs/configuration/smtp.md
+++ b/docs/configuration/smtp.md
@@ -16,32 +16,35 @@ The configuration options for smtp are as follows:
 #######################
 
 # Config for sending emails via an smtp server. See https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
-smtp:
-
-  # String. The hostname of the smtp server you want to use.
-  # If this is not set, smtp will not be used to send emails, and you can ignore the other settings.
-  # Examples: ["mail.example.org", "localhost"]
-  # Default: ""
-  host: ""
-  # Int. Port to use to connect to the smtp server.
-  # Examples: []
-  # Default: 0
-  port: 0
-  # String. Username to use when authenticating with the smtp server.
-  # This should have been provided to you by your smtp host.
-  # This is often, but not always, an email address.
-  # Examples: ["maillord@example.org"]
-  # Default: ""
-  username:
-  # String. Password to use when authenticating with the smtp server.
-  # This should have been provided to you by your smtp host.
-  # Examples: ["1234", "password"]
-  # Default: ""
-  password:
-  # String. 'From' address for sent emails.
-  # Examples: ["mail@example.org"]
-  # Default: ""
-  from: ""
+
+# String. The hostname of the smtp server you want to use.
+# If this is not set, smtp will not be used to send emails, and you can ignore the other settings.
+# Examples: ["mail.example.org", "localhost"]
+# Default: ""
+smtp-host: ""
+
+# Int. Port to use to connect to the smtp server.
+# Examples: []
+# Default: 0
+smtp-port: 0
+
+# String. Username to use when authenticating with the smtp server.
+# This should have been provided to you by your smtp host.
+# This is often, but not always, an email address.
+# Examples: ["maillord@example.org"]
+# Default: ""
+smtp-username: ""
+
+# String. Password to use when authenticating with the smtp server.
+# This should have been provided to you by your smtp host.
+# Examples: ["1234", "password"]
+# Default: ""
+smtp-password: ""
+
+# String. 'From' address for sent emails.
+# Examples: ["mail@example.org"]
+# Default: ""
+smtp-from: ""
 ```
 
 Note that if you don't set `Host`, then email sending via smtp will be disabled, and the other settings will be ignored. GoToSocial will still log (at trace level) emails that *would* have been sent if smtp was enabled.
diff --git a/docs/configuration/statuses.md b/docs/configuration/statuses.md
index 606776a83..e0348dd5a 100644
--- a/docs/configuration/statuses.md
+++ b/docs/configuration/statuses.md
@@ -3,43 +3,39 @@
 ## Settings
 
 ```yaml
-##########################
-##### STORAGE CONFIG #####
-##########################
-
-# Config pertaining to storage of user-created uploads (videos, images, etc).
-storage:
-
-  # String. Type of storage backend to use.
-  # Examples: ["local", "s3"]
-  # Default: "local" (storage on local disk)
-  # NOTE: s3 storage is not yet supported!
-  backend: "local"
-
-  # String. Directory to use as a base path for storing files.
-  # Make sure whatever user/group gotosocial is running as has permission to access
-  # this directly, and create new subdirectories and files with in.
-  # Examples: ["/home/gotosocial/storage", "/opt/gotosocial/datastorage"]
-  # Default: "/gotosocial/storage"
-  basePath: "/gotosocial/storage"
-
-  # String. Protocol to use for serving stored files.
-  # It's very unlikely that you'll need to change this ever, but there might be edge cases.
-  # Examples: ["http", "https"]
-  serveProtocol: "https"
-
-  # String. Host for serving stored files.
-  # If you're using local storage, this should be THE SAME as the value you've set for Host, above.
-  # It should only be a different value if you're serving stored files from a host
-  # other than the one your instance is running on.
-  # Examples: ["localhost", "example.org"]
-  # Default: "localhost" -- you should absolutely change this.
-  serveHost: "localhost"
-
-  # String. Base path for serving stored files. This will be added to serveHost and serveProtocol
-  # to form the prefix url of your stored files. Eg., https://example.org/fileserver/.....
-  # It's unlikely that you will need to change this.
-  # Examples: ["/fileserver", "/media"]
-  # Default: "/fileserver"
-  serveBasePath: "/fileserver"
+###########################
+##### STATUSES CONFIG #####
+###########################
+
+# Config pertaining to the creation of statuses/posts, and permitted limits.
+
+# Int. Maximum amount of characters permitted for a new status.
+# Note that going way higher than the default might break federation.
+# Examples: [140, 500, 5000]
+# Default: 5000
+statuses-max-chars: 5000
+
+# Int. Maximum amount of characters allowed in the CW/subject header of a status.
+# Note that going way higher than the default might break federation.
+# Examples: [100, 200]
+# Default: 100
+statuses-cw-max-chars: 100
+
+# Int. Maximum amount of options to permit when creating a new poll.
+# Note that going way higher than the default might break federation.
+# Examples: [4, 6, 10]
+# Default: 6
+statuses-poll-max-options: 6
+
+# Int. Maximum amount of characters to permit per poll option when creating a new poll.
+# Note that going way higher than the default might break federation.
+# Examples: [50, 100, 150]
+# Default: 50
+statuses-poll-option-max-chars: 50
+
+# Int. Maximum amount of media files that can be attached to a new status.
+# Note that going way higher than the default might break federation.
+# Examples: [4, 6, 10]
+# Default: 6
+statuses-media-max-files: 6
 ```
diff --git a/docs/configuration/storage.md b/docs/configuration/storage.md
index f62d59581..b0fadcd4c 100644
--- a/docs/configuration/storage.md
+++ b/docs/configuration/storage.md
@@ -8,38 +8,37 @@
 ##########################
 
 # Config pertaining to storage of user-created uploads (videos, images, etc).
-storage:
-
-  # String. Type of storage backend to use.
-  # Examples: ["local", "s3"]
-  # Default: "local" (storage on local disk)
-  # NOTE: s3 storage is not yet supported!
-  backend: "local"
-
-  # String. Directory to use as a base path for storing files.
-  # Make sure whatever user/group gotosocial is running as has permission to access
-  # this directly, and create new subdirectories and files with in.
-  # Examples: ["/home/gotosocial/storage", "/opt/gotosocial/datastorage"]
-  # Default: "/gotosocial/storage"
-  basePath: "/gotosocial/storage"
-
-  # String. Protocol to use for serving stored files.
-  # It's very unlikely that you'll need to change this ever, but there might be edge cases.
-  # Examples: ["http", "https"]
-  serveProtocol: "https"
-
-  # String. Host for serving stored files.
-  # If you're using local storage, this should be THE SAME as the value you've set for Host, above.
-  # It should only be a different value if you're serving stored files from a host
-  # other than the one your instance is running on.
-  # Examples: ["localhost", "example.org"]
-  # Default: "localhost" -- you should absolutely change this.
-  serveHost: "localhost"
-
-  # String. Base path for serving stored files. This will be added to serveHost and serveProtocol
-  # to form the prefix url of your stored files. Eg., https://example.org/fileserver/.....
-  # It's unlikely that you will need to change this.
-  # Examples: ["/fileserver", "/media"]
-  # Default: "/fileserver"
-  serveBasePath: "/fileserver"
-```
-\ No newline at end of file
+
+# String. Type of storage backend to use.
+# Examples: ["local", "s3"]
+# Default: "local" (storage on local disk)
+# NOTE: s3 storage is not yet supported!
+storage-backend: "local"
+
+# String. Directory to use as a base path for storing files.
+# Make sure whatever user/group gotosocial is running as has permission to access
+# this directly, and create new subdirectories and files with in.
+# Examples: ["/home/gotosocial/storage", "/opt/gotosocial/datastorage"]
+# Default: "/gotosocial/storage"
+storage-base-path: "/gotosocial/storage"
+
+# String. Protocol to use for serving stored files.
+# It's very unlikely that you'll need to change this ever, but there might be edge cases.
+# Examples: ["http", "https"]
+storage-serve-protocol: "https"
+
+# String. Host for serving stored files.
+# If you're using local storage, this should be THE SAME as the value you've set for Host, above.
+# It should only be a different value if you're serving stored files from a host
+# other than the one your instance is running on.
+# Examples: ["localhost", "example.org"]
+# Default: "localhost" -- you should absolutely change this.
+storage-serve-host: "localhost"
+
+# String. Base path for serving stored files. This will be added to serveHost and serveProtocol
+# to form the prefix url of your stored files. Eg., https://example.org/fileserver/.....
+# It's unlikely that you will need to change this.
+# Examples: ["/fileserver", "/media"]
+# Default: "/fileserver"
+storage-serve-base-path: "/fileserver"
+```
diff --git a/docs/configuration/template.md b/docs/configuration/template.md
deleted file mode 100644
index 2c0fd5a61..000000000
--- a/docs/configuration/template.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template
-
-## Settings
-
-```yaml
-###############################
-##### WEB TEMPLATE CONFIG #####
-###############################
-
-# Config pertaining to templating of web pages/email notifications and the like
-template:
-
-  # String. Directory from which gotosocial will attempt to load html templates (.tmpl files).
-  # Examples: ["/some/absolute/path/", "./relative/path/", "../../some/weird/path/"]
-  # Default: "./web/template/"
-  baseDir: "./web/template/"
-
-  # String. Directory from which gotosocial will attempt to serve static web assets (images, scripts).
-  # Examples: ["/some/absolute/path/", "./relative/path/", "../../some/weird/path/"]
-  # Default: "./web/assets/"
-  assetBaseDir: "./web/assets/"
-```
diff --git a/docs/configuration/web.md b/docs/configuration/web.md
new file mode 100644
index 000000000..99533a287
--- /dev/null
+++ b/docs/configuration/web.md
@@ -0,0 +1,21 @@
+# Web
+
+## Settings
+
+```yaml
+######################
+##### WEB CONFIG #####
+######################
+
+# Config pertaining to templating and serving of web pages/email notifications and the like
+
+# String. Directory from which gotosocial will attempt to load html templates (.tmpl files).
+# Examples: ["/some/absolute/path/", "./relative/path/", "../../some/weird/path/"]
+# Default: "./web/template/"
+web-template-base-dir: "./web/template/"
+
+# String. Directory from which gotosocial will attempt to serve static web assets (images, scripts).
+# Examples: ["/some/absolute/path/", "./relative/path/", "../../some/weird/path/"]
+# Default: "./web/assets/"
+web-asset-base-dir: "./web/assets/"
+```