42 changed files with 315 additions and 4979 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,2 @@
 .github
 review.js
-.env
-node_modules
--- a/website/drizzle/0001_heavy_leo.sql
+++ b/website/drizzle/0001_heavy_leo.sql
@ -1 +0,0 @@
-ALTER TABLE "notification" ADD COLUMN "link" text;
--- a/website/drizzle/0002_lonely_the_fallen.sql
+++ b/website/drizzle/0002_lonely_the_fallen.sql
@ -1,2 +0,0 @@
-ALTER TABLE "coin" ADD COLUMN "trading_unlocks_at" timestamp;--> statement-breakpoint
-ALTER TABLE "coin" ADD COLUMN "is_locked" boolean DEFAULT true NOT NULL;
--- a/website/drizzle/meta/0001_snapshot.json
+++ b/website/drizzle/meta/0001_snapshot.json
--- a/website/drizzle/meta/0002_snapshot.json
+++ b/website/drizzle/meta/0002_snapshot.json
--- a/website/drizzle/meta/_journal.json
+++ b/website/drizzle/meta/_journal.json
@ -8,20 +8,6 @@
      "when": 1750863600119,
      "tag": "0000_chief_korath",
      "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "7",
-      "when": 1752593600974,
-      "tag": "0001_heavy_leo",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "7",
-      "when": 1752597309305,
-      "tag": "0002_lonely_the_fallen",
-      "breakpoints": true
    }
  ]
 }
--- a/website/package-lock.json
+++ b/website/package-lock.json
@ -1,12 +1,12 @@
 {
 	"name": "website",
-	"version": "2.0.0.a0",
+	"version": "0.0.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "website",
-			"version": "2.0.0.a0",
+			"version": "0.0.1",
 			"dependencies": {
 				"@aws-sdk/client-s3": "^3.815.0",
 				"@aws-sdk/s3-request-presigner": "^3.815.0",
--- a/website/package.json
+++ b/website/package.json
@ -1,7 +1,7 @@
 {
 	"name": "website",
 	"private": true,
-	"version": "2.0.0.a0",
+	"version": "0.0.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",
@ -16,54 +16,53 @@
 		"db:studio": "drizzle-kit studio"
 	},
 	"devDependencies": {
-		"@internationalized/date": "^3.8.2",
-		"@lucide/svelte": "^0.539.0",
-		"@sveltejs/adapter-auto": "^6.1.0",
-		"@sveltejs/adapter-node": "^5.2.14",
-		"@sveltejs/kit": "^2.29.1",
-		"@sveltejs/vite-plugin-svelte": "^6.1.2",
+		"@internationalized/date": "^3.8.1",
+		"@lucide/svelte": "^0.482.0",
+		"@sveltejs/adapter-auto": "^3.0.0",
+		"@sveltejs/adapter-node": "^5.2.12",
+		"@sveltejs/kit": "^2.0.0",
+		"@sveltejs/vite-plugin-svelte": "^4.0.0",
 		"@types/canvas-confetti": "^1.9.0",
-		"@types/node": "^24.2.1",
-		"autoprefixer": "^10.4.21",
-		"bits-ui": "^2.9.2",
+		"@types/node": "^22.15.21",
+		"autoprefixer": "^10.4.20",
+		"bits-ui": "^2.5.0",
 		"clsx": "^2.1.1",
-		"dotenv": "^17.2.1",
-		"drizzle-kit": "^0.31.4",
-		"prettier": "^3.6.2",
-		"prettier-plugin-svelte": "^3.4.0",
-		"prettier-plugin-tailwindcss": "^0.6.14",
-		"svelte": "^5.38.1",
-		"svelte-apexcharts": "^1.0.2",
-		"svelte-check": "^4.3.1",
-		"svelte-confetti": "^2.3.2",
-		"svelte-lightweight-charts": "^2.2.0",
-		"svelte-sonner": "^1.0.5",
-		"tailwind-merge": "^3.3.1",
-		"tailwind-variants": "^2.1.0",
-		"tailwindcss": "^4.1.11",
-		"tw-animate-css": "^1.3.6",
-		"typescript": "^5.9.2",
-		"vite": "^7.1.2",
-		"vite-plugin-iso-import": "^1.3.0"
+		"drizzle-kit": "^0.22.0",
+		"prettier": "^3.3.2",
+		"prettier-plugin-svelte": "^3.2.6",
+		"prettier-plugin-tailwindcss": "^0.6.11",
+		"svelte": "^5.0.0",
+		"svelte-check": "^4.0.0",
+		"svelte-sonner": "^1.0.2",
+		"tailwind-merge": "^3.0.2",
+		"tailwind-variants": "^0.2.1",
+		"tailwindcss": "^4.1.7",
+		"tw-animate-css": "^1.3.0",
+		"typescript": "^5.0.0",
+		"vite": "^5.4.11",
+		"vite-plugin-iso-import": "^1.2.0"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "^3.864.0",
-		"@aws-sdk/s3-request-presigner": "^3.864.0",
-		"@tailwindcss/postcss": "^4.1.11",
+		"@aws-sdk/client-s3": "^3.815.0",
+		"@aws-sdk/s3-request-presigner": "^3.815.0",
+		"@tailwindcss/postcss": "^4.1.7",
 		"@tailwindcss/typography": "^0.5.16",
 		"@visx/scale": "^3.12.0",
-		"apexcharts": "^5.3.3",
-		"better-auth": "^1.3.6",
+		"apexcharts": "^4.7.0",
+		"better-auth": "^1.2.8",
 		"canvas-confetti": "^1.9.3",
-		"drizzle-orm": "^0.44.4",
+		"drizzle-orm": "^0.33.0",
 		"express": "^5.1.0",
-		"lightweight-charts": "^5.0.8",
-		"lucide-svelte": "^0.539.0",
-		"mode-watcher": "^1.1.0",
-		"openai": "^5.12.2",
-		"postgres": "^3.4.7",
-		"redis": "^5.8.1",
-		"sharp": "^0.34.3"
+		"lightweight-charts": "^5.0.7",
+		"lucide-svelte": "^0.511.0",
+		"mode-watcher": "^1.0.7",
+		"openai": "^4.103.0",
+		"postgres": "^3.4.4",
+		"redis": "^5.1.0",
+		"sharp": "^0.34.2",
+		"svelte-apexcharts": "^1.0.2",
+		"svelte-confetti": "^2.3.1",
+		"svelte-lightweight-charts": "^2.2.0"
 	},
 	"optionalDependencies": {
 		"@rollup/rollup-linux-x64-gnu": "*",
--- a/website/src/app.html
+++ b/website/src/app.html
@ -10,11 +10,11 @@
 	<link rel="apple-touch-icon" sizes="180x180" href="%sveltekit.assets%/apple-touch-icon.png" />
 	<link rel="icon" type="image/png" sizes="192x192" href="%sveltekit.assets%/android-chrome-192x192.png" />

-	<title>CoinStorge</title>
+	<title>Rugplay</title>
 	<!-- Global Meta Tags -->
-	<meta name="application-name" content="CoinStorge" />
+	<meta name="application-name" content="Rugplay" />
 	<meta name="theme-color" content="#fb2c36" />
-	<meta name="apple-mobile-web-app-title" content="CoinStorge" />
+	<meta name="apple-mobile-web-app-title" content="Rugplay" />
 	<meta name="apple-mobile-web-app-capable" content="yes" />
 	<meta name="apple-mobile-web-app-status-bar-style" content="default" />
 	<meta name="format-detection" content="telephone=no" />
@ -23,10 +23,12 @@
 	<link rel="preconnect" href="https://fonts.googleapis.com" />
 	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />

-	
+	<script defer data-domain="rugplay.com"
+		src="https://analytics.outpoot.com/js/script.outbound-links.pageview-props.tagged-events.js"></script>
 	<script>window.plausible = window.plausible || function () { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>

-	<!-- here go ads -->
+	<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-7420543404967748"
+		crossorigin="anonymous"></script>

 	%sveltekit.head%
 </head>
--- a/website/src/lib/auth.ts
+++ b/website/src/lib/auth.ts
@ -16,10 +16,11 @@ if (!publicEnv.PUBLIC_BETTER_AUTH_URL) throw new Error('PUBLIC_BETTER_AUTH_URL i
 export const auth = betterAuth({
    baseURL: publicEnv.PUBLIC_BETTER_AUTH_URL,
    secret: privateEnv.PRIVATE_BETTER_AUTH_SECRET,
-    appName: "CoinStorge",
+    appName: "Rugplay",

    trustedOrigins: [
        publicEnv.PUBLIC_BETTER_AUTH_URL,
+        "http://rugplay.com",
        "http://localhost:5173",
    ],

--- a/website/src/lib/components/self/AppSidebar.svelte
+++ b/website/src/lib/components/self/AppSidebar.svelte
@ -174,7 +174,7 @@
 		<div class="flex items-center gap-2 px-2 py-2">
 			<img src="/rugplay.svg" class="h-5 w-5" alt="twoblade" />
 			<div class="flex items-center gap-2">
-				<span class="text-base font-semibold">CoinStorge</span>
+				<span class="text-base font-semibold">Rugplay</span>
 				{#if $USER_DATA?.isAdmin}
 					<span class="text-muted-foreground text-xs">| Admin</span>
 				{/if}
--- a/website/src/lib/components/self/DataTable.svelte
+++ b/website/src/lib/components/self/DataTable.svelte
@ -191,7 +191,7 @@
 							{:else if cellData.type === 'coin'}
 								<div class="flex items-center gap-2">
 									<CoinIcon icon={cellData.icon} symbol={cellData.symbol} size={cellData.size} />
-									<span class="font-medium max-w-44 truncate">{cellData.name}</span>
+									<span class="font-medium">{cellData.name}</span>
 								</div>
 							{:else if cellData.type === 'rank'}
 								<div class="flex items-center gap-2">
--- a/website/src/lib/components/self/SEO.svelte
+++ b/website/src/lib/components/self/SEO.svelte
@ -2,13 +2,13 @@
 	import { page } from '$app/stores';

 	let {
-		title = 'CoinStorge',
+		title = 'Rugplay',
 		description = 'Experience realistic cryptocurrency trading simulation game with AI-powered markets, rug pull mechanics, and virtual currencies. Learn crypto trading without financial risk in this educational game.',
 		type = 'website',
 		image = '/apple-touch-icon.png',
-		imageAlt = 'CoinStorge Logo',
+		imageAlt = 'Rugplay Logo',
 		keywords = '',
-		author = 'Outpoot (with modifications)',
+		author = 'Outpoot',
 		canonicalUrl = '',
 		noindex = false,
 		twitterCard = 'summary_large_image'
@ -29,7 +29,7 @@
 	let canonical = $derived(canonicalUrl || currentUrl);

 	let fullImageUrl = $derived(
-		image?.startsWith('http') ? image : `${$page?.url?.origin || 'https://localhost'}${image}`
+		image?.startsWith('http') ? image : `${$page?.url?.origin || 'https://rugplay.com'}${image}`
 	);

 	let defaultKeywords =
@ -62,7 +62,7 @@
 	<meta property="og:url" content={currentUrl} />
 	<meta property="og:image" content={fullImageUrl} />
 	<meta property="og:image:alt" content={imageAlt} />
-	<meta property="og:site_name" content="CoinStorge" />
+	<meta property="og:site_name" content="Rugplay" />
 	<meta property="og:locale" content="en_US" />

 	<!-- Twitter Card Meta Tags -->
--- a/website/src/lib/components/self/SignInConfirmDialog.svelte
+++ b/website/src/lib/components/self/SignInConfirmDialog.svelte
@ -25,7 +25,7 @@
 <Dialog bind:open>
 	<DialogContent class="sm:max-w-md">
 		<DialogHeader>
-			<DialogTitle>Sign in to CoinStorge</DialogTitle>
+			<DialogTitle>Sign in to Rugplay</DialogTitle>
 			<DialogDescription>
 				Choose a service to sign in with. Your account will be created automatically if you don't
 				have one.
--- a/website/src/lib/components/self/UserManualModal.svelte
+++ b/website/src/lib/components/self/UserManualModal.svelte
@ -30,9 +30,9 @@
 	const tips: Tip[] = [
 		{
 			id: 1,
-			title: 'Welcome to CoinStorge!',
+			title: 'Welcome to Rugplay!',
 			description:
-				'CoinStorge is a cryptocurrency trading simulator where you can practice trading without real financial risk. Start with virtual money, create coins, bet on prediction markets, and most importantly, rugpull!',
+				'Rugplay is a cryptocurrency trading simulator where you can practice trading without real financial risk. Start with virtual money, create coins, bet on prediction markets, and most importantly, rugpull!',
 			icon: BookOpen,
 			image: '/tips/cover.avif'
 		},
@ -56,7 +56,7 @@
 			id: 4,
 			title: 'AMM - Automated Market Maker',
 			description:
-				'CoinStorge, like Rugplay, uses an AMM system where prices are calculated automatically based on supply and demand. The more you buy, the higher the price goes. The more you sell, the lower it drops. Large trades create "slippage" - the price change during your trade.',
+				'Rugplay uses an AMM system where prices are calculated automatically based on supply and demand. The more you buy, the higher the price goes. The more you sell, the lower it drops. Large trades create "slippage" - the price change during your trade.',
 			icon: BarChart3,
 			image: '/tips/amm.avif'
 		},
@ -205,11 +205,11 @@
 			<div class="flex items-center justify-center gap-2">
 				{#each tips as tip, index}
 					<button
-						aria-label={`Go to page ${index + 1}`}
 						onclick={() => goToPage(index)}
 						class="h-2 w-2 rounded-full transition-colors {index === currentPage
 							? 'bg-primary'
 							: 'bg-muted-foreground/30 hover:bg-muted-foreground/50'}"
+						aria-label={`Go to tip ${index + 1}: ${tip.title}`}
 						aria-current={index === currentPage ? 'page' : undefined}
 					></button>
 				{/each}
--- a/website/src/lib/server/ai.ts
+++ b/website/src/lib/server/ai.ts
@ -3,7 +3,7 @@ import { zodResponseFormat } from 'openai/helpers/zod';
 import { z } from 'zod';
 import { OPENROUTER_API_KEY } from '$env/static/private';
 import { db } from './db';
-import { coin, user, transaction, priceHistory } from './db/schema';
+import { coin, user, transaction } from './db/schema';
 import { eq, desc, sql, gte } from 'drizzle-orm';

 if (!OPENROUTER_API_KEY) {
@ -88,14 +88,7 @@ async function getCoinData(coinSymbol: string) {
            return null;
        }

-        const [priceStats] = await db
-            .select({
-                maxPrice: sql<number>`MAX(CAST(${priceHistory.price} AS NUMERIC))`,
-                minPrice: sql<number>`MIN(CAST(${priceHistory.price} AS NUMERIC))`,
-            })
-            .from(priceHistory)
-            .where(eq(priceHistory.coinId, coinData.id));
-
+        // Get recent trading activity for this coin
        const recentTrades = await db
            .select({
                type: transaction.type,
@ -120,10 +113,6 @@ async function getCoinData(coinSymbol: string) {
            poolCoinAmount: Number(coinData.poolCoinAmount),
            poolBaseCurrencyAmount: Number(coinData.poolBaseCurrencyAmount),
            circulatingSupply: Number(coinData.circulatingSupply),
-            pricing: {
-                peak: Number(priceStats?.maxPrice || 0),
-                lowest: Number(priceStats?.minPrice || 0),
-            },
            recentTrades: recentTrades.map(trade => ({
                ...trade,
                quantity: Number(trade.quantity),
@ -245,11 +234,11 @@ export async function validateQuestion(question: string, description?: string):
    }

    const prompt = `
-You are evaluating whether a prediction market question is valid and answerable for CoinStorge, a cryptocurrency trading simulation platform.
+You are evaluating whether a prediction market question is valid and answerable for Rugplay, a cryptocurrency trading simulation platform.

 Question: "${question}"

-Current CoinStorge Market Context:
+Current Rugplay Market Context:
 - Platform currency: $ (or *BUSS)
 - Total listed coins: ${marketOverview?.marketStats.totalCoins || 0}
 - Total market cap: $${marketOverview?.marketStats.totalMarketCap.toFixed(2) || '0'}
@ -271,8 +260,8 @@ Determine the optimal resolution date based on the question type:
 - If the question explicitly states the date, use that as the resolution date

 Also determine:
- Whether this question requires web search (external events, real-world data, non-CoinStorge information)
- If the question is related to the CoinStorge market, and contains what appears to be a coin name, ensure it's properly formatted (e.g. *BTC, *DOGE). Invalid question example: "will BTC reach $100,000 in 1 hour?" (invalid coin format, should be *BTC). 
+- Whether this question requires web search (external events, real-world data, non-Rugplay information)
+- If the question is related to the Rugplay market, and contains what appears to be a coin name, ensure it's properly formatted (e.g. *BTC, *DOGE). Invalid question example: "will BTC reach $100,000 in 1 hour?" (invalid coin format, should be *BTC). 
 - Provide a specific resolution date with time (suggest times between 12:00-20:00 UTC for good global coverage) The current date and time is ${new Date().toISOString()}.

 Note: All coins use *SYMBOL format (e.g., *BTC, *DOGE). All trading is simulated with *BUSS currency.
@ -336,11 +325,11 @@ export async function resolveQuestion(
    const rugplayData = customRugplayData || await getRugplayData(question);

    const prompt = `
-You are resolving a prediction market question with a definitive YES or NO answer for CoinStorge.
+You are resolving a prediction market question with a definitive YES or NO answer for Rugplay.

 Question: "${question}"

-Current CoinStorge Platform Data:
+Current Rugplay Platform Data:
 ${rugplayData}

 Instructions:
@ -348,10 +337,10 @@ Instructions:
 2. Give your confidence level (0-100) in this resolution
 3. Provide clear reasoning for your decision with specific data references
 4. For coin-specific questions that mention non-existent coins, answer NO (the coin doesn't exist, so it can't reach any price)
-5. For coin-specific questions about existing coins, reference actual market data from CoinStorge
+5. For coin-specific questions about existing coins, reference actual market data from Rugplay
 6. For external events, use web search if enabled

-Context about CoinStorge:
+Context about Rugplay:
 - Cryptocurrency trading simulation platform with fake money (*BUSS)
 - All coins use *SYMBOL format (e.g., *BTC, *DOGE, *SHIB)
 - Features AMM liquidity pools, rug pull mechanics, and real market dynamics
@ -421,7 +410,7 @@ export async function getRugplayData(question?: string): Promise<string> {
                coinSpecificData = '\n\nCoin Analysis for Question:';

                if (nonExistentCoins.length > 0) {
-                    coinSpecificData += `\nNON-EXISTENT COINS: ${nonExistentCoins.map(symbol => `*${symbol}`).join(', ')} - These coins do not exist on the CoinStorge platform`;
+                    coinSpecificData += `\nNON-EXISTENT COINS: ${nonExistentCoins.map(symbol => `*${symbol}`).join(', ')} - These coins do not exist on the Rugplay platform`;
                }

                if (existingCoins.length > 0) {
@ -430,8 +419,6 @@ export async function getRugplayData(question?: string): Promise<string> {
                        return `
 *${coin.symbol} (${coin.name}):
 - Current Price: $${coin.currentPrice.toFixed(8)}
- Peak Price: $${coin.pricing.peak.toFixed(8)}
- Lowest Price: $${coin.pricing.lowest.toFixed(8)}
 - Market Cap: $${coin.marketCap.toFixed(2)}
 - 24h Change: ${coin.change24h >= 0 ? '+' : ''}${coin.change24h.toFixed(2)}%
 - 24h Volume: $${coin.volume24h.toFixed(2)}
@ -450,7 +437,7 @@ ${coin.recentTrades.slice(0, 3).map(trade =>

        return `
 Current Timestamp: ${new Date().toISOString()}
-Platform: CoinStorge - Cryptocurrency Trading Simulation
+Platform: Rugplay - Cryptocurrency Trading Simulation

 Market Overview:
 - Total Listed Coins: ${marketOverview?.marketStats.totalCoins || 0}
@ -473,7 +460,7 @@ Platform Details:
 - Coins use *SYMBOL format (e.g., *BTC, *DOGE, *SHIB)${coinSpecificData}
        `;
    } catch (error) {
-        console.error('Error generating CoinStorge data:', error);
+        console.error('Error generating Rugplay data:', error);
        return `Couldn't retrieve data, please try again later.`;
    }
 }
--- a/website/src/lib/server/amm.ts
+++ b/website/src/lib/server/amm.ts
@ -1,142 +0,0 @@
-import { db } from '$lib/server/db';
-import { coin, transaction, priceHistory, userPortfolio } from '$lib/server/db/schema';
-import { eq, and, gte } from 'drizzle-orm';
-import { createNotification } from '$lib/server/notification';
-
-export async function calculate24hMetrics(coinId: number, currentPrice: number) {
-    const twentyFourHoursAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
-
-    const [priceData] = await db
-        .select({ price: priceHistory.price })
-        .from(priceHistory)
-        .where(and(
-            eq(priceHistory.coinId, coinId),
-            gte(priceHistory.timestamp, twentyFourHoursAgo)
-        ))
-        .orderBy(priceHistory.timestamp)
-        .limit(1);
-
-    let change24h = 0;
-    if (priceData) {
-        const priceFrom24hAgo = Number(priceData.price);
-        if (priceFrom24hAgo > 0) {
-            change24h = ((currentPrice - priceFrom24hAgo) / priceFrom24hAgo) * 100;
-        }
-    }
-
-    const volumeData = await db
-        .select({ totalBaseCurrencyAmount: transaction.totalBaseCurrencyAmount })
-        .from(transaction)
-        .where(and(
-            eq(transaction.coinId, coinId),
-            gte(transaction.timestamp, twentyFourHoursAgo)
-        ));
-
-    const volume24h = volumeData.reduce((sum, tx) => sum + Number(tx.totalBaseCurrencyAmount), 0);
-
-    return { change24h: Number(change24h.toFixed(4)), volume24h: Number(volume24h.toFixed(4)) };
-}
-
-export async function executeSellTrade(
-    tx: any,
-    coinData: any,
-    userId: number,
-    quantity: number
-) {
-    const poolCoinAmount = Number(coinData.poolCoinAmount);
-    const poolBaseCurrencyAmount = Number(coinData.poolBaseCurrencyAmount);
-    const currentPrice = Number(coinData.currentPrice);
-
-    if (poolCoinAmount <= 0 || poolBaseCurrencyAmount <= 0) {
-        throw new Error('Liquidity pool is not properly initialized or is empty');
-    }
-
-    const k = poolCoinAmount * poolBaseCurrencyAmount;
-    const newPoolCoin = poolCoinAmount + quantity;
-    const newPoolBaseCurrency = k / newPoolCoin;
-    const baseCurrencyReceived = poolBaseCurrencyAmount - newPoolBaseCurrency;
-    const newPrice = newPoolBaseCurrency / newPoolCoin;
-
-    if (baseCurrencyReceived <= 0 || newPoolBaseCurrency < 1) {
-        const fallbackValue = quantity * currentPrice;
-        return {
-            success: false,
-            fallbackValue,
-            newPrice: currentPrice,
-            priceImpact: 0
-        };
-    }
-
-    const priceImpact = ((newPrice - currentPrice) / currentPrice) * 100;
-
-    await tx.insert(transaction).values({
-        userId,
-        coinId: coinData.id,
-        type: 'SELL',
-        quantity: quantity.toString(),
-        pricePerCoin: (baseCurrencyReceived / quantity).toString(),
-        totalBaseCurrencyAmount: baseCurrencyReceived.toString(),
-        timestamp: new Date()
-    });
-
-    await tx.insert(priceHistory).values({
-        coinId: coinData.id,
-        price: newPrice.toString()
-    });
-
-    const metrics = await calculate24hMetrics(coinData.id, newPrice);
-
-    await tx.update(coin)
-        .set({
-            currentPrice: newPrice.toString(),
-            marketCap: (Number(coinData.circulatingSupply) * newPrice).toString(),
-            poolCoinAmount: newPoolCoin.toString(),
-            poolBaseCurrencyAmount: newPoolBaseCurrency.toString(),
-            change24h: metrics.change24h.toString(),
-            volume24h: metrics.volume24h.toString(),
-            updatedAt: new Date()
-        })
-        .where(eq(coin.id, coinData.id));
-
-    const isRugPull = priceImpact < -20 && baseCurrencyReceived > 1000;
-    if (isRugPull) {
-        (async () => {
-            try {
-                const affectedUsers = await db
-                    .select({
-                        userId: userPortfolio.userId,
-                        quantity: userPortfolio.quantity
-                    })
-                    .from(userPortfolio)
-                    .where(eq(userPortfolio.coinId, coinData.id));
-
-                for (const holder of affectedUsers) {
-                    if (holder.userId === userId) continue;
-                    
-                    const holdingValue = Number(holder.quantity) * newPrice;
-                    if (holdingValue > 10) {
-                        await createNotification(
-                            holder.userId.toString(),
-                            'RUG_PULL',
-                            'Coin rugpulled!',
-                            `A coin you owned, ${coinData.name} (*${coinData.symbol}), crashed ${Math.abs(priceImpact).toFixed(1)}%!`,
-                            `/coin/${coinData.symbol}`
-                        );
-                    }
-                }
-            } catch (error) {
-                console.error('Error sending rug pull notifications:', error);
-            }
-        })();
-    }
-
-    return {
-        success: true,
-        baseCurrencyReceived,
-        newPrice,
-        priceImpact,
-        newPoolCoin,
-        newPoolBaseCurrency,
-        metrics
-    };
-}
--- a/website/src/lib/server/db/schema.ts
+++ b/website/src/lib/server/db/schema.ts
@ -96,8 +96,6 @@ export const coin = pgTable("coin", {
 	createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
 	updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
 	isListed: boolean("is_listed").default(true).notNull(),
-	tradingUnlocksAt: timestamp("trading_unlocks_at"),
-	isLocked: boolean("is_locked").default(true).notNull(),
 }, (table) => {
 	return {
 		symbolIdx: index("coin_symbol_idx").on(table.symbol),
@ -267,7 +265,6 @@ export const notifications = pgTable("notification", {
 	type: notificationTypeEnum("type").notNull(),
 	title: varchar("title", { length: 200 }).notNull(),
 	message: text("message").notNull(),
-	link: text("link"),
 	isRead: boolean("is_read").notNull().default(false),
 	createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
 }, (table) => {
--- a/website/src/lib/server/job.ts
+++ b/website/src/lib/server/job.ts
@ -120,7 +120,6 @@ export async function resolveExpiredQuestions() {
                                'HOPIUM',
                                title,
                                message,
-                                `/hopium/${question.id}`
                            );
                        }
                    });
@ -220,7 +219,6 @@ export async function resolveExpiredQuestions() {
                            'HOPIUM',
                            title,
                            message,
-                            `/hopium/${question.id}`
                        );
                    }
                });
--- a/website/src/lib/server/notification.ts
+++ b/website/src/lib/server/notification.ts
@ -9,14 +9,12 @@ export async function createNotification(
    type: NotificationType,
    title: string,
    message: string,
-    link?: string,
 ): Promise<void> {
    await db.insert(notifications).values({
        userId: parseInt(userId),
        type,
        title,
-        message,
-        link
+        message
    });

    try {
@ -29,7 +27,6 @@ export async function createNotification(
            notificationType: type,
            title,
            message,
-            link
        };

        await redis.publish(channel, JSON.stringify(payload));
--- a/website/src/lib/stores/notifications.ts
+++ b/website/src/lib/stores/notifications.ts
@ -2,10 +2,9 @@ import { writable, derived } from 'svelte/store';

 export interface Notification {
    id: number;
-    type: 'HOPIUM' | 'TRANSFER' | 'RUG_PULL' | 'SYSTEM';
+    type: string;
    title: string;
    message: string;
-    link?: string;
    data: any;
    isRead: boolean;
    createdAt: string;
@ -35,21 +34,23 @@ export async function fetchNotifications(unreadOnly = false) {
    }
 }

-export async function markNotificationsAsRead() {
+export async function markNotificationsAsRead(ids: number[]) {
    try {
        const response = await fetch('/api/notifications', {
            method: 'PATCH',
            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ markAsRead: true })
+            body: JSON.stringify({ ids, markAsRead: true })
        });

        if (!response.ok) throw new Error('Failed to mark notifications as read');

        NOTIFICATIONS.update(notifications => 
-            notifications.map(notif => ({ ...notif, isRead: true }))
+            notifications.map(notif => 
+                ids.includes(notif.id) ? { ...notif, isRead: true } : notif
+            )
        );

-        UNREAD_COUNT.set(0);
+        UNREAD_COUNT.update(count => Math.max(0, count - ids.length));

    } catch (error) {
        console.error('Failed to mark notifications as read:', error);
--- a/website/src/lib/stores/websocket.ts
+++ b/website/src/lib/stores/websocket.ts
@ -197,7 +197,6 @@ function handleWebSocketMessage(event: MessageEvent): void {
                    type: message.notificationType,
                    title: message.title,
                    message: message.message,
-                    link: message.link,
                    isRead: false,
                    createdAt: message.timestamp,
                    data: message.amount ? { amount: message.amount } : null
--- a/website/src/lib/utils.ts
+++ b/website/src/lib/utils.ts
@ -123,7 +123,7 @@ export function formatRelativeTime(timestamp: string | Date): string {

    if (hours < 24) {
        const extraMinutes = minutes % 60;
-        return extraMinutes === 0 ? `${hours}h` : `${hours}h ${extraMinutes}m`;
+        return extraMinutes === 0 ? `${hours}hr` : `${hours}hr ${extraMinutes}m`;
    }

    if (days < 7) return `${days}d`;
@ -145,11 +145,11 @@ export function formatRelativeTime(timestamp: string | Date): string {
        tempDate.setMonth(tempDate.getMonth() + adjustedMonths);
        const remainingDays = Math.floor((now.getTime() - tempDate.getTime()) / (1000 * 60 * 60 * 24));
        const weeks = Math.floor(remainingDays / 7);
-        return weeks === 0 ? `${adjustedMonths}mo` : `${adjustedMonths}mo ${weeks}w`;
+        return weeks === 0 ? `${adjustedMonths}m` : `${adjustedMonths}m ${weeks}w`;
    }

    const remainingMonths = adjustedMonths % 12;
-    return remainingMonths === 0 ? `${years}y` : `${years}y ${remainingMonths}mo`;
+    return remainingMonths === 0 ? `${years}y` : `${years}y ${remainingMonths}m`;
 }

 export function formatTimeAgo(date: string) {
--- a/website/src/routes/+error.svelte
+++ b/website/src/routes/+error.svelte
@ -36,7 +36,7 @@
 </script>

 <svelte:head>
-	<title>{status} | CoinStorge</title>
+	<title>{status} | Rugplay</title>
 	<meta name="robots" content="noindex" />
 </svelte:head>

--- a/website/src/routes/+page.svelte
+++ b/website/src/routes/+page.svelte
@ -75,7 +75,7 @@
 </script>

 <SEO
-	title="CoinStorge"
+	title="Rugplay"
 	description="A realistic crypto trading simulator that lets you experience the risks and mechanics of decentralized exchanges without real financial consequences. Create coins, trade with liquidity pools, and learn about 'rug pulls' in a... relatively safe environment :)"
 	keywords="crypto simulation game, trading practice game, rug pull simulation, virtual cryptocurrency game"
 />
@ -85,7 +85,7 @@
 <div class="container mx-auto p-6">
 	<header class="mb-8">
 		<h1 class="mb-2 truncate text-3xl font-bold">
-			{$USER_DATA ? getTimeBasedGreeting($USER_DATA?.name) : 'Welcome to CoinStorge!'}
+			{$USER_DATA ? getTimeBasedGreeting($USER_DATA?.name) : 'Welcome to Rugplay!'}
 		</h1>
 		<p class="text-muted-foreground">
 			{#if $USER_DATA}
--- a/website/src/routes/about/+page.svelte
+++ b/website/src/routes/about/+page.svelte
@ -22,18 +22,18 @@
 <UserManualModal bind:open={showUserManual} />

 <svelte:head>
-	<title>About - CoinStorge</title>
+	<title>About - Rugplay</title>
 	<meta
 		name="description"
-		content="Learn about CoinStorge - a realistic cryptocurrency trading simulation focusing on DeFi risks and mechanics."
+		content="Learn about Rugplay - a realistic cryptocurrency trading simulation focusing on DeFi risks and mechanics."
 	/>
 </svelte:head>

 <div class="container mx-auto space-y-8 px-4 py-8">
 	<div class="space-y-4 text-center">
 		<div class="mb-4 flex items-center justify-center gap-2">
-			<img src="/rugplay.svg" class="h-12 w-12" alt="CoinStorge" />
-			<h1 class="text-4xl font-bold">CoinStorge</h1>
+			<img src="/rugplay.svg" class="h-12 w-12" alt="Rugplay" />
+			<h1 class="text-4xl font-bold">Rugplay</h1>
 		</div>
 		<p class="text-muted-foreground mx-auto max-w-2xl text-lg">
 			A crypto trading simulator where you can practice trading without losing real money. Create
--- a/website/src/routes/api/coin/[coinSymbol]/+server.ts
+++ b/website/src/routes/api/coin/[coinSymbol]/+server.ts
@ -134,9 +134,7 @@ export async function GET({ params, url }) {
                creatorName: user.name,
                creatorUsername: user.username,
                creatorBio: user.bio,
-                creatorImage: user.image,
-                tradingUnlocksAt: coin.tradingUnlocksAt,
-                isLocked: coin.isLocked
+                creatorImage: user.image
            })
            .from(coin)
            .leftJoin(user, eq(coin.creatorId, user.id))
@ -187,9 +185,7 @@ export async function GET({ params, url }) {
                poolCoinAmount: Number(coinData.poolCoinAmount),
                poolBaseCurrencyAmount: Number(coinData.poolBaseCurrencyAmount),
                circulatingSupply: Number(coinData.circulatingSupply),
-                initialSupply: Number(coinData.initialSupply),
-                tradingUnlocksAt: coinData.tradingUnlocksAt,
-                isLocked: coinData.isLocked
+                initialSupply: Number(coinData.initialSupply)
            },
            candlestickData,
            volumeData,
--- a/website/src/routes/api/coin/[coinSymbol]/trade/+server.ts
+++ b/website/src/routes/api/coin/[coinSymbol]/trade/+server.ts
@ -5,7 +5,43 @@ import { coin, userPortfolio, user, transaction, priceHistory } from '$lib/serve
 import { eq, and, gte } from 'drizzle-orm';
 import { redis } from '$lib/server/redis';
 import { createNotification } from '$lib/server/notification';
-import { calculate24hMetrics, executeSellTrade } from '$lib/server/amm';
+
+async function calculate24hMetrics(coinId: number, currentPrice: number) {
+    const twentyFourHoursAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
+
+    // Get price from 24h ago
+    const [priceData] = await db
+        .select({ price: priceHistory.price })
+        .from(priceHistory)
+        .where(and(
+            eq(priceHistory.coinId, coinId),
+            gte(priceHistory.timestamp, twentyFourHoursAgo)
+        ))
+        .orderBy(priceHistory.timestamp)
+        .limit(1);
+
+    // Calculate 24h change
+    let change24h = 0;
+    if (priceData) {
+        const priceFrom24hAgo = Number(priceData.price);
+        if (priceFrom24hAgo > 0) {
+            change24h = ((currentPrice - priceFrom24hAgo) / priceFrom24hAgo) * 100;
+        }
+    }
+
+    // Calculate 24h volume
+    const volumeData = await db
+        .select({ totalBaseCurrencyAmount: transaction.totalBaseCurrencyAmount })
+        .from(transaction)
+        .where(and(
+            eq(transaction.coinId, coinId),
+            gte(transaction.timestamp, twentyFourHoursAgo)
+        ));
+
+    const volume24h = volumeData.reduce((sum, tx) => sum + Number(tx.totalBaseCurrencyAmount), 0);
+
+    return { change24h: Number(change24h.toFixed(4)), volume24h: Number(volume24h.toFixed(4)) };
+}

 export async function POST({ params, request }) {
    const session = await auth.api.getSession({
@ -40,20 +76,7 @@ export async function POST({ params, request }) {
    }

    return await db.transaction(async (tx) => {
-        const [coinData] = await tx.select({
-            id: coin.id,
-            symbol: coin.symbol,
-            name: coin.name,
-            icon: coin.icon,
-            currentPrice: coin.currentPrice,
-            poolCoinAmount: coin.poolCoinAmount,
-            poolBaseCurrencyAmount: coin.poolBaseCurrencyAmount,
-            circulatingSupply: coin.circulatingSupply,
-            isListed: coin.isListed,
-            creatorId: coin.creatorId,
-            tradingUnlocksAt: coin.tradingUnlocksAt,
-            isLocked: coin.isLocked
-        }).from(coin).where(eq(coin.symbol, normalizedSymbol)).for('update').limit(1);
+        const [coinData] = await tx.select().from(coin).where(eq(coin.symbol, normalizedSymbol)).for('update').limit(1);

        if (!coinData) {
            throw error(404, 'Coin not found');
@ -63,18 +86,6 @@ export async function POST({ params, request }) {
            throw error(400, 'This coin is delisted and cannot be traded');
        }

-        if (coinData.isLocked && coinData.tradingUnlocksAt && userId !== coinData.creatorId) {
-            const unlockTime = new Date(coinData.tradingUnlocksAt);
-            if (new Date() < unlockTime) {
-                const remainingSeconds = Math.ceil((unlockTime.getTime() - Date.now()) / 1000);
-                throw error(400, `Trading is locked. Unlocks in ${remainingSeconds} seconds.`);
-            }
-            
-            await tx.update(coin)
-                .set({ isLocked: false })
-                .where(eq(coin.id, coinData.id));
-        }
-
        const [userData] = await tx.select({
            baseCurrencyBalance: user.baseCurrencyBalance,
            username: user.username,
@ -243,21 +254,24 @@ export async function POST({ params, request }) {
            }

            // Allow more aggressive selling for rug pull simulation - prevent only mathematical breakdown
-            const maxSellable = Math.floor(Number(coinData.poolCoinAmount) * 0.995);
+            const maxSellable = Math.floor(poolCoinAmount * 0.995);
            if (amount > maxSellable) {
                throw error(400, `Cannot sell more than 99.5% of pool tokens. Max sellable: ${maxSellable} tokens`);
            }

-            const sellResult = await executeSellTrade(tx, coinData, userId, amount);
+            const k = poolCoinAmount * poolBaseCurrencyAmount;
+            const newPoolCoin = poolCoinAmount + amount;
+            const newPoolBaseCurrency = k / newPoolCoin;
+            const baseCurrencyReceived = poolBaseCurrencyAmount - newPoolBaseCurrency;

-            if (!sellResult.success) {
-                throw error(400, 'Trade failed - insufficient liquidity or invalid parameters');
+            totalCost = baseCurrencyReceived;
+            newPrice = newPoolBaseCurrency / newPoolCoin;
+            priceImpact = ((newPrice - currentPrice) / currentPrice) * 100;
+
+            if (newPoolBaseCurrency < 10) {
+                throw error(400, `Trade would drain pool below minimum liquidity (*10 BUSS). Try selling fewer tokens.`);
            }

-            totalCost = sellResult.baseCurrencyReceived ?? 0;
-            newPrice = sellResult.newPrice;
-            priceImpact = sellResult.priceImpact;
-
            if (totalCost <= 0) {
                throw error(400, 'Trade amount results in zero base currency received');
            }
@ -288,15 +302,71 @@ export async function POST({ params, request }) {
                    ));
            }

-            const metrics = sellResult.metrics || await calculate24hMetrics(coinData.id, newPrice);
+            await tx.insert(transaction).values({
+                userId,
+                coinId: coinData.id,
+                type: 'SELL',
+                quantity: amount.toString(),
+                pricePerCoin: (totalCost / amount).toString(),
+                totalBaseCurrencyAmount: totalCost.toString()
+            });
+
+            await tx.insert(priceHistory).values({
+                coinId: coinData.id,
+                price: newPrice.toString()
+            });
+
+            const metrics = await calculate24hMetrics(coinData.id, newPrice);
+
+            await tx.update(coin)
+                .set({
+                    currentPrice: newPrice.toString(),
+                    marketCap: (Number(coinData.circulatingSupply) * newPrice).toString(),
+                    poolCoinAmount: newPoolCoin.toString(),
+                    poolBaseCurrencyAmount: newPoolBaseCurrency.toString(),
+                    change24h: metrics.change24h.toString(),
+                    volume24h: metrics.volume24h.toString(),
+                    updatedAt: new Date()
+                })
+                .where(eq(coin.id, coinData.id));
+
+            const isRugPull = priceImpact < -20 && totalCost > 1000;
+
+            // Send rug pull notifications to affected users
+            if (isRugPull) {
+                (async () => {
+                    const affectedUsers = await db
+                        .select({
+                            userId: userPortfolio.userId,
+                            quantity: userPortfolio.quantity
+                        })
+                        .from(userPortfolio)
+                        .where(eq(userPortfolio.coinId, coinData.id));
+
+                    for (const holder of affectedUsers) {
+                        if (holder.userId === userId) continue;
+                        
+                        const holdingValue = Number(holder.quantity) * newPrice;
+                        if (holdingValue > 10) {
+                            const lossAmount = Number(holder.quantity) * (currentPrice - newPrice);
+                            await createNotification(
+                                holder.userId.toString(),
+                                'RUG_PULL',
+                                'Coin rugpulled!',
+                                `A coin you owned, ${coinData.name} (*${normalizedSymbol}), crashed ${Math.abs(priceImpact).toFixed(1)}%!`,
+                            );
+                        }
+                    }
+                })();
+            }

            const priceUpdateData = {
                currentPrice: newPrice,
                marketCap: Number(coinData.circulatingSupply) * newPrice,
                change24h: metrics.change24h,
                volume24h: metrics.volume24h,
-                poolCoinAmount: sellResult.newPoolCoin,
-                poolBaseCurrencyAmount: sellResult.newPoolBaseCurrency
+                poolCoinAmount: newPoolCoin,
+                poolBaseCurrencyAmount: newPoolBaseCurrency
            };

            const tradeData = {
--- a/website/src/routes/api/coin/create/+server.ts
+++ b/website/src/routes/api/coin/create/+server.ts
@ -114,9 +114,7 @@ export async function POST({ request }) {
            currentPrice: STARTING_PRICE.toString(),
            marketCap: (FIXED_SUPPLY * STARTING_PRICE).toString(),
            poolCoinAmount: FIXED_SUPPLY.toString(),
-            poolBaseCurrencyAmount: INITIAL_LIQUIDITY.toString(),
-            tradingUnlocksAt: new Date(Date.now() + 60 * 1000), // 1 minute from now
-            isLocked: true
+            poolBaseCurrencyAmount: INITIAL_LIQUIDITY.toString()
        }).returning();

        createdCoin = newCoin;
--- a/website/src/routes/api/notifications/+server.ts
+++ b/website/src/routes/api/notifications/+server.ts
@ -25,7 +25,6 @@ export const GET: RequestHandler = async ({ url, request }) => {
            type: notifications.type,
            title: notifications.title,
            message: notifications.message,
-            link: notifications.link,
            isRead: notifications.isRead,
            createdAt: notifications.createdAt,
        })
@ -55,18 +54,20 @@ export const PATCH: RequestHandler = async ({ request }) => {
    if (!session?.user) throw error(401, 'Not authenticated');

    const userId = Number(session.user.id);
-    const { markAsRead } = await request.json();
+    const { ids, markAsRead } = await request.json();

-    if (typeof markAsRead !== 'boolean') {
+    if (!Array.isArray(ids) || typeof markAsRead !== 'boolean') {
        throw error(400, 'Invalid request body');
    }

    try {
-        if (markAsRead) {
-            await db.update(notifications)
-                .set({ isRead: true })
-                .where(eq(notifications.userId, userId));
-        }
+        await db
+            .update(notifications)
+            .set({ isRead: markAsRead })
+            .where(and(
+                eq(notifications.userId, userId),
+                inArray(notifications.id, ids)
+            ));

        return json({ success: true });
    } catch (e) {
--- a/website/src/routes/api/prestige/+server.ts
+++ b/website/src/routes/api/prestige/+server.ts
@ -5,7 +5,6 @@ import { user, userPortfolio, transaction, notifications, coin } from '$lib/serv
 import { eq, sql } from 'drizzle-orm';
 import type { RequestHandler } from './$types';
 import { formatValue, getPrestigeCost, getPrestigeName } from '$lib/utils';
-import { executeSellTrade } from '$lib/server/amm';

 export const POST: RequestHandler = async ({ request, locals }) => {
    const session = await auth.api.getSession({ headers: request.headers });
@ -45,10 +44,7 @@ export const POST: RequestHandler = async ({ request, locals }) => {
                coinId: userPortfolio.coinId,
                quantity: userPortfolio.quantity,
                currentPrice: coin.currentPrice,
-                symbol: coin.symbol,
-                poolCoinAmount: coin.poolCoinAmount,
-                poolBaseCurrencyAmount: coin.poolBaseCurrencyAmount,
-                circulatingSupply: coin.circulatingSupply
+                symbol: coin.symbol
            })
            .from(userPortfolio)
            .leftJoin(coin, eq(userPortfolio.coinId, coin.id))
@ -62,37 +58,18 @@ export const POST: RequestHandler = async ({ request, locals }) => {

            for (const holding of holdings) {
                const quantity = Number(holding.quantity);
-                const currentPrice = Number(holding.currentPrice);
-
-                if (Number(holding.poolCoinAmount) <= 0 || Number(holding.poolBaseCurrencyAmount) <= 0) {
-                    const fallbackValue = quantity * currentPrice;
-                    totalSaleValue += fallbackValue;
+                const price = Number(holding.currentPrice);
+                const saleValue = quantity * price;
+                totalSaleValue += saleValue;

                await tx.insert(transaction).values({
-                        userId,
                    coinId: holding.coinId!,
                    type: 'SELL',
                    quantity: holding.quantity,
                    pricePerCoin: holding.currentPrice || '0',
-                        totalBaseCurrencyAmount: fallbackValue.toString(),
+                    totalBaseCurrencyAmount: saleValue.toString(),
                    timestamp: new Date()
                });
-                    continue;
-                }
-
-                const sellResult = await executeSellTrade(tx, {
-                    id: holding.coinId,
-                    poolCoinAmount: holding.poolCoinAmount,
-                    poolBaseCurrencyAmount: holding.poolBaseCurrencyAmount,
-                    currentPrice: holding.currentPrice,
-                    circulatingSupply: holding.circulatingSupply
-                }, userId, quantity);
-
-                if (sellResult.success && sellResult.baseCurrencyReceived) {
-                    totalSaleValue += sellResult.baseCurrencyReceived;
-                } else {
-                    totalSaleValue += sellResult.fallbackValue || (quantity * currentPrice);
-                }
            }

            await tx
@ -117,7 +94,6 @@ export const POST: RequestHandler = async ({ request, locals }) => {
            type: 'SYSTEM',
            title: `${prestigeName} Achieved!`,
            message: `Congratulations! You have successfully reached ${prestigeName}. Your portfolio has been reset, daily reward cooldown has been cleared, and you can now start fresh with your new prestige badge and enhanced daily rewards.`,
-            link: `/user/${userId}`
        });

        return json({
--- a/website/src/routes/api/rewards/claim/+server.ts
+++ b/website/src/routes/api/rewards/claim/+server.ts
@ -16,29 +16,7 @@ const REWARD_TIERS = [
    2500,  // Day 5
    3000,  // Day 6
    3500,  // Day 7
-    4000,   // Day 8
-    4200,   // Day 9
-    4400,   // Day 10
-    4600,   // Day 11
-    4800,   // Day 12
-    5000,   // Day 13
-    5200,   // Day 14
-    5400,   // Day 15
-    5600,   // Day 16
-    5800,   // Day 17
-    6000,   // Day 18
-    6200,   // Day 19
-    6400,   // Day 20
-    6600,   // Day 21
-    6800,   // Day 22
-    7000,   // Day 23
-    7200,   // Day 24
-    7400,   // Day 25
-    7600,   // Day 26
-    7800,   // Day 27
-    8000,   // Day 28
-    8200,   // Day 29
-    8500    // Day 30+
+    4000,  // Day 8+
 ];

 const PRESTIGE_MULTIPLIERS = {
--- a/website/src/routes/api/transfer/+server.ts
+++ b/website/src/routes/api/transfer/+server.ts
@ -131,7 +131,6 @@ export const POST: RequestHandler = async ({ request }) => {
                        'TRANSFER',
                        'Money received!',
                        `You received ${formatValue(amount)} from @${senderData.username}`,
-                        `/user/${senderData.id}`
                    );
                })();

@ -265,7 +264,6 @@ export const POST: RequestHandler = async ({ request }) => {
                        'TRANSFER',
                        'Coins received!',
                        `You received ${amount.toFixed(6)} *${coinData.symbol} from @${senderData.username}`,
-                        `/coin/${normalizedSymbol}`
                    );
                })();

--- a/website/src/routes/coin/[coinSymbol]/+page.svelte
+++ b/website/src/routes/coin/[coinSymbol]/+page.svelte
@ -43,8 +43,6 @@
 	let shouldSignIn = $state(false);

 	let previousCoinSymbol = $state<string | null>(null);
-	let countdown = $state<number | null>(null);
-	let countdownInterval = $state<NodeJS.Timeout | null>(null);

 	const timeframeOptions = [
 		{ value: '1m', label: '1 minute' },
@ -91,41 +89,6 @@
 		}
 	});

-	$effect(() => {
-		if (coin?.isLocked && coin?.tradingUnlocksAt) {
-			const unlockTime = new Date(coin.tradingUnlocksAt).getTime();
-			
-			const updateCountdown = () => {
-				const now = Date.now();
-				const remaining = Math.max(0, Math.ceil((unlockTime - now) / 1000));
-				countdown = remaining;
-				
-				if (remaining === 0 && countdownInterval) {
-					clearInterval(countdownInterval);
-					countdownInterval = null;
-					if (coin) {
-						coin = { ...coin, isLocked: false };
-					}
-				}
-			};
-			
-			updateCountdown();
-			countdownInterval = setInterval(updateCountdown, 1000);
-		} else {
-			countdown = null;
-			if (countdownInterval) {
-				clearInterval(countdownInterval);
-				countdownInterval = null;
-			}
-		}
-		
-		return () => {
-			if (countdownInterval) {
-				clearInterval(countdownInterval);
-			}
-		};
-	});
-
 	async function loadCoinData() {
 		try {
 			loading = true;
@ -393,17 +356,6 @@
 			};
 		});
 	}
-
-	function formatCountdown(seconds: number): string {
-		const mins = Math.floor(seconds / 60);
-		const secs = seconds % 60;
-		return `${mins}:${secs.toString().padStart(2, '0')}`;
-	}
-
-	let isCreator = $derived(coin && $USER_DATA && coin.creatorId === Number($USER_DATA.id));
-	let isTradingLocked = $derived(coin?.isLocked && countdown !== null && countdown > 0);
-	let canTrade = $derived(!isTradingLocked || isCreator);
-
 </script>

 <SEO
@ -467,11 +419,6 @@
 									● LIVE
 								</Badge>
 							{/if}
-							{#if isTradingLocked}
-								<Badge variant="secondary" class="text-xs">
-									🔒 LOCKED {countdown !== null ? formatCountdown(countdown) : ''}
-								</Badge>
-							{/if}
 							{#if !coin.isListed}
 								<Badge variant="destructive">Delisted</Badge>
 							{/if}
@ -582,15 +529,6 @@
 									{coin.symbol}
 								</p>
 							{/if}
-							{#if isTradingLocked}
-								<p class="text-muted-foreground text-sm">
-									{#if isCreator}
-										🔒 Creator-only period: {countdown !== null ? formatCountdown(countdown) : ''} remaining
-									{:else}
-										🔒 Trading unlocks in: {countdown !== null ? formatCountdown(countdown) : ''}
-									{/if}
-								</p>
-							{/if}
 						</Card.Header>
 						<Card.Content>
 							{#if $USER_DATA}
@ -600,7 +538,7 @@
 										variant="default"
 										size="lg"
 										onclick={() => (buyModalOpen = true)}
-										disabled={!coin.isListed || !canTrade}
+										disabled={!coin.isListed}
 									>
 										<TrendingUp class="h-4 w-4" />
 										Buy {coin.symbol}
@ -610,7 +548,7 @@
 										variant="outline"
 										size="lg"
 										onclick={() => (sellModalOpen = true)}
-										disabled={!coin.isListed || userHolding <= 0 || !canTrade}
+										disabled={!coin.isListed || userHolding <= 0}
 									>
 										<TrendingDown class="h-4 w-4" />
 										Sell {coin.symbol}
--- a/website/src/routes/coin/create/+page.svelte
+++ b/website/src/routes/coin/create/+page.svelte
@ -238,9 +238,9 @@
 										<p>• Starting Price: <span class="font-medium">$0.000001 per token</span></p>
 										<p>• You receive <span class="font-medium">100%</span> of the supply</p>
 										<p>• Initial Market Cap: <span class="font-medium">$1,000</span></p>
-										<p>• Trading Lock: <span class="font-medium">1 minute creator-only period</span></p>
 										<p class="mt-2 text-sm">
-											After creation, you'll have 1 minute of exclusive trading time before others can trade. This allows you to purchase your initial supply.
+											These settings ensure a fair start for all traders. The price will increase
+											naturally as people buy tokens.
 										</p>
 									</div>
 								</AlertDescription>
--- a/website/src/routes/gambling/+page.svelte
+++ b/website/src/routes/gambling/+page.svelte
@ -40,8 +40,8 @@
 </script>

 <SEO 
-	title="Gambling - CoinStorge"
-	description="Play virtual gambling games with simulated currency in CoinStorge. Try coinflip, slots, and mines games using virtual money with no real-world value - purely for entertainment."
+	title="Gambling - Rugplay"
+	description="Play virtual gambling games with simulated currency in Rugplay. Try coinflip, slots, and mines games using virtual money with no real-world value - purely for entertainment."
 	keywords="virtual gambling simulation, coinflip game, slots game, mines game, virtual casino, simulated gambling, entertainment games"
 />

--- a/website/src/routes/hopium/[id]/+page.svelte
+++ b/website/src/routes/hopium/[id]/+page.svelte
@ -224,7 +224,7 @@
 				<MessageCircleQuestion class="h-14 w-14" />
 			</div>
 			<div class="flex-1">
-				<h1 class="text-2xl font-semibold break-all">{question.question}</h1>
+				<h1 class="text-2xl font-semibold">{question.question}</h1>
 				{#if question.status === 'ACTIVE'}
 					<p class="text-muted-foreground mt-1 text-sm">
 						{formatTimeUntil(question.resolutionDate).startsWith('Ended')
--- a/website/src/routes/legal/privacy/+page.svelte
+++ b/website/src/routes/legal/privacy/+page.svelte
@ -13,8 +13,8 @@
 </script>

 <SEO 
-	title="Privacy Policy - CoinStorge"
-	description="Privacy Policy for CoinStorge cryptocurrency simulation game. Learn about data collection, account deletion process, virtual currency privacy, and your rights."
+	title="Privacy Policy - Rugplay"
+	description="Privacy Policy for Rugplay cryptocurrency simulation game. Learn about data collection, account deletion process, virtual currency privacy, and your rights."
 	keywords="privacy policy, data protection, account deletion, virtual currency privacy, simulation game privacy"
 />

@ -50,7 +50,7 @@
 					it, and what happens when you delete your account.
 				</p>
 				<p>
-					<strong>Platform Note:</strong> CoinStorge is a simulated trading environment using virtual currency
+					<strong>Platform Note:</strong> Rugplay is a simulated trading environment using virtual currency
 					("*BUSS" or "$") with no real monetary value.
 				</p>
 			</Card.Content>
@ -74,7 +74,7 @@
 					</div>

 					<div>
-						<h3 class="mb-2 text-lg font-medium">2.2 Simulated Trading and Simulated Financial Data</h3>
+						<h3 class="mb-2 text-lg font-medium">2.2 Trading and Financial Data (Simulated)</h3>
 						<ul class="ml-6 list-disc space-y-2">
 							<li>Transaction history (buy/sell orders, amounts, prices, timestamps)</li>
 							<li>Portfolio holdings and balances</li>
@ -107,7 +107,7 @@
 					<li>Platform analytics and improvements</li>
 					<li>Resolving disputes and maintaining system integrity</li>
 					<li>
-						Operating and resolving prediction markets, which may involve AI-assisted decision-making
+						Operating and resolving prediction markets, which may involve automated decision-making
 						as detailed below.
 					</li>
 				</ul>
@ -241,6 +241,9 @@
 							<li>
 								<strong>14 days later:</strong> Complete deletion process executed automatically
 							</li>
+							<li>
+								<strong>Cancellation:</strong> Contact support within 14 days to cancel deletion
+							</li>
 						</ul>
 					</div>
 				</div>
@ -260,7 +263,7 @@
 			<Card.Content>
 				<h2 class="mb-4 text-2xl font-semibold">6. Your Data Protection Rights</h2>
 				<p class="mb-4">
-					You have rights regarding your personal data,
+					Depending on your location, you may have certain rights regarding your personal data,
 					including:
 				</p>
 				<ul class="ml-6 list-disc space-y-2">
@ -295,8 +298,8 @@
 				</ul>
 				<p class="mt-3">
 					To exercise these rights, please contact us at <a
-						href="mailto:privacy@ndspir.it"
-						class="text-primary underline">privacy@ndspir.it</a
+						href="mailto:{CONTACT_EMAIL}"
+						class="text-primary underline">{CONTACT_EMAIL}</a
 					>.
 				</p>
 			</Card.Content>
@ -324,8 +327,7 @@

 			<Card.Content>
 				<h2 class="mb-4 text-2xl font-semibold">8. Data Sharing</h2>
-				<p class="mb-4">We do not sell your personal data.</p>
-				<p class="mb-4">We might be forced to share your personal data with third parties:</p>
+				<p class="mb-4">We do not sell or share your personal data with third parties, except:</p>
 				<ul class="ml-6 list-disc space-y-2">
 					<li>When required by law or legal process</li>
 					<li>To prevent fraud or protect platform security</li>
@ -357,8 +359,8 @@
 				<p class="mb-4">For privacy-related questions or to exercise your rights:</p>
 				<ul class="ml-6 list-disc space-y-2">
 					<li>
-						Email: <a href="mailto:privacy@ndspir.it" class="text-primary underline"
-							>privacy@ndspir.it</a
+						Email: <a href="mailto:{CONTACT_EMAIL}" class="text-primary underline"
+							>{CONTACT_EMAIL}</a
 						>
 					</li>
 					<li>To cancel account deletion: Contact us immediately at the above email</li>
@ -380,7 +382,7 @@
 					<strong>Contact:</strong>
 					<a href="mailto:{CONTACT_EMAIL}" class="text-primary underline">{CONTACT_EMAIL}</a>
 				</p>
-				<p><strong>Platform:</strong> CoinStorge - virtual cryptocurrency trading simulation</p>
+				<p><strong>Platform:</strong> Rugplay - virtual cryptocurrency trading simulation</p>
 			</div>
 		</div>

--- a/website/src/routes/legal/terms/+page.svelte
+++ b/website/src/routes/legal/terms/+page.svelte
@ -9,13 +9,14 @@
 	import { goto } from '$app/navigation';
 	import SEO from '$lib/components/self/SEO.svelte';

-	const LAST_UPDATED = 'September 1, 2025';
-	const CONTACT_EMAIL = '[REDACTED]';
+	const LAST_UPDATED = 'May 29, 2025';
+	const CONTACT_EMAIL = 'contact@outpoot.com';
+	const MINIMUM_AGE = 18;
 </script>

 <SEO 
-	title="Terms of Service - CoinStorge"
-	description="Terms of Service for CoinStorge - cryptocurrency trading simulation game. Learn about virtual currency, rug pull mechanics, gambling features, and platform rules."
+	title="Terms of Service - Rugplay"
+	description="Terms of Service for Rugplay - cryptocurrency trading simulation game. Learn about virtual currency, rug pull mechanics, gambling features, and platform rules."
 	keywords="terms of service, legal terms, simulation game rules, virtual currency terms, rug pull simulation"
 />

@ -35,7 +36,7 @@
 			<TrendingDown class="h-4 w-4" />
 			<Alert.Title>Virtual Currency Simulation Only</Alert.Title>
 			<Alert.Description>
-				CoinStorge uses only virtual currency (*BUSS or "$") with no real monetary value. All trading,
+				Rugplay uses only virtual currency (*BUSS or "$") with no real monetary value. All trading,
 				including rug pulls, is simulated for educational purposes only.
 			</Alert.Description>
 		</Alert.Root>
@ -46,14 +47,13 @@
 			<Card.Content>
 				<h2 class="mb-4 text-2xl font-semibold">1. Acceptance of Terms</h2>
 				<p class="mb-4">
-					By accessing and using CoinStorge ("the Platform", "we", "us", "our"), you accept and agree
+					By accessing and using Rugplay ("the Platform", "we", "us", "our"), you accept and agree
 					to be bound by these Terms of Service ("Terms"). If you do not agree to these Terms, you
 					may not use the Platform.
 				</p>
 				<p>
-					These Terms constitute a legally binding agreement between you and CoinStorge regarding your
-					use of our cryptocurrency trading simulation platform. If you are not of the age required to sign 
-					a binding contract, you may not use the Platform.
+					These Terms constitute a legally binding agreement between you and Rugplay regarding your
+					use of our cryptocurrency trading simulation platform.
 				</p>
 			</Card.Content>

@ -61,7 +61,7 @@
 				<h2 class="mb-4 text-2xl font-semibold">2. Platform Description</h2>
 				<div class="space-y-4">
 					<p>
-						CoinStorge is a <strong>simulated cryptocurrency trading platform</strong> designed for educational
+						Rugplay is a <strong>simulated cryptocurrency trading platform</strong> designed for educational
 						and entertainment purposes. The Platform allows users to:
 					</p>
 					<ul class="ml-6 list-disc space-y-2">
@ -77,7 +77,7 @@
 						<AlertTriangle class="h-4 w-4" />
 						<Alert.Title>No Real Financial Value</Alert.Title>
 						<Alert.Description>
-							All currency on CoinStorge (*BUSS, "$", and created coins) is virtual and has no
+							All currency on Rugplay (*BUSS, "$", and created coins) is virtual and has no
 							real-world monetary value. No real cryptocurrency or money is involved in any
 							transactions.
 						</Alert.Description>
@ -91,12 +91,11 @@
 					<div>
 						<h3 class="mb-2 text-lg font-medium">3.1 Age Requirements</h3>
 						<p class="mb-3">
-							You must be at least 18 years old to use CoinStorge. 
+							You must be at least {MINIMUM_AGE} years old to use Rugplay due to the presence of gambling-style
+							features (coinflip and slots), even though they use only virtual currency.
 						</p>
 						<p class="text-muted-foreground text-sm">
-							Due to the presence of gambling-style
-							features (coinflip and slots), even though they use only virtual currency, and while our platform
-							uses only virtual currency with no real-world value, we maintain an 18+
+							While our platform uses virtual currency with no real-world value, we maintain an 18+
 							age requirement to ensure responsible engagement with simulated gambling mechanics.
 						</p>
 					</div>
@ -114,7 +113,7 @@

 					<div>
 						<h3 class="mb-2 text-lg font-medium">3.3 Prohibited Users</h3>
-						<p>You may not use CoinStorge if you are:</p>
+						<p>You may not use Rugplay if you are:</p>
 						<ul class="ml-6 list-disc space-y-2">
 							<li>Located in a jurisdiction where use is prohibited</li>
 							<li>Previously banned from the Platform</li>
@ -133,7 +132,7 @@
 					<TrendingDown class="h-4 w-4" />
 					<Alert.Title>Rug Pull Risk Simulation</Alert.Title>
 					<Alert.Description>
-						CoinStorge deliberately simulates rug pull scenarios where coin creators or large holders
+						Rugplay deliberately simulates rug pull scenarios where coin creators or large holders
 						can crash prices by selling significant holdings. This is a core educational feature.
 					</Alert.Description>
 				</Alert.Root>
@ -155,7 +154,7 @@

 					<div>
 						<h3 class="mb-2 text-lg font-medium">4.2 Trading Mechanics</h3>
-						<p class="mb-3">Trading on CoinStorge includes realistic mechanics such as:</p>
+						<p class="mb-3">Trading on Rugplay includes realistic mechanics such as:</p>
 						<ul class="ml-6 list-disc space-y-2">
 							<li>
 								<strong>Slippage:</strong> Large trades affect prices based on liquidity pool ratios
@ -203,7 +202,7 @@
 					<div>
 						<h3 class="mb-2 text-lg font-medium">5.1 Acceptable Use</h3>
 						<p class="mb-3">
-							You agree to use CoinStorge only for lawful purposes and in accordance with these Terms.
+							You agree to use Rugplay only for lawful purposes and in accordance with these Terms.
 							You will not:
 						</p>
 						<ul class="ml-6 list-disc space-y-2">
@ -255,13 +254,13 @@
 							Terms, your investments may be forfeited. This includes:
 						</p>
 						<ul class="ml-6 list-disc space-y-2" style="color: oklch(0.828 0.189 84.429 / 0.8)">
-							<li>Holdings in coins with names, symbols, or descriptions which are inappropriate or prohibited by applicable law</li>
+							<li>Holdings in coins with inappropriate names, symbols, or descriptions</li>
 							<li>Bets placed on prediction markets with offensive or prohibited content</li>
 							<li>Investments in content that violates intellectual property rights</li>
 							<li>Any virtual currency associated with content we remove for Terms violations</li>
 						</ul>
 						<p class="mt-3" style="color: oklch(0.828 0.189 84.429 / 0.8)">
-							<strong>No Compensation:</strong> There is no refund of
+							<strong>No Compensation:</strong> We will not provide alternative compensation or restore
 							virtual balances lost due to investments in prohibited content. You invest at your own
 							risk.
 						</p>
@ -314,7 +313,7 @@
 				<div class="space-y-4">
 					<div>
 						<h3 class="mb-2 text-lg font-medium">7.1 Virtual Gambling Games</h3>
-						<p class="mb-3">CoinStorge includes simulated gambling features:</p>
+						<p class="mb-3">Rugplay includes simulated gambling features:</p>
 						<ul class="ml-6 list-disc space-y-2">
 							<li><strong>Coinflip:</strong> Binary outcome betting with virtual currency</li>
 							<li>
@ -413,7 +412,7 @@
 					<AlertTriangle class="h-4 w-4" />
 					<Alert.Title>Important Legal Disclaimers</Alert.Title>
 					<Alert.Description>
-						CoinStorge is provided "as is" without warranties. We are not liable for virtual losses,
+						Rugplay is provided "as is" without warranties. We are not liable for virtual losses,
 						rug pulls, or any platform-related damages.
 					</Alert.Description>
 				</Alert.Root>
@ -449,7 +448,7 @@

 					<div>
 						<h3 class="mb-2 text-lg font-medium">9.3 Educational Purpose</h3>
-						<p>CoinStorge is designed for educational and entertainment purposes. It is not:</p>
+						<p>Rugplay is designed for educational and entertainment purposes. It is not:</p>
 						<ul class="ml-6 list-disc space-y-2">
 							<li>Financial advice or investment guidance</li>
 							<li>A substitute for professional financial education</li>
@ -470,6 +469,7 @@
 						</p>
 						<ul class="ml-6 list-disc space-y-2">
 							<li>Is scheduled 14 days after your request</li>
+							<li>Can be cancelled during the 14-day period by contacting support</li>
 							<li>Results in permanent loss of all virtual currency and account data</li>
 							<li>May leave some anonymized data as described in our Privacy Policy</li>
 						</ul>
@ -504,8 +504,7 @@
 				<div class="space-y-4">
 					<div>
 						<h3 class="mb-2 text-lg font-medium">11.1 Platform Ownership</h3>
-						<p>CoinStorge is based on Rugplay, licensed under CC BY-NC by OutPoot (FaceDev).</p>
-						<p>CoinStorge and all related intellectual property are owned by either us or OutPoot, including:</p>
+						<p>Rugplay and all related intellectual property are owned by us, including:</p>
 						<ul class="ml-6 list-disc space-y-2">
 							<li>Software, code, algorithms, and technical systems</li>
 							<li>Trademarks, logos, and branding</li>
@ -518,7 +517,7 @@
 					<div>
 						<h3 class="mb-2 text-lg font-medium">11.2 Past Project Assets and Themes</h3>
 						<p class="mb-3">
-							CoinStorge incorporates intellectual property from creators' past projects, including:
+							Rugplay incorporates intellectual property from creator's past projects, including:
 						</p>
 						<ul class="ml-6 list-disc space-y-2">
 							<li>Characters, artwork, and visual themes from previous projects</li>
@ -526,7 +525,7 @@
 							<li>Any derivative works or adaptations of existing intellectual property</li>
 						</ul>
 						<p class="text-muted-foreground mt-3 text-sm">
-							All past project assets used in CoinStorge are owned by the platform creators or used
+							All past project assets used in Rugplay are owned by the platform creators or used
 							with proper authorization.
 						</p>
 					</div>
@ -551,7 +550,7 @@
 					in our Privacy Policy, which is incorporated into these Terms by reference.
 				</p>
 				<p>
-					By using CoinStorge, you consent to our data practices as described in the Privacy Policy,
+					By using Rugplay, you consent to our data practices as described in the Privacy Policy,
 					including the retention of anonymized data after account deletion.
 				</p>
 			</Card.Content>
@ -562,8 +561,8 @@
 					<div>
 						<h3 class="mb-2 text-lg font-medium">13.1 Entire Agreement</h3>
 						<p>
-							These Terms, along with our Privacy Policy — incorporated in these Terms by reference —, constitute the entire agreement between
-							you and CoinStorge regarding use of the Platform.
+							These Terms, along with our Privacy Policy, constitute the entire agreement between
+							you and Rugplay regarding use of the Platform.
 						</p>
 					</div>

@ -579,18 +578,27 @@
 						<h3 class="mb-2 text-lg font-medium">13.3 Updates to Terms</h3>
 						<p>
 							We may update these Terms periodically. Material changes will be communicated via
-							email and platform notifications, on a best-effort basis. Continued use after changes constitutes acceptance.
-							Failure to communicate does not automatically terminate our Agreement.
+							email and platform notifications. Continued use after changes constitutes acceptance.
 						</p>
 					</div>

-					
+					<div>
+						<h3 class="mb-2 text-lg font-medium">13.4 Contact Information</h3>
+						<p>
+							For questions about these Terms, contact us at:
+							<a href="mailto:{CONTACT_EMAIL}" class="text-primary underline">{CONTACT_EMAIL}</a>
+						</p>
+					</div>
 				</div>
 			</Card.Content>

 			<div class="rounded-lg p-4 text-sm" style="background-color: oklch(var(--primary) / 0.1);">
 				<p class="mb-2"><strong>Last Updated:</strong> {LAST_UPDATED}</p>
-				<p class="mb-2"><strong>Platform:</strong> CoinStorge</p>
+				<p class="mb-2">
+					<strong>Contact:</strong>
+					<a href="mailto:{CONTACT_EMAIL}" class="text-primary underline">{CONTACT_EMAIL}</a>
+				</p>
+				<p class="mb-2"><strong>Platform:</strong> Rugplay</p>
 			</div>
 		</div>

--- a/website/src/routes/market/+page.svelte
+++ b/website/src/routes/market/+page.svelte
@ -445,7 +445,7 @@
 							<div class="flex items-center gap-3">
 								<CoinIcon icon={coin.icon} symbol={coin.symbol} size={8} />
 								<div>
-									<h3 class="truncate max-w-44 text-lg font-semibold leading-tight">{coin.name}</h3>
+									<h3 class="truncate text-lg font-semibold leading-tight">{coin.name}</h3>
 									<p class="text-muted-foreground truncate text-sm">*{coin.symbol}</p>
 								</div>
 							</div>
--- a/website/src/routes/notifications/+page.svelte
+++ b/website/src/routes/notifications/+page.svelte
@ -16,7 +16,6 @@
 	import { formatTimeAgo, formatValue } from '$lib/utils';
 	import { goto } from '$app/navigation';
 	import { toast } from 'svelte-sonner';
-	import NotificationItem from './NotificationItem.svelte';

 	let loading = $state(true);
 	let newNotificationIds = $state<number[]>([]);
@ -33,7 +32,9 @@
 			const unreadIds = ($NOTIFICATIONS || []).filter((n) => !n.isRead).map((n) => n.id);
 			newNotificationIds = unreadIds;

-			await markNotificationsAsRead();
+			if (unreadIds.length > 0) {
+				await markNotificationsAsRead(unreadIds);
+			}
 		} catch (error) {
 			toast.error('Failed to load notifications');
 		} finally {
@ -131,7 +132,13 @@
 						{#each $NOTIFICATIONS as notification, index (notification.id)}
 							{@const IconComponent = getNotificationIcon(notification.type)}
 							{@const isNewNotification = newNotificationIds.includes(notification.id)}
-							<NotificationItem {notification} isNew={isNewNotification}>
+							<button
+								class={getNotificationColorClasses(
+									notification.type,
+									isNewNotification,
+									notification.isRead
+								)}
+							>
 								<div
 									class="flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-full {getNotificationIconColorClasses(
 										notification.type
@ -139,6 +146,7 @@
 								>
 									<IconComponent class="h-4 w-4" />
 								</div>
+
 								<div class="min-w-0 flex-1">
 									<div class="mb-1 flex items-center gap-2">
 										<h3 class="truncate text-sm font-medium">{notification.title}</h3>
@ -180,7 +188,7 @@
 										{formatTimeAgo(notification.createdAt)}
 									</p>
 								</div>
-							</NotificationItem>
+							</button>

 							{#if index < $NOTIFICATIONS.length - 1}
 								<Separator />
--- a/website/src/routes/notifications/NotificationItem.svelte
+++ b/website/src/routes/notifications/NotificationItem.svelte
@ -1,46 +0,0 @@
-<script lang="ts">
-    interface Notification {
-        type: 'HOPIUM' | 'TRANSFER' | 'RUG_PULL' | 'SYSTEM';
-        link?: string;
-        isRead: boolean;
-    }
-
-    export let notification: Notification;
-    export let isNew = false;
-
-    function getNotificationColorClasses(type: string, isNew: boolean, isRead: boolean) {
-        const base =
-            'hover:bg-muted/50 flex w-full items-start gap-4 rounded-md p-3 text-left transition-all duration-200';
-
-        if (isNew) {
-            return `${base} bg-primary/10`;
-        }
-
-        if (!isRead) {
-            const colors = {
-                HOPIUM: 'bg-blue-50/50 dark:bg-blue-950/10',
-                TRANSFER: 'bg-green-50/50 dark:bg-green-950/10',
-                RUG_PULL: 'bg-red-50/50 dark:bg-red-950/10',
-                SYSTEM: 'bg-purple-50/50 dark:bg-purple-950/10'
-            };
-            return `${base} ${colors[type as keyof typeof colors] || 'bg-muted/20'}`;
-        }
-
-        return base;
-    }
-</script>
-
-{#if notification.link}
-  <a
-    href={notification.link}
-    class={getNotificationColorClasses(notification.type, isNew, notification.isRead)}
-  >
-    <slot />
-  </a>
-{:else}
-  <div
-    class={getNotificationColorClasses(notification.type, isNew, notification.isRead)}
-  >
-    <slot />
-  </div>
-{/if}
				`@ -1 +0,0 @@`
				`ALTER TABLE "notification" ADD COLUMN "link" text;`