diff --git a/OOP_2B6_PROJECT/src/windowInterface/JPanelChessBoard.java b/OOP_2B6_PROJECT/src/windowInterface/JPanelChessBoard.java
index 78a68de..56d4be3 100644
--- a/OOP_2B6_PROJECT/src/windowInterface/JPanelChessBoard.java
+++ b/OOP_2B6_PROJECT/src/windowInterface/JPanelChessBoard.java
@@ -22,10 +22,10 @@ public class JPanelChessBoard extends JPanel {
 	private Game myGame;
 	private MyInterface interfaceGlobal;
 	private BufferedImage spriteSheet;
-	private int PIECE_WIDTH = 16; //in spritesheet
-	private int PIECE_HEIGHT = 16; //in spritesheet
+	private int PIECE_WIDTH = 16;
+	private int PIECE_HEIGHT = 16;
 	private int MARGIN = 6;
-	
+
 	private boolean pieceSelectorMode;
 	private boolean selectedPieceIsWhite;
 	private PieceType selectedPieceType;
@@ -45,33 +45,30 @@ public class JPanelChessBoard extends JPanel {
 		}
 		pieceSelectorMode = false;
 		pieceAdderMode = false;
-		addMouseListener(new MouseAdapter() { 
-			public void mousePressed(MouseEvent me) { 
-				// System.out.println(me);
-				if(pieceSelectorMode) {
-					int x = Math.round(me.getX()/cellWidth());
-					selectedPieceType = PieceType.values()[5-x];
+		addMouseListener(new MouseAdapter() {
+			public void mousePressed(MouseEvent me) {
+				if (pieceSelectorMode) {
+					int x = Math.round(me.getX() / cellWidth());
+					selectedPieceType = PieceType.values()[5 - x];
 					selectedPieceIsWhite = (me.getY() > cellHeight());
 					pieceSelectorMode = false;
 				} else {
-					if(myGame == null) {
+					if (myGame == null) {
 						interfaceGlobal.instantiateSimu();
 					}
-					int x = (me.getX()*myGame.getWidth())/getWidth();
-					int y = (me.getY()*myGame.getHeight())/getHeight();
-					if(pieceAdderMode) {
-						//TODO
-						myGame.setPiece(selectedPieceIsWhite,selectedPieceType, x, y);
+					int x = (me.getX() * myGame.getWidth()) / getWidth();
+					int y = (me.getY() * myGame.getHeight()) / getHeight();
+					if (pieceAdderMode) {
+						myGame.setPiece(selectedPieceIsWhite, selectedPieceType, x, y);
 						pieceAdderMode = false;
 					} else {
-						myGame.clickCoords(x,y);
+						myGame.clickCoords(x, y);
 					}
 				}
 				repaint();
-			} 
-		}); 
+			}
+		});
 	}
-	
 
 	public void setGame(Game simu) {
 		myGame = simu;
@@ -81,116 +78,117 @@ public class JPanelChessBoard extends JPanel {
 	protected void paintComponent(Graphics g) {
 		super.paintComponent(g);
 		this.setBackground(Color.black);
-		if(pieceSelectorMode) {
+		if (pieceSelectorMode) {
 			g.drawImage(
-					spriteSheet, 
-					0, 
-					0,
-					Math.round(5*cellWidth()),
-					Math.round(2*cellHeight()),
-					null
-					);
+				spriteSheet,
+				0,
+				0,
+				Math.round(5 * cellWidth()),
+				Math.round(2 * cellHeight()),
+				null
+			);
 			return;
 		}
 		if (myGame != null) {
-			// Draw Interface from state of simulator
 			float cellWidth = cellWidth();
 			float cellHeight = cellHeight();
 
-			g.setColor(Color.white);
-			for(int x=0; x<myGame.getWidth();x++) {
-				for (int y=0; y<myGame.getHeight(); y++) {
-					boolean isSelect = myGame.isSelected(x,y);
-					boolean isHighlight = myGame.isHighlighted(x,y);
-					if(isSelect) {
-						g.setColor(Color.blue);
+			Color lightColor = new Color(240, 217, 181); // beige
+			Color darkColor = new Color(181, 136, 99);   // brown
+
+			for (int x = 0; x < myGame.getWidth(); x++) {
+				for (int y = 0; y < myGame.getHeight(); y++) {
+					boolean isSelect = myGame.isSelected(x, y);
+					boolean isHighlight = myGame.isHighlighted(x, y);
+					Color baseColor = ((x + y) % 2 == 0) ? lightColor : darkColor;
+
+					if (isSelect) {
+						baseColor = Color.blue;
 					}
-					if(isHighlight) {
-						g.setColor(Color.yellow);
+					if (isHighlight) {
+						baseColor = Color.yellow;
 					}
-					if((x+y)%2==1 || isSelect || isHighlight) {
-						g.fillRect(
-								Math.round(x*cellWidth),
-								Math.round(y*cellHeight), 
-								Math.round(cellWidth),
-								Math.round(cellHeight)
-								);
-					}
-					if(isHighlight || isSelect) {
-						g.setColor(Color.white);
-					}
-					
+
+					g.setColor(baseColor);
+					g.fillRect(
+						Math.round(x * cellWidth),
+						Math.round(y * cellHeight),
+						Math.round(cellWidth),
+						Math.round(cellHeight)
+					);
 				}
 			}
-			
+
 			g.setColor(Color.gray);
-			for(int x=0; x<myGame.getWidth();x++) {
-				int graphX = Math.round(x*cellWidth);
+			for (int x = 0; x < myGame.getWidth(); x++) {
+				int graphX = Math.round(x * cellWidth);
 				g.drawLine(graphX, 0, graphX, this.getHeight());
 			}
-			for (int y=0; y<myGame.getHeight(); y++) {
-				int graphY = Math.round(y*cellHeight);
+			for (int y = 0; y < myGame.getHeight(); y++) {
+				int graphY = Math.round(y * cellHeight);
 				g.drawLine(0, graphY, this.getWidth(), graphY);
 			}
-			
+
 			for (Piece piece : myGame.getPieces()) {
-				drawPiece(g,piece);
+				drawPiece(g, piece);
 			}
 		}
 	}
 
 	private void drawPiece(Graphics g, Piece piece) {
 		g.drawImage(
-				getChessPieceImageFromType(piece.getType(), piece.isWhite()), 
-				MARGIN+(xCoordFromGame(piece.getX())), 
-				MARGIN+(yCoordFromGame(piece.getY())), 
-				null
-				);
+			getChessPieceImageFromType(piece.getType(), piece.isWhite()),
+			MARGIN + (xCoordFromGame(piece.getX())),
+			MARGIN + (yCoordFromGame(piece.getY())),
+			null
+		);
 	}
 
-
 	private Image getChessPieceImageFromType(PieceType type, boolean isWhite) {
-		int x = spriteSheetPositionOfPieceType(type)*PIECE_WIDTH;
-		int y = PIECE_HEIGHT * (isWhite?1:0);
+		int x = spriteSheetPositionOfPieceType(type) * PIECE_WIDTH;
+		int y = PIECE_HEIGHT * (isWhite ? 1 : 0);
 		Image subImage = spriteSheet.getSubimage(x, y, PIECE_WIDTH, PIECE_HEIGHT);
 		return subImage.getScaledInstance(
-				Math.round(cellWidth())-2*MARGIN, 
-				Math.round(cellHeight())-2*MARGIN, 0
-				);
+			Math.round(cellWidth()) - 2 * MARGIN,
+			Math.round(cellHeight()) - 2 * MARGIN,
+			0
+		);
 	}
-	
+
 	private int spriteSheetPositionOfPieceType(PieceType type) {
-		return 5-type.ordinal();
+		return 5 - type.ordinal();
 	}
-	
+
 	private float cellWidth() {
-		return (float) this.getWidth()/ (float)myGame.getWidth();
+		return (float) this.getWidth() / (float) myGame.getWidth();
 	}
+
 	private float cellHeight() {
-		return (float)this.getHeight()/ (float)myGame.getHeight();
+		return (float) this.getHeight() / (float) myGame.getHeight();
 	}
+
 	private int xCoordFromGame(int x) {
-		return Math.round(x*cellWidth());
+		return Math.round(x * cellWidth());
 	}
+
 	private int yCoordFromGame(int y) {
-		return Math.round(y*cellHeight());
+		return Math.round(y * cellHeight());
 	}
 
 	public void togglePieceSelector() {
-		pieceSelectorMode = ! pieceSelectorMode;
+		pieceSelectorMode = !pieceSelectorMode;
 	}
 
 	public void toggleAdderMode() {
-		pieceAdderMode = ! pieceAdderMode;
+		pieceAdderMode = !pieceAdderMode;
 	}
 
 	public boolean isPieceSelectorMode() {
 		return pieceSelectorMode;
 	}
 
-
 	public boolean isPieceAdderMode() {
 		return pieceAdderMode;
 	}
-
 }
+