diff --git a/util/flags.go b/util/flags.go
index 31e29ba..39fdde6 100644
--- a/util/flags.go
+++ b/util/flags.go
@@ -23,65 +23,63 @@ var Flags = []cli.Flag{
 		Name:    "continue-on-error",
 		Value:   false,
 		Usage:   "don't exit if an error occurs while processing a file, continue processing remaining files.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_CONTINUE_ON_ERROR"), altsrctoml.TOML("continue_on_error", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_CONTINUE_ON_ERROR"), altsrctoml.TOML("continue-on-error", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "compile-only",
 		Value:   false,
 		Usage:   "show resulting HTML and don't update Confluence page content.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_COMPILE_ONLY"), altsrctoml.TOML("compile_only", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_COMPILE_ONLY"), altsrctoml.TOML("compile-only", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "dry-run",
 		Value:   false,
 		Usage:   "resolve page and ancestry, show resulting HTML and exit.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_DRY_RUN"), altsrctoml.TOML("dry_run", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_DRY_RUN"), altsrctoml.TOML("dry-run", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "edit-lock",
 		Value:   false,
 		Aliases: []string{"k"},
 		Usage:   "lock page editing to current user only to prevent accidental manual edits over Confluence Web UI.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_EDIT_LOCK"), altsrctoml.TOML("edit_lock", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_EDIT_LOCK"), altsrctoml.TOML("edit-lock", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "drop-h1",
 		Value:   false,
-		Aliases: []string{"h1_drop"},
 		Usage:   "don't include the first H1 heading in Confluence output.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_H1_DROP"), altsrctoml.TOML("drop_h1", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_DROP_H1"), altsrctoml.TOML("drop-h1", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "strip-linebreaks",
 		Value:   false,
 		Aliases: []string{"L"},
 		Usage:   "remove linebreaks inside of tags, to accommodate non-standard Confluence behavior",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_STRIP_LINEBREAKS"), altsrctoml.TOML("strip_linebreaks", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_STRIP_LINEBREAKS"), altsrctoml.TOML("strip-linebreaks", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "title-from-h1",
 		Value:   false,
-		Aliases: []string{"h1_title"},
 		Usage:   "extract page title from a leading H1 heading. If no H1 heading on a page exists, then title must be set in the page metadata.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_H1_TITLE"), altsrctoml.TOML("title_from_h1", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_TITLE_FROM_H1"), altsrctoml.TOML("title-from-h1", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "title-append-generated-hash",
 		Value:   false,
 		Usage:   "appends a short hash generated from the path of the page (space, parents, and title) to the title",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_TITLE_APPEND_GENERATED_HASH"), altsrctoml.TOML("title_append_generated_hash", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_TITLE_APPEND_GENERATED_HASH"), altsrctoml.TOML("title-append-generated-hash", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "minor-edit",
 		Value:   false,
 		Usage:   "don't send notifications while updating Confluence page.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_MINOR_EDIT"), altsrctoml.TOML("minor_edit", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_MINOR_EDIT"), altsrctoml.TOML("minor-edit", configFile)),
 	},
 	&cli.StringFlag{
 		Name:    "version-message",
 		Value:   "",
 		Usage:   "add a message to the page version, to explain the edit (default: \"\")",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_VERSION_MESSAGE"), altsrctoml.TOML("version_message", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_VERSION_MESSAGE"), altsrctoml.TOML("version-message", configFile)),
 	},
 	&cli.StringFlag{
 		Name:  "color",
@@ -94,7 +92,7 @@ var Flags = []cli.Flag{
 		Name:    "log-level",
 		Value:   "info",
 		Usage:   "set the log level. Possible values: TRACE, DEBUG, INFO, WARNING, ERROR, FATAL.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_LOG_LEVEL"), altsrctoml.TOML("log_level", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_LOG_LEVEL"), altsrctoml.TOML("log-level", configFile)),
 	},
 	&cli.StringFlag{
 		Name:    "username",
@@ -116,15 +114,15 @@ var Flags = []cli.Flag{
 		Aliases: []string{"l"},
 		Value:   "",
 		Usage:   "edit specified Confluence page. If -l is not specified, file should contain metadata (see above).",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_TARGET_URL"), altsrctoml.TOML("target_url", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_TARGET_URL"), altsrctoml.TOML("target-url", configFile)),
 	},
 	&cli.StringFlag{
 		Name:    "base-url",
-		Aliases: []string{"b", "base_url"},
+		Aliases: []string{"b"},
 		Value:   "",
 		Usage:   "base URL for Confluence. Alternative option for base_url config field.",
 		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_BASE_URL"),
-			altsrctoml.TOML("base_url", configFile)),
+			altsrctoml.TOML("base-url", configFile)),
 	},
 	&cli.StringFlag{
 		Name:        "config",
@@ -157,38 +155,38 @@ var Flags = []cli.Flag{
 		Name:    "parents-delimiter",
 		Value:   "/",
 		Usage:   "The delimiter used for the parents list",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_PARENTS_DELIMITER"), altsrctoml.TOML("parents_delimiter", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_PARENTS_DELIMITER"), altsrctoml.TOML("parents-delimiter", configFile)),
 	},
 	&cli.StringFlag{
 		Name:    "mermaid-provider",
 		Value:   "cloudscript",
 		Usage:   "defines the mermaid provider to use. Supported options are: cloudscript, mermaid-go.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_MERMAID_PROVIDER"), altsrctoml.TOML("mermaid_provider", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_MERMAID_PROVIDER"), altsrctoml.TOML("mermaid-provider", configFile)),
 	},
 	&cli.FloatFlag{
 		Name:    "mermaid-scale",
 		Value:   1.0,
 		Usage:   "defines the scaling factor for mermaid renderings.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_MERMAID_SCALE"), altsrctoml.TOML("mermaid_scale", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_MERMAID_SCALE"), altsrctoml.TOML("mermaid-scale", configFile)),
 	},
 	&cli.StringFlag{
 		Name:      "include-path",
 		Value:     "",
 		Usage:     "Path for shared includes, used as a fallback if the include doesn't exist in the current directory.",
 		TakesFile: true,
-		Sources:   cli.NewValueSourceChain(cli.EnvVar("MARK_INCLUDE_PATH"), altsrctoml.TOML("include_path", configFile)),
+		Sources:   cli.NewValueSourceChain(cli.EnvVar("MARK_INCLUDE_PATH"), altsrctoml.TOML("include-path", configFile)),
 	},
 	&cli.BoolFlag{
 		Name:    "changes-only",
 		Value:   false,
 		Usage:   "Avoids re-uploading pages that haven't changed since the last run.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_CHANGES_ONLY"), altsrctoml.TOML("changes_only", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_CHANGES_ONLY"), altsrctoml.TOML("changes-only", configFile)),
 	},
 	&cli.FloatFlag{
 		Name:    "d2-scale",
 		Value:   1.0,
 		Usage:   "defines the scaling factor for d2 renderings.",
-		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_D2_SCALE"), altsrctoml.TOML("d2_scale", configFile)),
+		Sources: cli.NewValueSourceChain(cli.EnvVar("MARK_D2_SCALE"), altsrctoml.TOML("d2-scale", configFile)),
 	},
 
 	&cli.StringSliceFlag{