diff --git a/Sources/MarkdownUI/Views/Environment/Environment+BaseURL.swift b/Sources/MarkdownUI/Views/Environment/Environment+BaseURL.swift
index 9eb4f852..939b7bd1 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+BaseURL.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+BaseURL.swift
@@ -13,9 +13,9 @@ extension EnvironmentValues {
 }
 
 private struct BaseURLKey: EnvironmentKey {
-  static var defaultValue: URL? = nil
+  static var defaultValue: URL? { nil }
 }
 
 private struct ImageBaseURLKey: EnvironmentKey {
-  static var defaultValue: URL? = nil
+  static var defaultValue: URL? { nil }
 }
diff --git a/Sources/MarkdownUI/Views/Environment/Environment+CodeSyntaxHighlighter.swift b/Sources/MarkdownUI/Views/Environment/Environment+CodeSyntaxHighlighter.swift
index beffd749..2f0f7338 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+CodeSyntaxHighlighter.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+CodeSyntaxHighlighter.swift
@@ -23,5 +23,5 @@ extension EnvironmentValues {
 }
 
 private struct CodeSyntaxHighlighterKey: EnvironmentKey {
-  static let defaultValue: CodeSyntaxHighlighter = .plainText
+  static var defaultValue: CodeSyntaxHighlighter { .plainText }
 }
diff --git a/Sources/MarkdownUI/Views/Environment/Environment+ImageProvider.swift b/Sources/MarkdownUI/Views/Environment/Environment+ImageProvider.swift
index 909f1e4f..05f7c19b 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+ImageProvider.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+ImageProvider.swift
@@ -20,5 +20,5 @@ extension EnvironmentValues {
 }
 
 private struct ImageProviderKey: EnvironmentKey {
-  static let defaultValue: AnyImageProvider = .init(.default)
+  static var defaultValue: AnyImageProvider { .init(.default) }
 }
diff --git a/Sources/MarkdownUI/Views/Environment/Environment+InlineImageProvider.swift b/Sources/MarkdownUI/Views/Environment/Environment+InlineImageProvider.swift
index fa1b5918..20ca68ba 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+InlineImageProvider.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+InlineImageProvider.swift
@@ -20,5 +20,5 @@ extension EnvironmentValues {
 }
 
 private struct InlineImageProviderKey: EnvironmentKey {
-  static let defaultValue: InlineImageProvider = .default
+  static var defaultValue: InlineImageProvider { .default }
 }
diff --git a/Sources/MarkdownUI/Views/Environment/Environment+List.swift b/Sources/MarkdownUI/Views/Environment/Environment+List.swift
index 46ea6343..205a4e94 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+List.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+List.swift
@@ -13,9 +13,9 @@ extension EnvironmentValues {
 }
 
 private struct ListLevelKey: EnvironmentKey {
-  static var defaultValue = 0
+  static var defaultValue: Int { 0 }
 }
 
 private struct TightSpacingEnabledKey: EnvironmentKey {
-  static var defaultValue = false
+  static var defaultValue: Bool { false }
 }
diff --git a/Sources/MarkdownUI/Views/Environment/Environment+SoftBreakMode.swift b/Sources/MarkdownUI/Views/Environment/Environment+SoftBreakMode.swift
index 52e24687..5769f3c7 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+SoftBreakMode.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+SoftBreakMode.swift
@@ -19,5 +19,5 @@ extension EnvironmentValues {
 }
 
 private struct SoftBreakModeKey: EnvironmentKey {
-  static let defaultValue: SoftBreak.Mode = .space
+  static var defaultValue: SoftBreak.Mode { .space }
 }
diff --git a/Sources/MarkdownUI/Views/Environment/Environment+Table.swift b/Sources/MarkdownUI/Views/Environment/Environment+Table.swift
index e8bd5e5f..91da3ea8 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+Table.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+Table.swift
@@ -37,9 +37,9 @@ extension EnvironmentValues {
 }
 
 private struct TableBorderStyleKey: EnvironmentKey {
-  static let defaultValue = TableBorderStyle(color: .secondary)
+  static var defaultValue: TableBorderStyle { TableBorderStyle(color: .secondary) }
 }
 
 private struct TableBackgroundStyleKey: EnvironmentKey {
-  static let defaultValue = TableBackgroundStyle.clear
+  static var defaultValue: TableBackgroundStyle { TableBackgroundStyle.clear }
 }
diff --git a/Sources/MarkdownUI/Views/Environment/Environment+TextStyle.swift b/Sources/MarkdownUI/Views/Environment/Environment+TextStyle.swift
index 8de1fb99..2fd356f7 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+TextStyle.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+TextStyle.swift
@@ -51,5 +51,5 @@ extension EnvironmentValues {
 }
 
 private struct TextStyleKey: EnvironmentKey {
-  static let defaultValue: TextStyle = FontProperties()
+  static var defaultValue: TextStyle { FontProperties() }
 }
diff --git a/Sources/MarkdownUI/Views/Environment/Environment+Theme.swift b/Sources/MarkdownUI/Views/Environment/Environment+Theme.swift
index 7fd986a3..9ee3a768 100644
--- a/Sources/MarkdownUI/Views/Environment/Environment+Theme.swift
+++ b/Sources/MarkdownUI/Views/Environment/Environment+Theme.swift
@@ -70,5 +70,5 @@ extension EnvironmentValues {
 }
 
 private struct ThemeKey: EnvironmentKey {
-  static let defaultValue: Theme = .basic
+  static var defaultValue: Theme { .basic }
 }