diff --git a/docs/content/docs/components/angle-slider.mdx b/docs/content/docs/components/angle-slider.mdx
index b2cab8dc..6147c97a 100644
--- a/docs/content/docs/components/angle-slider.mdx
+++ b/docs/content/docs/components/angle-slider.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/angle-slider"
+npx shadcn@latest add @diceui/angle-slider
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/avatar-group.mdx b/docs/content/docs/components/avatar-group.mdx
index 8c046b80..a864fcb7 100644
--- a/docs/content/docs/components/avatar-group.mdx
+++ b/docs/content/docs/components/avatar-group.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/avatar-group"
+npx shadcn@latest add @diceui/avatar-group
 
 ```
 
diff --git a/docs/content/docs/components/badge-overflow.mdx b/docs/content/docs/components/badge-overflow.mdx
index a0166b89..6831cef6 100644
--- a/docs/content/docs/components/badge-overflow.mdx
+++ b/docs/content/docs/components/badge-overflow.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/badge-overflow"
+npx shadcn@latest add @diceui/badge-overflow
 
 ```
 
diff --git a/docs/content/docs/components/checkbox-group.mdx b/docs/content/docs/components/checkbox-group.mdx
index 40f6f0e9..0b4fcea1 100644
--- a/docs/content/docs/components/checkbox-group.mdx
+++ b/docs/content/docs/components/checkbox-group.mdx
@@ -19,7 +19,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/checkbox-group"
+npx shadcn@latest add @diceui/checkbox-group
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/circular-progress.mdx b/docs/content/docs/components/circular-progress.mdx
index c9a8840b..ffdadeaf 100644
--- a/docs/content/docs/components/circular-progress.mdx
+++ b/docs/content/docs/components/circular-progress.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/circular-progress"
+npx shadcn@latest add @diceui/circular-progress
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/color-picker.mdx b/docs/content/docs/components/color-picker.mdx
index 1f54a199..a182e253 100644
--- a/docs/content/docs/components/color-picker.mdx
+++ b/docs/content/docs/components/color-picker.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/color-picker"
+npx shadcn@latest add @diceui/color-picker
 
 ```
 
diff --git a/docs/content/docs/components/color-swatch.mdx b/docs/content/docs/components/color-swatch.mdx
index e41ad42c..782ddcf9 100644
--- a/docs/content/docs/components/color-swatch.mdx
+++ b/docs/content/docs/components/color-swatch.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/color-swatch"
+npx shadcn@latest add @diceui/color-swatch
 
 ```
 
diff --git a/docs/content/docs/components/combobox.mdx b/docs/content/docs/components/combobox.mdx
index 14fdb596..24826664 100644
--- a/docs/content/docs/components/combobox.mdx
+++ b/docs/content/docs/components/combobox.mdx
@@ -19,7 +19,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/combobox"
+npx shadcn@latest add @diceui/combobox
 ```
 
 ### Manual
@@ -148,7 +148,7 @@ A wrapper element that positions the combobox popover relative to the input and
 
 <DataAttributesTable
   data={[
-    {   
+    {
       title: "[data-state]",
       value: ["open", "closed"],
     },
@@ -494,4 +494,4 @@ A visual divider for separating options or groups.
       description: "Closes the combobox popover, returns focus to the input, and resets or restores the input value."
     },
   ]}
-/> 
+/>
diff --git a/docs/content/docs/components/compare-slider.mdx b/docs/content/docs/components/compare-slider.mdx
index f238f920..20e9aac0 100644
--- a/docs/content/docs/components/compare-slider.mdx
+++ b/docs/content/docs/components/compare-slider.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/compare-slider"
+npx shadcn@latest add @diceui/compare-slider
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/cropper.mdx b/docs/content/docs/components/cropper.mdx
index 2ada2adb..c01eeb46 100644
--- a/docs/content/docs/components/cropper.mdx
+++ b/docs/content/docs/components/cropper.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/cropper"
+npx shadcn@latest add @diceui/cropper
 
 ```
 
diff --git a/docs/content/docs/components/editable.mdx b/docs/content/docs/components/editable.mdx
index 11513297..6ac7cb21 100644
--- a/docs/content/docs/components/editable.mdx
+++ b/docs/content/docs/components/editable.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/editable"
+npx shadcn@latest add @diceui/editable
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/file-upload.mdx b/docs/content/docs/components/file-upload.mdx
index ff66706c..6eaccc8a 100644
--- a/docs/content/docs/components/file-upload.mdx
+++ b/docs/content/docs/components/file-upload.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/file-upload"
+npx shadcn@latest add @diceui/file-upload
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/fps.mdx b/docs/content/docs/components/fps.mdx
index a81e8d10..36a5f74f 100644
--- a/docs/content/docs/components/fps.mdx
+++ b/docs/content/docs/components/fps.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/fps"
+npx shadcn@latest add @diceui/fps
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/kanban.mdx b/docs/content/docs/components/kanban.mdx
index 2b8b4014..799f6f8b 100644
--- a/docs/content/docs/components/kanban.mdx
+++ b/docs/content/docs/components/kanban.mdx
@@ -14,7 +14,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/kanban"
+npx shadcn@latest add @diceui/kanban
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/key-value.mdx b/docs/content/docs/components/key-value.mdx
index b4e0a359..ebc0ee6f 100644
--- a/docs/content/docs/components/key-value.mdx
+++ b/docs/content/docs/components/key-value.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/key-value"
+npx shadcn@latest add @diceui/key-value
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/listbox.mdx b/docs/content/docs/components/listbox.mdx
index 14ec58c9..cef1e0bf 100644
--- a/docs/content/docs/components/listbox.mdx
+++ b/docs/content/docs/components/listbox.mdx
@@ -19,7 +19,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/listbox"
+npx shadcn@latest add @diceui/listbox
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/marquee.mdx b/docs/content/docs/components/marquee.mdx
index 28d3e02e..eff2d583 100644
--- a/docs/content/docs/components/marquee.mdx
+++ b/docs/content/docs/components/marquee.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/marquee"
+npx shadcn@latest add @diceui/marquee
 ```
 
 ### Manual
@@ -247,7 +247,7 @@ Edge overlay components for smooth gradient transitions.
 - **RTL Support**: Automatically adapts to RTL (right-to-left) layouts
 - **Screen Reader Support**: Content remains accessible to assistive technologies
 - **Reduced Motion**: Respects user's `prefers-reduced-motion` setting
-- **Pause Controls**: 
+- **Pause Controls**:
   - **Hover**: Can be configured to pause animation when hovered
   - **Keyboard**: Press Space key to pause/resume (when `pauseOnKeyboard` is enabled)
 - **Focus Management**: Proper focus indicators and keyboard navigation when `pauseOnKeyboard` is enabled
diff --git a/docs/content/docs/components/mask-input.mdx b/docs/content/docs/components/mask-input.mdx
index ea95bea5..86230e3f 100644
--- a/docs/content/docs/components/mask-input.mdx
+++ b/docs/content/docs/components/mask-input.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/mask-input"
+npx shadcn@latest add @diceui/mask-input
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/masonry.mdx b/docs/content/docs/components/masonry.mdx
index 41f911ee..53f5e567 100644
--- a/docs/content/docs/components/masonry.mdx
+++ b/docs/content/docs/components/masonry.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/masonry"
+npx shadcn@latest add @diceui/masonry
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/media-player.mdx b/docs/content/docs/components/media-player.mdx
index ca23fe88..b241e1bb 100644
--- a/docs/content/docs/components/media-player.mdx
+++ b/docs/content/docs/components/media-player.mdx
@@ -58,7 +58,7 @@ links:
     After completing the prerequisite component updates, install the media player:
 
     ```package-install
-    npx shadcn@latest add "https://diceui.com/r/media-player"
+    npx shadcn@latest add @diceui/media-player
     ```
   </Step>
 </Steps>
diff --git a/docs/content/docs/components/mention.mdx b/docs/content/docs/components/mention.mdx
index 33e92c2c..3c9de1d6 100644
--- a/docs/content/docs/components/mention.mdx
+++ b/docs/content/docs/components/mention.mdx
@@ -19,7 +19,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/mention"
+npx shadcn@latest add @diceui/mention
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/qr-code.mdx b/docs/content/docs/components/qr-code.mdx
index 1c9546b1..813dd978 100644
--- a/docs/content/docs/components/qr-code.mdx
+++ b/docs/content/docs/components/qr-code.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/qr-code"
+npx shadcn@latest add @diceui/qr-code
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/rating.mdx b/docs/content/docs/components/rating.mdx
index cb0736f5..ed33fc9e 100644
--- a/docs/content/docs/components/rating.mdx
+++ b/docs/content/docs/components/rating.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/rating"
+npx shadcn@latest add @diceui/rating
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/relative-time-card.mdx b/docs/content/docs/components/relative-time-card.mdx
index bea92010..268bb681 100644
--- a/docs/content/docs/components/relative-time-card.mdx
+++ b/docs/content/docs/components/relative-time-card.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/relative-time-card"
+npx shadcn@latest add @diceui/relative-time-card
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/scroll-spy.mdx b/docs/content/docs/components/scroll-spy.mdx
index ee36c7df..5a842fb6 100644
--- a/docs/content/docs/components/scroll-spy.mdx
+++ b/docs/content/docs/components/scroll-spy.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/scroll-spy"
+npx shadcn@latest add @diceui/scroll-spy
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/scroller.mdx b/docs/content/docs/components/scroller.mdx
index e8907b7b..d445c4a2 100644
--- a/docs/content/docs/components/scroller.mdx
+++ b/docs/content/docs/components/scroller.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/scroller"
+npx shadcn@latest add @diceui/scroller
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/segmented-input.mdx b/docs/content/docs/components/segmented-input.mdx
index ed67bcea..28f47763 100644
--- a/docs/content/docs/components/segmented-input.mdx
+++ b/docs/content/docs/components/segmented-input.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/segmented-input"
+npx shadcn@latest add @diceui/segmented-input
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/sortable.mdx b/docs/content/docs/components/sortable.mdx
index 489c4b35..fc9c529c 100644
--- a/docs/content/docs/components/sortable.mdx
+++ b/docs/content/docs/components/sortable.mdx
@@ -14,7 +14,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/sortable"
+npx shadcn@latest add @diceui/sortable
 
 ```
 
diff --git a/docs/content/docs/components/stack.mdx b/docs/content/docs/components/stack.mdx
index eb6d2754..2bb3e65e 100644
--- a/docs/content/docs/components/stack.mdx
+++ b/docs/content/docs/components/stack.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/stack"
+npx shadcn@latest add @diceui/stack
 
 ```
 
diff --git a/docs/content/docs/components/stat.mdx b/docs/content/docs/components/stat.mdx
index 39968019..e4e25560 100644
--- a/docs/content/docs/components/stat.mdx
+++ b/docs/content/docs/components/stat.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/stat"
+npx shadcn@latest add @diceui/stat
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/stepper.mdx b/docs/content/docs/components/stepper.mdx
index b472f95d..e6a237e7 100644
--- a/docs/content/docs/components/stepper.mdx
+++ b/docs/content/docs/components/stepper.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/stepper"
+npx shadcn@latest add @diceui/stepper
 
 ```
 
diff --git a/docs/content/docs/components/tags-input.mdx b/docs/content/docs/components/tags-input.mdx
index d2efacc9..edf47d16 100644
--- a/docs/content/docs/components/tags-input.mdx
+++ b/docs/content/docs/components/tags-input.mdx
@@ -19,7 +19,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/tags-input"
+npx shadcn@latest add @diceui/tags-input
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/time-picker.mdx b/docs/content/docs/components/time-picker.mdx
index 51a4d388..eedcefdb 100644
--- a/docs/content/docs/components/time-picker.mdx
+++ b/docs/content/docs/components/time-picker.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/time-picker"
+npx shadcn@latest add @diceui/time-picker
 ```
 
 ### Manual
diff --git a/docs/content/docs/components/timeline.mdx b/docs/content/docs/components/timeline.mdx
index 7579ce1c..818d76d9 100644
--- a/docs/content/docs/components/timeline.mdx
+++ b/docs/content/docs/components/timeline.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/timeline"
+npx shadcn@latest add @diceui/timeline
 
 ```
 
diff --git a/docs/content/docs/components/tour.mdx b/docs/content/docs/components/tour.mdx
index 8876bece..b1ca3018 100644
--- a/docs/content/docs/components/tour.mdx
+++ b/docs/content/docs/components/tour.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/tour"
+npx shadcn@latest add @diceui/tour
 
 ```
 
diff --git a/docs/content/docs/utilities/client-only.mdx b/docs/content/docs/utilities/client-only.mdx
index 4571e2ce..0a65f877 100644
--- a/docs/content/docs/utilities/client-only.mdx
+++ b/docs/content/docs/utilities/client-only.mdx
@@ -10,7 +10,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/client-only"
+npx shadcn@latest add @diceui/client-only
 ```
 
 ### Manual
diff --git a/docs/content/docs/utilities/composition.mdx b/docs/content/docs/utilities/composition.mdx
index 9a087131..6c91e338 100644
--- a/docs/content/docs/utilities/composition.mdx
+++ b/docs/content/docs/utilities/composition.mdx
@@ -10,7 +10,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/composition"
+npx shadcn@latest add @diceui/composition
 ```
 
 ### Manual
diff --git a/docs/content/docs/utilities/direction-provider.mdx b/docs/content/docs/utilities/direction-provider.mdx
index afc0732d..ea15d4a6 100644
--- a/docs/content/docs/utilities/direction-provider.mdx
+++ b/docs/content/docs/utilities/direction-provider.mdx
@@ -11,7 +11,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/direction-provider"
+npx shadcn@latest add @diceui/direction-provider
 ```
 
 ### Manual
diff --git a/docs/content/docs/utilities/hitbox.mdx b/docs/content/docs/utilities/hitbox.mdx
index 9f829176..0ded4bc3 100644
--- a/docs/content/docs/utilities/hitbox.mdx
+++ b/docs/content/docs/utilities/hitbox.mdx
@@ -13,7 +13,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/hitbox"
+npx shadcn@latest add @diceui/hitbox
 ```
 
 ### Manual
diff --git a/docs/content/docs/utilities/portal.mdx b/docs/content/docs/utilities/portal.mdx
index 153733bd..c8934b0d 100644
--- a/docs/content/docs/utilities/portal.mdx
+++ b/docs/content/docs/utilities/portal.mdx
@@ -10,7 +10,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/portal"
+npx shadcn@latest add @diceui/portal
 ```
 
 ### Manual
diff --git a/docs/content/docs/utilities/presence.mdx b/docs/content/docs/utilities/presence.mdx
index 29f0a4d8..4db72924 100644
--- a/docs/content/docs/utilities/presence.mdx
+++ b/docs/content/docs/utilities/presence.mdx
@@ -10,7 +10,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/presence"
+npx shadcn@latest add @diceui/presence
 ```
 
 ### Manual
diff --git a/docs/content/docs/utilities/visually-hidden-input.mdx b/docs/content/docs/utilities/visually-hidden-input.mdx
index 2316f740..8c0214a0 100644
--- a/docs/content/docs/utilities/visually-hidden-input.mdx
+++ b/docs/content/docs/utilities/visually-hidden-input.mdx
@@ -10,7 +10,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/visually-hidden-input"
+npx shadcn@latest add @diceui/visually-hidden-input
 ```
 
 ### Manual
diff --git a/docs/content/docs/utilities/visually-hidden.mdx b/docs/content/docs/utilities/visually-hidden.mdx
index c971d72d..cdf9abd6 100644
--- a/docs/content/docs/utilities/visually-hidden.mdx
+++ b/docs/content/docs/utilities/visually-hidden.mdx
@@ -10,7 +10,7 @@ links:
 ### CLI
 
 ```package-install
-npx shadcn@latest add "https://diceui.com/r/visually-hidden"
+npx shadcn@latest add @diceui/visually-hidden
 ```
 
 ### Manual
diff --git a/docs/public/r/.gitignore b/docs/public/r/.gitignore
new file mode 100644
index 00000000..94a2dd14
--- /dev/null
+++ b/docs/public/r/.gitignore
@@ -0,0 +1 @@
+*.json
\ No newline at end of file
diff --git a/docs/scripts/build-registry.mts b/docs/scripts/build-registry.mts
index c0e79ca4..7593a6bc 100644
--- a/docs/scripts/build-registry.mts
+++ b/docs/scripts/build-registry.mts
@@ -1,4 +1,4 @@
-import { existsSync, promises as fs, readFileSync } from "node:fs";
+import { existsSync, promises as fs } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { cwd } from "node:process";
@@ -467,11 +467,19 @@ async function buildStyles(registry: Registry) {
       });
 
       if (payload.success) {
+        // Write to styles subdirectory (existing behavior)
         await fs.writeFile(
           path.join(targetPath, `${item.name}.json`),
           JSON.stringify(payload.data, null, 2),
           "utf8",
         );
+
+        // Write to root registry path: public/r/{item-name}.json
+        await fs.writeFile(
+          path.join(REGISTRY_PATH, `${item.name}.json`),
+          JSON.stringify(payload.data, null, 2),
+          "utf8",
+        );
       }
     }
   }