diff --git a/memento-note/app/api/ai/suggest-charts/route.ts b/memento-note/app/api/ai/suggest-charts/route.ts
index 973c43d..01df66c 100644
--- a/memento-note/app/api/ai/suggest-charts/route.ts
+++ b/memento-note/app/api/ai/suggest-charts/route.ts
@@ -44,7 +44,7 @@ export async function POST(req: Request) {
     const sysConfigEarly = await getSystemConfig()
     const { usedByok: willUseByok } = await willUseByokForLane('suggest-charts', sysConfigEarly, userId)
     if (!willUseByok) {
-      await checkEntitlementOrThrow(userId, 'ai')
+      await checkEntitlementOrThrow(userId, 'suggest_charts')
     }
   } catch (err) {
     if (err instanceof QuotaExceededError) {
@@ -169,7 +169,7 @@ Response format (JSON):
     )
 
     // Track usage
-    await trackFeatureUsage(userId, 'ai', 'suggest-charts', 1)
+    await trackFeatureUsage(userId, 'suggest_charts', 'suggest-charts', 1)
 
     return Response.json(parsed satisfies SuggestChartsResponse)
 
diff --git a/memento-note/app/layout.tsx b/memento-note/app/layout.tsx
index d47549c..7b04df7 100644
--- a/memento-note/app/layout.tsx
+++ b/memento-note/app/layout.tsx
@@ -112,7 +112,9 @@ export default async function RootLayout({
     >
       <head />
       <body className={`${inter.className} ${inter.variable} ${manrope.variable} ${playfair.variable} ${jetbrainsMono.variable}`}>
-        <script
+        <Script
+          id="theme-init"
+          strategy="beforeInteractive"
           dangerouslySetInnerHTML={{ __html: getThemeScript(userSettings.theme, userSettings.accentColor) }}
         />
         <Script
diff --git a/memento-note/lib/entitlements.ts b/memento-note/lib/entitlements.ts
index 99afc0a..0887a32 100644
--- a/memento-note/lib/entitlements.ts
+++ b/memento-note/lib/entitlements.ts
@@ -78,6 +78,7 @@ const TIER_LIMITS: Record<SubscriptionTier, Record<string, number | 'unlimited'>
     brainstorm_create: 1,
     brainstorm_expand: 10,
     brainstorm_enrich: 20,
+    suggest_charts: 5,
   },
   PRO: {
     semantic_search: 100,
@@ -88,6 +89,7 @@ const TIER_LIMITS: Record<SubscriptionTier, Record<string, number | 'unlimited'>
     brainstorm_create: 30,
     brainstorm_expand: 100,
     brainstorm_enrich: 200,
+    suggest_charts: 50,
   },
   BUSINESS: {
     semantic_search: 1000,
@@ -98,6 +100,7 @@ const TIER_LIMITS: Record<SubscriptionTier, Record<string, number | 'unlimited'>
     brainstorm_create: 200,
     brainstorm_expand: 500,
     brainstorm_enrich: 1000,
+    suggest_charts: 200,
   },
   ENTERPRISE: {
     semantic_search: 'unlimited',
@@ -108,6 +111,7 @@ const TIER_LIMITS: Record<SubscriptionTier, Record<string, number | 'unlimited'>
     brainstorm_create: 'unlimited',
     brainstorm_expand: 'unlimited',
     brainstorm_enrich: 'unlimited',
+    suggest_charts: 'unlimited',
   },
 };
 
diff --git a/memento-note/lib/quota-utils.ts b/memento-note/lib/quota-utils.ts
index a00d3ea..23c78e6 100644
--- a/memento-note/lib/quota-utils.ts
+++ b/memento-note/lib/quota-utils.ts
@@ -7,6 +7,7 @@ export const VALID_FEATURES = [
   'brainstorm_create',
   'brainstorm_expand',
   'brainstorm_enrich',
+  'suggest_charts',
 ] as const;
 
 export type FeatureName = (typeof VALID_FEATURES)[number];
