diff --git a/Sources/TokamakCore/Styles/ButtonStyle.swift b/Sources/TokamakCore/Styles/ButtonStyle.swift
index 074f1fe05..489386698 100644
--- a/Sources/TokamakCore/Styles/ButtonStyle.swift
+++ b/Sources/TokamakCore/Styles/ButtonStyle.swift
@@ -14,88 +14,35 @@
 //
 //  Created by Gene Z. Ragan on 07/22/2020.
 
-public struct ButtonStyleConfiguration {
-  public struct Label: _PrimitiveView {
-    let content: AnyView
-  }
-
-  public let label: Label
-  public let isPressed: Bool
-}
-
-public struct DefaultButtonStyle: ButtonStyle {
-  public init() {}
-  public func makeBody(configuration: ButtonStyleConfiguration) -> some View {
-    configuration.label
-  }
-}
-
-/// This is a helper type that works around absence of "package private" access control in Swift
-public struct _ButtonStyleConfigurationProxy {
-  public struct Label {
-    public typealias Subject = ButtonStyleConfiguration.Label
-    public let subject: Subject
-
-    public init(_ subject: Subject) { self.subject = subject }
-
-    public var content: AnyView { subject.content }
-  }
-
-  public typealias Subject = ButtonStyleConfiguration
-  public let subject: Subject
-
-  public init(label: AnyView, isPressed: Bool) {
-    subject = .init(label: .init(content: label), isPressed: isPressed)
-  }
-
-  public var label: ButtonStyleConfiguration.Label { subject.label }
-}
-
 public protocol ButtonStyle {
   associatedtype Body: View
-
+  @ViewBuilder
   func makeBody(configuration: Self.Configuration) -> Self.Body
-
   typealias Configuration = ButtonStyleConfiguration
 }
 
-public struct _AnyButtonStyle: ButtonStyle {
-  public typealias Body = AnyView
-
-  private let bodyClosure: (ButtonStyleConfiguration) -> AnyView
-  public let type: Any.Type
-
-  public init<S: ButtonStyle>(_ style: S) {
-    type = S.self
-    bodyClosure = { configuration in
-      AnyView(style.makeBody(configuration: configuration))
-    }
+public struct ButtonStyleConfiguration {
+  public struct Label: View {
+    public let body: AnyView
   }
 
-  public func makeBody(configuration: ButtonStyleConfiguration) -> AnyView {
-    bodyClosure(configuration)
-  }
+  public let role: ButtonRole?
+  public let label: ButtonStyleConfiguration.Label
+  public let isPressed: Bool
 }
 
-public enum _ButtonStyleKey: EnvironmentKey {
-  public static var defaultValue: _AnyButtonStyle {
-    _AnyButtonStyle(DefaultButtonStyle())
-  }
-}
+struct AnyButtonStyle: ButtonStyle {
+  let bodyClosure: (ButtonStyleConfiguration) -> AnyView
+  let type: Any.Type
 
-extension EnvironmentValues {
-  var buttonStyle: _AnyButtonStyle {
-    get {
-      self[_ButtonStyleKey.self]
-    }
-    set {
-      self[_ButtonStyleKey.self] = newValue
+  init<S: ButtonStyle>(_ style: S) {
+    type = S.self
+    bodyClosure = {
+      AnyView(style.makeBody(configuration: $0))
     }
   }
-}
 
-public extension View {
-  func buttonStyle<S>(_ style: S) -> some View where S: ButtonStyle {
-    environment(\.buttonStyle, _AnyButtonStyle(style))
+  func makeBody(configuration: Configuration) -> some View {
+    bodyClosure(configuration)
   }
 }
diff --git a/Sources/TokamakCore/Styles/ControlGroupStyle.swift b/Sources/TokamakCore/Styles/ControlGroupStyle.swift
new file mode 100644
index 000000000..7b772cd43
--- /dev/null
+++ b/Sources/TokamakCore/Styles/ControlGroupStyle.swift
@@ -0,0 +1,104 @@
+// Copyright 2018-2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Carson Katri on 7/12/21.
+//
+
+import Foundation
+
+public protocol ControlGroupStyle {
+  associatedtype Body: View
+  @ViewBuilder
+  func makeBody(configuration: Self.Configuration) -> Self.Body
+  typealias Configuration = ControlGroupStyleConfiguration
+}
+
+public struct ControlGroupStyleConfiguration {
+  public struct Content: View {
+    public let body: AnyView
+  }
+
+  public let content: ControlGroupStyleConfiguration.Content
+}
+
+public struct AutomaticControlGroupStyle: ControlGroupStyle {
+  public init() {}
+
+  public func makeBody(configuration: Self.Configuration) -> some View {
+    Picker(
+      selection: .constant(AnyHashable?.none),
+      label: EmptyView()
+    ) {
+      if let parentView = configuration.content.body.view as? ParentView {
+        ForEach(Array(parentView.children.enumerated()), id: \.offset) {
+          $0.element
+        }
+      } else {
+        configuration.content
+      }
+    }
+    .pickerStyle(SegmentedPickerStyle())
+  }
+}
+
+public struct NavigationControlGroupStyle: ControlGroupStyle {
+  public init() {}
+
+  public func makeBody(configuration: Self.Configuration) -> some View {
+    HStack {
+      configuration.content
+    }
+  }
+}
+
+public struct _AnyControlGroupStyle: ControlGroupStyle {
+  public typealias Body = AnyView
+
+  private let bodyClosure: (ControlGroupStyleConfiguration) -> AnyView
+  public let type: Any.Type
+
+  public init<S: ControlGroupStyle>(_ style: S) {
+    type = S.self
+    bodyClosure = { configuration in
+      AnyView(style.makeBody(configuration: configuration))
+    }
+  }
+
+  public func makeBody(configuration: ControlGroupStyleConfiguration) -> AnyView {
+    bodyClosure(configuration)
+  }
+}
+
+extension EnvironmentValues {
+  private enum ControlGroupStyleKey: EnvironmentKey {
+    static let defaultValue = _AnyControlGroupStyle(AutomaticControlGroupStyle())
+  }
+
+  var controlGroupStyle: _AnyControlGroupStyle {
+    get {
+      self[ControlGroupStyleKey.self]
+    }
+    set {
+      self[ControlGroupStyleKey.self] = newValue
+    }
+  }
+}
+
+public extension View {
+  func controlGroupStyle<S>(
+    _ style: S
+  ) -> some View where S: ControlGroupStyle {
+    environment(\.controlGroupStyle, .init(style))
+  }
+}
diff --git a/Sources/TokamakCore/Styles/PrimitiveButtonStyle.swift b/Sources/TokamakCore/Styles/PrimitiveButtonStyle.swift
new file mode 100644
index 000000000..3c7bdaac7
--- /dev/null
+++ b/Sources/TokamakCore/Styles/PrimitiveButtonStyle.swift
@@ -0,0 +1,133 @@
+// Copyright 2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Carson Katri on 7/12/21.
+//
+
+public protocol PrimitiveButtonStyle {
+  associatedtype Body: View
+  @ViewBuilder
+  func makeBody(configuration: Self.Configuration) -> Self.Body
+  typealias Configuration = PrimitiveButtonStyleConfiguration
+}
+
+public struct PrimitiveButtonStyleConfiguration {
+  public struct Label: View {
+    public let body: AnyView
+  }
+
+  public let role: ButtonRole?
+  public let label: PrimitiveButtonStyleConfiguration.Label
+
+  let action: () -> ()
+  public func trigger() { action() }
+}
+
+public struct DefaultButtonStyle: PrimitiveButtonStyle {
+  public init() {}
+
+  public func makeBody(configuration: Configuration) -> some View {
+    BorderedButtonStyle().makeBody(configuration: configuration)
+  }
+}
+
+public struct PlainButtonStyle: ButtonStyle {
+  public init() {}
+
+  public func makeBody(configuration: Configuration) -> some View {
+    configuration.label
+      .foregroundColor(configuration.isPressed ? .secondary : .primary)
+  }
+}
+
+public struct BorderedButtonStyle: PrimitiveButtonStyle {
+  public init() {}
+
+  public func makeBody(configuration: Configuration) -> some View {
+    _PrimitiveButtonStyleBody(style: self, configuration: configuration) {
+      configuration.label
+    }
+  }
+}
+
+public struct BorderlessButtonStyle: ButtonStyle {
+  public init() {}
+
+  public func makeBody(configuration: Configuration) -> some View {
+    configuration.label
+      .foregroundColor(configuration.isPressed ? .primary : .secondary)
+  }
+}
+
+public struct LinkButtonStyle: ButtonStyle {
+  public init() {}
+
+  public func makeBody(configuration: Configuration) -> some View {
+    configuration.label.body
+      .foregroundColor(
+        configuration
+          .isPressed ? Color(red: 128 / 255, green: 192 / 255, blue: 240 / 255) : .blue
+      )
+  }
+}
+
+struct AnyPrimitiveButtonStyle: PrimitiveButtonStyle {
+  let bodyClosure: (PrimitiveButtonStyleConfiguration) -> AnyView
+  let type: Any.Type
+
+  init<S: PrimitiveButtonStyle>(_ style: S) {
+    type = S.self
+    bodyClosure = {
+      AnyView(style.makeBody(configuration: $0))
+    }
+  }
+
+  func makeBody(configuration: Self.Configuration) -> AnyView {
+    bodyClosure(configuration)
+  }
+}
+
+extension EnvironmentValues {
+  enum ButtonStyleKey: EnvironmentKey {
+    enum ButtonStyleKeyValue {
+      case primitiveButtonStyle(AnyPrimitiveButtonStyle)
+      case buttonStyle(AnyButtonStyle)
+    }
+
+    public static let defaultValue: ButtonStyleKeyValue = .primitiveButtonStyle(
+      .init(DefaultButtonStyle())
+    )
+  }
+
+  var buttonStyle: ButtonStyleKey.ButtonStyleKeyValue {
+    get {
+      self[ButtonStyleKey.self]
+    }
+    set {
+      self[ButtonStyleKey.self] = newValue
+    }
+  }
+}
+
+public extension View {
+  func buttonStyle<S>(
+    _ style: S
+  ) -> some View where S: PrimitiveButtonStyle {
+    environment(\.buttonStyle, .primitiveButtonStyle(.init(style)))
+  }
+
+  func buttonStyle<S>(_ style: S) -> some View where S: ButtonStyle {
+    environment(\.buttonStyle, .buttonStyle(.init(style)))
+  }
+}
diff --git a/Sources/TokamakDOM/Styles/ButtonStyle.swift b/Sources/TokamakCore/Tokens/Controls/ButtonRole.swift
similarity index 63%
rename from Sources/TokamakDOM/Styles/ButtonStyle.swift
rename to Sources/TokamakCore/Tokens/Controls/ButtonRole.swift
index 025a50655..2b197420a 100644
--- a/Sources/TokamakDOM/Styles/ButtonStyle.swift
+++ b/Sources/TokamakCore/Tokens/Controls/ButtonRole.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2018-2020 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,13 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-//  Created by Gene Z. Ragan on 07/22/2020.
+//  Created by Carson Katri on 7/12/21.
 //
 
-import TokamakCore
+public struct ButtonRole: Equatable {
+  public static let destructive = ButtonRole(rawValue: 0)
+  public static let cancel = ButtonRole(rawValue: 1)
 
-extension ButtonStyleConfiguration.Label: DOMPrimitive {
-  var renderedBody: AnyView {
-    _ButtonStyleConfigurationProxy.Label(self).content
+  private let rawValue: Int
+  private init(rawValue: Int) {
+    self.rawValue = rawValue
   }
 }
diff --git a/Sources/TokamakCore/Tokens/Controls/ControlSize.swift b/Sources/TokamakCore/Tokens/Controls/ControlSize.swift
new file mode 100644
index 000000000..c31560a03
--- /dev/null
+++ b/Sources/TokamakCore/Tokens/Controls/ControlSize.swift
@@ -0,0 +1,47 @@
+// Copyright 2018-2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Carson Katri on 7/12/21.
+//
+
+public enum ControlSize: CaseIterable, Hashable {
+  case mini
+  case small
+  case regular
+  case large
+}
+
+extension EnvironmentValues {
+  private enum ControlSizeKey: EnvironmentKey {
+    static var defaultValue: ControlSize = .regular
+  }
+
+  public var controlSize: ControlSize {
+    get {
+      self[ControlSizeKey.self]
+    }
+    set {
+      self[ControlSizeKey.self] = newValue
+    }
+  }
+}
+
+public extension View {
+  @inlinable
+  func controlSize(
+    _ controlSize: ControlSize
+  ) -> some View {
+    environment(\.controlSize, controlSize)
+  }
+}
diff --git a/Sources/TokamakCore/Tokens/Controls/Prominence.swift b/Sources/TokamakCore/Tokens/Controls/Prominence.swift
new file mode 100644
index 000000000..3889e89fb
--- /dev/null
+++ b/Sources/TokamakCore/Tokens/Controls/Prominence.swift
@@ -0,0 +1,59 @@
+// Copyright 2018-2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Carson Katri on 7/12/21.
+//
+
+public enum Prominence: Hashable {
+  case standard
+  case increased
+}
+
+extension EnvironmentValues {
+  private enum ControlProminenceKey: EnvironmentKey {
+    static var defaultValue: Prominence = .standard
+  }
+
+  public var controlProminence: Prominence {
+    get {
+      self[ControlProminenceKey.self]
+    }
+    set {
+      self[ControlProminenceKey.self] = newValue
+    }
+  }
+
+  private enum HeaderProminenceKey: EnvironmentKey {
+    static var defaultValue: Prominence = .standard
+  }
+
+  public var headerProminence: Prominence {
+    get {
+      self[HeaderProminenceKey.self]
+    }
+    set {
+      self[HeaderProminenceKey.self] = newValue
+    }
+  }
+}
+
+public extension View {
+  func controlProminence(_ prominence: Prominence) -> some View {
+    environment(\.controlProminence, prominence)
+  }
+
+  func headerProminence(_ prominence: Prominence) -> some View {
+    environment(\.headerProminence, prominence)
+  }
+}
diff --git a/Sources/TokamakCore/Views/Buttons/Button.swift b/Sources/TokamakCore/Views/Buttons/Button.swift
deleted file mode 100644
index d00d46219..000000000
--- a/Sources/TokamakCore/Views/Buttons/Button.swift
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2018-2020 Tokamak contributors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//  Created by Max Desiatov on 02/12/2018.
-//
-
-/// A control that performs an action when triggered.
-///
-/// Available when `Label` conforms to `View`.
-///
-/// A button is created using a `Label`; the `action` initializer argument (a method or closure)
-/// is to be called on click.
-///
-///     @State private var counter: Int = 0
-///     var body: some View {
-///       Button(action: { counter += 1 }) {
-///         Text("\(counter)")
-///       }
-///     }
-///
-/// When your label is `Text`, you can create the button by directly passing a `String`:
-///
-///     @State private var counter: Int = 0
-///     var body: some View {
-///       Button("\(counter)", action: { counter += 1 })
-///     }
-public struct Button<Label>: View where Label: View {
-  let implementation: _Button<Label>
-
-  public init(action: @escaping () -> (), @ViewBuilder label: () -> Label) {
-    implementation = _Button(action: action, label: label())
-  }
-
-  @_spi(TomkamakCore)
-  public var body: some View {
-    implementation
-  }
-}
-
-public struct _Button<Label>: _PrimitiveView where Label: View {
-  public let label: Label
-  public let action: () -> ()
-  @State public var isPressed = false
-  @Environment(\.buttonStyle) public var buttonStyle
-
-  public init(action: @escaping () -> (), label: Label) {
-    self.label = label
-    self.action = action
-  }
-}
-
-public extension Button where Label == Text {
-  init<S>(_ title: S, action: @escaping () -> ()) where S: StringProtocol {
-    self.init(action: action) {
-      Text(title)
-    }
-  }
-}
-
-extension Button: ParentView {
-  @_spi(TokamakCore)
-  public var children: [AnyView] {
-    (implementation.label as? GroupView)?.children ?? [AnyView(implementation.label)]
-  }
-}
diff --git a/Sources/TokamakCore/Views/Controls/Button.swift b/Sources/TokamakCore/Views/Controls/Button.swift
new file mode 100644
index 000000000..00958944e
--- /dev/null
+++ b/Sources/TokamakCore/Views/Controls/Button.swift
@@ -0,0 +1,138 @@
+// Copyright 2018-2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Max Desiatov on 02/12/2018.
+//
+
+/// A control that performs an action when triggered.
+///
+/// Available when `Label` conforms to `View`.
+///
+/// A button is created using a `Label`; the `action` initializer argument (a method or closure)
+/// is to be called on click.
+///
+///     @State private var counter: Int = 0
+///     var body: some View {
+///       Button(action: { counter += 1 }) {
+///         Text("\(counter)")
+///       }
+///     }
+///
+/// When your label is `Text`, you can create the button by directly passing a `String`:
+///
+///     @State private var counter: Int = 0
+///     var body: some View {
+///       Button("\(counter)", action: { counter += 1 })
+///     }
+public struct Button<Label>: View where Label: View {
+  let label: Label
+  let action: () -> ()
+  let role: ButtonRole?
+
+  @Environment(\.buttonStyle) var buttonStyle
+
+  public init(action: @escaping () -> (), @ViewBuilder label: () -> Label) {
+    self.init(role: nil, action: action, label: label)
+  }
+
+  @_spi(TokamakCore)
+  public var body: some View {
+    switch buttonStyle {
+    case let .primitiveButtonStyle(style):
+      style.makeBody(configuration: .init(
+        role: role, label: .init(body: AnyView(label)),
+        action: action
+      ))
+    case let .buttonStyle(style):
+      _Button(
+        label: label,
+        role: role,
+        action: action,
+        anyStyle: style
+      )
+    }
+  }
+}
+
+public struct _PrimitiveButtonStyleBody<Label>: _PrimitiveView where Label: View {
+  public let label: Label
+  public let role: ButtonRole?
+  public let action: () -> ()
+
+  let anyStyle: AnyPrimitiveButtonStyle
+  public var style: Any.Type { anyStyle.type }
+
+  init<S: PrimitiveButtonStyle>(
+    style: S,
+    configuration: PrimitiveButtonStyleConfiguration,
+    @ViewBuilder label: () -> Label
+  ) {
+    role = configuration.role
+    action = configuration.action
+    self.label = label()
+    anyStyle = .init(style)
+  }
+
+  @Environment(\.controlProminence) public var controlProminence
+  @Environment(\.controlSize) public var controlSize
+}
+
+public struct _Button<Label>: _PrimitiveView where Label: View {
+  public let label: Label
+  public let role: ButtonRole?
+  public let action: () -> ()
+  @State public var isPressed = false
+
+  let anyStyle: AnyButtonStyle
+  public var style: Any.Type { anyStyle.type }
+  public func makeStyleBody() -> some View {
+    anyStyle.makeBody(
+      configuration: .init(
+        role: role,
+        label: .init(body: AnyView(label)),
+        isPressed: isPressed
+      )
+    )
+  }
+}
+
+public extension Button where Label == Text {
+  init<S>(_ title: S, action: @escaping () -> ()) where S: StringProtocol {
+    self.init(title, role: nil, action: action)
+  }
+}
+
+public extension Button {
+  init(
+    role: ButtonRole?,
+    action: @escaping () -> (),
+    @ViewBuilder label: () -> Label
+  ) {
+    self.label = label()
+    self.action = action
+    self.role = role
+  }
+}
+
+public extension Button where Label == Text {
+  init<S>(
+    _ title: S,
+    role: ButtonRole?,
+    action: @escaping () -> ()
+  ) where S: StringProtocol {
+    label = Text(title)
+    self.action = action
+    self.role = role
+  }
+}
diff --git a/Sources/TokamakCore/Views/Controls/ControlGroup.swift b/Sources/TokamakCore/Views/Controls/ControlGroup.swift
new file mode 100644
index 000000000..96ac659fa
--- /dev/null
+++ b/Sources/TokamakCore/Views/Controls/ControlGroup.swift
@@ -0,0 +1,35 @@
+// Copyright 2018-2020 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//  Created by Carson Katri on 7/12/21.
+//
+
+public struct ControlGroup<Content>: View where Content: View {
+  let content: Content
+  @Environment(\.controlGroupStyle) var style
+
+  public init(@ViewBuilder content: () -> Content) {
+    self.content = content()
+  }
+
+  public var body: some View {
+    style.makeBody(configuration: .init(content: .init(body: AnyView(content))))
+  }
+}
+
+public extension ControlGroup where Content == ControlGroupStyleConfiguration.Content {
+  init(_ configuration: ControlGroupStyleConfiguration) {
+    content = configuration.content
+  }
+}
diff --git a/Sources/TokamakCore/Views/Buttons/Link.swift b/Sources/TokamakCore/Views/Controls/Link.swift
similarity index 100%
rename from Sources/TokamakCore/Views/Buttons/Link.swift
rename to Sources/TokamakCore/Views/Controls/Link.swift
diff --git a/Sources/TokamakCore/Views/Selectors/DatePicker.swift b/Sources/TokamakCore/Views/Controls/Selectors/DatePicker.swift
similarity index 100%
rename from Sources/TokamakCore/Views/Selectors/DatePicker.swift
rename to Sources/TokamakCore/Views/Controls/Selectors/DatePicker.swift
diff --git a/Sources/TokamakCore/Views/Selectors/Picker.swift b/Sources/TokamakCore/Views/Controls/Selectors/Picker.swift
similarity index 100%
rename from Sources/TokamakCore/Views/Selectors/Picker.swift
rename to Sources/TokamakCore/Views/Controls/Selectors/Picker.swift
diff --git a/Sources/TokamakCore/Views/Selectors/Slider.swift b/Sources/TokamakCore/Views/Controls/Selectors/Slider.swift
similarity index 100%
rename from Sources/TokamakCore/Views/Selectors/Slider.swift
rename to Sources/TokamakCore/Views/Controls/Selectors/Slider.swift
diff --git a/Sources/TokamakCore/Views/Selectors/Toggle.swift b/Sources/TokamakCore/Views/Controls/Selectors/Toggle.swift
similarity index 100%
rename from Sources/TokamakCore/Views/Selectors/Toggle.swift
rename to Sources/TokamakCore/Views/Controls/Selectors/Toggle.swift
diff --git a/Sources/TokamakDOM/Core.swift b/Sources/TokamakDOM/Core.swift
index f3993a992..18d47acad 100644
--- a/Sources/TokamakDOM/Core.swift
+++ b/Sources/TokamakDOM/Core.swift
@@ -62,6 +62,14 @@ public typealias ToggleStyleConfiguration = TokamakCore.ToggleStyleConfiguration
 public typealias ButtonStyle = TokamakCore.ButtonStyle
 public typealias ButtonStyleConfiguration = TokamakCore.ButtonStyleConfiguration
 public typealias DefaultButtonStyle = TokamakCore.DefaultButtonStyle
+public typealias PlainButtonStyle = TokamakCore.PlainButtonStyle
+public typealias BorderedButtonStyle = TokamakCore.BorderedButtonStyle
+public typealias BorderlessButtonStyle = TokamakCore.BorderlessButtonStyle
+public typealias LinkButtonStyle = TokamakCore.LinkButtonStyle
+
+public typealias ControlGroupStyle = TokamakCore.ControlGroupStyle
+public typealias AutomaticControlGroupStyle = TokamakCore.AutomaticControlGroupStyle
+public typealias NavigationControlGroupStyle = TokamakCore.NavigationControlGroupStyle
 
 public typealias TextFieldStyle = TokamakCore.TextFieldStyle
 
@@ -109,10 +117,14 @@ public typealias UnitPoint = TokamakCore.UnitPoint
 
 public typealias Edge = TokamakCore.Edge
 
+public typealias Prominence = TokamakCore.Prominence
+
 // MARK: Views
 
 public typealias Alignment = TokamakCore.Alignment
 public typealias Button = TokamakCore.Button
+public typealias ControlGroup = TokamakCore.ControlGroup
+public typealias ControlSize = TokamakCore.ControlSize
 public typealias DatePicker = TokamakCore.DatePicker
 public typealias DisclosureGroup = TokamakCore.DisclosureGroup
 public typealias Divider = TokamakCore.Divider
diff --git a/Sources/TokamakDOM/Views/Buttons/Button.swift b/Sources/TokamakDOM/Views/Buttons/Button.swift
index 7ad08a9e0..899d618b1 100644
--- a/Sources/TokamakDOM/Views/Buttons/Button.swift
+++ b/Sources/TokamakDOM/Views/Buttons/Button.swift
@@ -21,7 +21,6 @@ import TokamakStaticHTML
 extension _Button: DOMPrimitive {
   @_spi(TokamakCore)
   public var renderedBody: AnyView {
-    var attributes: [HTMLAttribute: String] = [:]
     let listeners: [String: Listener] = [
       "pointerdown": { _ in isPressed = true },
       "pointerup": { _ in
@@ -29,21 +28,58 @@ extension _Button: DOMPrimitive {
         action()
       },
     ]
-    if buttonStyle.type != DefaultButtonStyle.self {
+    return AnyView(DynamicHTML(
+      "button",
+      ["class": "_tokamak-buttonstyle-reset"],
+      listeners: listeners
+    ) {
+      self.makeStyleBody()
+    })
+  }
+}
+
+extension _PrimitiveButtonStyleBody: DOMPrimitive {
+  @_spi(TokamakCore)
+  public var renderedBody: AnyView {
+    let listeners: [String: Listener] = [
+      "pointerup": { _ in
+        action()
+      },
+    ]
+    let isResetStyle = style is PlainButtonStyle.Type
+      || style is BorderlessButtonStyle.Type
+      || style is LinkButtonStyle.Type
+    let isBordered = style is BorderedButtonStyle.Type
+      || style is DefaultButtonStyle.Type
+    var attributes = [HTMLAttribute: String]()
+    if isResetStyle {
       attributes["class"] = "_tokamak-buttonstyle-reset"
+    } else if isBordered && controlProminence == .increased {
+      attributes["class"] = "_tokamak-button-prominence-increased"
+    }
+    let font: Font?
+    switch controlSize {
+    case .mini: font = .caption2
+    case .small: font = .caption
+    case .regular: font = .body
+    case .large: font = .title3
     }
     return AnyView(DynamicHTML(
       "button",
       attributes,
       listeners: listeners
     ) {
-      buttonStyle.makeBody(
-        configuration: _ButtonStyleConfigurationProxy(
-          label: AnyView(label),
-          isPressed: isPressed
-        ).subject
-      )
-      .colorScheme(.light)
-    })
+      if !isResetStyle {
+        if isBordered && controlProminence == .increased {
+          self.label
+            .foregroundColor(.white)
+        } else {
+          self.label
+            .colorScheme(.light)
+        }
+      } else {
+        self.label
+      }
+    }.font(font))
   }
 }
diff --git a/Sources/TokamakDemo/ButtonStyleDemo.swift b/Sources/TokamakDemo/ButtonStyleDemo.swift
index 006ee9b3d..28f393355 100644
--- a/Sources/TokamakDemo/ButtonStyleDemo.swift
+++ b/Sources/TokamakDemo/ButtonStyleDemo.swift
@@ -25,6 +25,19 @@ struct PressedButtonStyle: ButtonStyle {
 }
 
 public struct ButtonStyleDemo: View {
+  #if compiler(>=5.5) || os(WASI) // Xcode 13 required for `controlSize` & `ButtonRole`.
+  var allSizes: some View {
+    HStack {
+      if #available(iOS 15.0, macOS 12.0, *) {
+        ForEach(Array(ControlSize.allCases.enumerated()), id: \.offset) { controlSize in
+          Button("Button", role: .cancel) {}
+            .controlSize(controlSize.element)
+        }
+      }
+    }
+  }
+  #endif
+
   public var body: some View {
     VStack {
       Button("Default Style") {
@@ -65,6 +78,28 @@ public struct ButtonStyleDemo: View {
         .buttonStyle(
           PressedButtonStyle(pressedColor: Color.red)
         )
+      if #available(iOS 15.0, macOS 12.0, *) {
+        #if compiler(>=5.5) || os(WASI) // Xcode 13 required for `controlProminence`.
+        Button("Prominent") {}
+          .controlProminence(.increased)
+        Text("borderless")
+          .font(.headline)
+        allSizes
+          .buttonStyle(BorderlessButtonStyle())
+        Text("bordered")
+          .font(.headline)
+        allSizes
+          .buttonStyle(BorderedButtonStyle())
+        Text("link")
+          .font(.headline)
+        allSizes
+          .buttonStyle(LinkButtonStyle())
+        Text("plain")
+          .font(.headline)
+        allSizes
+          .buttonStyle(PlainButtonStyle())
+        #endif
+      }
     }
   }
 }
diff --git a/Sources/TokamakStaticHTML/Resources/TokamakStyles.swift b/Sources/TokamakStaticHTML/Resources/TokamakStyles.swift
index 558dd4238..a5e6ee61a 100644
--- a/Sources/TokamakStaticHTML/Resources/TokamakStyles.swift
+++ b/Sources/TokamakStaticHTML/Resources/TokamakStyles.swift
@@ -72,6 +72,30 @@ public let tokamakStyles = """
   padding: 0;
   font-size: inherit;
 }
+@supports (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    -webkit-appearance: default-button;
+  }
+}
+@supports not (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    background-color: rgb(55, 120, 246);
+    border: 1px solid rgb(88, 156, 248);
+    border-radius: 4px;
+  }
+  ._tokamak-button-prominence-increased:active {
+    background-color: rgb(38, 99, 226);
+  }
+
+  @media (prefers-color-scheme:dark) {
+    ._tokamak-button-prominence-increased {
+      background-color: rgb(56, 116, 225);
+    }
+    ._tokamak-button-prominence-increased:active {
+      background-color: rgb(56, 134, 247);
+    }
+  }
+}
 
 ._tokamak-text-redacted {
   position: relative;
diff --git a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testFontStacks.1.txt b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testFontStacks.1.txt
index 1122808ba..2e44677dc 100644
--- a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testFontStacks.1.txt
+++ b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testFontStacks.1.txt
@@ -59,6 +59,30 @@
   padding: 0;
   font-size: inherit;
 }
+@supports (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    -webkit-appearance: default-button;
+  }
+}
+@supports not (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    background-color: rgb(55, 120, 246);
+    border: 1px solid rgb(88, 156, 248);
+    border-radius: 4px;
+  }
+  ._tokamak-button-prominence-increased:active {
+    background-color: rgb(38, 99, 226);
+  }
+
+  @media (prefers-color-scheme:dark) {
+    ._tokamak-button-prominence-increased {
+      background-color: rgb(56, 116, 225);
+    }
+    ._tokamak-button-prominence-increased:active {
+      background-color: rgb(56, 134, 247);
+    }
+  }
+}
 
 ._tokamak-text-redacted {
   position: relative;
diff --git a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testFontStacks.2.txt b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testFontStacks.2.txt
index 67c3d5c01..f60d22570 100644
--- a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testFontStacks.2.txt
+++ b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testFontStacks.2.txt
@@ -59,6 +59,30 @@
   padding: 0;
   font-size: inherit;
 }
+@supports (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    -webkit-appearance: default-button;
+  }
+}
+@supports not (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    background-color: rgb(55, 120, 246);
+    border: 1px solid rgb(88, 156, 248);
+    border-radius: 4px;
+  }
+  ._tokamak-button-prominence-increased:active {
+    background-color: rgb(38, 99, 226);
+  }
+
+  @media (prefers-color-scheme:dark) {
+    ._tokamak-button-prominence-increased {
+      background-color: rgb(56, 116, 225);
+    }
+    ._tokamak-button-prominence-increased:active {
+      background-color: rgb(56, 134, 247);
+    }
+  }
+}
 
 ._tokamak-text-redacted {
   position: relative;
diff --git a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testOptional.1.txt b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testOptional.1.txt
index 6d91d8b53..d147f7220 100644
--- a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testOptional.1.txt
+++ b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testOptional.1.txt
@@ -59,6 +59,30 @@
   padding: 0;
   font-size: inherit;
 }
+@supports (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    -webkit-appearance: default-button;
+  }
+}
+@supports not (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    background-color: rgb(55, 120, 246);
+    border: 1px solid rgb(88, 156, 248);
+    border-radius: 4px;
+  }
+  ._tokamak-button-prominence-increased:active {
+    background-color: rgb(38, 99, 226);
+  }
+
+  @media (prefers-color-scheme:dark) {
+    ._tokamak-button-prominence-increased {
+      background-color: rgb(56, 116, 225);
+    }
+    ._tokamak-button-prominence-increased:active {
+      background-color: rgb(56, 134, 247);
+    }
+  }
+}
 
 ._tokamak-text-redacted {
   position: relative;
diff --git a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testPaddingFusion.1.txt b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testPaddingFusion.1.txt
index b5b8af2a5..30437af3f 100644
--- a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testPaddingFusion.1.txt
+++ b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testPaddingFusion.1.txt
@@ -59,6 +59,30 @@
   padding: 0;
   font-size: inherit;
 }
+@supports (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    -webkit-appearance: default-button;
+  }
+}
+@supports not (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    background-color: rgb(55, 120, 246);
+    border: 1px solid rgb(88, 156, 248);
+    border-radius: 4px;
+  }
+  ._tokamak-button-prominence-increased:active {
+    background-color: rgb(38, 99, 226);
+  }
+
+  @media (prefers-color-scheme:dark) {
+    ._tokamak-button-prominence-increased {
+      background-color: rgb(56, 116, 225);
+    }
+    ._tokamak-button-prominence-increased:active {
+      background-color: rgb(56, 134, 247);
+    }
+  }
+}
 
 ._tokamak-text-redacted {
   position: relative;
diff --git a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testPaddingFusion.2.txt b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testPaddingFusion.2.txt
index 7b232a063..24c122c8b 100644
--- a/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testPaddingFusion.2.txt
+++ b/Tests/TokamakStaticHTMLTests/__Snapshots__/HTMLTests/testPaddingFusion.2.txt
@@ -59,6 +59,30 @@
   padding: 0;
   font-size: inherit;
 }
+@supports (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    -webkit-appearance: default-button;
+  }
+}
+@supports not (-webkit-appearance: default-button) {
+  ._tokamak-button-prominence-increased {
+    background-color: rgb(55, 120, 246);
+    border: 1px solid rgb(88, 156, 248);
+    border-radius: 4px;
+  }
+  ._tokamak-button-prominence-increased:active {
+    background-color: rgb(38, 99, 226);
+  }
+
+  @media (prefers-color-scheme:dark) {
+    ._tokamak-button-prominence-increased {
+      background-color: rgb(56, 116, 225);
+    }
+    ._tokamak-button-prominence-increased:active {
+      background-color: rgb(56, 134, 247);
+    }
+  }
+}
 
 ._tokamak-text-redacted {
   position: relative;
diff --git a/Tests/TokamakTests/ReconcilerTests.swift b/Tests/TokamakTests/ReconcilerTests.swift
index d45160fc7..30bfbae9b 100644
--- a/Tests/TokamakTests/ReconcilerTests.swift
+++ b/Tests/TokamakTests/ReconcilerTests.swift
@@ -58,7 +58,7 @@ final class ReconcilerTests: XCTestCase {
     )
     let stack = conditional.subviews[0]
     XCTAssertEqual(stack.subviews.count, 2)
-    XCTAssertTrue(stack.subviews[0].view.view is _Button<Text>)
+    XCTAssertTrue(stack.subviews[0].view.view is Button<Text>.Body)
     XCTAssertTrue(stack.subviews[1].view.view is Text)
     XCTAssertEqual((stack.subviews[1].view.view as? Text)?.verbatim, "42")
   }
@@ -68,7 +68,9 @@ final class ReconcilerTests: XCTestCase {
     let root = renderer.rootTarget
     let stack = root.subviews[0].subviews[0]
 
-    guard let button = stack.subviews[0].view.view as? _Button<Text> else {
+    guard let button = stack.subviews[0].subviews[0].view
+      .view as? _PrimitiveButtonStyleBody<PrimitiveButtonStyleConfiguration.Label>
+    else {
       XCTAssert(false, "counter has no button")
       return
     }
@@ -83,7 +85,7 @@ final class ReconcilerTests: XCTestCase {
     XCTAssert(stack === newStack)
     XCTAssertTrue(stack.view.view is VStack<TupleView<(Button<Text>, Text)>>)
     XCTAssertEqual(stack.subviews.count, 2)
-    XCTAssertTrue(stack.subviews[0].view.view is _Button<Text>)
+    XCTAssertTrue(stack.subviews[0].view.view is Button<Text>.Body)
     XCTAssertTrue(stack.subviews[1].view.view is Text)
     XCTAssertTrue(originalLabel === newStack.subviews[1])
     XCTAssertEqual((stack.subviews[1].view.view as? Text)?.verbatim, "43")
@@ -94,7 +96,9 @@ final class ReconcilerTests: XCTestCase {
     let root = renderer.rootTarget
     let stack = root.subviews[0].subviews[0]
 
-    guard let button = stack.subviews[0].view.view as? _Button<Text> else {
+    guard let button = stack.subviews[0].subviews[0].view
+      .view as? _PrimitiveButtonStyleBody<PrimitiveButtonStyleConfiguration.Label>
+    else {
       XCTAssert(false, "counter has no button")
       return
     }
@@ -109,12 +113,14 @@ final class ReconcilerTests: XCTestCase {
     XCTAssert(stack === newStack)
     XCTAssertTrue(stack.view.view is VStack<TupleView<(Button<Text>, Text)>>)
     XCTAssertEqual(stack.subviews.count, 2)
-    XCTAssertTrue(stack.subviews[0].view.view is _Button<Text>)
+    XCTAssertTrue(stack.subviews[0].view.view is Button<Text>.Body)
     XCTAssertTrue(stack.subviews[1].view.view is Text)
     XCTAssertTrue(originalLabel === newStack.subviews[1])
     XCTAssertEqual((stack.subviews[1].view.view as? Text)?.verbatim, "43")
 
-    guard let newButton = stack.subviews[0].view.view as? _Button<Text> else {
+    guard let newButton = stack.subviews[0].subviews[0].view
+      .view as? _PrimitiveButtonStyleBody<PrimitiveButtonStyleConfiguration.Label>
+    else {
       XCTAssert(false, "counter has no button")
       return
     }
@@ -127,7 +133,7 @@ final class ReconcilerTests: XCTestCase {
     XCTAssert(stack === newestStack)
     XCTAssertTrue(stack.view.view is VStack<TupleView<(Button<Text>, Text)>>)
     XCTAssertEqual(stack.subviews.count, 2)
-    XCTAssertTrue(stack.subviews[0].view.view is _Button<Text>)
+    XCTAssertTrue(stack.subviews[0].view.view is Button<Text>.Body)
     XCTAssertTrue(stack.subviews[1].view.view is Text)
     XCTAssertTrue(originalLabel === newStack.subviews[1])
     XCTAssertEqual((stack.subviews[1].view.view as? Text)?.verbatim, "44")
@@ -138,21 +144,27 @@ final class ReconcilerTests: XCTestCase {
     let root = renderer.rootTarget
 
     let stack = root.subviews[0].subviews[0]
-    guard let button = stack.subviews[0].view.view as? _Button<Text> else {
+    guard let button = stack.subviews[0].subviews[0].view
+      .view as? _PrimitiveButtonStyleBody<PrimitiveButtonStyleConfiguration.Label>
+    else {
       XCTAssert(false, "counter has no button")
       return
     }
 
     button.action()
 
-    guard let newButton = stack.subviews[0].view.view as? _Button<Text> else {
+    guard let newButton = stack.subviews[0].subviews[0].view
+      .view as? _PrimitiveButtonStyleBody<PrimitiveButtonStyleConfiguration.Label>
+    else {
       XCTAssert(false, "counter has no button")
       return
     }
 
     newButton.action()
 
-    guard let newestButton = stack.subviews[0].view.view as? _Button<Text> else {
+    guard let newestButton = stack.subviews[0].subviews[0].view
+      .view as? _PrimitiveButtonStyleBody<PrimitiveButtonStyleConfiguration.Label>
+    else {
       XCTAssert(false, "counter has no button")
       return
     }