diff --git a/changelog.md b/changelog.md
index 5512b77..b95d3b6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -10,6 +10,7 @@
 - nommage de variables préfixé pour plus de maintenabilité : `$gutter` -> `$grid-gutter`, `$number` -> `$grid-number`, `$left` -> `$grid-left` et `$right` -> `$grid-right`
 - mise à jour de la documentation
 - ajout de commentaires dans les grilles
+- ajout de Table des Matières dans la feuille de style non minifiée
 
 # changelog v4.4.5 (1er avril 2016)
 
diff --git a/sass/_layout-general.scss b/sass/_layout-general.scss
index f9bf015..61d0062 100644
--- a/sass/_layout-general.scss
+++ b/sass/_layout-general.scss
@@ -1,5 +1,5 @@
 /* ----------------------------- */
-/* ==layout and modules          */
+/* ==Global Layout               */
 /* ----------------------------- */
 
 /* module, gains superpower "BFC" Block Formating Context */
diff --git a/sass/_layout-grids.scss b/sass/_layout-grids.scss
index 7dfd46d..c5a44b0 100644
--- a/sass/_layout-grids.scss
+++ b/sass/_layout-grids.scss
@@ -1,5 +1,5 @@
 /* ---------------------------------- */
-/* ==Grillade                         */
+/* ==Grid Layout (grillade)           */
 /* ---------------------------------- */
 
 // Tuto : http://www.alsacreations.com/tuto/lire/1659-une-grille-responsive-avec-flexbox-et-LESS.html
diff --git a/sass/_library-base.scss b/sass/_library-base.scss
index 25c64c9..62a19fa 100644
--- a/sass/_library-base.scss
+++ b/sass/_library-base.scss
@@ -1,5 +1,5 @@
 /* ----------------------------- */
-/* == soft reset                 */
+/* ==Base (basic styles)         */
 /* ----------------------------- */
 
 /* switching to border-box model for all elements */
@@ -31,15 +31,9 @@ figure {
   margin-right: 0;
 }
 
-/* ----------------------------- */
-/* == typography                 */
-/* ----------------------------- */
-
 html {
-
   /* set base font-size to equiv "10px", which is adapted to rem unit */
   font-size: 62.5%;
-
   /* IE9-IE11 math fixing. See http://bit.ly/1g4X0bX */
   /* thanks to @guardian, @victorbritopro and @eQRoeil */
   font-size: calc(1em * 0.625);
@@ -147,10 +141,6 @@ var {
   font-style: italic;
 }
 
-/* ----------------------------- */
-/* == browsers consistency       */
-/* ----------------------------- */
-
 /* avoid top margins on first content element */
 p,
 .#{$kna-namespace}p-like,
diff --git a/sass/_library-misc.scss b/sass/_library-misc.scss
index 76cc811..676082a 100644
--- a/sass/_library-misc.scss
+++ b/sass/_library-misc.scss
@@ -1,5 +1,5 @@
 /* ----------------------------- */
-/* ==misc rules                  */
+/* ==Misc (skip links, hyphens)  */
 /* ----------------------------- */
 
 /* styling skip links */
diff --git a/sass/_library-print.scss b/sass/_library-print.scss
index 21bec89..bf468cf 100644
--- a/sass/_library-print.scss
+++ b/sass/_library-print.scss
@@ -1,4 +1,7 @@
-/* quick print reset */
+/* ----------------------------- */
+/* ==Print (quick print reset)   */
+/* ----------------------------- */
+
 @media print {
   * {
     background: transparent !important;
diff --git a/sass/_library-styling.scss b/sass/_library-styling.scss
index 52067e0..99692a5 100644
--- a/sass/_library-styling.scss
+++ b/sass/_library-styling.scss
@@ -1,5 +1,5 @@
 /* ----------------------------- */
-/* ==minor stylings              */
+/* ==Stylings (minor stylings)   */
 /* ----------------------------- */
 
 /* styling elements */
diff --git a/sass/_library-wordpress.scss b/sass/_library-wordpress.scss
index 1e9733e..15d57aa 100644
--- a/sass/_library-wordpress.scss
+++ b/sass/_library-wordpress.scss
@@ -8,10 +8,6 @@ Contributors: Automattic, Geoffrey Crofte
 Description: Reset styles for WordPress usage of KNACSS
 */
 
-/* ----------------------------- */
-/* ==Menus                       */
-/* ----------------------------- */
-
 // current menu elements
 .current_page_item > a {
 }
@@ -43,10 +39,6 @@ Description: Reset styles for WordPress usage of KNACSS
   width: 50%;
 }
 
-/* ----------------------------- */
-/* ==Alignments                  */
-/* ----------------------------- */
-
 // class in img elements
 .alignnone {
   margin: .25em 1.5em 1.5em 0;
@@ -68,10 +60,6 @@ Description: Reset styles for WordPress usage of KNACSS
   margin: 0 0 .25em 1.5em;
 }
 
-/* ----------------------------- */
-/* ==Clearings                   */
-/* ----------------------------- */
-
 .entry-content,
 .comment-content {
   clear: both;
@@ -82,10 +70,6 @@ Description: Reset styles for WordPress usage of KNACSS
   }
 }
 
-/* ----------------------------- */
-/* ==Widgets                     */
-/* ----------------------------- */
-
 .widget + .widget {
   margin: 1.5em 0 0;
 }
@@ -95,10 +79,6 @@ Description: Reset styles for WordPress usage of KNACSS
   max-width: 100%;
 }
 
-/* ----------------------------- */
-/* ==Posts and pages             */
-/* ----------------------------- */
-
 /* === 5.1 Posts - post_class === */
 
 // featured content
@@ -215,10 +195,6 @@ Description: Reset styles for WordPress usage of KNACSS
   margin: 0 0 1.5em;
 }
 
-/* ----------------------------- */
-/* ==Comments                    */
-/* ----------------------------- */
-
 .comment-content a {
   word-wrap: break-word;
 }
@@ -227,10 +203,6 @@ Description: Reset styles for WordPress usage of KNACSS
   // some make-the-logo-bigger styles
 }
 
-/* ----------------------------- */
-/* ==Media                       */
-/* ----------------------------- */
-
 img.wp-smiley {
   margin-bottom: 0;
   margin-top: 0;
@@ -238,10 +210,6 @@ img.wp-smiley {
   border: none;
 }
 
-/* ----------------------------- */
-/* ==Captions                    */
-/* ----------------------------- */
-
 .wp-caption {
   max-width: 100%;
   margin-bottom: 1.5em;
@@ -257,10 +225,6 @@ img.wp-smiley {
   text-align: center;
 }
 
-/* ----------------------------- */
-/* ==Galleries                   */
-/* ----------------------------- */
-
 .gallery {
   margin-bottom: 1.5em;
 }
diff --git a/sass/_object-forms.scss b/sass/_object-forms.scss
index 0fd20f0..82b5cb8 100644
--- a/sass/_object-forms.scss
+++ b/sass/_object-forms.scss
@@ -1,5 +1,5 @@
 /* ----------------------------- */
-/* ==forms                       */
+/* ==Forms                       */
 /* ----------------------------- */
 
 /* thanks to HTML5boilerplate,
diff --git a/sass/_object-tables.scss b/sass/_object-tables.scss
index 4032f5a..ee86a54 100644
--- a/sass/_object-tables.scss
+++ b/sass/_object-tables.scss
@@ -1,5 +1,5 @@
 /* ----------------------------- */
-/* ==tables                      */
+/* ==Tables                      */
 /* ----------------------------- */
 
 table,
diff --git a/sass/_override-helpers.scss b/sass/_override-helpers.scss
index eedbf16..462754b 100644
--- a/sass/_override-helpers.scss
+++ b/sass/_override-helpers.scss
@@ -1,7 +1,10 @@
 /* ---------------------------------- */
-/* ==state helpers                    */
+/* ==Helpers                          */
 /* ---------------------------------- */
 
+/* State Helpers */
+/* ------------- */
+
 /* invisible for all */
 .is-hidden,
 [hidden] {
@@ -33,10 +36,8 @@ ul.unstyled {
   padding-left: 0;
 }
 
-/* ---------------------------------- */
-/* ==visual helpers                   */
-/* .. use them with parcimony !       */
-/* ---------------------------------- */
+/* Width Helpers */
+/* ------------- */
 
 /* blocks widths (percentage and pixels) */
 .#{$kna-namespace}w10 {
@@ -155,11 +156,9 @@ ul.unstyled {
   width: auto;
 }
 
-/* spacing helpers
-p,m = padding,margin
-a,t,r,b,l = all,top,right,bottom,left
-s,m,l,n = small, medium, large, none
-*/
+/* Spacing Helpers */
+/* --------------- */
+
 .#{$kna-namespace}man,
 .#{$kna-namespace}ma0 {
   margin: 0;
diff --git a/sass/_override-responsive.scss b/sass/_override-responsive.scss
index cf700b1..2458fd8 100644
--- a/sass/_override-responsive.scss
+++ b/sass/_override-responsive.scss
@@ -1,6 +1,9 @@
-/* ---------------------------------- */
-/* ==Responsive large                 */
-/* ---------------------------------- */
+/* -------------------------- */
+/* ==Responsive helpers       */
+/* -------------------------- */
+
+/* large screens */
+/* ------------- */
 
 @include media('>=large-screen') {
 
@@ -71,9 +74,9 @@
   }
 }
 
-/* ---------------------------------- */
-/* ==Responsive medium                */
-/* ---------------------------------- */
+/* medium screens */
+/* -------------- */
+
 @include media('>=medium-screen', '<large-screen') {
 
   /* layouts for medium screens */
@@ -145,9 +148,8 @@
   }
 }
 
-/* ---------------------------------- */
-/* ==Responsive small                 */
-/* ---------------------------------- */
+/* small screens */
+/* ------------- */
 
 @include media('>=small-screen', '<medium-screen') {
 
@@ -236,9 +238,8 @@
 
 }
 
-/* ---------------------------------- */
-/* ==Responsive tiny                  */
-/* ---------------------------------- */
+/* tiny screens */
+/* ------------ */
 
 @include media('<small-screen') {
 
diff --git a/sass/knacss.scss b/sass/knacss.scss
index d280cf8..25347fc 100644
--- a/sass/knacss.scss
+++ b/sass/knacss.scss
@@ -3,18 +3,34 @@
 * Licence WTFPL http://www.wtfpl.net/
 */
 
+/* ----------------------------- */
+/* ==Table Of Content            */
+/* ----------------------------- */
+/* 1- Normalize (basic reset) */
+/* 2- Base (basic styles) */
+/* 3- Print (print quick reset) */
+/* 4- Stylings (minor stylings) */
+/* 5- Misc (skip links, hyphens) */
+/* (6- WordPress reset (disabled by default)) */
+/* 7- Global Layout (alignment, modules, positionning) */
+/* 8- Grid Layout (grillade) */
+/* 9- Tables (data tables consistency) */
+/* 10- Forms (forms consistency) */
+/* 11- Helpers (width and spacers helpers) */
+/* 12- Responsive (Responsive Web Design helpers) */
+
 // This is the global Sass imports file
 // -----------------
 
 // normalize and include-media imports
-@import "_normalize/_normalize.scss"; // normalize
+@import "_normalize/_normalize.scss"; // normalize (basic reset)
 @import "_include-media/_include-media.scss"; // include-media
 
 // (WARNING : you should comment this line and move config file from vendor/knacss folder to your own project folder)
 @import "_config-variables.scss";
 
 // Libraries
-@import "_library-base.scss"; // reset and basic styles
+@import "_library-base.scss"; // basic styles
 @import "_library-print.scss"; // print quick reset
 @import "_library-styling.scss"; // minor stylings
 @import "_library-misc.scss"; // skip links, hyphens