diff --git a/db/migrate_guild_system_v2.php b/db/migrate_guild_system_v2.php
new file mode 100644
index 0000000..ba95eb8
--- /dev/null
+++ b/db/migrate_guild_system_v2.php
@@ -0,0 +1,30 @@
+<?php
+require_once __DIR__ . '/config.php';
+$pdo = db();
+
+// Ensure guilds table has a description or other useful fields
+try {
+    $pdo->exec("ALTER TABLE guilds ADD COLUMN IF NOT EXISTS description TEXT");
+    $pdo->exec("ALTER TABLE guilds ADD COLUMN IF NOT EXISTS tag VARCHAR(10)");
+} catch (Exception $e) {
+    // Columns might already exist
+}
+
+// Create guild_members table if not exists
+$pdo->exec("CREATE TABLE IF NOT EXISTS guild_members (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    guild_id INT NOT NULL,
+    user_id INT NOT NULL,
+    role ENUM('superviseur', 'officier', 'membre') DEFAULT 'membre',
+    joined_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY (user_id),
+    FOREIGN KEY (guild_id) REFERENCES guilds(id) ON DELETE CASCADE,
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+)");
+
+// Add guild_id to users for convenience
+try {
+    $pdo->exec("ALTER TABLE users ADD COLUMN IF NOT EXISTS guild_id INT DEFAULT NULL");
+} catch (Exception $e) {}
+
+echo "Guild system v2 migration completed.";
diff --git a/guilde.php b/guilde.php
new file mode 100644
index 0000000..9012f8c
--- /dev/null
+++ b/guilde.php
@@ -0,0 +1,503 @@
+<?php
+require_once 'db/config.php';
+require_once 'includes/status_helper.php';
+session_start();
+$db = db();
+
+if (!isset($_SESSION['user_id'])) {
+    header("Location: auth.php");
+    exit;
+}
+
+$user_id = $_SESSION['user_id'];
+$message = '';
+$error = '';
+
+// --- HEADER DATA FETCHING (from index.php) ---
+$user_role = 'user';
+$stmt = $db->prepare("SELECT u.role, u.display_name, u.username, u.guild_id, l.name as level_raw,
+                             u.selected_title_id, u.selected_badge_id,
+                             t.name as title_name,
+                             b.name as badge_name, b.image_url as badge_image
+                      FROM users u 
+                      LEFT JOIN levels l ON u.level_id = l.id 
+                      LEFT JOIN titles t ON u.selected_title_id = t.id
+                      LEFT JOIN badges b ON u.selected_badge_id = b.id
+                      WHERE u.id = ?");
+$stmt->execute([$user_id]);
+$u_data = $stmt->fetch();
+
+if ($u_data) {
+    $user_role = $u_data['role'] ?? 'user';
+    $_SESSION['display_name'] = $u_data['display_name'] ?: $u_data['username'];
+    $level_num = (int)filter_var($u_data['level_raw'], FILTER_SANITIZE_NUMBER_INT);
+    $_SESSION['level'] = $level_num;
+    $_SESSION['guild_id'] = $u_data['guild_id'];
+    
+    $_SESSION['selected_title_name'] = $u_data['title_name'];
+    $_SESSION['selected_badge_name'] = $u_data['badge_name'];
+    $_SESSION['selected_badge_image'] = $u_data['badge_image'];
+    
+    $grade_type = ($user_role === 'admin') ? 'admin' : 'utilisateur';
+    $g_stmt = $db->prepare("SELECT name, image_url FROM grades 
+                            WHERE user_type = ? 
+                            AND (min_level <= ? OR min_level IS NULL) 
+                            AND (max_level >= ? OR max_level IS NULL) 
+                            LIMIT 1");
+    $g_stmt->execute([$grade_type, $level_num, $level_num]);
+    $grade_data = $g_stmt->fetch();
+    
+    if ($grade_data) {
+        $_SESSION['grade_name'] = $grade_data['name'];
+        $_SESSION['grade_image'] = $grade_data['image_url'];
+    } else {
+        $_SESSION['grade_name'] = "Recrue";
+        $_SESSION['grade_image'] = "assets/images/placeholder_grade.png";
+    }
+}
+
+// Dynamic Resources for Header & Check
+$resources = [];
+$user_resource_amounts = []; // For easier access
+$stmt = $db->prepare("
+    SELECT gr.*, COALESCE(ur.amount, 0) as amount 
+    FROM game_resources gr 
+    LEFT JOIN user_resources ur ON gr.id = ur.resource_id AND ur.user_id = ? 
+    ORDER BY CASE 
+        WHEN gr.name LIKE 'Crédit%' THEN 1 
+        WHEN gr.name LIKE 'Matériau%' THEN 2 
+        WHEN gr.name LIKE 'Energie%' THEN 3 
+        WHEN gr.name LIKE 'Donnée%' THEN 4 
+        ELSE 5 
+    END ASC, gr.name ASC
+");
+$stmt->execute([$user_id]);
+$all_resources_raw = $stmt->fetchAll(PDO::FETCH_ASSOC);
+foreach($all_resources_raw as $hr) {
+    $user_resource_amounts[$hr['id']] = (float)$hr['amount'];
+    if ($hr['show_in_header'] == 1) {
+        $resources[$hr["name"]] = [
+            "val" => (string)$hr["amount"], 
+            "prod" => "", 
+            "icon" => $hr["icon"] ?: "fa-gem", 
+            "image" => $hr["image_url"]
+        ];
+    }
+}
+
+// --- GUILD SPECIFIC LOGIC ---
+
+// Check if user is in a guild
+$stmt = $db->prepare("SELECT u.guild_id, m.role, g.name as guild_name, g.tag as guild_tag, g.description as guild_desc 
+                      FROM users u 
+                      LEFT JOIN guild_members m ON u.id = m.user_id 
+                      LEFT JOIN guilds g ON u.guild_id = g.id 
+                      WHERE u.id = ?");
+$stmt->execute([$user_id]);
+$user_guild_info = $stmt->fetch(PDO::FETCH_ASSOC);
+
+$in_guild = !empty($user_guild_info['guild_id']);
+
+// Fetch member limit
+$stmt = $db->query("SELECT value FROM guild_restrictions WHERE restriction_key = 'member_limit'");
+$member_limit = (int)($stmt->fetchColumn() ?: 50);
+
+// --- ACTIONS ---
+
+// JOIN GUILD
+if (isset($_GET['join']) && !$in_guild) {
+    $guild_id = (int)$_GET['join'];
+    $stmt = $db->prepare("SELECT COUNT(*) FROM guild_members WHERE guild_id = ?");
+    $stmt->execute([$guild_id]);
+    $current_members = (int)$stmt->fetchColumn();
+    if ($current_members >= $member_limit) { $error = "Cette guilde est pleine."; } else {
+        $db->beginTransaction();
+        try {
+            $db->prepare("UPDATE users SET guild_id = ? WHERE id = ?")->execute([$guild_id, $user_id]);
+            $db->prepare("INSERT INTO guild_members (guild_id, user_id, role) VALUES (?, ?, 'membre')")->execute([$guild_id, $user_id]);
+            $_SESSION['guild_id'] = $guild_id;
+            $db->commit();
+            header("Location: guilde.php");
+            exit;
+        } catch (Exception $e) { $db->rollBack(); $error = "Erreur : " . $e->getMessage(); }
+    }
+}
+
+// DISBAND GUILD
+if (isset($_GET['action']) && $_GET['action'] === 'disband' && $in_guild && $user_guild_info['role'] === 'superviseur') {
+    $guild_id = $user_guild_info['guild_id'];
+    $db->beginTransaction();
+    try {
+        $db->prepare("UPDATE users SET guild_id = NULL WHERE guild_id = ?")->execute([$guild_id]);
+        $db->prepare("DELETE FROM guild_members WHERE guild_id = ?")->execute([$guild_id]);
+        $db->prepare("DELETE FROM guilds WHERE id = ?")->execute([$guild_id]);
+        $_SESSION['guild_id'] = null;
+        $db->commit();
+        header("Location: guilde.php");
+        exit;
+    } catch (Exception $e) { $db->rollBack(); $error = "Erreur : " . $e->getMessage(); }
+}
+
+// LEAVE GUILD
+if (isset($_GET['action']) && $_GET['action'] === 'leave' && $in_guild && $user_guild_info['role'] !== 'superviseur') {
+    $db->beginTransaction();
+    try {
+        $db->prepare("UPDATE users SET guild_id = NULL WHERE id = ?")->execute([$user_id]);
+        $db->prepare("DELETE FROM guild_members WHERE user_id = ?")->execute([$user_id]);
+        $_SESSION['guild_id'] = null;
+        $db->commit();
+        header("Location: guilde.php");
+        exit;
+    } catch (Exception $e) { $db->rollBack(); $error = "Erreur : " . $e->getMessage(); }
+}
+
+// KICK MEMBER
+if (isset($_GET['kick']) && $in_guild && ($user_guild_info['role'] === 'superviseur' || $user_guild_info['role'] === 'officier')) {
+    $target_id = (int)$_GET['kick'];
+    if ($target_id != $user_id) {
+        $stmt = $db->prepare("SELECT role FROM guild_members WHERE user_id = ? AND guild_id = ?");
+        $stmt->execute([$target_id, $user_guild_info['guild_id']]);
+        $target_role = $stmt->fetchColumn();
+        if ($target_role) {
+            $can_kick = ($user_guild_info['role'] === 'superviseur') || ($user_guild_info['role'] === 'officier' && $target_role === 'membre');
+            if ($can_kick) {
+                $db->prepare("UPDATE users SET guild_id = NULL WHERE id = ?")->execute([$target_id]);
+                $db->prepare("DELETE FROM guild_members WHERE user_id = ?")->execute([$target_id]);
+                $message = "Membre exclu.";
+            } else $error = "Droits insuffisants.";
+        }
+    }
+}
+
+// UPDATE ROLE
+if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'update_role' && $in_guild && $user_guild_info['role'] === 'superviseur') {
+    $target_id = (int)$_POST['target_user_id'];
+    $new_role = $_POST['new_role'];
+    if (in_array($new_role, ['membre', 'officier']) && $target_id != $user_id) {
+        $db->prepare("UPDATE guild_members SET role = ? WHERE user_id = ? AND guild_id = ?")->execute([$new_role, $target_id, $user_guild_info['guild_id']]);
+        $message = "Grade mis à jour.";
+    }
+}
+
+// CREATE GUILD
+if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'create_guild' && !$in_guild) {
+    $name = trim($_POST['name']);
+    $tag = strtoupper(trim($_POST['tag']));
+    $description = trim($_POST['description']);
+    if (strlen($name) < 3) $error = "Nom trop court.";
+    elseif (strlen($tag) < 2) $error = "Tag trop court.";
+    else {
+        $reqs = $db->query("SELECT resource_id, amount FROM guild_creation_requirements WHERE amount > 0")->fetchAll(PDO::FETCH_ASSOC);
+        $db->beginTransaction();
+        try {
+            $can_afford = true;
+            foreach ($reqs as $req) {
+                $stmt = $db->prepare("SELECT amount FROM user_resources WHERE user_id = ? AND resource_id = ?");
+                $stmt->execute([$user_id, $req['resource_id']]);
+                if (($stmt->fetchColumn() ?: 0) < $req['amount']) { $can_afford = false; break; }
+            }
+            if (!$can_afford) { $error = "Ressources insuffisantes."; $db->rollBack(); }
+            else {
+                foreach ($reqs as $req) $db->prepare("UPDATE user_resources SET amount = amount - ? WHERE user_id = ? AND resource_id = ?")->execute([$req['amount'], $user_id, $req['resource_id']]);
+                $db->prepare("INSERT INTO guilds (name, tag, description) VALUES (?, ?, ?)")->execute([$name, $tag, $description]);
+                $guild_id = $db->lastInsertId();
+                $db->prepare("INSERT INTO guild_members (guild_id, user_id, role) VALUES (?, ?, 'superviseur')")->execute([$guild_id, $user_id]);
+                $db->prepare("UPDATE users SET guild_id = ? WHERE id = ?")->execute([$guild_id, $user_id]);
+                $_SESSION['guild_id'] = $guild_id;
+                $db->commit();
+                header("Location: guilde.php");
+                exit;
+            }
+        } catch (Exception $e) { $db->rollBack(); $error = "Erreur : " . $e->getMessage(); }
+    }
+}
+
+// --- DATA FETCHING ---
+
+if ($in_guild) {
+    $stmt = $db->prepare("SELECT m.*, u.username, u.display_name FROM guild_members m JOIN users u ON m.user_id = u.id WHERE m.guild_id = ? ORDER BY FIELD(role, 'superviseur', 'officier', 'membre'), joined_at ASC");
+    $stmt->execute([$user_guild_info['guild_id']]);
+    $guild_members = $stmt->fetchAll(PDO::FETCH_ASSOC);
+} else {
+    $display_reqs = $db->query("SELECT r.id, r.name, r.icon, r.image_url, gr.amount FROM guild_creation_requirements gr JOIN game_resources r ON gr.resource_id = r.id WHERE gr.amount > 0")->fetchAll(PDO::FETCH_ASSOC);
+    $all_guilds = $db->query("SELECT g.*, (SELECT COUNT(*) FROM guild_members WHERE guild_id = g.id) as member_count FROM guilds g ORDER BY member_count DESC")->fetchAll(PDO::FETCH_ASSOC);
+    
+    // Check global affordability for create button
+    $can_afford_creation = true;
+    foreach ($display_reqs as $req) {
+        if (($user_resource_amounts[$req['id']] ?? 0) < $req['amount']) {
+            $can_afford_creation = false;
+            break;
+        }
+    }
+}
+
+?>
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+    <meta charset="UTF-8">
+    <title><?php echo $in_guild ? htmlspecialchars($user_guild_info['guild_name']) : 'Guildes'; ?> - Nexus</title>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
+    <link href="assets/css/custom.css?v=<?php echo time(); ?>" rel="stylesheet">
+    <style>
+        body { background: #000; color: #fff; font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; margin: 0; }
+        #main-wrapper { display: flex; flex-direction: column; min-height: 100vh; }
+        
+        /* HEADER STYLES (MATCHING index.php) */
+        #top-bar {
+            background: #0f172a;
+            border-bottom: 1px solid #1e293b;
+            padding: 10px 40px;
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
+        }
+        .user-auth-bar {
+            display: flex;
+            justify-content: flex-end;
+            align-items: center;
+            gap: 20px;
+            font-size: 11px;
+            color: #8c92a3;
+        }
+        .user-auth-bar a { color: #88c0d0; text-decoration: none; font-weight: bold; }
+        .user-auth-bar .username { color: #ebcb8b; }
+        
+        .resource-container {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 30px;
+            flex-wrap: wrap;
+        }
+        .resource-box {
+            display: flex;
+            align-items: center;
+            gap: 12px;
+            background: rgba(30, 41, 59, 0.5);
+            padding: 6px 15px;
+            border-radius: 8px;
+            border: 1px solid #1e293b;
+            min-width: 140px;
+            transition: all 0.2s;
+        }
+        .resource-box:hover { border-color: #88c0d0; background: rgba(30, 41, 59, 0.8); }
+        .resource-icon {
+            width: 32px;
+            height: 32px;
+            background: #1e293b;
+            border-radius: 6px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 16px;
+            color: #88c0d0;
+        }
+        .resource-icon img { width: 20px; height: 20px; object-fit: contain; }
+        .resource-info { display: flex; flex-direction: column; }
+        .resource-name { font-size: 9px; text-transform: uppercase; letter-spacing: 0.05em; color: #64748b; margin-bottom: 2px; }
+        .resource-val-prod { display: flex; align-items: baseline; gap: 6px; }
+        .resource-value { font-size: 14px; font-weight: bold; color: #f8fafc; }
+        .resource-prod { font-size: 10px; color: #10b981; }
+
+        #game-container { flex: 1; padding: 30px; display: flex; flex-direction: column; align-items: center; }
+
+        /* GUILD SPECIFIC STYLES */
+        .guild-content { max-width: 1000px; width: 100%; margin-top: 20px; }
+        .guild-card { background: rgba(10, 15, 30, 0.95); border: 1px solid #2d3545; padding: 25px; border-radius: 8px; box-shadow: 0 0 30px rgba(0,0,0,0.5); }
+        h1, h2, h3 { color: #88c0d0; text-transform: uppercase; letter-spacing: 1px; border-bottom: 1px solid #2d3545; padding-bottom: 10px; }
+        .form-group { margin-bottom: 15px; }
+        .form-group label { display: block; color: #8c92a3; font-size: 13px; margin-bottom: 5px; }
+        .form-group input, .form-group textarea { width: 100%; background: #0f172a; border: 1px solid #334155; color: #fff; padding: 10px; box-sizing: border-box; font-family: inherit; border-radius: 4px; }
+        .btn { border: none; padding: 10px 20px; cursor: pointer; font-weight: bold; border-radius: 4px; text-transform: uppercase; font-family: inherit; text-decoration: none; display: inline-block; font-size: 12px; transition: all 0.2s; }
+        .btn-primary { background: #88c0d0; color: #000; }
+        .btn-primary:hover { background: #81a1c1; }
+        .btn-primary:disabled { background: #4c566a; color: #8c92a3; cursor: not-allowed; }
+        .btn-danger { background: #bf616a; color: #fff; }
+        .btn-join { background: #a3be8c; color: #000; }
+        .error-msg { background: rgba(191, 97, 106, 0.1); color: #bf616a; padding: 12px; border: 1px solid #bf616a; margin-bottom: 20px; border-radius: 4px; }
+        .success-msg { background: rgba(163, 190, 140, 0.1); color: #a3be8c; padding: 12px; border: 1px solid #a3be8c; margin-bottom: 20px; border-radius: 4px; }
+        .member-table, .guild-table { width: 100%; border-collapse: collapse; margin-top: 20px; }
+        .member-table th, .member-table td, .guild-table th, .guild-table td { border-bottom: 1px solid #1e293b; padding: 15px; text-align: left; }
+        .member-table th, .guild-table th { background: rgba(30, 41, 59, 0.5); color: #88c0d0; font-size: 11px; text-transform: uppercase; }
+        .role-badge { padding: 3px 10px; border-radius: 12px; font-size: 10px; font-weight: bold; text-transform: uppercase; }
+        .role-superviseur { background: #ebcb8b; color: #000; }
+        .role-officier { background: #81a1c1; color: #fff; }
+        .role-membre { background: #4c566a; color: #fff; }
+        .req-item { background: #1a202c; padding: 8px 12px; border: 1px solid #2d3545; display: inline-flex; align-items: center; gap: 8px; border-radius: 4px; margin-right: 10px; margin-bottom: 10px;}
+        .req-item img { width: 18px; height: 18px; }
+        .req-item.insufficient { border-color: #bf616a; color: #bf616a; }
+    </style>
+</head>
+<body>
+    <div id="main-wrapper">
+        <header id="top-bar">
+            <div style="display: flex; align-items: center; gap: 20px;">
+                <a href="index.php" style="text-decoration:none; color:#8c92a3; font-size:11px; font-weight:bold;"><i class="fa-solid fa-arrow-left"></i> Retour au Nexus</a>
+                <?php if (isset($_SESSION["user_id"])): ?>
+                    <a href="guilde.php" style="text-decoration:none; color:#88c0d0; font-size:11px; font-weight:bold;"><i class="fa-solid fa-building-shield"></i> <?php echo empty($_SESSION["guild_id"]) ? "Création de guilde" : "Voir ma guilde"; ?></a>
+                <?php endif; ?>
+            </div>
+            <div class="user-auth-bar">
+                <?php if (isset($_SESSION["user_id"])): ?>
+                    <span>Bienvenue, <span class="username">@<?php echo htmlspecialchars($_SESSION["display_name"] ?? $_SESSION["username"]); ?></span></span>
+                    <a href="project_log.php"><i class="fa-solid fa-clipboard-list"></i> Journal</a> <a href="account.php"><i class="fa-solid fa-user-gear"></i> Mon compte</a>
+                    <a href="auth.php?logout=1" style="color: #bf616a;"><i class="fa-solid fa-right-from-bracket"></i> Déconnexion</a>
+                <?php endif; ?>
+            </div>
+            <div class="resource-container">
+                <?php foreach($resources as $name => $res): ?>
+                <div class="resource-box">
+                    <div class="resource-icon">
+                        <?php if (!empty($res["image"])): ?>
+                            <img src="<?php echo htmlspecialchars($res["image"]); ?>?v=<?php echo time(); ?>">
+                        <?php else: ?>
+                            <i class="fa-solid <?php echo htmlspecialchars($res["icon"]); ?>"></i>
+                        <?php endif; ?>
+                    </div>
+                    <div class="resource-info">
+                        <div class="resource-name"><?php echo htmlspecialchars($name); ?></div>
+                        <div class="resource-val-prod">
+                            <span class="resource-value"><?php echo htmlspecialchars($res["val"]); ?></span>
+                            <span class="resource-prod"><?php echo htmlspecialchars($res["prod"]); ?></span>
+                        </div>
+                    </div>
+                </div>
+                <?php endforeach; ?>
+            </div>
+        </header>
+
+        <main id="game-container">
+            <div class="guild-content">
+                <?php if ($message): ?><div class="success-msg"><?php echo $message; ?></div><?php endif; ?>
+                <?php if ($error): ?><div class="error-msg"><?php echo $error; ?></div><?php endif; ?>
+
+                <div class="guild-card">
+                    <?php if (!$in_guild): ?>
+                        <div style="display: flex; gap: 40px; flex-wrap: wrap;">
+                            <!-- Liste des guildes -->
+                            <div style="flex: 2; min-width: 300px;">
+                                <h2><i class="fa-solid fa-list"></i> Guildes Actives</h2>
+                                <table class="guild-table">
+                                    <thead><tr><th>Guilde</th><th>Membres</th><th>Actions</th></tr></thead>
+                                    <tbody>
+                                        <?php if (empty($all_guilds)): ?>
+                                            <tr><td colspan="3" style="text-align:center; color:#8c92a3;">Aucune guilde pour le moment.</td></tr>
+                                        <?php endif; ?>
+                                        <?php foreach ($all_guilds as $g): ?>
+                                            <tr>
+                                                <td>
+                                                    <strong style="color:#ebcb8b;">[<?php echo htmlspecialchars($g['tag']); ?>]</strong> 
+                                                    <strong><?php echo htmlspecialchars($g['name']); ?></strong><br>
+                                                    <small style="color:#8c92a3;"><?php echo htmlspecialchars(mb_strimwidth($g['description'], 0, 80, "...")); ?></small>
+                                                </td>
+                                                <td><?php echo $g['member_count']; ?> / <?php echo $member_limit; ?></td>
+                                                <td>
+                                                    <?php if ($g['member_count'] < $member_limit): ?>
+                                                        <a href="?join=<?php echo $g['id']; ?>" class="btn btn-join">Rejoindre</a>
+                                                    <?php else: ?>
+                                                        <span style="color:#bf616a; font-size:11px; font-weight:bold;">PLEINE</span>
+                                                    <?php endif; ?>
+                                                </td>
+                                            </tr>
+                                        <?php endforeach; ?>
+                                    </tbody>
+                                </table>
+                            </div>
+
+                            <!-- Création -->
+                            <div style="flex: 1; min-width: 280px; background: rgba(30, 41, 59, 0.3); padding: 20px; border: 1px solid #2d3545; border-radius: 8px;">
+                                <h3>Fonder une Guilde</h3>
+                                <div style="margin-bottom: 20px;">
+                                    <p style="font-size: 13px; color: #8c92a3;">Coût requis :</p>
+                                    <?php if (empty($display_reqs)): ?><p style="color:#a3be8c;">Gratuit</p>
+                                    <?php else: ?>
+                                        <?php foreach ($display_reqs as $req): 
+                                            $user_has = $user_resource_amounts[$req['id']] ?? 0;
+                                            $is_insufficient = $user_has < $req['amount'];
+                                        ?>
+                                            <div class="req-item <?php echo $is_insufficient ? 'insufficient' : ''; ?>" title="Vous avez: <?php echo number_format($user_has); ?>">
+                                                <?php if ($req['image_url']): ?><img src="<?php echo htmlspecialchars($req['image_url']); ?>">
+                                                <?php else: ?><i class="fa-solid <?php echo htmlspecialchars($req['icon'] ?: 'fa-gem'); ?>"></i><?php endif; ?>
+                                                <strong><?php echo number_format($req['amount']); ?></strong>
+                                            </div>
+                                        <?php endforeach; ?>
+                                    <?php endif; ?>
+                                </div>
+                                <form method="POST">
+                                    <input type="hidden" name="action" value="create_guild">
+                                    <div class="form-group"><label>Nom</label><input type="text" name="name" required placeholder="Nom de votre organisation"></div>
+                                    <div class="form-group"><label>Tag (2-5 car.)</label><input type="text" name="tag" required maxlength="5" placeholder="TAG"></div>
+                                    <div class="form-group"><label>Description</label><textarea name="description" rows="3" placeholder="Objectifs de la guilde..."></textarea></div>
+                                    <button type="submit" class="btn btn-primary" style="width:100%;" <?php echo !$can_afford_creation ? 'disabled' : ''; ?>>
+                                        <?php echo $can_afford_creation ? 'Fonder la guilde' : 'Ressources insuffisantes'; ?>
+                                    </button>
+                                </form>
+                            </div>
+                        </div>
+                    <?php else: ?>
+                        <div style="display: flex; justify-content: space-between; align-items: center; border-bottom: 2px solid #88c0d0; padding-bottom: 15px; margin-bottom: 20px;">
+                            <div>
+                                <span style="color: #ebcb8b; font-weight: bold; font-size: 24px;">[<?php echo htmlspecialchars($user_guild_info['guild_tag']); ?>]</span>
+                                <h1 style="display: inline; border-bottom: none; margin-left: 10px;"><?php echo htmlspecialchars($user_guild_info['guild_name']); ?></h1>
+                            </div>
+                            <div style="color: #8c92a3; font-size: 14px;">Votre grade : <span class="role-badge role-<?php echo $user_guild_info['role']; ?>"><?php echo $user_guild_info['role']; ?></span></div>
+                        </div>
+
+                        <div style="background: rgba(30, 41, 59, 0.4); border-left: 4px solid #88c0d0; padding: 20px; margin-bottom: 30px; color: #d8dee9; border-radius: 0 4px 4px 0;">
+                            <?php echo nl2br(htmlspecialchars($user_guild_info['guild_desc'] ?: "Pas de description.")); ?>
+                        </div>
+
+                        <h3>Membres de la Guilde (<?php echo count($guild_members); ?> / <?php echo $member_limit; ?>)</h3>
+                        <table class="member-table">
+                            <thead><tr><th>Membre</th><th>Grade</th><th>Ancienneté</th><?php if ($user_guild_info['role'] === 'superviseur' || $user_guild_info['role'] === 'officier'): ?><th>Gestion</th><?php endif; ?></tr></thead>
+                            <tbody>
+                                <?php foreach ($guild_members as $member): ?>
+                                    <tr>
+                                        <td>
+                                            <strong style="color:<?php echo $member['user_id'] == $user_id ? '#88c0d0' : '#fff'; ?>">
+                                                @<?php echo htmlspecialchars($member['display_name'] ?: $member['username']); ?>
+                                                <?php if($member['user_id'] == $user_id) echo " (Vous)"; ?>
+                                            </strong>
+                                        </td>
+                                        <td><span class="role-badge role-<?php echo $member['role']; ?>"><?php echo $member['role']; ?></span></td>
+                                        <td><?php echo date('d/m/Y', strtotime($member['joined_at'])); ?></td>
+                                        <?php if ($user_guild_info['role'] === 'superviseur' || $user_guild_info['role'] === 'officier'): ?>
+                                            <td>
+                                                <?php if ($member['user_id'] != $user_id): ?>
+                                                    <?php if ($user_guild_info['role'] === 'superviseur'): ?>
+                                                        <form method="POST" style="display: inline;">
+                                                            <input type="hidden" name="action" value="update_role">
+                                                            <input type="hidden" name="target_user_id" value="<?php echo $member['user_id']; ?>">
+                                                            <select name="new_role" onchange="this.form.submit()" style="background: #1a202c; color: #fff; border: 1px solid #334155; padding: 4px; font-size: 11px; border-radius: 4px; cursor: pointer;">
+                                                                <option value="membre" <?php echo $member['role'] === 'membre' ? 'selected' : ''; ?>>Membre</option>
+                                                                <option value="officier" <?php echo $member['role'] === 'officier' ? 'selected' : ''; ?>>Officier</option>
+                                                            </select>
+                                                        </form>
+                                                    <?php endif; ?>
+                                                    <?php if ($user_guild_info['role'] === 'superviseur' || ($user_guild_info['role'] === 'officier' && $member['role'] === 'membre')): ?>
+                                                        <a href="?kick=<?php echo $member['user_id']; ?>" style="color: #bf616a; margin-left: 15px;" onclick="return confirm('Voulez-vous vraiment exclure ce membre ?')" title="Exclure"><i class="fa-solid fa-user-xmark"></i></a>
+                                                    <?php endif; ?>
+                                                <?php endif; ?>
+                                            </td>
+                                        <?php endif; ?>
+                                    </tr>
+                                <?php endforeach; ?>
+                            </tbody>
+                        </table>
+
+                        <div style="margin-top: 40px; border-top: 1px solid #1e293b; padding-top: 20px; display: flex; justify-content: flex-end;">
+                            <?php if ($user_guild_info['role'] === 'superviseur'): ?>
+                                <a href="?action=disband" class="btn btn-danger" onclick="return confirm('ATTENTION : Voulez-vous vraiment DISSOUDRE la guilde ? Cette action est irréversible.')">Dissoudre la guilde</a>
+                            <?php else: ?>
+                                <a href="?action=leave" class="btn btn-danger" onclick="return confirm('Quitter la guilde ?')">Quitter la guilde</a>
+                            <?php endif; ?>
+                        </div>
+                    <?php endif; ?>
+                </div>
+            </div>
+        </main>
+    </div>
+</body>
+</html>
diff --git a/index.php b/index.php
index d22345a..0dd2e84 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@ $db = db();
 
 $user_role = 'user';
 if (isset($_SESSION['user_id'])) {
-    $stmt = $db->prepare("SELECT u.role, u.display_name, u.username, l.name as level_raw,
+    $stmt = $db->prepare("SELECT u.role, u.display_name, u.username, u.guild_id, l.name as level_raw,
                                  u.selected_title_id, u.selected_badge_id,
                                  t.name as title_name,
                                  b.name as badge_name, b.image_url as badge_image
@@ -23,6 +23,7 @@ if (isset($_SESSION['user_id'])) {
         $_SESSION['display_name'] = $u_data['display_name'] ?: $u_data['username'];
         $level_num = (int)filter_var($u_data['level_raw'], FILTER_SANITIZE_NUMBER_INT);
         $_SESSION['level'] = $level_num;
+        $_SESSION['guild_id'] = $u_data['guild_id'];
         
         // Save title and badge to session for modal
         $_SESSION['selected_title_name'] = $u_data['title_name'];
@@ -620,17 +621,20 @@ function getStatusColor($status, $statuses_map) {
 <body>
     <div id="main-wrapper">
         <header id="top-bar">
+            <div style="display: flex; align-items: center; gap: 20px;">
                 <?php if (isset($_SESSION["user_id"])): ?>
-                    <button type="button" onclick="document.getElementById('profileModal').style.display='flex'" style="background:none; border:none; color:#88c0d0; cursor:pointer; font-size:11px; font-weight:bold; margin-right:auto;">Voir mon profil public</button>
+                    <button type="button" onclick="document.getElementById('profileModal').style.display='flex'" style="background:none; border:none; color:#88c0d0; cursor:pointer; font-size:11px; font-weight:bold;">Voir mon profil public</button>
+                    <a href="guilde.php" style="text-decoration:none; color:#88c0d0; font-size:11px; font-weight:bold;"><i class="fa-solid fa-building-shield"></i> <?php echo empty($_SESSION["guild_id"]) ? "Création de guilde" : "Voir ma guilde"; ?></a>
                 <?php endif; ?>
+            </div>
             <div class="user-auth-bar">
-                <?php if (isset($_SESSION['user_id'])): ?>
+                <?php if (isset($_SESSION["user_id"])): ?>
                     <span>Bienvenue, <span class="username">@<?php echo htmlspecialchars($_SESSION["display_name"] ?? $_SESSION["username"]); ?></span></span>
                     <a href="project_log.php"><i class="fa-solid fa-clipboard-list"></i> Journal</a> <a href="account.php"><i class="fa-solid fa-user-gear"></i> Mon compte</a>
                     <a href="auth.php?logout=1" style="color: #bf616a;"><i class="fa-solid fa-right-from-bracket"></i> Déconnexion</a>
                 <?php else: ?>
                     <a href="auth.php?page=login"><i class="fa-solid fa-right-to-bracket"></i> Connexion</a>
-                    <a href='project_log.php'><i class='fa-solid fa-clipboard-list'></i> Journal</a> <a href="auth.php?page=register"><i class="fa-solid fa-user-plus"></i> S'inscrire</a>
+                    <a href="project_log.php"><i class="fa-solid fa-clipboard-list"></i> Journal</a> <a href="auth.php?page=register"><i class="fa-solid fa-user-plus"></i> S'inscrire</a>
                 <?php endif; ?>
             </div>
             <div class="resource-container">
@@ -646,8 +650,8 @@ function getStatusColor($status, $statuses_map) {
                     <div class="resource-info">
                         <div class="resource-name"><?php echo htmlspecialchars($name); ?></div>
                         <div class="resource-val-prod">
-                            <span class="resource-value"><?php echo htmlspecialchars($res['val']); ?></span>
-                            <span class="resource-prod"><?php echo htmlspecialchars($res['prod']); ?></span>
+                            <span class="resource-value"><?php echo htmlspecialchars($res["val"]); ?></span>
+                            <span class="resource-prod"><?php echo htmlspecialchars($res["prod"]); ?></span>
                         </div>
                     </div>
                 </div>