diff --git a/resources/views/components/scheme-picker.blade.php b/resources/views/components/scheme-picker.blade.php
index 09ad1c0b..1c9172c6 100644
--- a/resources/views/components/scheme-picker.blade.php
+++ b/resources/views/components/scheme-picker.blade.php
@@ -29,7 +29,7 @@
 @endphp
 
 @if ($profiles !== [])
-    <fieldset x-data data-scheme-picker {{ $attributes->only(['class', 'wire:key'])->class('min-w-0') }}>
+    <fieldset x-data data-scheme-picker {{ $attributes->whereDoesntStartWith(['wire:model', 'x-model'])->except('name')->class('min-w-0') }}>
         @if (filled($label))
             <legend class="mb-2 type-label-lg text-on-surface-variant">{{ $label }}</legend>
         @endif
@@ -38,7 +38,7 @@
             @foreach ($profiles as $profile => $scheme)
                 <label
                     data-scheme-option="{{ $profile }}"
-                    class="state-layer flex min-w-0 cursor-pointer select-none items-center gap-3 rounded-corner-lg border border-outline-variant bg-surface-container-low p-3 text-on-surface transition-[background-color,border-color] duration-(--md-sys-motion-effects-fast-duration) ease-effects-fast has-checked:border-transparent has-checked:bg-secondary-container has-checked:text-on-secondary-container has-focus-visible:outline-3 has-focus-visible:outline-offset-2 has-focus-visible:outline-secondary"
+                    class="state-layer flex min-w-0 cursor-pointer select-none flex-col items-start gap-2 rounded-corner-lg border border-outline-variant bg-surface-container-low p-3 text-on-surface transition-[background-color,border-color] duration-(--md-sys-motion-effects-fast-duration) ease-effects-fast has-checked:border-transparent has-checked:bg-secondary-container has-checked:text-on-secondary-container has-focus-visible:outline-3 has-focus-visible:outline-offset-2 has-focus-visible:outline-secondary"
                 >
                     <input
                         {{ $attributes->whereStartsWith(['wire:model', 'x-model']) }}
@@ -53,14 +53,17 @@
                         @foreach (['primary', 'secondary', 'tertiary'] as $role)
                             <span
                                 style="--swatch-light: {{ $scheme['light'][$role] }}; --swatch-dark: {{ $scheme['dark'][$role] }}"
-                                class="size-5 rounded-full bg-(--swatch-light) ring-2 ring-surface-container-low dark:bg-(--swatch-dark)"
+                                class="size-5 rounded-full bg-(--swatch-light) ring-2 ring-surface-container-low in-has-checked:ring-secondary-container dark:bg-(--swatch-dark)"
                             ></span>
                         @endforeach
                     </span>
 
-                    <span class="min-w-0 flex-1 truncate type-label-lg">{{ __($scheme['label']) }}</span>
+                    <span class="w-full truncate pe-6 type-label-lg">{{ __($scheme['label']) }}</span>
 
-                    <x-livewire-material::icon name="check" class="hidden size-5 shrink-0 peer-checked:block" />
+                    {{-- In the corner, so a long name keeps its room. The wrapper carries the position. --}}
+                    <span class="pointer-events-none absolute end-2 top-2 hidden peer-checked:block">
+                        <x-livewire-material::icon name="check" class="size-5" />
+                    </span>
                 </label>
             @endforeach
         </div>
diff --git a/tests/Feature/Components/SchemePickerTest.php b/tests/Feature/Components/SchemePickerTest.php
index dea189fc..7b770401 100644
--- a/tests/Feature/Components/SchemePickerTest.php
+++ b/tests/Feature/Components/SchemePickerTest.php
@@ -32,6 +32,14 @@ it('draws a radio per generated profile, bound, named and previewing on change',
         ->toContain('style="--swatch-light: #00897b; --swatch-dark: #80cbc4"');
 });
 
+it('puts its other attributes on the group and the binding on the radios', function () {
+    $html = (string) $this->blade('<x-scheme-picker wire:model="colorProfile" data-test="color-profile" class="mt-4" />');
+
+    expect($html)->toMatch('/<fieldset x-data data-scheme-picker class="min-w-0 mt-4" data-test="color-profile">/')
+        ->and(substr_count($html, 'wire:model="colorProfile"'))->toBe(2)
+        ->and(substr_count($html, 'data-test="color-profile"'))->toBe(1);
+});
+
 it('keeps its inline styles to the scheme file\'s checked colours', function () {
     File::put($this->path, json_encode([
         'default' => 'indigo',