diff --git a/aider/args.py b/aider/args.py
index 6c06978ae..a614c4570 100644
--- a/aider/args.py
+++ b/aider/args.py
@@ -483,7 +483,12 @@ def get_sample_yaml():
 
 
 def main():
-    print(get_sample_yaml())
+    arg = sys.argv[1] if len(sys.argv[1:]) else None
+
+    if arg == "md":
+        print(get_help())
+    else:
+        print(get_sample_yaml())
 
 
 if __name__ == "__main__":
diff --git a/aider/args_formatter.py b/aider/args_formatter.py
index 4be3df460..18288ea08 100644
--- a/aider/args_formatter.py
+++ b/aider/args_formatter.py
@@ -30,10 +30,13 @@ class YamlHelpFormatter(argparse.HelpFormatter):
             metavar = "VALUE"
 
         default = action.default
-        if isinstance(default, list) and not default:
+        if default == argparse.SUPPRESS:
             default = ""
-        elif action.default not in (argparse.SUPPRESS, None):
-            default = action.default
+        elif isinstance(default, str):
+            pass
+        elif isinstance(default, list) and not default:
+            default = ""
+        elif action.default is not None:
             default = "true" if default else "false"
         else:
             default = ""
@@ -41,7 +44,24 @@ class YamlHelpFormatter(argparse.HelpFormatter):
         if action.help:
             parts.append(f"## {action.help}")
 
-        parts.append(f"#{action.dest}: {default}\n")
+        switch = action.dest
+        if isinstance(action, argparse._StoreTrueAction):
+            default = False
+        elif isinstance(action, argparse._StoreConstAction):
+            default = action.const
+
+        if default is False:
+            default = "false"
+        if default is True:
+            default = "true"
+
+        if default is not None:
+            parts.append(f"#{switch}: {default}\n")
+        else:
+            parts.append(f"#{switch}:\n")
+
+        ###
+        # parts.append(str(action))
 
         return "\n".join(parts) + "\n"
 
@@ -65,16 +85,23 @@ class MarkdownHelpFormatter(argparse.HelpFormatter):
         return ""
 
     def _format_action(self, action):
+        if not action.option_strings:
+            return ""
+
         parts = [""]
 
         metavar = action.metavar
         if not metavar and isinstance(action, argparse._StoreAction):
             metavar = "VALUE"
 
+        for switch in action.option_strings:
+            if switch.startswith("--"):
+                break
+
         if metavar:
-            parts.append(f"### `--{action.dest} {metavar}`")
+            parts.append(f"### `{switch} {metavar}`")
         else:
-            parts.append(f"### `--{action.dest}`")
+            parts.append(f"### `{switch}`")
         if action.help:
             parts.append(action.help + "  ")
 
diff --git a/website/assets/sample.aider.conf.yml b/website/assets/sample.aider.conf.yml
index c35efc6a7..52d9c2fd6 100644
--- a/website/assets/sample.aider.conf.yml
+++ b/website/assets/sample.aider.conf.yml
@@ -22,25 +22,25 @@
 #anthropic_api_key: 
 
 ## Specify the model to use for the main chat (default: gpt-4o)
-#model: true
+#model: gpt-4o
 
 ## Use claude-3-opus-20240229 model for the main chat
-#model: 
+#model: claude-3-opus-20240229
 
 ## Use claude-3-sonnet-20240229 model for the main chat
-#model: 
+#model: claude-3-sonnet-20240229
 
 ## Use gpt-4-0613 model for the main chat
-#model: 
+#model: gpt-4-0613
 
 ## Use gpt-4o model for the main chat
-#model: 
+#model: gpt-4o
 
 ## Use gpt-4-1106-preview model for the main chat
-#model: 
+#model: gpt-4-1106-preview
 
 ## Use gpt-3.5-turbo model for the main chat
-#model: 
+#model: gpt-3.5-turbo
 
 #################
 # Model Settings:
@@ -79,16 +79,16 @@
 #max_chat_history_tokens: 
 
 ## Specify the .env file to load (default: .env in git root)
-#env_file: true
+#env_file: .env
 
 ################
 # History Files:
 
 ## Specify the chat input history file (default: .aider.input.history)
-#input_history_file: true
+#input_history_file: .aider.input.history
 
 ## Specify the chat history file (default: .aider.chat.history.md)
-#chat_history_file: true
+#chat_history_file: .aider.chat.history.md
 
 ## Restore the previous chat history messages (default: False)
 #restore_chat_history: false
@@ -109,19 +109,19 @@
 #stream: true
 
 ## Set the color for user input (default: #00cc00)
-#user_input_color: true
+#user_input_color: #00cc00
 
 ## Set the color for tool output (default: None)
 #tool_output_color: 
 
 ## Set the color for tool error messages (default: red)
-#tool_error_color: true
+#tool_error_color: #FF2222
 
 ## Set the color for assistant output (default: #0088ff)
-#assistant_output_color: true
+#assistant_output_color: #0088ff
 
 ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)
-#code_theme: true
+#code_theme: default
 
 ## Show diffs when committing changes (default: False)
 #show_diffs: false
@@ -136,7 +136,7 @@
 #gitignore: true
 
 ## Specify the aider ignore file (default: .aiderignore in git root)
-#aiderignore: true
+#aiderignore: .aiderignore
 
 ## Enable/disable auto commit of LLM changes (default: True)
 #auto_commits: true
@@ -175,7 +175,7 @@
 # Other Settings:
 
 ## Specify the language for voice using ISO 639-1 code (default: auto)
-#voice_language: true
+#voice_language: en
 
 ## Show the version number and exit
 #version: 
@@ -190,7 +190,7 @@
 #apply: 
 
 ## Always say yes to every confirmation
-#yes: 
+#yes: false
 
 ## Enable verbose output
 #verbose: false
@@ -208,7 +208,7 @@
 #message_file: 
 
 ## Specify the encoding for input and output (default: utf-8)
-#encoding: true
+#encoding: utf-8
 
 ## Specify the config file (default: search for .aider.conf.yml in git root, cwd or home directory)
 #config: 
diff --git a/website/docs/aider_conf.md b/website/docs/aider_conf.md
index dff9d17d3..f21d2fbbd 100644
--- a/website/docs/aider_conf.md
+++ b/website/docs/aider_conf.md
@@ -47,25 +47,25 @@ cog.outl("```")
 #anthropic_api_key: 
 
 ## Specify the model to use for the main chat (default: gpt-4o)
-#model: true
+#model: gpt-4o
 
 ## Use claude-3-opus-20240229 model for the main chat
-#model: 
+#model: claude-3-opus-20240229
 
 ## Use claude-3-sonnet-20240229 model for the main chat
-#model: 
+#model: claude-3-sonnet-20240229
 
 ## Use gpt-4-0613 model for the main chat
-#model: 
+#model: gpt-4-0613
 
 ## Use gpt-4o model for the main chat
-#model: 
+#model: gpt-4o
 
 ## Use gpt-4-1106-preview model for the main chat
-#model: 
+#model: gpt-4-1106-preview
 
 ## Use gpt-3.5-turbo model for the main chat
-#model: 
+#model: gpt-3.5-turbo
 
 #################
 # Model Settings:
@@ -104,16 +104,16 @@ cog.outl("```")
 #max_chat_history_tokens: 
 
 ## Specify the .env file to load (default: .env in git root)
-#env_file: true
+#env_file: .env
 
 ################
 # History Files:
 
 ## Specify the chat input history file (default: .aider.input.history)
-#input_history_file: true
+#input_history_file: .aider.input.history
 
 ## Specify the chat history file (default: .aider.chat.history.md)
-#chat_history_file: true
+#chat_history_file: .aider.chat.history.md
 
 ## Restore the previous chat history messages (default: False)
 #restore_chat_history: false
@@ -134,19 +134,19 @@ cog.outl("```")
 #stream: true
 
 ## Set the color for user input (default: #00cc00)
-#user_input_color: true
+#user_input_color: #00cc00
 
 ## Set the color for tool output (default: None)
 #tool_output_color: 
 
 ## Set the color for tool error messages (default: red)
-#tool_error_color: true
+#tool_error_color: #FF2222
 
 ## Set the color for assistant output (default: #0088ff)
-#assistant_output_color: true
+#assistant_output_color: #0088ff
 
 ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)
-#code_theme: true
+#code_theme: default
 
 ## Show diffs when committing changes (default: False)
 #show_diffs: false
@@ -161,7 +161,7 @@ cog.outl("```")
 #gitignore: true
 
 ## Specify the aider ignore file (default: .aiderignore in git root)
-#aiderignore: true
+#aiderignore: .aiderignore
 
 ## Enable/disable auto commit of LLM changes (default: True)
 #auto_commits: true
@@ -200,7 +200,7 @@ cog.outl("```")
 # Other Settings:
 
 ## Specify the language for voice using ISO 639-1 code (default: auto)
-#voice_language: true
+#voice_language: en
 
 ## Show the version number and exit
 #version: 
@@ -215,7 +215,7 @@ cog.outl("```")
 #apply: 
 
 ## Always say yes to every confirmation
-#yes: 
+#yes: false
 
 ## Enable verbose output
 #verbose: false
@@ -233,7 +233,7 @@ cog.outl("```")
 #message_file: 
 
 ## Specify the encoding for input and output (default: utf-8)
-#encoding: true
+#encoding: utf-8
 
 ## Specify the config file (default: search for .aider.conf.yml in git root, cwd or home directory)
 #config: 
diff --git a/website/docs/options_ref.md b/website/docs/options_ref.md
index ea55ba21c..3bec20f74 100644
--- a/website/docs/options_ref.md
+++ b/website/docs/options_ref.md
@@ -41,14 +41,11 @@ Aliases:
 
 ## Main:
 
-### `--files FILE`
-files to edit with an LLM (optional)  
-
-### `--openai_api_key OPENAI_API_KEY`
+### `--openai-api-key OPENAI_API_KEY`
 Specify the OpenAI API key  
 Environment variable: `OPENAI_API_KEY`  
 
-### `--anthropic_api_key ANTHROPIC_API_KEY`
+### `--anthropic-api-key ANTHROPIC_API_KEY`
 Specify the OpenAI API key  
 Environment variable: `ANTHROPIC_API_KEY`  
 
@@ -57,30 +54,30 @@ Specify the model to use for the main chat (default: gpt-4o)
 Default: gpt-4o  
 Environment variable: `AIDER_MODEL`  
 
-### `--model`
+### `--opus`
 Use claude-3-opus-20240229 model for the main chat  
 Environment variable: `AIDER_OPUS`  
 
-### `--model`
+### `--sonnet`
 Use claude-3-sonnet-20240229 model for the main chat  
 Environment variable: `AIDER_SONNET`  
 
-### `--model`
+### `--4`
 Use gpt-4-0613 model for the main chat  
 Environment variable: `AIDER_4`  
 Aliases:
   - `--4`
   - `-4`
 
-### `--model`
+### `--4o`
 Use gpt-4o model for the main chat  
 Environment variable: `AIDER_4O`  
 
-### `--model`
+### `--4-turbo`
 Use gpt-4-1106-preview model for the main chat  
 Environment variable: `AIDER_4_TURBO`  
 
-### `--model`
+### `--35turbo`
 Use gpt-3.5-turbo model for the main chat  
 Environment variable: `AIDER_35TURBO`  
 Aliases:
@@ -95,35 +92,35 @@ Aliases:
 List known models which match the (partial) MODEL name  
 Environment variable: `AIDER_MODELS`  
 
-### `--openai_api_base OPENAI_API_BASE`
+### `--openai-api-base OPENAI_API_BASE`
 Specify the api base url  
 Environment variable: `OPENAI_API_BASE`  
 
-### `--openai_api_type OPENAI_API_TYPE`
+### `--openai-api-type OPENAI_API_TYPE`
 Specify the api_type  
 Environment variable: `OPENAI_API_TYPE`  
 
-### `--openai_api_version OPENAI_API_VERSION`
+### `--openai-api-version OPENAI_API_VERSION`
 Specify the api_version  
 Environment variable: `OPENAI_API_VERSION`  
 
-### `--openai_api_deployment_id OPENAI_API_DEPLOYMENT_ID`
+### `--openai-api-deployment-id OPENAI_API_DEPLOYMENT_ID`
 Specify the deployment_id  
 Environment variable: `OPENAI_API_DEPLOYMENT_ID`  
 
-### `--openai_organization_id OPENAI_ORGANIZATION_ID`
+### `--openai-organization-id OPENAI_ORGANIZATION_ID`
 Specify the OpenAI organization ID  
 Environment variable: `OPENAI_ORGANIZATION_ID`  
 
-### `--edit_format EDIT_FORMAT`
+### `--edit-format EDIT_FORMAT`
 Specify what edit format the LLM should use (default depends on model)  
 Environment variable: `AIDER_EDIT_FORMAT`  
 
-### `--weak_model WEAK_MODEL`
+### `--weak-model WEAK_MODEL`
 Specify the model to use for commit messages and chat history summarization (default depends on --model)  
 Environment variable: `AIDER_WEAK_MODEL`  
 
-### `--show_model_warnings`
+### `--show-model-warnings`
 Only work with models that have meta-data available (default: True)  
 Default: True  
 Environment variable: `AIDER_SHOW_MODEL_WARNINGS`  
@@ -131,33 +128,33 @@ Aliases:
   - `--show-model-warnings`
   - `--no-show-model-warnings`
 
-### `--map_tokens VALUE`
+### `--map-tokens VALUE`
 Max number of tokens to use for repo map, use 0 to disable (default: 1024)  
 Default: 1024  
 Environment variable: `AIDER_MAP_TOKENS`  
 
-### `--max_chat_history_tokens VALUE`
+### `--max-chat-history-tokens VALUE`
 Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.  
 Environment variable: `AIDER_MAX_CHAT_HISTORY_TOKENS`  
 
-### `--env_file ENV_FILE`
+### `--env-file ENV_FILE`
 Specify the .env file to load (default: .env in git root)  
 Default: .env  
 Environment variable: `AIDER_ENV_FILE`  
 
 ## History Files:
 
-### `--input_history_file INPUT_HISTORY_FILE`
+### `--input-history-file INPUT_HISTORY_FILE`
 Specify the chat input history file (default: .aider.input.history)  
 Default: .aider.input.history  
 Environment variable: `AIDER_INPUT_HISTORY_FILE`  
 
-### `--chat_history_file CHAT_HISTORY_FILE`
+### `--chat-history-file CHAT_HISTORY_FILE`
 Specify the chat history file (default: .aider.chat.history.md)  
 Default: .aider.chat.history.md  
 Environment variable: `AIDER_CHAT_HISTORY_FILE`  
 
-### `--restore_chat_history`
+### `--restore-chat-history`
 Restore the previous chat history messages (default: False)  
 Default: False  
 Environment variable: `AIDER_RESTORE_CHAT_HISTORY`  
@@ -167,12 +164,12 @@ Aliases:
 
 ## Output Settings:
 
-### `--dark_mode`
+### `--dark-mode`
 Use colors suitable for a dark terminal background (default: False)  
 Default: False  
 Environment variable: `AIDER_DARK_MODE`  
 
-### `--light_mode`
+### `--light-mode`
 Use colors suitable for a light terminal background (default: False)  
 Default: False  
 Environment variable: `AIDER_LIGHT_MODE`  
@@ -193,31 +190,31 @@ Aliases:
   - `--stream`
   - `--no-stream`
 
-### `--user_input_color VALUE`
+### `--user-input-color VALUE`
 Set the color for user input (default: #00cc00)  
 Default: #00cc00  
 Environment variable: `AIDER_USER_INPUT_COLOR`  
 
-### `--tool_output_color VALUE`
+### `--tool-output-color VALUE`
 Set the color for tool output (default: None)  
 Environment variable: `AIDER_TOOL_OUTPUT_COLOR`  
 
-### `--tool_error_color VALUE`
+### `--tool-error-color VALUE`
 Set the color for tool error messages (default: red)  
 Default: #FF2222  
 Environment variable: `AIDER_TOOL_ERROR_COLOR`  
 
-### `--assistant_output_color VALUE`
+### `--assistant-output-color VALUE`
 Set the color for assistant output (default: #0088ff)  
 Default: #0088ff  
 Environment variable: `AIDER_ASSISTANT_OUTPUT_COLOR`  
 
-### `--code_theme VALUE`
+### `--code-theme VALUE`
 Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)  
 Default: default  
 Environment variable: `AIDER_CODE_THEME`  
 
-### `--show_diffs`
+### `--show-diffs`
 Show diffs when committing changes (default: False)  
 Default: False  
 Environment variable: `AIDER_SHOW_DIFFS`  
@@ -245,7 +242,7 @@ Specify the aider ignore file (default: .aiderignore in git root)
 Default: .aiderignore  
 Environment variable: `AIDER_AIDERIGNORE`  
 
-### `--auto_commits`
+### `--auto-commits`
 Enable/disable auto commit of LLM changes (default: True)  
 Default: True  
 Environment variable: `AIDER_AUTO_COMMITS`  
@@ -253,7 +250,7 @@ Aliases:
   - `--auto-commits`
   - `--no-auto-commits`
 
-### `--dirty_commits`
+### `--dirty-commits`
 Enable/disable commits when repo is found dirty (default: True)  
 Default: True  
 Environment variable: `AIDER_DIRTY_COMMITS`  
@@ -261,7 +258,7 @@ Aliases:
   - `--dirty-commits`
   - `--no-dirty-commits`
 
-### `--dry_run`
+### `--dry-run`
 Perform a dry run without modifying files (default: False)  
 Default: False  
 Environment variable: `AIDER_DRY_RUN`  
@@ -281,12 +278,12 @@ Lint and fix provided files, or dirty files if none provided
 Default: False  
 Environment variable: `AIDER_LINT`  
 
-### `--lint_cmd`
+### `--lint-cmd`
 Specify lint commands to run for different languages, eg: "python: flake8 --select=..." (can be used multiple times)  
 Default: []  
 Environment variable: `AIDER_LINT_CMD`  
 
-### `--auto_lint`
+### `--auto-lint`
 Enable/disable automatic linting after changes (default: True)  
 Default: True  
 Environment variable: `AIDER_AUTO_LINT`  
@@ -294,12 +291,12 @@ Aliases:
   - `--auto-lint`
   - `--no-auto-lint`
 
-### `--test_cmd`
+### `--test-cmd`
 Specify command to run tests  
 Default: []  
 Environment variable: `AIDER_TEST_CMD`  
 
-### `--auto_test`
+### `--auto-test`
 Enable/disable automatic testing after changes (default: False)  
 Default: False  
 Environment variable: `AIDER_AUTO_TEST`  
@@ -314,7 +311,7 @@ Environment variable: `AIDER_TEST`
 
 ## Other Settings:
 
-### `--voice_language VOICE_LANGUAGE`
+### `--voice-language VOICE_LANGUAGE`
 Specify the language for voice using ISO 639-1 code (default: auto)  
 Default: en  
 Environment variable: `AIDER_VOICE_LANGUAGE`  
@@ -322,12 +319,12 @@ Environment variable: `AIDER_VOICE_LANGUAGE`
 ### `--version`
 Show the version number and exit  
 
-### `--check_update`
+### `--check-update`
 Check for updates and return status in the exit code  
 Default: False  
 Environment variable: `AIDER_CHECK_UPDATE`  
 
-### `--skip_check_update`
+### `--skip-check-update`
 Skips checking for the update when the program runs  
 Default: False  
 Environment variable: `AIDER_SKIP_CHECK_UPDATE`  
@@ -348,12 +345,12 @@ Aliases:
   - `-v`
   - `--verbose`
 
-### `--show_repo_map`
+### `--show-repo-map`
 Print the repo map and exit (debug)  
 Default: False  
 Environment variable: `AIDER_SHOW_REPO_MAP`  
 
-### `--show_prompts`
+### `--show-prompts`
 Print the system prompts and exit (debug)  
 Default: False  
 Environment variable: `AIDER_SHOW_PROMPTS`  
@@ -366,7 +363,7 @@ Aliases:
   - `--msg COMMAND`
   - `-m COMMAND`
 
-### `--message_file MESSAGE_FILE`
+### `--message-file MESSAGE_FILE`
 Specify a file containing the message to send the LLM, process reply, then exit (disables chat mode)  
 Environment variable: `AIDER_MESSAGE_FILE`  
 Aliases: