diff --git a/.env b/.env
index 8ffa39ae..04bf2b7b 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 NEXT_PUBLIC_POSTS_PAGE_SIZE=20
 NEXT_PUBLIC_THEME=penx-theme-garden
 
-DATABASE_URL=postgresql://user:demo@43.154.135.183:5437/demo
+DATABASE_URL=postgresql://user:demo@43.154.135.183:5437/demo
\ No newline at end of file
diff --git a/.github/workflows/create-images.yml b/.github/workflows/create-images.yml
index 8deb236e..4ae630d0 100644
--- a/.github/workflows/create-images.yml
+++ b/.github/workflows/create-images.yml
@@ -31,4 +31,4 @@ jobs:
           multiPlatform: true
           platform: linux/amd64,linux/arm64
           username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
\ No newline at end of file
+          password: ${{ secrets.GHCR_TOKEN }}
diff --git a/README.md b/README.md
index 86eb5e05..1c12cb1f 100644
--- a/README.md
+++ b/README.md
@@ -41,3 +41,5 @@ Deploy your blog in **10 minutes**!
 
 
 ## ⚖️ License
+
+
diff --git a/app/(creator-fi)/CreatorFiLayout.tsx b/app/(creator-fi)/CreatorFiLayout.tsx
index 13d9f468..c5e8a67c 100644
--- a/app/(creator-fi)/CreatorFiLayout.tsx
+++ b/app/(creator-fi)/CreatorFiLayout.tsx
@@ -2,7 +2,6 @@
 
 import { PropsWithChildren, Suspense } from 'react'
 import { useQueryEthBalance } from '@/app/(creator-fi)/hooks/useEthBalance'
-import { useQueryEthPrice } from '@/app/(creator-fi)/hooks/useEthPrice'
 import { ClientOnly } from '@/components/ClientOnly'
 import LoadingCircle from '@/components/icons/loading-circle'
 import { Profile } from '@/components/Profile/Profile'
@@ -51,7 +50,6 @@ interface Props {
 }
 
 export function CreatorFiLayout({ children, space }: PropsWithChildren<Props>) {
-  useQueryEthPrice()
   useQueryEthBalance()
 
   return (
diff --git a/app/(creator-fi)/Space/SpaceNav.tsx b/app/(creator-fi)/Space/SpaceNav.tsx
index cc3b6dd0..d4c3e3e0 100644
--- a/app/(creator-fi)/Space/SpaceNav.tsx
+++ b/app/(creator-fi)/Space/SpaceNav.tsx
@@ -29,7 +29,7 @@ export function SpaceNav({}: Props) {
   return (
     <div className="flex justify-center">
       <Link href={Paths.plans} className={linkClassName(Paths.plans)}>
-        subscription
+        Membership
       </Link>
 
       <Link href={Paths.trade} className={linkClassName(Paths.trade)}>
diff --git a/app/(creator-fi)/Space/SpaceStats.tsx b/app/(creator-fi)/Space/SpaceStats.tsx
index 63ecfea9..6e836b7d 100644
--- a/app/(creator-fi)/Space/SpaceStats.tsx
+++ b/app/(creator-fi)/Space/SpaceStats.tsx
@@ -1,11 +1,11 @@
 'use client'
 
 import { ReactNode } from 'react'
+import { useSpaceContext } from '@/components/SpaceContext'
 import { Skeleton } from '@/components/ui/skeleton'
-import { useEthPrice } from '@/app/(creator-fi)/hooks/useEthPrice'
+import { useEthPrice } from '@/hooks/useEthPrice'
 import { precision } from '@/lib/math'
 import { useBalance } from 'wagmi'
-import { useSpaceContext } from '@/components/SpaceContext'
 
 interface Props {}
 
diff --git a/app/(creator-fi)/creator-fi/plans/AddPlanDialog/AddPlanForm.tsx b/app/(creator-fi)/creator-fi/plans/AddPlanDialog/AddPlanForm.tsx
index e7bab384..4b5e9cb2 100644
--- a/app/(creator-fi)/creator-fi/plans/AddPlanDialog/AddPlanForm.tsx
+++ b/app/(creator-fi)/creator-fi/plans/AddPlanDialog/AddPlanForm.tsx
@@ -4,7 +4,7 @@ import { useMemo, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { NumberInput } from '@/app/(creator-fi)/components/NumberInput'
 import { editorDefaultValue } from '@/app/(creator-fi)/constants'
-import { useEthPrice } from '@/app/(creator-fi)/hooks/useEthPrice'
+import { usePlans } from '@/app/(creator-fi)/hooks/usePlans'
 import LoadingDots from '@/components/icons/loading-dots'
 import { useSpaceContext } from '@/components/SpaceContext'
 import { Button } from '@/components/ui/button'
@@ -18,6 +18,7 @@ import {
 } from '@/components/ui/form'
 import { Input } from '@/components/ui/input'
 import { useCheckChain } from '@/hooks/useCheckChain'
+import { useEthPrice } from '@/hooks/useEthPrice'
 import { useWagmiConfig } from '@/hooks/useWagmiConfig'
 import { spaceAbi } from '@/lib/abi'
 import { addToIpfs } from '@/lib/addToIpfs'
@@ -42,6 +43,7 @@ export function AddPlanForm() {
   const { ethPrice } = useEthPrice()
   const wagmiConfig = useWagmiConfig()
   const checkChain = useCheckChain()
+  const { refetch } = usePlans()
 
   const form = useForm<z.infer<typeof FormSchema>>({
     resolver: zodResolver(FormSchema),
@@ -65,10 +67,12 @@ export function AddPlanForm() {
       const cid = await addToIpfs(
         JSON.stringify({
           name: data.name,
-          benefits: JSON.stringify(editorDefaultValue),
+          benefits: editorDefaultValue,
         }),
       )
 
+      // console.log('=======cid:', cid, 'ethPrice:', ethPrice)
+
       const price = precision.token(Number(data.price) / ethPrice)
       const hash = await writeContract(wagmiConfig, {
         address: space.address as Address,
@@ -80,6 +84,9 @@ export function AddPlanForm() {
       await waitForTransactionReceipt(wagmiConfig, { hash })
 
       setIsOpen(false)
+      setTimeout(() => {
+        refetch()
+      }, 1500)
       toast.success('Add Plan successfully!')
     } catch (error) {
       const msg = extractErrorMessage(error)
@@ -130,7 +137,7 @@ export function AddPlanForm() {
         <Button
           type="submit"
           className="w-full"
-          disabled={isLoading || !form.formState.isValid}
+          disabled={isLoading || !form.formState.isValid || !ethPrice}
         >
           {isLoading ? <LoadingDots /> : <p>Add</p>}
         </Button>
diff --git a/app/(creator-fi)/creator-fi/plans/PlanItem.tsx b/app/(creator-fi)/creator-fi/plans/PlanItem.tsx
index 5820dd5f..ced8c478 100644
--- a/app/(creator-fi)/creator-fi/plans/PlanItem.tsx
+++ b/app/(creator-fi)/creator-fi/plans/PlanItem.tsx
@@ -3,13 +3,13 @@
 import { useMemberDialog } from '@/app/(creator-fi)/components/MemberDialog/useMemberDialog'
 import { Plan } from '@/app/(creator-fi)/domains/Plan'
 import { useAddress } from '@/app/(creator-fi)/hooks/useAddress'
-import { useEthPrice } from '@/app/(creator-fi)/hooks/useEthPrice'
 import { useMembers } from '@/app/(creator-fi)/hooks/useMembers'
 import { useSubscriptions } from '@/app/(creator-fi)/hooks/useSubscriptions'
 import { PlateEditor } from '@/components/editor/plate-editor'
 import { useSpaceContext } from '@/components/SpaceContext'
 import { Button } from '@/components/ui/button'
 import { Card } from '@/components/ui/card'
+import { useEthPrice } from '@/hooks/useEthPrice'
 import { useConnectModal } from '@rainbow-me/rainbowkit'
 import { EditIcon } from 'lucide-react'
 import { useAccount } from 'wagmi'
@@ -35,7 +35,7 @@ export function PlanItem({ plan }: Props) {
   )
 
   return (
-    <Card className="relative flex min-h-[520px] flex-col justify-between gap-4 rounded-xl p-4 shadow-none bg-background">
+    <Card className="relative flex min-h-[520px] flex-col justify-between gap-4 rounded-xl p-4 shadow-none bg-background w-[300px]">
       {space.isFounder(address) && (
         <Button
           variant="ghost"
@@ -46,7 +46,7 @@ export function PlanItem({ plan }: Props) {
           <EditIcon size={20} className="text-foreground/50" />
         </Button>
       )}
-      <div>
+      <div className="space-y-1">
         <div className="flex">
           <div>{plan.name}</div>
         </div>
@@ -58,8 +58,8 @@ export function PlanItem({ plan }: Props) {
         </div>
       </div>
 
-      <div className="prose-xl prose-neutral flex-1 prose-p:m-4 prose-p:leading-none">
-        <PlateEditor value={plan.benefitsJson} readonly />
+      <div className="flex-1">
+        <PlateEditor value={plan.benefitsJson} readonly className="p-0" />
       </div>
 
       <Button
diff --git a/app/(creator-fi)/creator-fi/plans/PlanList.tsx b/app/(creator-fi)/creator-fi/plans/PlanList.tsx
index 6fd4c6ad..01b42cb3 100644
--- a/app/(creator-fi)/creator-fi/plans/PlanList.tsx
+++ b/app/(creator-fi)/creator-fi/plans/PlanList.tsx
@@ -22,12 +22,16 @@ export function PlanList({}: Props) {
   }
 
   return (
-    <div className="w-full">
-      {space.isFounder(address) && <AddPlanDialog />}
+    <div className="w-full flex flex-col gap-6">
+      {space.isFounder(address) && (
+        <div className="flex justify-center">
+          <AddPlanDialog />
+        </div>
+      )}
 
       <UpdatePlanDialog />
       <MemberDialog />
-      <div className="mt-4 grid grid-cols-1 justify-center gap-4 sm:grid-cols-2 md:grid-cols-2  lg:grid-cols-3">
+      <div className="mt-4 flex items-center justify-center gap-4 flex-wrap">
         {plans.map((item, index) => {
           return <PlanItem key={index} plan={item} />
         })}
diff --git a/app/(creator-fi)/creator-fi/plans/UpdatePlanDialog/UpdatePlanForm.tsx b/app/(creator-fi)/creator-fi/plans/UpdatePlanDialog/UpdatePlanForm.tsx
index 6665fcd3..97c43e3a 100644
--- a/app/(creator-fi)/creator-fi/plans/UpdatePlanDialog/UpdatePlanForm.tsx
+++ b/app/(creator-fi)/creator-fi/plans/UpdatePlanDialog/UpdatePlanForm.tsx
@@ -4,7 +4,6 @@ import { useMemo, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { NumberInput } from '@/app/(creator-fi)/components/NumberInput'
 import { PlanStatus } from '@/app/(creator-fi)/domains/Plan'
-import { useEthPrice } from '@/app/(creator-fi)/hooks/useEthPrice'
 import { usePlans } from '@/app/(creator-fi)/hooks/usePlans'
 import { PlateEditor } from '@/components/editor/plate-editor'
 import LoadingDots from '@/components/icons/loading-dots'
@@ -21,6 +20,7 @@ import {
 import { Input } from '@/components/ui/input'
 import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
 import { useCheckChain } from '@/hooks/useCheckChain'
+import { useEthPrice } from '@/hooks/useEthPrice'
 import { useWagmiConfig } from '@/hooks/useWagmiConfig'
 import { spaceAbi } from '@/lib/abi'
 import { addToIpfs } from '@/lib/addToIpfs'
@@ -54,8 +54,8 @@ export function UpdatePlanForm() {
     resolver: zodResolver(FormSchema),
     defaultValues: {
       status: plan.status,
-      name: plan.name,
-      price: plan.getUsdPrice(ethPrice).toFixed(2),
+      name: plan.name || '',
+      price: plan.getUsdPrice(ethPrice).toFixed(2) || '',
       benefits: plan.benefits,
     },
   })
@@ -74,10 +74,12 @@ export function UpdatePlanForm() {
       const cid = await addToIpfs(
         JSON.stringify({
           name: data.name,
-          benefits: data.benefits,
+          benefits: JSON.parse(data.benefits),
         }),
       )
 
+      // console.log('cid=======:', cid)
+
       const price = precision.token(Number(data.price) / ethPrice)
       const hash = await writeContract(wagmiConfig, {
         address: space.address as Address,
@@ -135,7 +137,7 @@ export function UpdatePlanForm() {
                   <FormControl>
                     <NumberInput
                       placeholder=""
-                      precision={2}
+                      precision={6}
                       {...field}
                       className="w-full"
                     />
diff --git a/app/(creator-fi)/domains/Plan.ts b/app/(creator-fi)/domains/Plan.ts
index d3494a6f..209bcd70 100644
--- a/app/(creator-fi)/domains/Plan.ts
+++ b/app/(creator-fi)/domains/Plan.ts
@@ -40,14 +40,13 @@ export class Plan {
   }
 
   get benefits() {
-    try {
-      JSON.parse(this.raw.benefits)
-      return this.raw.benefits
-    } catch (error) {
-      return JSON.stringify(editorDefaultValue)
+    if (Array.isArray(this.raw?.benefits)) {
+      return JSON.stringify(this.raw.benefits)
     }
+    return JSON.stringify(editorDefaultValue)
   }
   get benefitsJson() {
+    if (Array.isArray(this.raw.benefits)) return this.raw.benefits
     try {
       JSON.parse(this.raw.benefits)
       return this.raw.benefits
diff --git a/app/(creator-fi)/hooks/useEthPrice.ts b/app/(creator-fi)/hooks/useEthPrice.ts
deleted file mode 100644
index 328810db..00000000
--- a/app/(creator-fi)/hooks/useEthPrice.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useEffect } from 'react'
-import { store } from '@/store'
-import { atom, useAtom } from 'jotai'
-import ky from 'ky'
-import { RESPACE_BASE_URI } from '@/lib/constants'
-import { useQuery } from '@tanstack/react-query'
-
-interface EthPriceResponse {
-  price: number
-}
-
-export const ethPriceAtom = atom<number>(0 as number)
-
-export function useEthPrice() {
-  const [ethPrice, setEthPrice] = useAtom(ethPriceAtom)
-  return { ethPrice, setEthPrice }
-}
-
-export function useQueryEthPrice() {
-  const { data, ...rest } = useQuery({
-    queryKey: ['ethPrice'],
-    queryFn: async () => {
-      const response = await ky
-        .get(RESPACE_BASE_URI + '/api/get-eth-price')
-        .json<EthPriceResponse>()
-      return response
-    },
-  })
-
-  useEffect(() => {
-    if (typeof data !== 'undefined') {
-      store.set(ethPriceAtom, data.price)
-    }
-  }, [data])
-  return { data, ...rest }
-}
diff --git a/app/membership/page.tsx b/app/membership/page.tsx
new file mode 100644
index 00000000..19a51aab
--- /dev/null
+++ b/app/membership/page.tsx
@@ -0,0 +1,60 @@
+import { PlanList } from '@/app/(creator-fi)/creator-fi/plans/PlanList'
+import { SpaceProvider } from '@/components/SpaceContext'
+import { getSite, getSpace } from '@/lib/fetchers'
+import Image from 'next/image'
+import Link from 'next/link'
+
+export const dynamic = 'force-static'
+export const revalidate = 3600 * 24
+
+export default async function HomePage() {
+  const [site] = await Promise.all([getSite()])
+
+  if (!site?.spaceId) return null
+  const space = await getSpace(site.spaceId)
+
+  return (
+    <SpaceProvider space={space}>
+      <Link
+        href="/"
+        className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-foreground/5 mt-2 ml-2"
+      >
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          // width="1em"
+          // height="2em"
+          viewBox="0 0 12 24"
+          className="h-6"
+        >
+          <path
+            fill="currentColor"
+            fillRule="evenodd"
+            d="m3.343 12l7.071 7.071L9 20.485l-7.778-7.778a1 1 0 0 1 0-1.414L9 3.515l1.414 1.414z"
+          ></path>
+        </svg>
+      </Link>
+
+      <div className="flex flex-col items-center space-x-2 pt-8">
+        {site.logo && (
+          <Image
+            src={site.logo}
+            alt="avatar"
+            width={192}
+            height={192}
+            className="h-20 w-20 rounded-full"
+          />
+        )}
+        <h3 className="pb-2 pt-4 text-2xl font-bold leading-8 tracking-tight">
+          {site.name}
+        </h3>
+      </div>
+
+      <div className="flex flex-col items-center space-x-2 pt-8 gap-10">
+        <div className="text-center text-4xl font-bold">
+          Choose a subscription plan
+        </div>
+        <PlanList />
+      </div>
+    </SpaceProvider>
+  )
+}
diff --git a/components/ContentRender/Leaf.tsx b/components/ContentRender/Leaf.tsx
new file mode 100644
index 00000000..b7a83fa9
--- /dev/null
+++ b/components/ContentRender/Leaf.tsx
@@ -0,0 +1,88 @@
+import { cn } from '@/lib/utils'
+import { RenderLeafProps } from 'slate-react'
+
+export type CustomText = {
+  text: string
+
+  id?: string
+  type?: any
+
+  bold?: true
+  italic?: true
+  underline?: true
+
+  /**
+   * is inline code
+   */
+  code?: true
+
+  strike_through?: true
+  highlight?: true
+  subscript?: true
+  superscript?: true
+  language?: string
+}
+
+export const Leaf = (p: RenderLeafProps) => {
+  let { attributes, children } = p
+  const leaf = p.leaf as CustomText
+  const { text, ...rest } = leaf
+  const className = Object.keys(rest).join(' ')
+
+  const sharedProps = {
+    ...attributes,
+    className,
+  }
+
+  if (leaf.bold) {
+    children = <strong {...sharedProps}>{children}</strong>
+  }
+
+  if (leaf.italic) {
+    children = <em {...sharedProps}>{children}</em>
+  }
+
+  if (leaf.underline) {
+    children = <u {...sharedProps}>{children}</u>
+  }
+
+  if (leaf.strike_through) {
+    children = <del {...sharedProps}>{children}</del>
+  }
+
+  if (leaf.superscript) {
+    children = <sup {...sharedProps}>{children}</sup>
+  }
+
+  if (leaf.subscript) {
+    children = <sub {...sharedProps}>{children}</sub>
+  }
+
+  if (leaf.subscript) {
+    children = <sub {...sharedProps}>{children}</sub>
+  }
+
+  if (leaf.highlight) {
+    children = (
+      <span {...sharedProps} className="bg-yellow-100">
+        {children}
+      </span>
+    )
+  }
+
+  if (leaf.code) {
+    children = (
+      <code
+        {...sharedProps}
+        className={cn(
+          'bg-foreground/5 text-red-500 rounded px-1 py-1 text-sm',
+          className,
+        )}
+      >
+        {children}
+      </code>
+    )
+  }
+
+  return <span {...sharedProps}>{children}</span>
+}
diff --git a/components/ContentRender/SlateContent.tsx b/components/ContentRender/SlateContent.tsx
index 680d2154..b677cb89 100644
--- a/components/ContentRender/SlateContent.tsx
+++ b/components/ContentRender/SlateContent.tsx
@@ -18,17 +18,27 @@ import {
 } from '@/lib/constants'
 import { cn, getUrl } from '@/lib/utils'
 import { Editable } from 'slate-react'
+import { Leaf } from './Leaf'
 
 export function SlateContent() {
   return (
     <Editable
       className="mt-4"
+      renderLeaf={(props) => <Leaf {...props} />}
       renderElement={({ attributes, children, element }) => {
         switch (element.type) {
           case ELEMENT_P:
             if (element.listStyleType == 'disc') {
+              // console.log('=====element:', element)
+              const { indent = 1 } = element
               return (
-                <ul className="my-[1px]" {...attributes}>
+                <ul
+                  className="my-[1px]"
+                  style={{
+                    marginLeft: indent === 1 ? 0 : `${indent}em`,
+                  }}
+                  {...attributes}
+                >
                   <li>{children}</li>
                 </ul>
               )
diff --git a/components/SpaceContext.tsx b/components/SpaceContext.tsx
index d5e8a701..a544162a 100644
--- a/components/SpaceContext.tsx
+++ b/components/SpaceContext.tsx
@@ -1,6 +1,7 @@
 'use client'
 
 import { createContext, PropsWithChildren, useContext } from 'react'
+import { useQueryEthPrice } from '@/hooks/useEthPrice'
 import { SpaceType } from '@/lib/types'
 import { Space } from '../app/(creator-fi)/domains/Space'
 
@@ -14,6 +15,7 @@ export const SpaceProvider = ({
   space,
   children,
 }: PropsWithChildren<Props>) => {
+  useQueryEthPrice()
   return (
     <SpaceContext.Provider value={new Space(space)}>
       {children}
diff --git a/components/editor/plate-editor.tsx b/components/editor/plate-editor.tsx
index b9cd9e6f..61049d15 100644
--- a/components/editor/plate-editor.tsx
+++ b/components/editor/plate-editor.tsx
@@ -12,15 +12,22 @@ import { FixedToolbar } from '@/components/plate-ui/fixed-toolbar'
 import { FixedToolbarButtons } from '@/components/plate-ui/fixed-toolbar-buttons'
 import { FloatingToolbar } from '@/components/plate-ui/floating-toolbar'
 import { FloatingToolbarButtons } from '@/components/plate-ui/floating-toolbar-buttons'
+import { cn } from '@/lib/utils'
 import { Plate } from '@udecode/plate-common/react'
 
 interface Props {
   readonly?: boolean
   value: any
+  className?: string
   onChange?: (value: any) => void
 }
 
-export function PlateEditor({ onChange, value, readonly = false }: Props) {
+export function PlateEditor({
+  onChange,
+  value,
+  className,
+  readonly = false,
+}: Props) {
   const containerRef = useRef(null)
   const editor = useCreateEditor(value)
 
@@ -36,14 +43,18 @@ export function PlateEditor({ onChange, value, readonly = false }: Props) {
           <FixedToolbarButtons />
         </FixedToolbar> */}
 
-        <EditorContainer id="scroll_container" ref={containerRef}>
-          <Editor variant="default" readOnly={readonly} />
+        <Editor
+          variant="default"
+          readOnly={readonly}
+          className={cn(className)}
+        />
 
+        <EditorContainer id="scroll_container" ref={containerRef}>
           <FloatingToolbar>
             <FloatingToolbarButtons />
           </FloatingToolbar>
 
-          <CommentsPopover />
+          {/* <CommentsPopover /> */}
 
           <CursorOverlay containerRef={containerRef} />
         </EditorContainer>
diff --git a/components/editor/plugins/editor-plugins.tsx b/components/editor/plugins/editor-plugins.tsx
index af62358c..1bdf9e11 100644
--- a/components/editor/plugins/editor-plugins.tsx
+++ b/components/editor/plugins/editor-plugins.tsx
@@ -75,7 +75,7 @@ export const editorPlugins = [
 
   // Functionality
   autoformatPlugin,
-  ...blockMenuPlugins,
+  // ...blockMenuPlugins,
   ...dndPlugins,
   EmojiPlugin,
   exitBreakPlugin,
diff --git a/custom-types.ts b/custom-types.ts
index 78a4e063..360c2208 100644
--- a/custom-types.ts
+++ b/custom-types.ts
@@ -17,6 +17,7 @@ declare module 'slate' {
       id?: string
       nodeType?: string
       listStyleType?: string
+      indent?: number
     }
   }
 }
diff --git a/lib/addToIpfs.ts b/lib/addToIpfs.ts
index 7d91996d..e71a58bc 100644
--- a/lib/addToIpfs.ts
+++ b/lib/addToIpfs.ts
@@ -1,6 +1,10 @@
+import { IPFS_ADD_URL } from './constants'
+
 export async function addToIpfs(value: string) {
-  const { create } = await import('kubo-rpc-client')
-  const client = create(new URL(process.env.NEXT_PUBLIC_IPFS_API!))
-  const { cid } = await client.add(value, { pin: true })
-  return cid.toString()
+  const res = await fetch(IPFS_ADD_URL, {
+    method: 'POST',
+    body: value,
+    headers: { 'Content-Type': 'application/json' },
+  }).then((d) => d.json())
+  return res.cid
 }
diff --git a/lib/fetchers.ts b/lib/fetchers.ts
index 228e1ea9..14f42609 100644
--- a/lib/fetchers.ts
+++ b/lib/fetchers.ts
@@ -13,7 +13,7 @@ export async function getSite() {
     },
     [`site`],
     {
-      revalidate: 3600 * 24,
+      revalidate: isProd ? 3600 * 24 : 10,
       tags: [`site`],
     },
   )()
@@ -126,7 +126,7 @@ export async function getSpace(spaceId: string) {
     },
     [`space-${spaceId}`],
     {
-      revalidate: 3600 * 24,
+      revalidate: isProd ? 3600 : 10,
       tags: [`space-${spaceId}`],
     },
   )()
diff --git a/lib/local-session.ts b/lib/local-session.ts
index 56c035a0..002e4625 100644
--- a/lib/local-session.ts
+++ b/lib/local-session.ts
@@ -6,6 +6,7 @@ export interface Session {
   userId: string
   address: string
   email: string
+  role: string
   user: {
     name: string
     email: string
diff --git a/lib/worker/pollingCloudSync.ts b/lib/worker/pollingCloudSync.ts
index 876b1f0b..8092b826 100644
--- a/lib/worker/pollingCloudSync.ts
+++ b/lib/worker/pollingCloudSync.ts
@@ -10,7 +10,7 @@ export async function pollingCloudSync() {
   while (true) {
     try {
       const session = await getLocalSession()
-      if (session?.userId) {
+      if (session?.userId && session?.role === 'ADMIN') {
         await sync(true)
       }
     } catch (error) {
diff --git a/package.json b/package.json
index 1f19d416..8222f092 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@floating-ui/react": "^0.25.4",
     "@glideapps/glide-data-grid": "^6.0.3",
     "@hookform/resolvers": "^3.9.0",
-    "@penxio/types": "^0.0.4",
+    "@penxio/types": "^0.0.5",
     "@prisma/client": "^5.21.1",
     "@privy-io/server-auth": "^1.15.0",
     "@radix-ui/react-accordion": "^1.2.1",
@@ -145,11 +145,11 @@
     "octokit": "^4.0.2",
     "openai-edge": "^1.2.2",
     "p-retry": "^6.2.0",
-    "penx-theme-card": "^0.0.4",
-    "penx-theme-garden": "^0.0.4",
-    "penx-theme-micro": "^0.0.4",
-    "penx-theme-minimal": "^0.0.4",
-    "penx-theme-photo": "^0.0.4",
+    "penx-theme-card": "^0.0.5",
+    "penx-theme-garden": "^0.0.5",
+    "penx-theme-micro": "^0.0.5",
+    "penx-theme-minimal": "^0.0.5",
+    "penx-theme-photo": "^0.0.5",
     "prisma-extension-pagination": "^0.7.4",
     "prismjs": "^1.29.0",
     "rc-table": "^7.48.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cff3a201..3fcba338 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,8 +36,8 @@ importers:
         specifier: ^3.9.0
         version: 3.9.0(react-hook-form@7.53.1(react@18.2.0))
       '@penxio/types':
-        specifier: ^0.0.4
-        version: 0.0.4
+        specifier: ^0.0.5
+        version: 0.0.5
       '@prisma/client':
         specifier: ^5.21.1
         version: 5.21.1(prisma@5.21.1)
@@ -402,20 +402,20 @@ importers:
         specifier: ^6.2.0
         version: 6.2.0
       penx-theme-card:
-        specifier: ^0.0.4
-        version: 0.0.4
+        specifier: ^0.0.5
+        version: 0.0.5
       penx-theme-garden:
-        specifier: ^0.0.4
-        version: 0.0.4
+        specifier: ^0.0.5
+        version: 0.0.5
       penx-theme-micro:
-        specifier: ^0.0.4
-        version: 0.0.4
+        specifier: ^0.0.5
+        version: 0.0.5
       penx-theme-minimal:
-        specifier: ^0.0.4
-        version: 0.0.4
+        specifier: ^0.0.5
+        version: 0.0.5
       penx-theme-photo:
-        specifier: ^0.0.4
-        version: 0.0.4
+        specifier: ^0.0.5
+        version: 0.0.5
       prisma-extension-pagination:
         specifier: ^0.7.4
         version: 0.7.4(@prisma/client@5.21.1(prisma@5.21.1))
@@ -2190,11 +2190,11 @@ packages:
     resolution: {integrity: sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==}
     engines: {node: '>= 10.0.0'}
 
-  '@penxio/types@0.0.4':
-    resolution: {integrity: sha512-E+T58oPqDmiMt4G7ivnt1ngWzeGhgOF87OD06QVQgz7B28hMcJChDRzvF01LkejUiVViBm8CfnvN5zroehmwtg==}
+  '@penxio/types@0.0.5':
+    resolution: {integrity: sha512-kpFqjSrXGFig8WNAOtKo2zAha/iQfc5qOKc7/OCj3WYM3fA1dtIInqRwX93d73V5+xRh5/IKSYRs3hn7XDWAng==}
 
-  '@penxio/utils@0.0.4':
-    resolution: {integrity: sha512-qD33j/si8KMFDeUaw4OURKi6wQcoX0uKKPaRqlWF+UOe8zoNyWiUXZRPHMhgcuHk1dlXas0jRXmr/pt5aTVeOA==}
+  '@penxio/utils@0.0.5':
+    resolution: {integrity: sha512-pxUlPheoucdXAp2ToW+JPPduPNy4R6P7Dd0/HR8C9jQ5u9U0xkuLk3y7+Qlt3Yth5NXXZxL7oUGfoKl+8xiALA==}
 
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
@@ -7390,20 +7390,20 @@ packages:
   pathe@1.1.2:
     resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
 
-  penx-theme-card@0.0.4:
-    resolution: {integrity: sha512-MOHrV0oZlNC5YJBhK7ocrldLfpDmiFEJkQ5zNyPb14pgwPt4YaxDsmyhuVElvP1BK7owYPHh0E2MkTvWmGAwBA==}
+  penx-theme-card@0.0.5:
+    resolution: {integrity: sha512-xuRiW3lVkjBOHh+4bB5W+44NMik/aWRKekTj+6aef5Ej1Td155joRbPdjE8H/sK4lQRBU+iR1M7oqaO9ZYK8Iw==}
 
-  penx-theme-garden@0.0.4:
-    resolution: {integrity: sha512-pUIoOZiIzrCb0iE5QUy6968piJHpfRcLr/UvT4QvHc7tFqNkfLaZO5ZwzMtskhT0i73oQFPn7VcRF0iCGkOjIg==}
+  penx-theme-garden@0.0.5:
+    resolution: {integrity: sha512-NP75Fgj+z7w7RDmb0w+M4QCQaLPsx4i+jvbAko5cOX7kAAX6hnT10bV4GbdlTlPQR3ekxmE3jAYbtwEYP/NjLA==}
 
-  penx-theme-micro@0.0.4:
-    resolution: {integrity: sha512-HFGc6f0dumWcNIMPDGZWJWmZGfSz7BhYd7FgZm0LUui+1j0P+/w2w0VR0WBH0iEmP9+7bhnVgYTwDeGaZvhyKg==}
+  penx-theme-micro@0.0.5:
+    resolution: {integrity: sha512-KheqvsPgA4ProFJmq9jff1hpGuSxtSLcKXlfu7XH+RlqaIOyXp+H7DmSJbXzvtR164Pxs407RDAfzXi5rjXBwg==}
 
-  penx-theme-minimal@0.0.4:
-    resolution: {integrity: sha512-6D6GYUN8Vdnll7iSuCKozRlOJWghCE5wCzuhJuh50GvPD9xVOxRzYUAqGjpH/FLdkFdUqlC2z0Vm1xWMGSWWOg==}
+  penx-theme-minimal@0.0.5:
+    resolution: {integrity: sha512-gC0n969yj7WDTbyy+/5LNi0uK7jZZAw9y2T4Zp9OcUFB2aJyAYafVMS2WgHakfe0BiPlp5i2TyNvvLi09KgKQQ==}
 
-  penx-theme-photo@0.0.4:
-    resolution: {integrity: sha512-Cvh5vtFPRmQsM0IfpU5LhQ3nA0MixEiFwyXPFdNxvjH3pmhwla0connGtICfAZE/1QURKp+KyJwuRShazRNaxw==}
+  penx-theme-photo@0.0.5:
+    resolution: {integrity: sha512-hlbS7yWdfZKMCl1xpedQz7GxC9nos6tbCix/y+arczHweZpvkL8WHpJ0KLYa19otDOu1RUcLGusq1gICGNJKJQ==}
 
   performance-now@2.1.0:
     resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
@@ -11465,9 +11465,9 @@ snapshots:
       '@parcel/watcher-win32-ia32': 2.4.1
       '@parcel/watcher-win32-x64': 2.4.1
 
-  '@penxio/types@0.0.4': {}
+  '@penxio/types@0.0.5': {}
 
-  '@penxio/utils@0.0.4':
+  '@penxio/utils@0.0.5':
     dependencies:
       clsx: 2.1.1
       tailwind-merge: 2.5.4
@@ -17989,42 +17989,42 @@ snapshots:
 
   pathe@1.1.2: {}
 
-  penx-theme-card@0.0.4:
+  penx-theme-card@0.0.5:
     dependencies:
-      '@penxio/types': 0.0.4
-      '@penxio/utils': 0.0.4
+      '@penxio/types': 0.0.5
+      '@penxio/utils': 0.0.5
       clsx: 2.1.1
       github-slugger: 2.0.0
       tailwind-merge: 2.5.4
 
-  penx-theme-garden@0.0.4:
+  penx-theme-garden@0.0.5:
     dependencies:
-      '@penxio/types': 0.0.4
-      '@penxio/utils': 0.0.4
+      '@penxio/types': 0.0.5
+      '@penxio/utils': 0.0.5
       clsx: 2.1.1
       github-slugger: 2.0.0
       tailwind-merge: 2.5.4
 
-  penx-theme-micro@0.0.4:
+  penx-theme-micro@0.0.5:
     dependencies:
-      '@penxio/types': 0.0.4
-      '@penxio/utils': 0.0.4
+      '@penxio/types': 0.0.5
+      '@penxio/utils': 0.0.5
       clsx: 2.1.1
       github-slugger: 2.0.0
       tailwind-merge: 2.5.4
 
-  penx-theme-minimal@0.0.4:
+  penx-theme-minimal@0.0.5:
     dependencies:
-      '@penxio/types': 0.0.4
-      '@penxio/utils': 0.0.4
+      '@penxio/types': 0.0.5
+      '@penxio/utils': 0.0.5
       clsx: 2.1.1
       github-slugger: 2.0.0
       tailwind-merge: 2.5.4
 
-  penx-theme-photo@0.0.4:
+  penx-theme-photo@0.0.5:
     dependencies:
-      '@penxio/types': 0.0.4
-      '@penxio/utils': 0.0.4
+      '@penxio/types': 0.0.5
+      '@penxio/utils': 0.0.5
       clsx: 2.1.1
       github-slugger: 2.0.0
       tailwind-merge: 2.5.4
diff --git a/server/lib/getSite.ts b/server/lib/getSite.ts
index 86505ea7..0b89587b 100644
--- a/server/lib/getSite.ts
+++ b/server/lib/getSite.ts
@@ -33,6 +33,8 @@ export async function getSite() {
 
   return {
     ...site,
+    // spaceId: site.spaceId || process.env.NEXT_PUBLIC_SPACE_ID,
+    spaceId: process.env.NEXT_PUBLIC_SPACE_ID || site.spaceId,
     logo: getUrl(site.logo || ''),
     image: getUrl(site.image || ''),
     about: getAbout(),
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 2b46afef..41e5feab 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -39,6 +39,7 @@ const config = {
         sans: ['var(--font-sans)', ...fontFamily.sans],
       },
       colors: {
+        // brand: process.env.BRAND_COLOR ? colors.green : colors.pink,
         brand: colors.pink,
         border: 'hsl(var(--border))',
         input: 'hsl(var(--input))',