diff --git a/src/components/game/Footer.tsx b/src/components/game/Footer.tsx
index 8133377..223eda5 100644
--- a/src/components/game/Footer.tsx
+++ b/src/components/game/Footer.tsx
@@ -1,8 +1,8 @@
-import { Github, Info } from 'lucide-react';
+import { Github, Info } from "lucide-react";
 
 export function Footer() {
   const currentYear = new Date().getFullYear();
-  
+
   return (
     <footer className="w-full py-6 px-6 border-t border-border bg-card/20 mt-auto">
       <div className="max-w-7xl mx-auto flex flex-col items-center gap-4">
@@ -15,8 +15,9 @@ export function Footer() {
 
         <div className="max-w-4xl text-center space-y-2">
           <p className="text-[10px] text-muted-foreground/80 leading-tight font-body">
-            Purely hobbyist, non-commercial open-source project. All character names, images, and assets from "Rick and
-            Morty" are property of <strong>Adult Swim, Warner Bros. Discovery</strong>.
+            Purely hobbyist, non-commercial open-source project. All character
+            names, images, and assets from "Rick and Morty" are property of{" "}
+            <strong>Adult Swim, Warner Bros. Discovery</strong>.
           </p>
 
           <div className="flex flex-col md:flex-row items-center justify-center gap-x-4 gap-y-1 opacity-60">
diff --git a/src/components/game/GameCard.tsx b/src/components/game/GameCard.tsx
index 61d67fa..659b12f 100644
--- a/src/components/game/GameCard.tsx
+++ b/src/components/game/GameCard.tsx
@@ -1,4 +1,4 @@
-import { type GameCard as GameCardType } from "@/store/gameStore";
+import { type GameCard as GameCardType } from "@/types/game";
 import {
   Sparkles,
   Zap,
diff --git a/src/components/game/Header.tsx b/src/components/game/Header.tsx
index 9db563e..ba9ab6f 100644
--- a/src/components/game/Header.tsx
+++ b/src/components/game/Header.tsx
@@ -3,6 +3,7 @@ import { Leaf, TrendingUp, Settings, Beaker, Library } from 'lucide-react';
 import { Link } from 'react-router-dom';
 import { Button } from '@/components/ui/button';
 import { formatNumber, formatCurrency } from '@/lib/utils';
+import { GAME_CONFIG, calculateCurrentIncome } from '@/config/gameConfig';
 
 export function Header() {
   const seeds = useGameStore((s) => s.seeds);
@@ -10,20 +11,14 @@ export function Header() {
   const inventory = useGameStore((s) => s.inventory);
   const upgrades = useGameStore((s) => s.upgrades);
 
-  const activeIncome = activeSlots.reduce(
-    (sum, slot) => sum + (slot?.income ?? 0),
-    0
-  );
-
   const inactiveCards = inventory.filter(
     (c) => !activeSlots.some((s) => s?.id === c.id)
   ).length;
   
-  const collectionBonus = inactiveCards; // +1% per inactive card
-  const labBonus = (upgrades.seeds || 0) * 5; // +5% per upgrade level
+  const collectionBonus = Math.round(inactiveCards * GAME_CONFIG.INCOME.INACTIVE_CARD_BONUS * 100);
+  const labBonus = Math.round((upgrades.seeds || 0) * GAME_CONFIG.UPGRADES.seeds.BONUS_PER_LEVEL * 100);
   
-  const totalMultiplier = (1 + collectionBonus / 100) * (1 + labBonus / 100);
-  const totalIncome = activeIncome * totalMultiplier;
+  const totalIncome = calculateCurrentIncome({ activeSlots, inventory, upgrades });
 
   return (
     <header className="flex items-center justify-between px-6 py-4 border-b border-border bg-card/60 backdrop-blur-md">
diff --git a/src/components/game/PackOpening.tsx b/src/components/game/PackOpening.tsx
index 9e65c42..4a7cfe4 100644
--- a/src/components/game/PackOpening.tsx
+++ b/src/components/game/PackOpening.tsx
@@ -1,11 +1,13 @@
-import { useState, useEffect } from 'react';
-import { useGameStore, GameCard as CardType } from '@/store/gameStore';
-import { GameCard } from './GameCard';
-import { Button } from '@/components/ui/button';
-import { Package, Sparkles, X, ChevronRight, Lock } from 'lucide-react';
-import { toast } from 'sonner';
-import { formatCurrency } from '@/lib/utils';
-import packs from '@/data/packs.json';
+import { useState, useEffect } from "react";
+import { useGameStore } from "@/store/gameStore";
+import { GameCard } from "./GameCard";
+import { Button } from "@/components/ui/button";
+import { Package, Sparkles, X, ChevronRight, Lock } from "lucide-react";
+import { toast } from "sonner";
+import { formatCurrency } from "@/lib/utils";
+import packs from "@/data/packs.json";
+import { GAME_CONFIG } from "@/config/gameConfig";
+import { GameCard as GameCardType } from "@/types/game";
 
 interface PackOpeningProps {
   packId: string;
@@ -19,11 +21,11 @@ export function PackOpening({ packId }: PackOpeningProps) {
   const addCards = useGameStore((s) => s.addCards);
   const isUnlocked = useGameStore((s) => s.isPackUnlocked(packId));
 
-  const pack = packs.find(p => p.id === packId);
+  const pack = packs.find((p) => p.id === packId);
 
   const [isOpen, setIsOpen] = useState(false);
   const [isOpening, setIsOpening] = useState(false);
-  const [revealedCards, setRevealedCards] = useState<CardType[]>([]);
+  const [revealedCards, setRevealedCards] = useState<GameCardType[]>([]);
   const [showCards, setShowCards] = useState<number[]>([]);
   const [soldCards, setSoldCards] = useState<string[]>([]);
   const [addedToInventory, setAddedToInventory] = useState(false);
@@ -34,7 +36,7 @@ export function PackOpening({ packId }: PackOpeningProps) {
   useEffect(() => {
     if (isOpening) {
       const interval = setInterval(() => {
-        setPortalVibration(v => (v + 1) % 5);
+        setPortalVibration((v) => (v + 1) % 5);
       }, 50);
       return () => clearInterval(interval);
     }
@@ -44,27 +46,29 @@ export function PackOpening({ packId }: PackOpeningProps) {
 
   const handleBuyPack = () => {
     if (!isUnlocked) {
-      toast.error('Portal Locked!', {
-        description: 'Reach higher dimension levels to unlock this portal.',
+      toast.error("Portal Locked!", {
+        description: "Reach higher dimension levels to unlock this portal.",
       });
       return;
     }
 
     if (inventory.length >= maxInventory) {
-      toast.error('Inventory Full!', {
-        description: 'Sell some cards to make room for new ones.',
+      toast.error("Inventory Full!", {
+        description: "Sell some cards to make room for new ones.",
       });
       return;
     }
 
     if (seeds < pack.cost) {
-      toast.error('Not enough Mega Seeds!');
+      toast.error("Not enough Mega Seeds!");
       return;
     }
 
     // If we're already in a portal (Open Again), add current cards to inventory first if not already added
     if (showCards.length > 0 && !addedToInventory) {
-      const remainingCards = revealedCards.filter(c => !soldCards.includes(c.id));
+      const remainingCards = revealedCards.filter(
+        (c) => !soldCards.includes(c.id),
+      );
       addCards(remainingCards);
     }
 
@@ -76,7 +80,7 @@ export function PackOpening({ packId }: PackOpeningProps) {
       setShowCards([]);
       setSoldCards([]);
       setAddedToInventory(false);
-      
+
       setTimeout(() => {
         setIsOpening(false);
       }, 2000);
@@ -89,23 +93,30 @@ export function PackOpening({ packId }: PackOpeningProps) {
     setShowCards(newShowCards);
 
     if (newShowCards.length === pack.cardCount) {
-      const remainingCards = revealedCards.filter(c => !soldCards.includes(c.id));
+      const remainingCards = revealedCards.filter(
+        (c) => !soldCards.includes(c.id),
+      );
       addCards(remainingCards);
       setAddedToInventory(true);
     }
   };
 
-  const handleSellCard = (card: CardType) => {
+  const handleSellCard = (card: GameCardType) => {
     sellCard(card.id, card);
     setSoldCards((prev) => [...prev, card.id]);
+    const sellPrice = Math.floor(
+      card.income * GAME_CONFIG.SELL_PRICE_MULTIPLIER,
+    );
     toast.success(`${card.characterName} sold!`, {
-      description: `Gained ${formatCurrency(Math.floor(card.income * 100))} Mega Seeds.`,
+      description: `Gained ${formatCurrency(sellPrice)} Mega Seeds.`,
     });
   };
 
   const closePortal = () => {
     if (!addedToInventory) {
-      const remainingCards = revealedCards.filter(c => !soldCards.includes(c.id));
+      const remainingCards = revealedCards.filter(
+        (c) => !soldCards.includes(c.id),
+      );
       addCards(remainingCards);
     }
     setIsOpen(false);
@@ -116,30 +127,44 @@ export function PackOpening({ packId }: PackOpeningProps) {
   };
 
   const getUnlockRequirement = (id: string) => {
-    if (id === 'mega') return 'Dimension Lvl 10';
-    if (id === 'silver-rift') return 'Dimension Lvl 25';
-    if (id === 'alchemists-portal') return 'Dimension Lvl 50';
-    if (id === 'void-breach') return 'Dimension Lvl 100';
-    return null;
+    const reqLevel = GAME_CONFIG.DIMENSIONS.PACK_UNLOCKS[id];
+    if (reqLevel === undefined || reqLevel === 0) return null;
+    return `Dimension Lvl ${reqLevel}`;
   };
 
-  const colorClass = pack.id === 'mega' ? 'text-blue-400' : pack.id === 'central-finite-curve' ? 'text-purple-400' : 'text-primary';
-  const borderClass = pack.id === 'mega' ? 'border-blue-500/50' : pack.id === 'central-finite-curve' ? 'border-purple-500/50' : 'border-primary/50';
+  const colorClass =
+    pack.id === "mega"
+      ? "text-blue-400"
+      : pack.id === "central-finite-curve"
+        ? "text-purple-400"
+        : "text-primary";
+  const borderClass =
+    pack.id === "mega"
+      ? "border-blue-500/50"
+      : pack.id === "central-finite-curve"
+        ? "border-purple-500/50"
+        : "border-primary/50";
 
   return (
-    <div className={`p-6 rounded-2xl bg-card border ${borderClass} flex flex-col md:flex-row items-center gap-6 group transition-all ${!isUnlocked ? 'grayscale opacity-60' : 'hover:bg-muted/10'}`}>
+    <div
+      className={`p-6 rounded-2xl bg-card border ${borderClass} flex flex-col md:flex-row items-center gap-6 group transition-all ${!isUnlocked ? "grayscale opacity-60" : "hover:bg-muted/10"}`}
+    >
       <div className="relative">
-        <div className={`w-24 h-24 rounded-3xl bg-muted/20 flex items-center justify-center relative shadow-2xl overflow-hidden`}>
-          <Package className={`w-12 h-12 ${colorClass} ${isUnlocked && 'group-hover:scale-110'} transition-transform`} />
+        <div
+          className={`w-24 h-24 rounded-3xl bg-muted/20 flex items-center justify-center relative shadow-2xl overflow-hidden`}
+        >
+          <Package
+            className={`w-12 h-12 ${colorClass} ${isUnlocked && "group-hover:scale-110"} transition-transform`}
+          />
           <div className="absolute inset-0 bg-gradient-to-tr from-white/5 to-transparent opacity-50" />
           {!isUnlocked && (
             <div className="absolute inset-0 flex items-center justify-center bg-black/40 backdrop-blur-[2px]">
-               <Lock className="w-8 h-8 text-white/80" />
+              <Lock className="w-8 h-8 text-white/80" />
             </div>
           )}
         </div>
-        {pack.id !== 'standard' && isUnlocked && (
-           <Sparkles className="absolute -top-2 -right-2 w-6 h-6 text-yellow-400 animate-pulse" />
+        {pack.id !== "standard" && isUnlocked && (
+          <Sparkles className="absolute -top-2 -right-2 w-6 h-6 text-yellow-400 animate-pulse" />
         )}
       </div>
 
@@ -152,139 +177,186 @@ export function PackOpening({ packId }: PackOpeningProps) {
             </span>
           )}
         </div>
-        <p className="text-xs text-muted-foreground font-body max-w-xs">{pack.description}</p>
-        
+        <p className="text-xs text-muted-foreground font-body max-w-xs">
+          {pack.description}
+        </p>
+
         <div className="flex flex-wrap justify-center md:justify-start gap-3 pt-2">
           {Object.entries(pack.weights)
             .filter(([_, chance]) => (chance as number) > 0)
             .map(([type, chance]) => (
-              <div key={type} className="flex items-center gap-1.5 px-2 py-0.5 rounded-full bg-muted/40 border border-border/50">
-                 <span className="text-[8px] font-bold uppercase opacity-60 tracking-tighter">{type}</span>
-                 <span className="text-[10px] font-display font-bold text-foreground">{(chance as number * 100).toFixed(0)}%</span>
+              <div
+                key={type}
+                className="flex items-center gap-1.5 px-2 py-0.5 rounded-full bg-muted/40 border border-border/50"
+              >
+                <span className="text-[8px] font-bold uppercase opacity-60 tracking-tighter">
+                  {type}
+                </span>
+                <span className="text-[10px] font-display font-bold text-foreground">
+                  {((chance as number) * 100).toFixed(0)}%
+                </span>
               </div>
             ))}
           {pack.combineChance > 0 && (
             <div className="flex items-center gap-1.5 px-2 py-0.5 rounded-full bg-primary/10 border border-primary/20">
-               <span className="text-[8px] font-bold uppercase text-primary tracking-tighter">Merge</span>
-               <span className="text-[10px] font-display font-bold text-primary">{(pack.combineChance * 100).toFixed(0)}%</span>
+              <span className="text-[8px] font-bold uppercase text-primary tracking-tighter">
+                Merge
+              </span>
+              <span className="text-[10px] font-display font-bold text-primary">
+                {(pack.combineChance * 100).toFixed(0)}%
+              </span>
             </div>
           )}
         </div>
       </div>
 
-      <Button 
-        onClick={handleBuyPack} 
+      <Button
+        onClick={handleBuyPack}
         disabled={seeds < pack.cost || !isUnlocked}
         className="font-display font-bold min-w-[140px] shadow-xl"
-        variant={!isUnlocked ? 'outline' : 'default'}
+        variant={!isUnlocked ? "outline" : "default"}
       >
-        {!isUnlocked ? 'LOCKED' : `Buy for ${formatCurrency(pack.cost)}`}
+        {!isUnlocked ? "LOCKED" : `Buy for ${formatCurrency(pack.cost)}`}
       </Button>
 
       {isOpen && (
-        <div className="fixed inset-0 z-[100] flex items-center justify-center bg-background/95 backdrop-blur-2xl p-6 overflow-hidden">
+        <div className="fixed inset-0 z-[100] bg-background/95 backdrop-blur-2xl overflow-y-auto">
           {/* Background Portal FX */}
-          <div className={`absolute inset-0 opacity-20 pointer-events-none transition-all duration-1000 ${isOpening ? 'scale-150' : 'scale-100'}`}>
+          <div
+            className={`fixed inset-0 opacity-20 pointer-events-none transition-all duration-1000 ${isOpening ? "scale-150" : "scale-100"}`}
+          >
             <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[800px] h-[800px] rounded-full bg-primary blur-[120px] animate-pulse" />
           </div>
 
-          <div className="relative w-full max-w-6xl flex flex-col items-center">
-            {isOpening ? (
-              <div 
-                className="flex flex-col items-center gap-8 animate-in zoom-in duration-300"
-                style={{ transform: `translate(${portalVibration}px, ${portalVibration}px)` }}
-              >
-                <div className="relative">
-                   <div className="absolute inset-0 blur-3xl bg-primary/40 animate-pulse" />
-                   <div className="w-56 h-72 bg-gradient-to-b from-primary/20 to-primary/60 rounded-3xl border-4 border-primary shadow-[0_0_100px_rgba(var(--primary),0.6)] flex items-center justify-center relative overflow-hidden">
+          <div className="relative min-h-full flex items-center justify-center p-4 md:p-8">
+            <div className="relative w-full max-w-6xl flex flex-col items-center">
+              {isOpening ? (
+                <div
+                  className="flex flex-col items-center gap-8 animate-in zoom-in duration-300"
+                  style={{
+                    transform: `translate(${portalVibration}px, ${portalVibration}px)`,
+                  }}
+                >
+                  <div className="relative">
+                    <div className="absolute inset-0 blur-3xl bg-primary/40 animate-pulse" />
+                    <div className="w-56 h-72 bg-gradient-to-b from-primary/20 to-primary/60 rounded-3xl border-4 border-primary shadow-[0_0_100px_rgba(var(--primary),0.6)] flex items-center justify-center relative overflow-hidden">
                       <Package className="w-24 h-24 text-white animate-bounce drop-shadow-2xl" />
                       <div className="absolute top-0 left-0 w-full h-full bg-[radial-gradient(circle_at_center,transparent,rgba(0,0,0,0.5))]" />
-                   </div>
-                </div>
-                <div className="text-center space-y-2">
-                  <h2 className="text-4xl font-display font-bold text-primary tracking-[0.2em] animate-pulse">
-                    STABILIZING RIFT
-                  </h2>
-                  <p className="text-muted-foreground font-body text-sm">Accessing Rick's Secret Stash...</p>
-                </div>
-              </div>
-            ) : (
-              <div className="w-full flex flex-col items-center gap-12 animate-in fade-in duration-1000">
-                <div className="text-center space-y-2">
-                  <h2 className="text-4xl font-display font-bold text-foreground">
-                    {showCards.length === pack.cardCount ? 'ENTITY ACQUIRED' : 'MANIFESTING...'}
-                  </h2>
-                  <p className="text-muted-foreground">Click to stabilize the interdimensional form</p>
-                  <div className="flex items-center justify-center gap-2 pt-2">
-                    <span className="text-[10px] uppercase font-bold text-muted-foreground">Inventory:</span>
-                    <span className={`text-[10px] font-bold ${inventory.length >= maxInventory ? 'text-red-500' : 'text-primary'}`}>
-                      {inventory.length} / {maxInventory}
-                    </span>
+                    </div>
+                  </div>
+                  <div className="text-center space-y-2">
+                    <h2 className="text-4xl font-display font-bold text-primary tracking-[0.2em] animate-pulse">
+                      STABILIZING RIFT
+                    </h2>
+                    <p className="text-muted-foreground font-body text-sm">
+                      Accessing Rick's Secret Stash...
+                    </p>
                   </div>
                 </div>
-                
-                <div className="flex flex-wrap justify-center gap-8 md:gap-12">
-                  {revealedCards.map((card, i) => (
-                    <div key={i} className="flex flex-col items-center gap-4">
-                      {showCards.includes(i) ? (
-                        <div className="flex flex-col items-center gap-3 animate-in flip-in-y duration-700">
-                          <div className={soldCards.includes(card.id) ? 'grayscale opacity-40 pointer-events-none' : ''}>
-                            <GameCard card={card} />
-                          </div>
-                          {!soldCards.includes(card.id) && (
-                            <Button 
-                              variant="destructive" 
-                              size="sm"
-                              className="w-full font-bold text-[10px] h-8 bg-red-950/40 hover:bg-red-900 border border-red-500/50"
-                              onClick={() => handleSellCard(card)}
+              ) : (
+                <div className="w-full flex flex-col items-center gap-12 animate-in fade-in duration-1000 py-12">
+                  <div className="text-center space-y-2">
+                    <h2 className="text-4xl font-display font-bold text-foreground">
+                      {showCards.length === pack.cardCount
+                        ? "ENTITY ACQUIRED"
+                        : "MANIFESTING..."}
+                    </h2>
+                    <p className="text-muted-foreground">
+                      Click to stabilize the interdimensional form
+                    </p>
+                    <div className="flex items-center justify-center gap-2 pt-2">
+                      <span className="text-[10px] uppercase font-bold text-muted-foreground">
+                        Inventory:
+                      </span>
+                      <span
+                        className={`text-[10px] font-bold ${inventory.length >= maxInventory ? "text-red-500" : "text-primary"}`}
+                      >
+                        {inventory.length} / {maxInventory}
+                      </span>
+                    </div>
+                  </div>
+
+                  <div className="flex flex-wrap justify-center gap-8 md:gap-12">
+                    {revealedCards.map((card, i) => (
+                      <div key={i} className="flex flex-col items-center gap-4">
+                        {showCards.includes(i) ? (
+                          <div className="flex flex-col items-center gap-3 animate-in flip-in-y duration-700">
+                            <div
+                              className={
+                                soldCards.includes(card.id)
+                                  ? "grayscale opacity-40 pointer-events-none"
+                                  : ""
+                              }
                             >
-                              SELL FOR {formatCurrency(Math.floor(card.income * 100))}
-                            </Button>
-                          )}
-                          {soldCards.includes(card.id) && (
-                            <div className="h-8 flex items-center justify-center">
-                              <span className="text-[10px] font-bold text-red-400 uppercase tracking-widest">Sold</span>
+                              <GameCard card={card} />
                             </div>
-                          )}
-                        </div>
-                      ) : (
-                        <button
-                          onClick={() => revealCard(i)}
-                          className="w-44 h-64 bg-gradient-to-br from-muted/80 to-muted-foreground/10 rounded-2xl border-2 border-border/50 flex flex-col items-center justify-center gap-4 hover:border-primary/50 transition-all hover:scale-105 group relative overflow-hidden shadow-2xl"
-                        >
-                          <div className="absolute inset-0 bg-[radial-gradient(circle_at_center,rgba(var(--primary),0.1),transparent)] group-hover:opacity-100 opacity-0 transition-opacity" />
-                          <div className="w-14 h-14 rounded-full bg-background/50 flex items-center justify-center group-hover:rotate-12 transition-transform shadow-inner">
-                            <ChevronRight className="w-6 h-6 text-muted-foreground group-hover:text-primary" />
+                            {!soldCards.includes(card.id) && (
+                              <Button
+                                variant="destructive"
+                                size="sm"
+                                className="w-full font-bold text-[10px] h-8 bg-red-950/40 hover:bg-red-900 border border-red-500/50"
+                                onClick={() => handleSellCard(card)}
+                              >
+                                SELL FOR{" "}
+                                {formatCurrency(
+                                  Math.floor(
+                                    card.income *
+                                      GAME_CONFIG.SELL_PRICE_MULTIPLIER,
+                                  ),
+                                )}
+                              </Button>
+                            )}
+                            {soldCards.includes(card.id) && (
+                              <div className="h-8 flex items-center justify-center">
+                                <span className="text-[10px] font-bold text-red-400 uppercase tracking-widest">
+                                  Sold
+                                </span>
+                              </div>
+                            )}
                           </div>
-                          <span className="text-[10px] font-display font-bold text-muted-foreground tracking-[0.3em] uppercase group-hover:text-primary">DECRYPT</span>
-                        </button>
-                      )}
+                        ) : (
+                          <button
+                            onClick={() => revealCard(i)}
+                            className="w-44 h-64 bg-gradient-to-br from-muted/80 to-muted-foreground/10 rounded-2xl border-2 border-border/50 flex flex-col items-center justify-center gap-4 hover:border-primary/50 transition-all hover:scale-105 group relative overflow-hidden shadow-2xl"
+                          >
+                            <div className="absolute inset-0 bg-[radial-gradient(circle_at_center,rgba(var(--primary),0.1),transparent)] group-hover:opacity-100 opacity-0 transition-opacity" />
+                            <div className="w-14 h-14 rounded-full bg-background/50 flex items-center justify-center group-hover:rotate-12 transition-transform shadow-inner">
+                              <ChevronRight className="w-6 h-6 text-muted-foreground group-hover:text-primary" />
+                            </div>
+                            <span className="text-[10px] font-display font-bold text-muted-foreground tracking-[0.3em] uppercase group-hover:text-primary">
+                              DECRYPT
+                            </span>
+                          </button>
+                        )}
+                      </div>
+                    ))}
+                  </div>
+
+                  {showCards.length === pack.cardCount && (
+                    <div className="flex flex-col md:flex-row items-center gap-4 animate-in slide-in-from-bottom-8">
+                      <Button
+                        onClick={closePortal}
+                        size="lg"
+                        variant="outline"
+                        className="font-display font-bold px-12 py-8 text-xl shadow-2xl"
+                      >
+                        RETURN TO CITADEL
+                      </Button>
+                      <Button
+                        onClick={handleBuyPack}
+                        size="lg"
+                        disabled={
+                          seeds < pack.cost || inventory.length >= maxInventory
+                        }
+                        className="font-display font-bold px-12 py-8 text-xl shadow-2xl"
+                      >
+                        OPEN AGAIN ({formatCurrency(pack.cost)})
+                      </Button>
                     </div>
-                  ))}
+                  )}
                 </div>
-
-                {showCards.length === pack.cardCount && (
-                  <div className="flex flex-col md:flex-row items-center gap-4 animate-in slide-in-from-bottom-8">
-                    <Button 
-                      onClick={closePortal} 
-                      size="lg" 
-                      variant="outline"
-                      className="font-display font-bold px-12 py-8 text-xl shadow-2xl"
-                    >
-                      RETURN TO CITADEL
-                    </Button>
-                    <Button 
-                      onClick={handleBuyPack} 
-                      size="lg" 
-                      disabled={seeds < pack.cost || inventory.length >= maxInventory}
-                      className="font-display font-bold px-12 py-8 text-xl shadow-2xl border-2 border-primary"
-                    >
-                      OPEN AGAIN ({formatCurrency(pack.cost)})
-                    </Button>
-                  </div>
-                )}
-              </div>
-            )}
+              )}
+            </div>
           </div>
         </div>
       )}
diff --git a/src/config/gameConfig.ts b/src/config/gameConfig.ts
new file mode 100644
index 0000000..9e7c0c6
--- /dev/null
+++ b/src/config/gameConfig.ts
@@ -0,0 +1,90 @@
+import { GameCard, GameState } from "@/types/game";
+
+export const GAME_CONFIG = {
+  INITIAL_SEEDS: 100,
+  INITIAL_MAX_INVENTORY: 50,
+  DIMENSION_ENTRY_COST: 1000,
+  SELL_PRICE_MULTIPLIER: 100,
+  MAX_OFFLINE_SECONDS: 24 * 60 * 60, // 24h
+  
+  UPGRADES: {
+    seeds: {
+      BASE_COST: 500,
+      COST_EXPONENT: 1.6,
+      JUMP_THRESHOLD: 10,
+      JUMP_MULTIPLIER: 5,
+      BONUS_PER_LEVEL: 0.05, // 5% per level
+    },
+    power: {
+      BASE_COST: 800,
+      COST_EXPONENT: 1.6,
+      JUMP_THRESHOLD: 10,
+      JUMP_MULTIPLIER: 5,
+      BONUS_PER_LEVEL: 0.05, // 5% per level
+    }
+  },
+
+  INCOME: {
+    INACTIVE_CARD_BONUS: 0.01, // 1% per inactive card
+  },
+
+  CARD_GENERATION: {
+    DEFAULT_WEIGHTS: {
+      COMMON: 0.7,
+      RARE: 0.2,
+      HOLO: 0.08,
+      FULL_ART: 0.02,
+    },
+    DEFAULT_COMBINE_CHANCE: 0.1,
+    ENEMY_WEIGHTS: {
+      COMMON: 0.6,
+      RARE: 0.3,
+      HOLO: 0.08,
+      FULL_ART: 0.02,
+    }
+  },
+
+  DIMENSIONS: {
+    BONUS_STEP: 5,
+    BONUS_AMOUNT: 200, // (dimensionLevel + 1) * 200
+    SCALE_FACTOR: 0.25,
+    MAX_LEVEL: 100,
+    MAX_LEVEL_REWARD: 1000000,
+    LEVEL_REWARD_MULTIPLIER: 500,
+    MILESTONES: {
+      10: "Mega Portal",
+      25: "Silver Rift",
+      50: "Alchemist Portal",
+      100: "Void Breach",
+    } as Record<number, string>,
+    PACK_UNLOCKS: {
+      "standard": 0,
+      "mega": 10,
+      "silver-rift": 25,
+      "alchemists-portal": 50,
+      "void-breach": 100,
+    } as Record<string, number>
+  }
+};
+
+/**
+ * Calculates the current income per second based on the game state.
+ * @param state The current game state
+ * @returns Income per second
+ */
+export const calculateCurrentIncome = (state: Pick<GameState, "activeSlots" | "inventory" | "upgrades">) => {
+  const activeIncome = state.activeSlots.reduce(
+    (sum: number, slot: GameCard | null) => sum + (slot?.income ?? 0),
+    0,
+  );
+  
+  const inactiveCards = state.inventory.filter(
+    (c: GameCard) => !state.activeSlots.some((s: GameCard | null) => s?.id === c.id),
+  ).length;
+  
+  const bonus = 1 + inactiveCards * GAME_CONFIG.INCOME.INACTIVE_CARD_BONUS;
+  
+  const upgradeBonus = 1 + state.upgrades.seeds * GAME_CONFIG.UPGRADES.seeds.BONUS_PER_LEVEL;
+
+  return activeIncome * bonus * upgradeBonus;
+};
diff --git a/src/pages/Collection.tsx b/src/pages/Collection.tsx
index 0f1579f..d231716 100644
--- a/src/pages/Collection.tsx
+++ b/src/pages/Collection.tsx
@@ -1,5 +1,5 @@
 import { useState, useMemo } from 'react';
-import { useGameStore, GameCard as CardType } from '@/store/gameStore';
+import { useGameStore } from '@/store/gameStore';
 import { Header } from '@/components/game/Header';
 import { GameCard } from '@/components/game/GameCard';
 import { Footer } from '@/components/game/Footer';
@@ -15,6 +15,7 @@ import { Button } from '@/components/ui/button';
 import { Search, Trash2, FilterX, CheckCircle2, Circle, ArrowLeft } from 'lucide-react';
 import { toast } from 'sonner';
 import { Link } from 'react-router-dom';
+import { GAME_CONFIG } from '@/config/gameConfig';
 
 const Collection = () => {
   const inventory = useGameStore((s) => s.inventory);
@@ -56,7 +57,7 @@ const Collection = () => {
     
     const totalProfit = inventory
       .filter(c => selectedIds.includes(c.id))
-      .reduce((acc, c) => acc + (c.income * 100), 0);
+      .reduce((acc, c) => acc + (c.income * GAME_CONFIG.SELL_PRICE_MULTIPLIER), 0);
 
     if (confirm(`Sell ${selectedIds.length} selected cards for ${totalProfit.toLocaleString()} Mega Seeds?`)) {
       sellCards(selectedIds);
@@ -189,7 +190,7 @@ const Collection = () => {
             <div className="text-destructive-foreground">
               <p className="font-display font-bold text-lg">{selectedIds.length} Selected</p>
               <p className="text-xs opacity-80">
-                Total: {inventory.filter(c => selectedIds.includes(c.id)).reduce((acc, c) => acc + (c.income * 100), 0).toLocaleString()} Seeds
+                Total: {inventory.filter(c => selectedIds.includes(c.id)).reduce((acc, c) => acc + (c.income * GAME_CONFIG.SELL_PRICE_MULTIPLIER), 0).toLocaleString()} Seeds
               </p>
             </div>
             <div className="flex gap-2">
diff --git a/src/pages/Dimension.tsx b/src/pages/Dimension.tsx
index 49f203f..c8fc4dd 100644
--- a/src/pages/Dimension.tsx
+++ b/src/pages/Dimension.tsx
@@ -4,10 +4,12 @@ import { Footer } from "@/components/game/Footer";
 import { Button } from "@/components/ui/button";
 import { Link } from "react-router-dom";
 import { Map, ArrowLeft, Sword, History, Zap, Beaker } from "lucide-react";
-import { useGameStore, GameCard as GameCardType } from "@/store/gameStore";
+import { useGameStore } from "@/store/gameStore";
+import { GameCard as GameCardType } from "@/types/game";
 import { GameCard } from "@/components/game/GameCard";
 import { toast } from "sonner";
 import { formatNumber, formatCurrency } from "@/lib/utils";
+import { GAME_CONFIG } from "@/config/gameConfig";
 
 const Dimension = () => {
   const {
@@ -31,20 +33,20 @@ const Dimension = () => {
     if (inventory.length === 0) return null;
     const strongest = [...inventory].sort((a, b) => b.power - a.power)[0];
 
-    // Lab Power Upgrade: +5% per level
-    const powerMultiplier = 1 + upgrades.power * 0.05;
+    // Lab Power Upgrade
+    const powerMultiplier = 1 + upgrades.power * GAME_CONFIG.UPGRADES.power.BONUS_PER_LEVEL;
     const totalPower = Math.floor(strongest.power * powerMultiplier);
 
     return {
       card: strongest,
       basePower: strongest.power,
       totalPower,
-      bonusPercent: upgrades.power * 5,
+      bonusPercent: Math.round(upgrades.power * GAME_CONFIG.UPGRADES.power.BONUS_PER_LEVEL * 100),
     };
   }, [inventory, upgrades.power]);
 
   const handleStart = () => {
-    if (seeds < 1000) {
+    if (seeds < GAME_CONFIG.DIMENSION_ENTRY_COST) {
       toast.error("Not enough Mega Seeds!");
       return;
     }
@@ -61,11 +63,11 @@ const Dimension = () => {
     setIsFighting(true);
 
     setTimeout(() => {
-      if (dimensionLevel == 100) {
+      if (dimensionLevel >= GAME_CONFIG.DIMENSIONS.MAX_LEVEL) {
         toast.success(`EPIC VICTORY! You conquered the Dimension Rift!`, {
           description: `You've reached the maximum level and unlocked all rewards!`,
         });
-        resetDimension(1000000);
+        resetDimension(GAME_CONFIG.DIMENSIONS.MAX_LEVEL_REWARD);
       } else if (playerStats.totalPower >= currentEnemy.power) {
         const { bonus, milestoneUnlocked } = nextDimensionLevel();
 
@@ -82,7 +84,7 @@ const Dimension = () => {
           toast.success(`Victory! Level ${dimensionLevel} cleared.`);
         }
       } else {
-        const reward = dimensionLevel * 500;
+        const reward = dimensionLevel * GAME_CONFIG.DIMENSIONS.LEVEL_REWARD_MULTIPLIER;
         toast.error(`Defeat! You reached level ${dimensionLevel}.`, {
           description: `Final Reward: ${formatCurrency(reward)} Mega Seeds.`,
         });
@@ -119,7 +121,7 @@ const Dimension = () => {
             <div className="flex items-center gap-6">
               <div className="flex items-center gap-2 text-xs font-bold px-3 py-1 bg-primary/10 text-primary border border-primary/20 rounded-full">
                 <Beaker className="w-3.5 h-3.5" />
-                Lab Bonus: +{upgrades.power * 5}% Power
+                Lab Bonus: +{Math.round(upgrades.power * GAME_CONFIG.UPGRADES.power.BONUS_PER_LEVEL * 100)}% Power
               </div>
               <div className="flex items-center gap-2">
                 <History className="w-4 h-4 text-muted-foreground" />
diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx
index 6411267..e6069e5 100644
--- a/src/pages/Index.tsx
+++ b/src/pages/Index.tsx
@@ -9,8 +9,7 @@ import { Button } from "@/components/ui/button";
 import { Package, Map, Beaker } from "lucide-react";
 import { toast } from "sonner";
 import { formatCurrency } from "@/lib/utils";
-
-const MAX_OFFLINE_SECONDS = 24 * 60 * 60; // 24h
+import { GAME_CONFIG, calculateCurrentIncome } from "@/config/gameConfig";
 
 const Index = () => {
   const offlineProcessed = useRef(false);
@@ -23,23 +22,13 @@ const Index = () => {
     const state = useGameStore.getState();
     const elapsed = Math.min(
       (Date.now() - state.lastSaved) / 1000,
-      MAX_OFFLINE_SECONDS,
+      GAME_CONFIG.MAX_OFFLINE_SECONDS,
     );
 
     if (elapsed > 10) {
-      const activeIncome = state.activeSlots.reduce(
-        (sum, slot) => sum + (slot?.income ?? 0),
-        0,
-      );
-      const inactiveCards = state.inventory.filter(
-        (c) => !state.activeSlots.some((s) => s?.id === c.id),
-      ).length;
-      const bonus = 1 + inactiveCards / 100;
-
-      // Apply Upgrade Multiplier (5% per level)
-      const upgradeBonus = 1 + state.upgrades.seeds * 0.05;
-
-      const earned = Math.floor(activeIncome * bonus * upgradeBonus * elapsed);
+      const incomePerSecond = calculateCurrentIncome(state);
+      const earned = Math.floor(incomePerSecond * elapsed);
+      
       if (earned > 0) {
         state.updateSeeds(earned);
         toast.success(`Welcome back!`, {
@@ -53,21 +42,10 @@ const Index = () => {
   useEffect(() => {
     const interval = setInterval(() => {
       const state = useGameStore.getState();
-      const activeIncome = state.activeSlots.reduce(
-        (sum, slot) => sum + (slot?.income ?? 0),
-        0,
-      );
-      const inactiveCards = state.inventory.filter(
-        (c) => !state.activeSlots.some((s) => s?.id === c.id),
-      ).length;
-      const bonus = 1 + inactiveCards / 100;
-
-      // Apply Upgrade Multiplier (5% per level)
-      const upgradeBonus = 1 + state.upgrades.seeds * 0.05;
-
-      const earned = activeIncome * bonus * upgradeBonus;
-      if (earned > 0) {
-        state.updateSeeds(earned);
+      const incomePerSecond = calculateCurrentIncome(state);
+      
+      if (incomePerSecond > 0) {
+        state.updateSeeds(incomePerSecond);
       }
     }, 1000);
     return () => clearInterval(interval);
diff --git a/src/pages/Upgrades.tsx b/src/pages/Upgrades.tsx
index cc2cee4..68b33c0 100644
--- a/src/pages/Upgrades.tsx
+++ b/src/pages/Upgrades.tsx
@@ -13,6 +13,7 @@ import {
 import { useGameStore } from "@/store/gameStore";
 import { toast } from "sonner";
 import { formatNumber, formatCurrency } from "@/lib/utils";
+import { GAME_CONFIG } from "@/config/gameConfig";
 
 const Upgrades = () => {
   const { seeds, upgrades, buyUpgrade, getUpgradeCost } = useGameStore();
@@ -35,7 +36,8 @@ const Upgrades = () => {
 
   const getEffect = (type: "seeds" | "power") => {
     const level = upgrades[type];
-    return `+${(level * 5).toFixed(0)}%`;
+    const bonus = GAME_CONFIG.UPGRADES[type].BONUS_PER_LEVEL;
+    return `+${(level * bonus * 100).toFixed(0)}%`;
   };
 
   const upgradesList = [
@@ -144,7 +146,7 @@ const Upgrades = () => {
                         </p>
                         <div className="flex items-center gap-1">
                           <p className="text-lg font-bold text-foreground">
-                            +{((level + 1) * 5).toFixed(0)}%
+                            + {((level + 1) * GAME_CONFIG.UPGRADES[type].BONUS_PER_LEVEL * 100).toFixed(0)}%
                           </p>
                           <ChevronUp className="w-4 h-4 text-green-500" />
                         </div>
diff --git a/src/store/gameStore.ts b/src/store/gameStore.ts
index 4567b4f..11e4e8e 100644
--- a/src/store/gameStore.ts
+++ b/src/store/gameStore.ts
@@ -3,45 +3,15 @@ import { persist } from "zustand/middleware";
 import characters from "@/data/characters.json";
 import cardTypes from "@/data/cardTypes.json";
 import packs from "@/data/packs.json";
-
-export interface CardType {
-  id: string;
-  label: string;
-  multiplier: number;
-  color: string;
-  canCombine: boolean;
-}
-
-export interface GameCard {
-  id: string;
-  name: string;
-  characterName: string;
-  types: string[]; // e.g. ["HOLO", "FULL_ART"]
-  income: number;
-  power: number;
-  avatarId?: number;
-  customImage?: string;
-  origin: string;
-  location: string;
-  status: string;
-  species: string;
-  timestamp: number;
-}
-
-interface GameState {
-  seeds: number;
-  inventory: GameCard[];
-  maxInventory: number;
-  activeSlots: (GameCard | null)[];
-  dimensionLevel: number;
-  maxDimensionLevel: number;
-  isDimensionActive: boolean;
-  currentEnemy: GameCard | null;
-  upgrades: {
-    seeds: number;
-    power: number;
-  };
-  lastSaved: number;
+import { GAME_CONFIG } from "@/config/gameConfig";
+import {
+  CardType,
+  GameCard,
+  Character,
+  GameState as BaseGameState,
+} from "@/types/game";
+
+interface GameState extends BaseGameState {
   addCard: (card: GameCard) => boolean;
   addCards: (cards: GameCard[]) => boolean;
   sellCard: (cardId: string, card?: GameCard) => void;
@@ -63,16 +33,15 @@ interface GameState {
   setLastSaved: (ts: number) => void;
 }
 
+type PersistedGameState = GameState;
+
 const generateCard = (
-  weights: Record<string, number> = {
-    COMMON: 0.7,
-    RARE: 0.2,
-    HOLO: 0.08,
-    FULL_ART: 0.02,
-  },
-  combineChance: number = 0.1,
+  weights: Record<string, number> = GAME_CONFIG.CARD_GENERATION.DEFAULT_WEIGHTS,
+  combineChance: number = GAME_CONFIG.CARD_GENERATION.DEFAULT_COMBINE_CHANCE,
 ): GameCard => {
-  const character = characters[Math.floor(Math.random() * characters.length)];
+  const character = (characters as Character[])[
+    Math.floor(Math.random() * characters.length)
+  ];
 
   const typeRoll = Math.random();
   let baseTypeId = "COMMON";
@@ -86,11 +55,11 @@ const generateCard = (
     }
   }
 
-  const baseType = cardTypes.find((t) => t.id === baseTypeId);
+  const baseType = (cardTypes as CardType[]).find((t) => t.id === baseTypeId);
   const selectedTypes = [baseTypeId];
 
   if (baseType?.canCombine && Math.random() < combineChance) {
-    const validExtraTypes = (baseType as any).combinesWith || [];
+    const validExtraTypes = baseType.combinesWith || [];
     if (validExtraTypes.length > 0) {
       const extraTypeId =
         validExtraTypes[Math.floor(Math.random() * validExtraTypes.length)];
@@ -101,14 +70,12 @@ const generateCard = (
   }
 
   const combinedMultiplier = selectedTypes.reduce((acc, typeId) => {
-    const type = cardTypes.find((t) => t.id === typeId);
+    const type = (cardTypes as CardType[]).find((t) => t.id === typeId);
     return acc * (type?.multiplier || 1);
   }, 1);
 
   const finalIncome = Math.floor(character.baseMultiplier * combinedMultiplier);
-  const finalPower = Math.floor(
-    (character as any).basePower * combinedMultiplier,
-  );
+  const finalPower = Math.floor(character.basePower * combinedMultiplier);
   const timestamp = Date.now();
   const uuid = crypto.randomUUID();
 
@@ -120,7 +87,7 @@ const generateCard = (
     income: finalIncome,
     power: finalPower,
     avatarId: character.avatarId,
-    customImage: (character as any).customImage,
+    customImage: character.customImage,
     origin: character.origin,
     location: character.location,
     status: character.status,
@@ -132,9 +99,9 @@ const generateCard = (
 export const useGameStore = create<GameState>()(
   persist(
     (set, get) => ({
-      seeds: 100,
+      seeds: GAME_CONFIG.INITIAL_SEEDS,
       inventory: [],
-      maxInventory: 50,
+      maxInventory: GAME_CONFIG.INITIAL_MAX_INVENTORY,
       activeSlots: [null, null, null, null],
       dimensionLevel: 1,
       maxDimensionLevel: 1,
@@ -167,10 +134,12 @@ export const useGameStore = create<GameState>()(
         set((s) => {
           const cardInInventory = s.inventory.find((c) => c.id === cardId);
           const targetCard = cardInInventory || card;
-          
+
           if (!targetCard) return s;
-          
-          const sellPrice = Math.floor(targetCard.income * 100);
+
+          const sellPrice = Math.floor(
+            targetCard.income * GAME_CONFIG.SELL_PRICE_MULTIPLIER,
+          );
           return {
             inventory: s.inventory.filter((c) => c.id !== cardId),
             activeSlots: s.activeSlots.map((sl) =>
@@ -184,7 +153,8 @@ export const useGameStore = create<GameState>()(
         set((s) => {
           const cardsToSell = s.inventory.filter((c) => cardIds.includes(c.id));
           const totalProfit = cardsToSell.reduce(
-            (acc, c) => acc + Math.floor(c.income * 100),
+            (acc, c) =>
+              acc + Math.floor(c.income * GAME_CONFIG.SELL_PRICE_MULTIPLIER),
             0,
           );
 
@@ -199,12 +169,9 @@ export const useGameStore = create<GameState>()(
 
       isPackUnlocked: (packId) => {
         const { maxDimensionLevel } = get();
-        if (packId === "standard") return true;
-        if (packId === "mega") return maxDimensionLevel >= 10;
-        if (packId === "silver-rift") return maxDimensionLevel >= 25;
-        if (packId === "alchemists-portal") return maxDimensionLevel >= 50;
-        if (packId === "void-breach") return maxDimensionLevel >= 100;
-        return false;
+        const reqLevel = GAME_CONFIG.DIMENSIONS.PACK_UNLOCKS[packId];
+        if (reqLevel === undefined) return false;
+        return maxDimensionLevel >= reqLevel;
       },
 
       buyPack: (packId) => {
@@ -250,19 +217,18 @@ export const useGameStore = create<GameState>()(
 
       startDimension: () => {
         const { seeds, generateRandomCard } = get();
-        if (seeds < 1000) return false;
-        
+        if (seeds < GAME_CONFIG.DIMENSION_ENTRY_COST) return false;
+
         const enemy = generateRandomCard(
-          { COMMON: 0.6, RARE: 0.3, HOLO: 0.08, FULL_ART: 0.02 },
-          0.1,
+          GAME_CONFIG.CARD_GENERATION.ENEMY_WEIGHTS,
+          GAME_CONFIG.CARD_GENERATION.DEFAULT_COMBINE_CHANCE,
         );
-        // Strength scale for lvl 1 is already handled by base power
 
         set((s) => ({
-          seeds: s.seeds - 1000,
+          seeds: s.seeds - GAME_CONFIG.DIMENSION_ENTRY_COST,
           isDimensionActive: true,
           dimensionLevel: 1,
-          currentEnemy: enemy
+          currentEnemy: enemy,
         }));
         return true;
       },
@@ -272,21 +238,19 @@ export const useGameStore = create<GameState>()(
         let bonus = 0;
         let milestoneUnlocked = null;
 
-        if ((dimensionLevel + 1) % 5 === 0) {
-          bonus = (dimensionLevel + 1) * 200;
+        if ((dimensionLevel + 1) % GAME_CONFIG.DIMENSIONS.BONUS_STEP === 0) {
+          bonus = (dimensionLevel + 1) * GAME_CONFIG.DIMENSIONS.BONUS_AMOUNT;
         }
 
         const nextLvl = dimensionLevel + 1;
-        if (nextLvl === 10) milestoneUnlocked = "Mega Portal";
-        if (nextLvl === 25) milestoneUnlocked = "Silver Rift";
-        if (nextLvl === 50) milestoneUnlocked = "Alchemist Portal";
-        if (nextLvl === 100) milestoneUnlocked = "Void Breach";
+        milestoneUnlocked = GAME_CONFIG.DIMENSIONS.MILESTONES[nextLvl] || null;
 
         const newEnemy = generateRandomCard(
-          { COMMON: 0.6, RARE: 0.3, HOLO: 0.08, FULL_ART: 0.02 },
-          0.1,
+          GAME_CONFIG.CARD_GENERATION.ENEMY_WEIGHTS,
+          GAME_CONFIG.CARD_GENERATION.DEFAULT_COMBINE_CHANCE,
         );
-        const scaleFactor = 1 + (nextLvl - 1) * 0.25;
+        const scaleFactor =
+          1 + (nextLvl - 1) * GAME_CONFIG.DIMENSIONS.SCALE_FACTOR;
         newEnemy.power = Math.floor(newEnemy.power * scaleFactor);
 
         set((s) => {
@@ -296,7 +260,7 @@ export const useGameStore = create<GameState>()(
             seeds: s.seeds + bonus,
             dimensionLevel: nextLevel,
             maxDimensionLevel: newMax,
-            currentEnemy: newEnemy
+            currentEnemy: newEnemy,
           };
         });
 
@@ -308,21 +272,19 @@ export const useGameStore = create<GameState>()(
           seeds: s.seeds + reward,
           isDimensionActive: false,
           dimensionLevel: 1,
-          currentEnemy: null
+          currentEnemy: null,
         }));
       },
 
       getUpgradeCost: (type) => {
         const { upgrades } = get();
         const level = upgrades[type];
-        const baseCost = type === "seeds" ? 500 : 800;
+        const config = GAME_CONFIG.UPGRADES[type];
 
-        // Exponential growth: base * 1.5^level.
-        // Significant jump every 10 levels (multiplier * 5)
-        let cost = baseCost * Math.pow(1.6, level);
-        const jumps = Math.floor(level / 10);
+        let cost = config.BASE_COST * Math.pow(config.COST_EXPONENT, level);
+        const jumps = Math.floor(level / config.JUMP_THRESHOLD);
         if (jumps > 0) {
-          cost = cost * Math.pow(5, jumps);
+          cost = cost * Math.pow(config.JUMP_MULTIPLIER, jumps);
         }
 
         return Math.floor(cost);
@@ -346,9 +308,9 @@ export const useGameStore = create<GameState>()(
 
       hardReset: () => {
         set({
-          seeds: 100,
+          seeds: GAME_CONFIG.INITIAL_SEEDS,
           inventory: [],
-          maxInventory: 50,
+          maxInventory: GAME_CONFIG.INITIAL_MAX_INVENTORY,
           activeSlots: [null, null, null, null],
           dimensionLevel: 1,
           maxDimensionLevel: 1,
@@ -369,10 +331,12 @@ export const useGameStore = create<GameState>()(
     {
       name: "rick-morty-idle-save",
       version: 4,
-      migrate: (persistedState: any, version: number) => {
+      migrate: (persistedState: unknown, version: number) => {
+        let state = persistedState as PersistedGameState;
+
         if (version === 0) {
-          persistedState = {
-            ...persistedState,
+          state = {
+            ...state,
             inventory: [],
             activeSlots: [null, null, null, null],
             upgrades: { seeds: 0, power: 0 },
@@ -380,10 +344,12 @@ export const useGameStore = create<GameState>()(
         }
 
         if (version < 2) {
-          const migrateCard = (card: any) => {
+          const migrateCard = (card: GameCard): GameCard => {
             if (!card) return card;
             if (!card.origin || card.origin === "none") {
-              const charData = characters.find((c) => c.name === card.characterName);
+              const charData = (characters as Character[]).find(
+                (c) => c.name === card.characterName,
+              );
               return {
                 ...card,
                 origin: charData?.origin || "unknown",
@@ -393,56 +359,59 @@ export const useGameStore = create<GameState>()(
             return card;
           };
 
-          persistedState = {
-            ...persistedState,
-            inventory: persistedState.inventory?.map(migrateCard) || [],
-            activeSlots: persistedState.activeSlots?.map(migrateCard) || [
-              null,
-              null,
-              null,
-              null,
-            ],
+          state = {
+            ...state,
+            inventory: state.inventory?.map(migrateCard) || [],
+            activeSlots: state.activeSlots?.map((slot) =>
+              slot ? migrateCard(slot) : null,
+            ) || [null, null, null, null],
           };
         }
 
         if (version < 3) {
           // Fix duplicate IDs by regenerating them for all cards
-          const oldInv = persistedState.inventory || [];
-          const newInventory = oldInv.map((card: any) => {
+          const oldInv = state.inventory || [];
+          const newInventory = oldInv.map((card: GameCard) => {
             const uuid = crypto.randomUUID().slice(0, 8);
-            const baseId = card.id ? card.id.split('-').slice(0, 2).join('-') : 'unknown';
-            return { 
-              ...card, 
-              id: `${baseId}-${card.timestamp || Date.now()}-${uuid}` 
+            const baseId = card.id
+              ? card.id.split("-").slice(0, 2).join("-")
+              : "unknown";
+            return {
+              ...card,
+              id: `${baseId}-${card.timestamp || Date.now()}-${uuid}`,
             };
           });
-          
-          const newActiveSlots = (persistedState.activeSlots || [null, null, null, null]).map((slot: any) => {
+
+          const newActiveSlots = (
+            state.activeSlots || [null, null, null, null]
+          ).map((slot) => {
             if (!slot) return null;
-            const oldIndex = oldInv.findIndex((c: any) => c.id === slot.id);
+            const oldIndex = oldInv.findIndex(
+              (c: GameCard) => c.id === slot.id,
+            );
             if (oldIndex !== -1 && newInventory[oldIndex]) {
               return newInventory[oldIndex];
             }
             return null;
           });
 
-          persistedState = {
-            ...persistedState,
+          state = {
+            ...state,
             inventory: newInventory,
             activeSlots: newActiveSlots,
           };
         }
 
         if (version < 4) {
-          persistedState = {
-            ...persistedState,
+          state = {
+            ...state,
             currentEnemy: null,
           };
         }
 
-        return persistedState;
+        return state;
       },
-      onRehydrateStorage: () => (state) => {
+      onRehydrateStorage: () => (state: GameState | undefined) => {
         if (state && state.inventory.length === 0) {
           const starter = generateCard(
             { COMMON: 0.8, RARE: 0.2, HOLO: 0, FULL_ART: 0 },
diff --git a/src/types/game.ts b/src/types/game.ts
new file mode 100644
index 0000000..bd290b0
--- /dev/null
+++ b/src/types/game.ts
@@ -0,0 +1,54 @@
+export interface CardType {
+  id: string;
+  label: string;
+  multiplier: number;
+  canCombine: boolean;
+  combinesWith?: string[];
+}
+
+export interface Character {
+  id: number;
+  name: string;
+  status: string;
+  species: string;
+  type: string;
+  gender: string;
+  origin: string;
+  location: string;
+  avatarId: number;
+  baseMultiplier: number;
+  basePower: number;
+  customImage?: string;
+}
+
+export interface GameCard {
+  id: string;
+  name: string;
+  characterName: string;
+  types: string[]; // e.g. ["HOLO", "FULL_ART"]
+  income: number;
+  power: number;
+  avatarId?: number;
+  customImage?: string;
+  origin: string;
+  location: string;
+  status: string;
+  species: string;
+  timestamp: number;
+}
+
+export interface GameState {
+  seeds: number;
+  inventory: GameCard[];
+  maxInventory: number;
+  activeSlots: (GameCard | null)[];
+  dimensionLevel: number;
+  maxDimensionLevel: number;
+  isDimensionActive: boolean;
+  currentEnemy: GameCard | null;
+  upgrades: {
+    seeds: number;
+    power: number;
+  };
+  lastSaved: number;
+}