diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..e4344db
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Hashimiste
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ce1c62c..de9b4b6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="corretto-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 753b969..c599e74 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
     <option name="OUTPUT_DIRECTORY" value="doc/" />
     <option name="OPTION_INCLUDE_LIBS" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="temurin-16" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d907020..b4e985b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e29c0059-5eeb-44eb-be8c-5a66edbf6aec" name="Changes" comment="Création de classes pour créer la grille de jeu">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_21_02_2024_13_53_[Changes]/shelved.patch" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_21_02_2024_13_53__Changes_.xml" beforeDir="false" />
+    <list default="true" id="e29c0059-5eeb-44eb-be8c-5a66edbf6aec" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/fr/hashimiste/impl/gui/theme/DebugTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/hashimiste/impl/gui/theme/DebugTheme.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/fr/hashimiste/impl/gui/component/GameComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/hashimiste/impl/gui/component/GameComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/fr/hashimiste/impl/gui/jeu/Jeu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/hashimiste/impl/gui/jeu/Jeu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -60,17 +57,13 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="Interface" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="GithubProjectSettings">
-    <option name="branchProtectionPatterns">
-      <list>
-        <option value="master" />
-      </list>
-    </option>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/main/java/fr/hashimiste/impl/gui/component/GameComponent.java" root0="SKIP_INSPECTION" />
   </component>
   <component name="KubernetesApiProvider">{
   &quot;isMigrated&quot;: true
@@ -89,43 +82,46 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Application.Editor.executor": "Run",
-    "Application.Main.executor": "Profiler#1",
-    "Gradle.AppImageImplTest.executor": "Run",
-    "Gradle.AppImageImplTest.getIcon.executor": "Run",
-    "Gradle.Build Hashimiste.executor": "Run",
-    "Gradle.Hashimiste [:DebugFrame.main()].executor": "Run",
-    "Gradle.Hashimiste [:Editor.main()].executor": "Run",
-    "Gradle.Hashimiste [:Main.main()].executor": "Run",
-    "Gradle.Hashimiste [:ModeLibre.main()].executor": "Run",
-    "Gradle.Hashimiste [sonar].executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary": "JUnit5",
-    "com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5": "",
-    "git-widget-placeholder": "imp/restructure",
-    "ignore.virus.scanning.warn.message": "true",
-    "kotlin-language-version-configured": "true",
-    "last_directory_selection": "D:/projects/IdeaProjects/Hashimiste/src/main/java/fr/hashimiste/core/utils",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Application.Editor.executor&quot;: &quot;Run&quot;,
+    &quot;Application.Main.executor&quot;: &quot;Profiler#1&quot;,
+    &quot;Gradle.AppImageImplTest.executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.AppImageImplTest.getIcon.executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Build Hashimiste.executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Hashimiste [:DebugFrame.main()].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Hashimiste [:Editor.main()].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Hashimiste [:Main.main()].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Hashimiste [:ModeLibre.main()].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Hashimiste [sonar].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.mode-libre [:Main.main()].executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary&quot;: &quot;JUnit5&quot;,
+    &quot;com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5&quot;: &quot;&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;elie&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_directory_selection&quot;: &quot;D:/projects/IdeaProjects/Hashimiste/src/main/java/fr/hashimiste/core/utils&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.IDE.editor.colors.General&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "sqlite"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;sqlite&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CreateClassDialog.RecentsKey">
       <recent name="fr.hashimiste.impl.data" />
@@ -157,7 +153,7 @@
       <recent name="fr.hashimiste.maps" />
     </key>
   </component>
-  <component name="RunManager" selected="Gradle.Hashimiste [sonar]">
+  <component name="RunManager" selected="Application.Main">
     <configuration name="Aventure (Antoine S.)" type="Application" factoryName="Application" folderName="Antoine S.">
       <option name="MAIN_CLASS_NAME" value="fr.hashimiste.impl.Main" />
       <module name="Hashimiste.main" />
@@ -503,22 +499,30 @@
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Application.Menu (Antoine T.)" />
-      <item itemvalue="Application.Aventure (Antoine T.)" />
-      <item itemvalue="Application.Mode Libre (Antoine T.)" />
-      <item itemvalue="Application.Parametre (Antoine T.)" />
-      <item itemvalue="Application.Technique (Antoine T.)" />
       <item itemvalue="Application.Menu (Antoine S.)" />
       <item itemvalue="Application.Aventure (Antoine S.)" />
       <item itemvalue="Application.Mode Libre (Antoine S.)" />
       <item itemvalue="Application.Parametre (Antoine S.)" />
       <item itemvalue="Application.Technique (Antoine S.)" />
       <item itemvalue="Application.Jeu (Antoine S.) (1)" />
+      <item itemvalue="Application.Menu (Antoine T.)" />
+      <item itemvalue="Application.Aventure (Antoine T.)" />
+      <item itemvalue="Application.Mode Libre (Antoine T.)" />
+      <item itemvalue="Application.Parametre (Antoine T.)" />
+      <item itemvalue="Application.Technique (Antoine T.)" />
       <item itemvalue="Application.Main" />
       <item itemvalue="Application.DebugFrame" />
       <item itemvalue="Gradle.Hashimiste [sonar]" />
     </list>
   </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="jdk-17.0.10-corretto-17.0.10-4caba194b151-53826d6a" />
+        <option value="jdk-21.0.2-openjdk-21.0.2-4caba194b151-322ed176" />
+      </set>
+    </attachedChunks>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -531,6 +535,8 @@
       <workItem from="1708531199805" duration="85400000" />
       <workItem from="1709583624311" duration="904000" />
       <workItem from="1710057416742" duration="29770000" />
+      <workItem from="1710790013069" duration="6127000" />
+      <workItem from="1710844637592" duration="885000" />
     </task>
     <task id="LOCAL-00001" summary="Fix manque d'import et de déclaration de package&#10;Fusion de fichiers&#10;TODO: adapter la classe Technique&#10;&#10;(cherry picked from commit 989c8193f7d010ef69863c80df84757a94007c0b)">
       <option name="closed" value="true" />
@@ -556,7 +562,23 @@
       <option name="project" value="LOCAL" />
       <updated>1708520541207</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="fixing bugs">
+      <option name="closed" value="true" />
+      <created>1710798244689</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1710798244689</updated>
+    </task>
+    <task id="LOCAL-00005" summary="ajout graphique des doubles ponts">
+      <option name="closed" value="true" />
+      <created>1710798747111</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1710798747111</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -588,10 +610,12 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Fix manque d'import et de déclaration de package&#10;Fusion de fichiers&#10;TODO: adapter la classe Technique&#10;&#10;(cherry picked from commit 989c8193f7d010ef69863c80df84757a94007c0b)" />
     <MESSAGE value="Création de classes pour créer la grille de jeu" />
-    <option name="LAST_COMMIT_MESSAGE" value="Création de classes pour créer la grille de jeu" />
+    <MESSAGE value="fixing bugs" />
+    <MESSAGE value="ajout graphique des doubles ponts" />
+    <option name="LAST_COMMIT_MESSAGE" value="ajout graphique des doubles ponts" />
   </component>
-  <component name="WfRunsListSearchHistory"><![CDATA[{
-  "history": [
+  <component name="WfRunsListSearchHistory">{
+  &quot;history&quot;: [
     {
     },
     {
@@ -599,9 +623,9 @@
     {
     }
   ],
-  "lastFilter": {
+  &quot;lastFilter&quot;: {
   }
-}]]></component>
+}</component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
     <select />
diff --git a/src/main/java/fr/hashimiste/core/gui/Theme.java b/src/main/java/fr/hashimiste/core/gui/Theme.java
index 059f50a..c737480 100644
--- a/src/main/java/fr/hashimiste/core/gui/Theme.java
+++ b/src/main/java/fr/hashimiste/core/gui/Theme.java
@@ -47,4 +47,11 @@ public interface Theme {
      * @return une instance de Color représentant la couleur du texte.
      */
     Color getTextColor();
+
+    /**
+     * Renvoie la couleur des ponts potentiels.
+     *
+     * @return une instance de Color représentant la couleur des ponts potentiels.
+     */
+    Color getPotentialBridgeColor();
 }
\ No newline at end of file
diff --git a/src/main/java/fr/hashimiste/impl/gui/builder/Editor.java b/src/main/java/fr/hashimiste/impl/gui/builder/Editor.java
index e769040..f46df74 100644
--- a/src/main/java/fr/hashimiste/impl/gui/builder/Editor.java
+++ b/src/main/java/fr/hashimiste/impl/gui/builder/Editor.java
@@ -140,8 +140,8 @@ public static void main(String[] args) {
     private void updateLayout() {
         gridPanel.setLayout(new GridLayout((int) grille.getDimension().getHeight(), (int) grille.getDimension().getWidth()));
         gridPanel.removeAll();
-        for (int x = 0; x < grille.getDimension().getHeight(); x++) {
-            for (int y = 0; y < grille.getDimension().getWidth(); y++) {
+        for (int x = 0; x < grille.getDimension().getWidth(); x++) {
+            for (int y = 0; y < grille.getDimension().getHeight(); y++) {
                 Ile ile = grille.getIle(x, y);
                 if (ile != null) {
                     gridPanel.add(new Cell(ile, grille));
diff --git a/src/main/java/fr/hashimiste/impl/gui/component/GameComponent.java b/src/main/java/fr/hashimiste/impl/gui/component/GameComponent.java
new file mode 100644
index 0000000..0e614ca
--- /dev/null
+++ b/src/main/java/fr/hashimiste/impl/gui/component/GameComponent.java
@@ -0,0 +1,360 @@
+package fr.hashimiste.impl.gui.component;
+
+import fr.hashimiste.core.gui.Theme;
+import fr.hashimiste.core.jeu.Direction;
+import fr.hashimiste.core.jeu.Grille;
+import fr.hashimiste.core.jeu.Ile;
+import fr.hashimiste.impl.gui.theme.DefaultTheme;
+import fr.hashimiste.impl.jeu.GrilleImpl;
+
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Cette classe est une sous classe de previewComponent
+ * elle ajoute nottament des interactions
+ *
+ * @author elie
+ */
+public class GameComponent extends PreviewComponent implements MouseMotionListener, MouseListener {
+
+    /**
+     * Cette classe représente des ponts
+     *
+     * @author elie
+     */
+    public class Bridge {
+
+        Ile ile1; // première ile du pont
+        Ile ile2; // deuxième ile du pont
+
+        boolean duo = false; // pont double
+        boolean hor; // disposition du pont true: horizontal & false: vertical
+
+        /**
+         * Constructeur d'un pont potentiel
+         *
+         * @param ile1
+         * @param ile2
+         * @param hor
+         */
+        public Bridge(Ile ile1, Ile ile2, boolean hor) {
+            this.ile1 = ile1;
+            this.ile2 = ile2;
+            this.hor = hor;
+        }
+
+        public Ile getIle1() {
+            return ile1;
+        }
+
+        public Ile getIle2() {
+            return ile2;
+        }
+    }
+
+    /**
+     * Liste des ponts potentiels à afficher
+     */
+    private List<Bridge> potentialsBridges;
+
+    /**
+     * Liste des ponts réels à afficher
+     */
+    private List<Bridge> bridges;
+
+    /**
+     * Constructeur de la classe GameComponent.
+     *
+     * @param grille la grille à prévisualiser.
+     */
+    public GameComponent(Grille grille) {
+        super(grille);
+        potentialsBridges = new ArrayList<>();
+        bridges = new ArrayList<>();
+
+    }
+
+    /**
+     * Cette méthode est utilisée pour dessiner le composant de prévisualisation avec effet de survolement.
+     *
+     * @param g l'instance de Graphics utilisée pour dessiner le composant.
+     */
+    @Override
+    protected void paintComponent(Graphics g) {
+        super.paintComponent(g);
+
+        double factor = Math.min((getSize().getWidth() - 5) / getGrille().getDimension().width, (getSize().getHeight() - 5) / getGrille().getDimension().height);
+        System.out.println("factor: " + factor);
+        int zeroX = (int) ((getSize().width / 2d) - ((getGrille().getDimension().width * factor) / 2));
+        int zeroY = (int) ((getSize().height / 2d) - ((getGrille().getDimension().height * factor) / 2));
+        float cell_size = (this.getWidth() - zeroX - zeroX) / getGrille().getDimension().width;
+        Graphics2D g2 = (Graphics2D) g;
+
+        float lineThickness = cell_size / 12; // Ajustez le dénominateur selon vos besoins
+        g2.setStroke(new BasicStroke(lineThickness));
+        cell_size=(float)factor;
+
+        // Espacement entre les deux lignes d'un pont double
+        int bridgeSpacing = (int) (cell_size/12);
+
+        // Dessiner les ponts potentiels
+        for (Bridge bridge : potentialsBridges) {
+            g2.setColor(DefaultTheme.INSTANCE.getPotentialBridgeColor());
+            if(BridgeAlreadyExists(bridge) == -1) {
+                if (bridge.hor) {
+                    g2.draw(new Line2D.Float(zeroX + cell_size * bridge.ile1.getX() + cell_size, zeroY + cell_size * bridge.ile1.getY() + cell_size / 2,
+                            zeroX + cell_size * bridge.ile2.getX(), zeroY + cell_size * bridge.ile1.getY() + cell_size / 2));
+                } else {
+                    g2.draw(new Line2D.Float(zeroX + cell_size * bridge.ile1.getX() + cell_size / 2, zeroY + cell_size * bridge.ile1.getY() + cell_size,
+                            zeroX + cell_size * bridge.ile2.getX() + cell_size / 2, zeroY + cell_size * bridge.ile2.getY()));
+                }
+            }
+
+        }
+
+        // Dessiner les ponts réels
+        for (Bridge bridge : bridges) {
+            g2.setColor(Color.BLACK);
+            if (bridge.duo) { // si pont double
+                if (bridge.hor) {
+                    g2.draw(new Line2D.Float(zeroX + cell_size * bridge.ile1.getX() + cell_size, zeroY + cell_size * bridge.ile1.getY() + cell_size / 2 - bridgeSpacing,
+                            zeroX + cell_size * bridge.ile2.getX(), zeroY + cell_size * bridge.ile1.getY() + cell_size / 2 - bridgeSpacing));
+                    g2.draw(new Line2D.Float(zeroX + cell_size * bridge.ile1.getX() + cell_size, zeroY + cell_size * bridge.ile1.getY() + cell_size / 2 + bridgeSpacing,
+                            zeroX + cell_size * bridge.ile2.getX(), zeroY + cell_size * bridge.ile1.getY() + cell_size / 2 + bridgeSpacing));
+                } else {
+                    g2.draw(new Line2D.Float(zeroX + cell_size * bridge.ile1.getX() + cell_size / 2 - bridgeSpacing, zeroY + cell_size * bridge.ile1.getY() + cell_size,
+                            zeroX + cell_size * bridge.ile2.getX() + cell_size / 2 - bridgeSpacing, zeroY + cell_size * bridge.ile2.getY()));
+                    g2.draw(new Line2D.Float(zeroX + cell_size * bridge.ile1.getX() + cell_size / 2 + bridgeSpacing, zeroY + cell_size * bridge.ile1.getY() + cell_size,
+                            zeroX + cell_size * bridge.ile2.getX() + cell_size / 2 + bridgeSpacing, zeroY + cell_size * bridge.ile2.getY()));
+                }
+            } else { // sinon si pont simple
+                if (bridge.hor) {
+                    g2.draw(new Line2D.Float(zeroX + cell_size * bridge.ile1.getX() + cell_size, zeroY + cell_size * bridge.ile1.getY() + cell_size / 2,
+                            zeroX + cell_size * bridge.ile2.getX(), zeroY + cell_size * bridge.ile1.getY() + cell_size / 2));
+                } else {
+                    g2.draw(new Line2D.Float(zeroX + cell_size * bridge.ile1.getX() + cell_size / 2, zeroY + cell_size * bridge.ile1.getY() + cell_size,
+                            zeroX + cell_size * bridge.ile2.getX() + cell_size / 2, zeroY + cell_size * bridge.ile2.getY()));
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Evenement de mouvement de la souris
+     * @param e the event to be processed
+     */
+    @Override
+    public void mouseMoved(MouseEvent e) {
+
+        refreshBridge(e.getX(), e.getY());
+    }
+
+    /**
+     * rafraichit la liste des ponts potentiels en fonction de la position de la souris
+     * @param souris_x
+     * @param souris_y
+     */
+    public void refreshBridge(int souris_x, int souris_y) {
+        potentialsBridges.clear();
+        double factor = Math.min((getSize().getWidth() - 5) / getGrille().getDimension().width, (getSize().getHeight() - 5) / getGrille().getDimension().height);
+        int zeroX = (int) ((getSize().width / 2d) - ((getGrille().getDimension().width * factor) / 2));
+        int zeroY = (int) ((getSize().height / 2d) - ((getGrille().getDimension().height * factor) / 2));
+
+        if (souris_x >= zeroX && souris_y >= zeroY) {
+            int i = (this.getWidth() - zeroX - zeroX) / getGrille().getDimension().width;
+            int x = (souris_x - zeroX) / i;
+            int y = (souris_y - zeroY) / i;
+            Ile ile = getIsle(x, y);
+            boolean isOnIsle = ile != null;
+
+            Ile ileOuest = checkNearIsle(Direction.OUEST, x, y);
+            Ile ileEst = checkNearIsle(Direction.EST, x, y);
+            Ile ileNord = checkNearIsle(Direction.NORD, x, y);
+            Ile ileSud = checkNearIsle(Direction.SUD, x, y);
+
+            if (!isOnIsle) {
+                if (ileOuest != null && ileEst != null) {
+                    potentialsBridges.add(new Bridge(ileOuest, ileEst, true));
+                }
+
+                if (ileNord != null && ileSud != null) {
+                    potentialsBridges.add(new Bridge(ileNord, ileSud, false));
+                }
+            } else {
+                for (Bridge bridge : bridges) {
+                    if ((bridge.ile1 == ile || bridge.ile2 == ile) && !bridge.duo) {
+                        potentialsBridges.add(bridge);
+                        break;
+                    }
+                }
+                if (ileOuest != null) {
+                    potentialsBridges.add(new Bridge(ileOuest, ile, true));
+                }
+                if (ileEst != null) {
+                    potentialsBridges.add(new Bridge(ile, ileEst, true));
+                }
+                if (ileSud != null) {
+                    potentialsBridges.add(new Bridge(ile, ileSud, false));
+                }
+                if (ileNord != null) {
+                    potentialsBridges.add(new Bridge(ileNord, ile, false));
+                }
+            }
+        }
+        repaint();
+    }
+
+
+    /**
+     * Retourne vrai si au moins un potentiel pont est survolé
+     *
+     * @return boolean
+     */
+    public boolean isBridgeHover() {
+        return !potentialsBridges.isEmpty();
+    }
+
+    /**
+     * Retourne l'ile de la grille correspondant au coordonnées, null sinon
+     *
+     * @param x position x
+     * @param y position y
+     * @return Ile
+     */
+    public Ile getIsle(int x, int y) {
+        for (Ile ile : getGrille().getIles()) {
+            if (ile.getX() == x && ile.getY() == y) return ile;
+        }
+        return null;
+    }
+
+    /**
+     * Retourne l'ile la plus proche dans la direction passé en paramètre, null sinon
+     *
+     * @param dir direction
+     * @param x   position x de l'ile de départ
+     * @param y   position y de l'ile de départ
+     * @return
+     */
+    public Ile checkNearIsle(Direction dir, int x, int y) {
+        Ile ile = null;
+        switch (dir) {
+            case OUEST:
+                for (int i = x - 1; i >= 0; i--) {
+                    ile = getIsle(i, y);
+                    if (ile != null) break;
+                }
+                break;
+            case EST:
+                for (int i = x + 1; i < getGrille().getDimension().width; i++) {
+                    ile = getIsle(i, y);
+                    if (ile != null) break;
+                }
+                break;
+            case NORD:
+                for (int i = y - 1; i >= 0; i--) {
+                    ile = getIsle(x, i);
+                    if (ile != null) break;
+                }
+                break;
+            case SUD:
+                for (int i = y + 1; i < getGrille().getDimension().height; i++) {
+                    ile = getIsle(x, i);
+                    if (ile != null) break;
+                }
+                break;
+        }
+        return ile;
+    }
+
+    @Override
+    public void mouseDragged(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseClicked(MouseEvent e) {
+
+    }
+
+    /**
+     * Evenement de clique de la souris
+     * @param e the event to be processed
+     */
+    @Override
+    public void mousePressed(MouseEvent e) {
+        // Si des ponts potentiels sont détectés
+        if (isBridgeHover()) {
+            Bridge selectedBridge = potentialsBridges.get(0);
+            int index = BridgeAlreadyExists(selectedBridge);
+
+            System.out.println("index: " + index);
+            if (index < 0) {
+                // Ajouter le pont à la liste des ponts
+                bridges.add(selectedBridge);
+                ((GrilleImpl) getGrille()).poserPont(selectedBridge.ile1, selectedBridge.ile2, 1);
+            } else {
+                Bridge currentBridge = bridges.get(index);
+
+                // Le pont est déjà dans la liste, le rendre double ou le supprimer
+                if (currentBridge.duo) {
+                    // Supprimer le pont
+                    bridges.remove(index);
+                } else {
+                    // Rendre le pont double
+                    currentBridge.duo = true;
+                    ((GrilleImpl) getGrille()).poserPont(selectedBridge.ile1, selectedBridge.ile2, 2);
+                }
+            }
+
+            // Rafraîchir les ponts potentiels après chaque clic de souris
+            refreshBridge(e.getX(), e.getY());
+
+            repaint();
+            System.out.println("pb: " + potentialsBridges.size());
+            System.out.println("b: " + bridges.size());
+        }
+    }
+
+
+    /**
+     * methode qui retourne si le pont passer en paramètre existe déjà et retourne sont index ou -1 sinon
+     * @param bridge
+     * @return index
+     */
+    private int BridgeAlreadyExists(Bridge bridge) {
+        for (int i = 0; i < bridges.size(); i++) {
+            Bridge b = bridges.get(i);
+            if (bridge.ile1.getX() == b.ile1.getX() && bridge.ile1.getY() == b.ile1.getY() &&
+                    bridge.ile2.getX() == b.ile2.getX() && bridge.ile2.getY() == b.ile2.getY()) {
+                return i; // Retourner l'index si le pont existe déjà
+            }
+        }
+        return -1; // Retourner -1 si le pont n'existe pas
+    }
+
+
+
+    @Override
+    public void mouseReleased(MouseEvent e) {
+
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+
+    }
+}
diff --git a/src/main/java/fr/hashimiste/impl/gui/component/PreviewComponent.java b/src/main/java/fr/hashimiste/impl/gui/component/PreviewComponent.java
index 4f295a8..31a39ff 100644
--- a/src/main/java/fr/hashimiste/impl/gui/component/PreviewComponent.java
+++ b/src/main/java/fr/hashimiste/impl/gui/component/PreviewComponent.java
@@ -38,7 +38,7 @@ protected void paintComponent(Graphics g) {
         double factor = Math.min((getSize().getWidth() - 5) / grille.getDimension().width, (getSize().getHeight() - 5) / grille.getDimension().height);
         int zeroX = (int) ((getSize().width / 2d) - ((grille.getDimension().width * factor) / 2));
         int zeroY = (int) ((getSize().height / 2d) - ((grille.getDimension().height * factor) / 2));
-        Font font = new Font("Futura", Font.PLAIN, (int) (factor));
+        Font font = new Font("Arial", Font.PLAIN, (int) (factor));
         g.drawRect(zeroX, zeroY, (int) (grille.getDimension().width * factor), (int) (grille.getDimension().height * factor));
         for (Ile ile : grille.getIles()) {
             g.setColor(Color.BLACK);
diff --git a/src/main/java/fr/hashimiste/impl/gui/jeu/Jeu.java b/src/main/java/fr/hashimiste/impl/gui/jeu/Jeu.java
index 55ec847..9651ea7 100644
--- a/src/main/java/fr/hashimiste/impl/gui/jeu/Jeu.java
+++ b/src/main/java/fr/hashimiste/impl/gui/jeu/Jeu.java
@@ -6,9 +6,12 @@
 import fr.hashimiste.core.jeu.Historique;
 import fr.hashimiste.core.jeu.Sauvegarde;
 import fr.hashimiste.core.utils.CollectionsUtils;
+import fr.hashimiste.impl.gui.component.GameComponent;
+import fr.hashimiste.impl.gui.component.PreviewComponent;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -18,7 +21,7 @@
  * Cette classe représente le jeu.
  * Elle hérite de JFrameTemplateProfil et implémente Debuggable.
  */
-public class Jeu extends JFrameTemplateProfil implements Debuggable {
+public class Jeu extends JFrameTemplateProfil implements Debuggable, MouseMotionListener {
 
     private final transient Grille grille;
     private final JButton butMenu = creerBoutton("Menu", fenetreParente);
@@ -31,6 +34,7 @@ public class Jeu extends JFrameTemplateProfil implements Debuggable {
     private transient Historique precedent;
     private transient List<Sauvegarde> sauvegardes;
 
+
     /**
      * Constructeur de la classe Jeu.
      *
@@ -41,24 +45,40 @@ public Jeu(JFrameTemplateProfil parent, Grille grille) {
         super(parent);
         this.grille = grille;
 
+
         setLayout(new GridBagLayout());
+        GridBagConstraints constraints = new GridBagConstraints();
+        constraints.fill = GridBagConstraints.BOTH;
+        constraints.weighty = 0; // Set weighty to 0 for the buttons
+
         JPanel panelButtons = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
+
         for (JButton button : new JButton[]{butMenu, butVerifier, butCharger, butSauvegarder, butCheckpoint, butPrecedent, butAide}) {
             panelButtons.add(button);
         }
-
-        GridBagConstraints constraints = new GridBagConstraints();
-        constraints.fill = GridBagConstraints.BOTH;
-        constraints.weighty = 1;
         add(panelButtons, constraints);
 
-        chargerHistorique(new Historique(grille, null, null, Historique.Action.NOUVELLE_GRILLE));
+        this.setMinimumSize(new Dimension(700, 400));
 
-        sauvegardes = CollectionsUtils.listeDe(grille.getSauvegardes(stockage).stream().filter(s -> s.getProfil().equals(profil)).toArray(Sauvegarde[]::new));
-        Collections.sort(sauvegardes, (o1, o2) -> o2.getReference().getTimestamp().compareTo(o1.getReference().getTimestamp()));
-        setActive(!sauvegardes.isEmpty(), butCharger);
-    }
+        // Create the game panel
+        JPanel game = new JPanel(new BorderLayout());
 
+
+        // Add the PreviewComponent to the center of the game panel
+        GameComponent gameComponent = new GameComponent(grille);
+        game.add(gameComponent, BorderLayout.CENTER);
+
+
+
+        // Add the game panel to the frame
+        constraints.gridy = 1; // Set the gridy to 1 to place it below the buttons
+        constraints.weighty = 1; // Set weighty to 1 to make it fill the remaining space
+        add(game, constraints);
+
+        game.addMouseMotionListener(gameComponent);
+        game.addMouseListener(gameComponent);
+    }
     /**
      * Cette méthode est utilisée pour vérifier le jeu.
      */
@@ -173,4 +193,13 @@ public String getDebugInfo() {
     }
 
 
+    @Override
+    public void mouseDragged(MouseEvent e) {
+
+    }
+
+    @Override
+    public void mouseMoved(MouseEvent e) {
+        System.out.println("Mouse moved");
+    }
 }
diff --git a/src/main/java/fr/hashimiste/impl/gui/menu/ModeLibre.java b/src/main/java/fr/hashimiste/impl/gui/menu/ModeLibre.java
index a59b571..d26755b 100644
--- a/src/main/java/fr/hashimiste/impl/gui/menu/ModeLibre.java
+++ b/src/main/java/fr/hashimiste/impl/gui/menu/ModeLibre.java
@@ -64,6 +64,7 @@ public ModeLibre(JFrameTemplateProfil parent) {
         centre.setLayout(new BoxLayout(centre, BoxLayout.Y_AXIS));
 
         txtStats.setEditable(false);
+        txtStats.setFocusable(false);
         txtStats.setLineWrap(true);
         txtStats.setWrapStyleWord(true);
         appliquerTheme(txtStats, facile, moyen, difficile, preview, butMenu);
@@ -138,7 +139,7 @@ public void mouseExited(MouseEvent e) {
                 }
 
                 @Override
-                public void mouseClicked(MouseEvent e) {
+                public void mousePressed(MouseEvent e) {
                     ModeLibre.super.changerFenetre(new Jeu(ModeLibre.this, grille));
                     super.mouseClicked(e);
                 }
diff --git a/src/main/java/fr/hashimiste/impl/gui/menu/ProfilSelection.java b/src/main/java/fr/hashimiste/impl/gui/menu/ProfilSelection.java
index 410289c..ecd9757 100644
--- a/src/main/java/fr/hashimiste/impl/gui/menu/ProfilSelection.java
+++ b/src/main/java/fr/hashimiste/impl/gui/menu/ProfilSelection.java
@@ -97,7 +97,7 @@ private void afficherProfil(String label, Consumer<MouseEvent> clickGauche, Cons
         but.setHorizontalTextPosition(SwingConstants.CENTER);
         but.addMouseListener(new MouseAdapter() {
             @Override
-            public void mouseClicked(MouseEvent e) {
+            public void mousePressed(MouseEvent e) {
                 if (SwingUtilities.isLeftMouseButton(e) && clickGauche != null) {
                     clickGauche.accept(e);
                 } else if (SwingUtilities.isRightMouseButton(e) && clickDroit != null) {
diff --git a/src/main/java/fr/hashimiste/impl/gui/theme/DebugTheme.java b/src/main/java/fr/hashimiste/impl/gui/theme/DebugTheme.java
index 365203c..1426032 100644
--- a/src/main/java/fr/hashimiste/impl/gui/theme/DebugTheme.java
+++ b/src/main/java/fr/hashimiste/impl/gui/theme/DebugTheme.java
@@ -82,4 +82,7 @@ public Color getTransparentColor() {
     public Color getTextColor() {
         return Color.BLACK;
     }
+
+    @Override
+    public Color getPotentialBridgeColor() { return Color.BLUE; }
 }
diff --git a/src/main/java/fr/hashimiste/impl/gui/theme/DefaultTheme.java b/src/main/java/fr/hashimiste/impl/gui/theme/DefaultTheme.java
index afbc78f..cc4f2ff 100644
--- a/src/main/java/fr/hashimiste/impl/gui/theme/DefaultTheme.java
+++ b/src/main/java/fr/hashimiste/impl/gui/theme/DefaultTheme.java
@@ -87,4 +87,9 @@ public Color getTransparentColor() {
     public Color getTextColor() {
         return Color.BLACK;
     }
+
+    @Override
+    public Color getPotentialBridgeColor() {
+        return BOUTON;
+    }
 }