diff --git a/changelog.md b/changelog.md
index a34749f..7fed615 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,9 @@
-# changelog v7.0.0beta (1er août 2017)
+# changelog v7.0.0beta (août - ? 2017)
 - architecture globale revisitée (vendor, config, library, components)
 - refonte complète du système de grille (dorénavant basé sur Grid Layout)
 - création d'un mixin de grille
+- déplacement des variables de gouttières de grillade.scss vers variables.scss
+- déplacement des variables de breakpoints de breakpoints.scss vers variables.scss
 - normalize.css v7.0.0
 - refonte complète des boutons, avec possibilités de variantes (primary, success, warning, etc.)
 - ajout des badges (tags), avec possibilités de variantes (primary, success, warning, etc.)
diff --git a/css/grillade.scss b/css/grillade.scss
index 974a8b7..3ff652d 100644
--- a/css/grillade.scss
+++ b/css/grillade.scss
@@ -1,14 +1,3 @@
-// Responsive breakpoints variables
-
-// Warning : you should use your own values, regardless of the devices
-// Best practise is Mobile First: (max-width: ($BP - 1)) and (min-width: $BP)
-
-$tiny: 480px !default; // or 'em' if you prefer, of course
-$small: 576px !default;
-$medium: 768px !default;
-$large: 992px !default;
-$extra-large: 1200px !default;
-
 /* --------------------------------------- */
 /* ==Grillade : ultra light Grid System    */
 /* --------------------------------------- */
@@ -18,6 +7,13 @@ $extra-large: 1200px !default;
 //   1- use vanilla CSS Grid Layout spec (perfect for you)
 //   2- use Bootstrap (good luck)
 
+@if (not variable_exists(tiny)) or (not variable_exists(small))  or (not variable_exists(medium))
+  {
+  $tiny: 480px !global;
+  $small: 576px !global;
+  $medium: 768px !global;
+}
+
 [class*=" grid-"],
 [class^="grid-"] {
   @media (min-width: $tiny) {
diff --git a/sass/_config/_breakpoints.scss b/sass/_config/_breakpoints.scss
deleted file mode 100644
index 2e1ce33..0000000
--- a/sass/_config/_breakpoints.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// Responsive breakpoints variables
-
-// Warning : you should use your own values, regardless of the devices
-// Best practise is Mobile First: (max-width: ($BP - 1)) and (min-width: $BP)
-
-$tiny: 480px !default; // or 'em' if you prefer, of course
-$small: 576px !default;
-$medium: 768px !default;
-$large: 992px !default;
-$extra-large: 1200px !default;
diff --git a/sass/_config/_variables.scss b/sass/_config/_variables.scss
index 35498a1..c2ad42a 100644
--- a/sass/_config/_variables.scss
+++ b/sass/_config/_variables.scss
@@ -85,3 +85,13 @@ $grid-gutters: ( '': 1rem, '-l': 2rem, '-xl': 4rem );
 
 // border-radius
 $border-radius: 0;
+
+// Responsive breakpoints variables
+// Warning : you should use your own values, regardless of the devices
+// Best practise is Mobile First: (max-width: ($BP - 1)) and (min-width: $BP)
+
+$tiny: 480px !default; // or 'em' if you prefer, of course
+$small: 576px !default;
+$medium: 768px !default;
+$large: 992px !default;
+$extra-large: 1200px !default;
diff --git a/sass/components/grillade.scss b/sass/components/grillade.scss
index f4b4340..3ff652d 100644
--- a/sass/components/grillade.scss
+++ b/sass/components/grillade.scss
@@ -7,6 +7,13 @@
 //   1- use vanilla CSS Grid Layout spec (perfect for you)
 //   2- use Bootstrap (good luck)
 
+@if (not variable_exists(tiny)) or (not variable_exists(small))  or (not variable_exists(medium))
+  {
+  $tiny: 480px !global;
+  $small: 576px !global;
+  $medium: 768px !global;
+}
+
 [class*=" grid-"],
 [class^="grid-"] {
   @media (min-width: $tiny) {
diff --git a/sass/knacss.scss b/sass/knacss.scss
index 814aa04..7bcbafb 100644
--- a/sass/knacss.scss
+++ b/sass/knacss.scss
@@ -38,7 +38,6 @@
 // and move variables file from knacss folder to your own project folder!
 @import "_config/_variables.scss";
 
-@import "_config/_breakpoints.scss";
 @import "_config/_mixins.scss";
 
 // Libraries