diff --git a/include/grid.h b/include/grid.h
index 5d7e781..f9702cb 100644
--- a/include/grid.h
+++ b/include/grid.h
@@ -63,7 +63,7 @@ struct Grid
     SDL_Color backgroundColor;
 
     // Grid border thickness and color
-    int border;
+    unsigned int border;
     SDL_Color borderColor;
 
     // Number of cells over the x axis
@@ -72,7 +72,7 @@ struct Grid
     int yCells;
 
     // Cells boder thickness and color
-    int cellsBorder;
+    unsigned int cellsBorder;
     SDL_Color cellsBorderColor;
 
     // Matrix of Cells
diff --git a/src/grid.c b/src/grid.c
index f02dfaf..668a750 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -114,15 +114,18 @@ void Grid_initCell(Grid *grid, Cell *cell, int i, int j, SDL_Color color, SDL_Co
 
 void Grid_render(Grid *grid, SDL_Renderer *renderer)
 {
-    // Set renderer color to draw the grid border
-    SDL_SetRenderDrawColor(renderer,
-                           grid->borderColor.r,
-                           grid->borderColor.g,
-                           grid->borderColor.b,
-                           grid->borderColor.a);
+    if(grid->border != 0) // Grid border thickness different from 0
+    {
+        // Set renderer color to draw the grid border
+        SDL_SetRenderDrawColor(renderer,
+                               grid->borderColor.r,
+                               grid->borderColor.g,
+                               grid->borderColor.b,
+                               grid->borderColor.a);
 
-    // Render grid border
-    SDL_RenderFillRect(renderer, &(grid->rect));
+        // Render grid border
+        SDL_RenderFillRect(renderer, &(grid->rect));
+    }
 
     // Render all cells
     for(int i = 0; i < grid->xCells; ++i)
@@ -136,15 +139,18 @@ void Grid_render(Grid *grid, SDL_Renderer *renderer)
 
 void Grid_renderCell(Cell *cell, SDL_Renderer *renderer)
 {
-    // Set renderer color to cell color
-    SDL_SetRenderDrawColor(renderer,
-                           cell->borderColor.r,
-                           cell->borderColor.g,
-                           cell->borderColor.b,
-                           cell->borderColor.a);
+    if(cell->border.x != cell->rect.x) // Cells border thickness different from 0
+    {
+        // Set renderer color to cell color
+        SDL_SetRenderDrawColor(renderer,
+                               cell->borderColor.r,
+                               cell->borderColor.g,
+                               cell->borderColor.b,
+                               cell->borderColor.a);
 
-    // Render filled cell
-    SDL_RenderFillRect(renderer, &(cell->border));
+        // Render filled cell
+        SDL_RenderFillRect(renderer, &(cell->border));
+    }
 
     // Set renderer color to cell color
     SDL_SetRenderDrawColor(renderer,