diff --git a/.changeset/tame-swans-rush.md b/.changeset/tame-swans-rush.md
new file mode 100644
index 00000000000..95692860c57
--- /dev/null
+++ b/.changeset/tame-swans-rush.md
@@ -0,0 +1,7 @@
+---
+'@primer/react': patch
+---
+
+- adds [`color-scheme`](https://developer.mozilla.org/en-US/docs/Web/CSS/color-scheme) style to inputs so they get the correct user-agent dark/light styles
+- crops ToggleSwitch knob's shadow inside the toggle switch boundaries
+- changes FormControl styles to prevent `<select>`, `<textarea>`, `<input>` from filling the parent's width when the `block` prop has not been passed to the input component
diff --git a/src/BaseStyles.tsx b/src/BaseStyles.tsx
index 270558f87dd..e4ae52fc79b 100644
--- a/src/BaseStyles.tsx
+++ b/src/BaseStyles.tsx
@@ -1,13 +1,15 @@
 import React from 'react'
 import styled, {createGlobalStyle} from 'styled-components'
 import {COMMON, SystemCommonProps, SystemTypographyProps, TYPOGRAPHY} from './constants'
+import {useTheme} from './ThemeProvider'
 import {ComponentProps} from './utils/types'
 
-const GlobalStyle = createGlobalStyle`
+const GlobalStyle = createGlobalStyle<{colorScheme?: 'light' | 'dark'}>`
   * { box-sizing: border-box; }
   body { margin: 0; }
   table { border-collapse: collapse; }
-  
+  input { color-scheme: ${props => props.colorScheme}; }
+
   [role="button"]:focus:not(:focus-visible):not(.focus-visible),
   [role="tabpanel"][tabindex="0"]:focus:not(:focus-visible):not(.focus-visible),
   button:focus:not(:focus-visible):not(.focus-visible),
@@ -32,13 +34,14 @@ export type BaseStylesProps = ComponentProps<typeof Base>
 
 function BaseStyles(props: BaseStylesProps) {
   const {children, ...rest} = props
+  const {colorScheme} = useTheme()
 
   // load polyfill for :focus-visible
   require('focus-visible')
 
   return (
     <Base {...rest} data-portal-root>
-      <GlobalStyle />
+      <GlobalStyle colorScheme={colorScheme?.includes('dark') ? 'dark' : 'light'} />
       {children}
     </Base>
   )
diff --git a/src/FormControl/FormControl.tsx b/src/FormControl/FormControl.tsx
index 79eaf428456..9ffd6be8ac7 100644
--- a/src/FormControl/FormControl.tsx
+++ b/src/FormControl/FormControl.tsx
@@ -174,6 +174,7 @@ const FormControl = React.forwardRef<HTMLDivElement, FormControlProps>(
               ref={ref}
               display="flex"
               flexDirection="column"
+              alignItems="flex-start"
               sx={{...(isLabelHidden ? {'> *:not(label) + *': {marginTop: 1}} : {'> * + *': {marginTop: 1}}), ...sx}}
             >
               {slots.Label}
diff --git a/src/Select.tsx b/src/Select.tsx
index e001611dcc1..8d7bed2a852 100644
--- a/src/Select.tsx
+++ b/src/Select.tsx
@@ -56,7 +56,7 @@ const ArrowIndicator = styled(ArrowIndicatorSVG)`
 `
 
 const Select = React.forwardRef<HTMLSelectElement, SelectProps>(
-  ({children, disabled, placeholder, size, required, validationStatus, ...rest}: SelectProps, ref) => (
+  ({block, children, contrast, disabled, placeholder, size, required, validationStatus, ...rest}: SelectProps, ref) => (
     <TextInputWrapper
       sx={{
         overflow: 'hidden',
@@ -67,9 +67,11 @@ const Select = React.forwardRef<HTMLSelectElement, SelectProps>(
           }
         }
       }}
+      block={block}
+      contrast={contrast}
+      disabled={disabled}
       size={size}
       validationStatus={validationStatus}
-      disabled={disabled}
     >
       <StyledSelect
         ref={ref}
diff --git a/src/ToggleSwitch.tsx b/src/ToggleSwitch.tsx
index 14e07f1e006..d92425acd5f 100644
--- a/src/ToggleSwitch.tsx
+++ b/src/ToggleSwitch.tsx
@@ -94,6 +94,7 @@ const SwitchButton = styled.button<SwitchButtonProps>`
   width: 64px;
   outline-offset: 2px;
   position: relative;
+  overflow: hidden;
 
   @media (pointer: coarse) {
     &:before {
@@ -115,17 +116,6 @@ const SwitchButton = styled.button<SwitchButtonProps>`
     }
   }
 
-  &:after {
-    content: '';
-    box-sizing: border-box;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    border-radius: calc(${get('radii.2')} - 1px); /* -1px to account for 1px border around the control */
-  }
-
   ${props => {
     if (props.disabled) {
       return css`
diff --git a/src/_TextInputWrapper.tsx b/src/_TextInputWrapper.tsx
index d30a27c46f1..668cad08d3d 100644
--- a/src/_TextInputWrapper.tsx
+++ b/src/_TextInputWrapper.tsx
@@ -163,6 +163,7 @@ export const TextInputBaseWrapper = styled.span<StyledBaseWrapperProps>`
     css`
       width: 100%;
       display: flex;
+      align-self: stretch;
     `}
       
   // Ensures inputs don' t zoom on mobile but are body-font size on desktop
diff --git a/src/__tests__/__snapshots__/TextInput.test.tsx.snap b/src/__tests__/__snapshots__/TextInput.test.tsx.snap
index f63eed90f8c..7c5b1c85368 100644
--- a/src/__tests__/__snapshots__/TextInput.test.tsx.snap
+++ b/src/__tests__/__snapshots__/TextInput.test.tsx.snap
@@ -144,6 +144,9 @@ exports[`TextInput renders block 1`] = `
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
+  -webkit-align-self: stretch;
+  -ms-flex-item-align: stretch;
+  align-self: stretch;
   background-repeat: no-repeat;
   background-position: right 8px center;
   padding-left: 0;
diff --git a/src/__tests__/__snapshots__/TextInputWithTokens.test.tsx.snap b/src/__tests__/__snapshots__/TextInputWithTokens.test.tsx.snap
index 4d7f5009ddf..a4575b0092e 100644
--- a/src/__tests__/__snapshots__/TextInputWithTokens.test.tsx.snap
+++ b/src/__tests__/__snapshots__/TextInputWithTokens.test.tsx.snap
@@ -1208,6 +1208,9 @@ exports[`TextInputWithTokens renders as block layout 1`] = `
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
+  -webkit-align-self: stretch;
+  -ms-flex-item-align: stretch;
+  align-self: stretch;
   padding-left: 12px;
   padding-top: calc(12px / 2);
   padding-bottom: calc(12px / 2);
diff --git a/src/__tests__/__snapshots__/ToggleSwitch.test.tsx.snap b/src/__tests__/__snapshots__/ToggleSwitch.test.tsx.snap
index ef3575ba286..91f728c3e4e 100644
--- a/src/__tests__/__snapshots__/ToggleSwitch.test.tsx.snap
+++ b/src/__tests__/__snapshots__/ToggleSwitch.test.tsx.snap
@@ -133,21 +133,11 @@ exports[`renders consistently 1`] = `
   width: 64px;
   outline-offset: 2px;
   position: relative;
+  overflow: hidden;
   background-color: #eaeef2;
   border-color: #afb8c1;
 }
 
-.c4:after {
-  content: '';
-  box-sizing: border-box;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  border-radius: calc(6px - 1px);
-}
-
 .c4:hover .Toggle-knob,
 .c4:focus:focus-visible .Toggle-knob {
   background-color: #f3f4f6;