diff --git a/app/utils/constants.ts b/app/utils/constants.ts
index a1744cb..afeed76 100644
--- a/app/utils/constants.ts
+++ b/app/utils/constants.ts
@@ -31,7 +31,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'Lightweight Astro starter template for building fast static websites',
     githubRepo: 'thecodacus/bolt-astro-basic-template',
     tags: ['astro', 'blog', 'performance'],
-    icon: 'i-bolt:astro',
+    icon: 'i-bolt-astro',
   },
   {
     name: 'bolt-nextjs-shadcn',
@@ -39,7 +39,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'Next.js starter fullstack template integrated with shadcn/ui components and styling system',
     githubRepo: 'thecodacus/bolt-nextjs-shadcn-template',
     tags: ['nextjs', 'react', 'typescript', 'shadcn', 'tailwind'],
-    icon: 'i-bolt:nextjs',
+    icon: 'i-bolt-nextjs',
   },
   {
     name: 'bolt-qwik-ts',
@@ -47,7 +47,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'Qwik framework starter with TypeScript for building resumable applications',
     githubRepo: 'thecodacus/bolt-qwik-ts-template',
     tags: ['qwik', 'typescript', 'performance', 'resumable'],
-    icon: 'i-bolt:qwik',
+    icon: 'i-bolt-qwik',
   },
   {
     name: 'bolt-remix-ts',
@@ -55,7 +55,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'Remix framework starter with TypeScript for full-stack web applications',
     githubRepo: 'thecodacus/bolt-remix-ts-template',
     tags: ['remix', 'typescript', 'fullstack', 'react'],
-    icon: 'i-bolt:remix',
+    icon: 'i-bolt-remix',
   },
   {
     name: 'bolt-slidev',
@@ -71,7 +71,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'SvelteKit starter template for building fast, efficient web applications',
     githubRepo: 'bolt-sveltekit-template',
     tags: ['svelte', 'sveltekit', 'typescript'],
-    icon: 'i-bolt:svelte',
+    icon: 'i-bolt-svelte',
   },
   {
     name: 'vanilla-vite',
@@ -79,7 +79,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'Minimal Vite starter template for vanilla JavaScript projects',
     githubRepo: 'thecodacus/vanilla-vite-template',
     tags: ['vite', 'vanilla-js', 'minimal'],
-    icon: 'i-bolt:vite',
+    icon: 'i-bolt-vite',
   },
   {
     name: 'bolt-vite-react',
@@ -87,7 +87,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'React starter template powered by Vite for fast development experience',
     githubRepo: 'thecodacus/bolt-vite-react-ts-template',
     tags: ['react', 'vite', 'frontend'],
-    icon: 'i-bolt:react',
+    icon: 'i-bolt-react',
   },
   {
     name: 'bolt-vite-ts',
@@ -95,7 +95,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'Vite starter template with TypeScript configuration for type-safe development',
     githubRepo: 'thecodacus/bolt-vite-ts-template',
     tags: ['vite', 'typescript', 'minimal'],
-    icon: 'i-bolt:typescript',
+    icon: 'i-bolt-typescript',
   },
   {
     name: 'bolt-vue',
@@ -103,7 +103,7 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'Vue.js starter template with modern tooling and best practices',
     githubRepo: 'thecodacus/bolt-vue-template',
     tags: ['vue', 'typescript', 'frontend'],
-    icon: 'i-bolt:vue',
+    icon: 'i-bolt-vue',
   },
   {
     name: 'bolt-angular',
@@ -111,6 +111,6 @@ export const STARTER_TEMPLATES: Template[] = [
     description: 'A modern Angular starter template with TypeScript support and best practices configuration',
     githubRepo: 'thecodacus/bolt-angular-template',
     tags: ['angular', 'typescript', 'frontend', 'spa'],
-    icon: 'i-bolt:angular',
+    icon: 'i-bolt-angular',
   },
 ];
diff --git a/uno.config.ts b/uno.config.ts
index de78a55..d6bbdb8 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -21,7 +21,6 @@ const customIconCollection = {
       acc[iconName] = async () => {
         try {
           const content = await fs.readFile(iconPath, 'utf8');
-
           // Simplified SVG processing
           return content
             .replace(/fill="[^"]*"/g, 'fill="currentColor"')
@@ -121,9 +120,9 @@ const COLOR_PRIMITIVES = {
 
 export default defineConfig({
   safelist: [
-    // Explicitly safelist all icon combinations
+    // Explicitly safelist all icon combinations with both formats
     ...Object.keys(customIconCollection[collectionName] || {}).map((x) => `i-${collectionName}-${x}`),
-    ...Object.keys(customIconCollection[collectionName] || {}).map((x) => `i-${collectionName}:${x}`),
+    ...Object.keys(customIconCollection[collectionName] || {}).map((x) => `i-${collectionName}-${x.toLowerCase()}`),
   ],
   shortcuts: {
     'bolt-ease-cubic-bezier': 'ease-[cubic-bezier(0.4,0,0.2,1)]',
@@ -278,15 +277,8 @@ export default defineConfig({
         width: '24px',
         height: '24px',
       },
-      customizations: {
-        customize(props) {
-          return {
-            ...props,
-            width: '24px',
-            height: '24px',
-          };
-        },
-      },
+      scale: 1,
+      cdn: 'https://esm.sh/',
     }),
   ],
 });