diff --git a/apps/www/scripts/build-registry.ts b/apps/www/scripts/build-registry.ts
index 6ab0ccf2b..2df7fd3ee 100644
--- a/apps/www/scripts/build-registry.ts
+++ b/apps/www/scripts/build-registry.ts
@@ -66,6 +66,8 @@ fs.writeFileSync(path.join(process.cwd(), '__registry__/index.ts'), index)
 // ----------------------------------------------------------------------------
 // Build registry/styles/[style]/[name].json.
 // ----------------------------------------------------------------------------
+const newLine = '\n'
+
 for (const style of styles) {
   const targetPath = path.join(REGISTRY_PATH, 'styles', style.name)
 
@@ -78,11 +80,14 @@ for (const style of styles) {
       continue
 
     const files = item.files?.map((file) => {
-      const content = fs.readFileSync(
+      let content = fs.readFileSync(
         path.join(process.cwd(), 'src/lib/registry', style.name, file),
         'utf8',
       )
 
+      // Replace Windows-style newlines with Unix-style newlines
+      content = content.replace(/\r\n/g, newLine)
+
       return {
         name: basename(file),
         content,
@@ -94,9 +99,11 @@ for (const style of styles) {
       files,
     }
 
+    const payloadStr = JSON.stringify(payload, null, 2).replace(/\r\n/g, newLine)
+
     fs.writeFileSync(
       path.join(targetPath, `${item.name}.json`),
-      JSON.stringify(payload, null, 2),
+      payloadStr,
       'utf8',
     )
   }
diff --git a/apps/www/src/lib/registry/registry.ts b/apps/www/src/lib/registry/registry.ts
index 3e3948808..c7ed9cafb 100644
--- a/apps/www/src/lib/registry/registry.ts
+++ b/apps/www/src/lib/registry/registry.ts
@@ -110,6 +110,7 @@ async function buildUIRegistry(componentPath: string, componentName: string) {
 
     const file_path = join('ui', componentName, dirent.name)
     files.push(file_path)
+    files.sort()
 
     // only grab deps from the vue files
     if (dirent.name === 'index.ts')