diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot
index dfafb57..2c7eb83 100644
Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ
diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf
index 76369cd..323c7e1 100644
Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ
diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff
index b031c21..05a4401 100644
Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ
diff --git a/src/scss/cdb-components/forms/checkbox.scss b/src/scss/cdb-components/forms/checkbox.scss
index a6902d4..f8b7f06 100644
--- a/src/scss/cdb-components/forms/checkbox.scss
+++ b/src/scss/cdb-components/forms/checkbox.scss
@@ -5,9 +5,9 @@
 # Forms/Checkbox
 
 ```
-  <input type="checkbox" name="vehicle" value="Bike" class="CDB-Checkbox" checked>
-  <input type="checkbox" name="vehicle" value="Bus" class="CDB-Checkbox">
-  <input type="checkbox" name="vehicle" value="Car" class="CDB-Checkbox" disabled>
+<input type="checkbox" name="vehicle" value="Bike" class="CDB-Checkbox" checked>
+<input type="checkbox" name="vehicle" value="Bus" class="CDB-Checkbox">
+<input type="checkbox" name="vehicle" value="Car" class="CDB-Checkbox" disabled>
 ```
 */
 
diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/inputs.scss
index 430781e..5e00e7a 100644
--- a/src/scss/cdb-components/forms/inputs.scss
+++ b/src/scss/cdb-components/forms/inputs.scss
@@ -5,9 +5,9 @@
 # Forms/Inputs
 
 ```
-  <input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText Text">
-  <input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText has-error Text">
-  <input type="text" name="text" placeholder="DejaVu Sans" disabled class="CDB-InputText is-disabled Text">
+<input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText CDB-Text">
+<input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText has-error CDB-Text">
+<input type="text" name="text" placeholder="DejaVu Sans" disabled class="CDB-InputText is-disabled CDB-Text">
 ```
 */
 
diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss
index 090bc16..2b918e4 100644
--- a/src/scss/cdb-components/forms/legends.scss
+++ b/src/scss/cdb-components/forms/legends.scss
@@ -5,55 +5,55 @@
 # Forms/Labels
 
 ```
-  <label class="u-iblock Text Size-medium u-rSpace--xl">
-    <input class="CDB-Radio u-iBlock u-rSpace--s" type="radio" name="True" value="01" checked>
-    <span class="u-iBlock">True</span>
-  </label>
-  <label class="u-iblock Text Size-medium">
-    <input class="CDB-Radio u-iBlock u-rSpace--s" type="radio" name="True" value="02" checked>
-    <span class="u-iBlock">False</span>
-  </label>
+<label class="u-iblock CDB-Text CDB-Size-medium u-rSpace--xl">
+  <input class="CDB-Radio u-iBlock u-rSpace--s" type="radio" name="True" value="01" checked>
+  <span class="u-iBlock">True</span>
+</label>
+<label class="u-iblock CDB-Text CDB-Size-medium">
+  <input class="CDB-Radio u-iBlock u-rSpace--s" type="radio" name="True" value="02" checked>
+  <span class="u-iBlock">False</span>
+</label>
 
-  <br/>
-  <br/>
-  <br/>
+<br/>
+<br/>
+<br/>
 
-  <label class="u-iblock Text Size-medium u-rSpace--xl">
-    <input class="CDB-Checkbox u-iBlock u-rSpace--s" type="checkbox" name="hobbies" value="Sport" >
-    <span class="u-iBlock">Sport</span>
-  </label>
-  <label class="u-iblock Text Size-medium">
-    <input class="CDB-Checkbox u-iBlock u-rSpace--s" type="checkbox" name="hobbies" value="Travel">
-    <span class="u-iBlock">Travel</span>
-  </label>
+<label class="u-iblock CDB-Text CDB-Size-medium u-rSpace--xl">
+  <input class="CDB-Checkbox u-iBlock u-rSpace--s" type="checkbox" name="hobbies" value="Sport" >
+  <span class="u-iBlock">Sport</span>
+</label>
+<label class="u-iblock CDB-Text CDB-Size-medium">
+  <input class="CDB-Checkbox u-iBlock u-rSpace--s" type="checkbox" name="hobbies" value="Travel">
+  <span class="u-iBlock">Travel</span>
+</label>
 
-  <br/>
-  <br/>
-  <br/>
+<br/>
+<br/>
+<br/>
 
-  <fieldset>
-    <p class="CDB-Legend u-iBlock Text is-semibold Size-small u-rSpace--m">RADIO</p>
-    <ul class="Text Size-medium u-iBlock">
-      <li class="u-iBlock u-rSpace--xl">
-        <label>
-          <input class="CDB-Checkbox u-iBlock u-rSpace--s" type="checkbox" name="Gender" value="Travel">
-          <span class="u-iBlock">Travel</span>
-        </label>
-      </li>
-      <li class="u-iblock">
-        <label>
-          <input class="CDB-Checkbox u-iBlock u-rSpace--s" type="checkbox" name="Gender" value="Travel">
-          <span class="u-iBlock">Travel</span>
-        </label>
-      </li>
-    </ul>
-  </fieldset>
-  <fieldset class="u-tSpace-xl">
-    <p class="CDB-Legend u-iBlock Text is-semibold Size-small u-rSpace--m">RADIO</p>
-    <div class="u-iBlock">
-      <input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText Text">
-    </div>
-  </fieldset>
+<fieldset>
+  <p class="CDB-Legend u-iBlock CDB-Text is-semibold CDB-Size-small u-rSpace--m">RADIO</p>
+  <ul class="CDB-Text CDB-Size-medium u-iBlock">
+    <li class="u-iBlock u-rSpace--xl">
+      <label>
+        <input class="CDB-Checkbox u-iBlock u-rSpace--s" type="checkbox" name="Gender" value="Travel">
+        <span class="u-iBlock">Travel</span>
+      </label>
+    </li>
+    <li class="u-iblock">
+      <label>
+        <input class="CDB-Checkbox u-iBlock u-rSpace--s" type="checkbox" name="Gender" value="Travel">
+        <span class="u-iBlock">Travel</span>
+      </label>
+    </li>
+  </ul>
+</fieldset>
+<fieldset class="u-tSpace-xl CDB-Text">
+  <p class="CDB-Legend u-iBlock is-semibold CDB-Size-small u-rSpace--m">RADIO</p>
+  <div class="u-iBlock">
+    <input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText">
+  </div>
+</fieldset>
 
 ```
 */
diff --git a/src/scss/cdb-components/forms/radio.scss b/src/scss/cdb-components/forms/radio.scss
index db729c4..2076860 100644
--- a/src/scss/cdb-components/forms/radio.scss
+++ b/src/scss/cdb-components/forms/radio.scss
@@ -6,9 +6,9 @@
 
 
 ```
-  <input class="CDB-Radio" type="radio" name="Gender" value="01" checked>
-  <input class="CDB-Radio" type="radio" name="Gender" value="02">
-  <input class="CDB-Radio" type="radio" name="Gender" value="03" disabled>
+<input class="CDB-Radio" type="radio" name="Gender" value="01" checked>
+<input class="CDB-Radio" type="radio" name="Gender" value="02">
+<input class="CDB-Radio" type="radio" name="Gender" value="03" disabled>
 ```
 */
 
diff --git a/src/scss/cdb-components/forms/selects.scss b/src/scss/cdb-components/forms/selects.scss
index dee2267..cdad7de 100644
--- a/src/scss/cdb-components/forms/selects.scss
+++ b/src/scss/cdb-components/forms/selects.scss
@@ -6,17 +6,17 @@
 # Forms/Selects
 
 ```
-  <div class="CDB-Select" style="height: 250px;">
-    <input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText Text">
-    <div class="CDB-Box-Modal CDB-SelectItem">
-      <ul class="Text Size-medium">
-        <li class="CDB-ListDecoration-Item"><a href="#" class="CDB-ListDecoration-ItemLink">Hide</a></li>
-        <li class="CDB-ListDecoration-Item"><a href="#" class="CDB-ListDecoration-ItemLink">Rename</a></li>
-        <li class="CDB-ListDecoration-Item"><a href="#" class="CDB-ListDecoration-ItemLink">Change source dataset…</a></li>
-        <li class="CDB-ListDecoration-Item"><a href="#" class="CDB-ListDecoration-ItemLink">Delete this layer…</a></li>
-      </ul>
-    </div>
+<div class="CDB-Select" style="height: 250px;">
+  <input type="text" name="text" placeholder="DejaVu Sans" class="CDB-InputText CDB-Text">
+  <div class="CDB-Box-Modal CDB-SelectItem">
+    <ul class="CDB-Text CDB-Size-medium">
+      <li class="CDB-ListDecoration-Item"><a href="#" class="CDB-ListDecoration-ItemLink">Hide</a></li>
+      <li class="CDB-ListDecoration-Item"><a href="#" class="CDB-ListDecoration-ItemLink">Rename</a></li>
+      <li class="CDB-ListDecoration-Item"><a href="#" class="CDB-ListDecoration-ItemLink">Change source dataset…</a></li>
+      <li class="CDB-ListDecoration-Item"><a href="#" class="CDB-ListDecoration-ItemLink">Delete this layer…</a></li>
+    </ul>
   </div>
+</div>
 ```
 */
 
diff --git a/src/scss/cdb-components/forms/sliders.scss b/src/scss/cdb-components/forms/sliders.scss
index fbae886..b3e6804 100644
--- a/src/scss/cdb-components/forms/sliders.scss
+++ b/src/scss/cdb-components/forms/sliders.scss
@@ -5,7 +5,7 @@
 # Forms/Sliders
 
 ```
-  <input type="range" min="100" max="500" step="50" value="300" class="CDB-Range"/>
+<input type="range" min="100" max="500" step="50" value="300" class="CDB-Range"/>
 ```
 */
 
diff --git a/src/scss/cdb-components/forms/toogle.scss b/src/scss/cdb-components/forms/toogle.scss
index 58933e3..9bd0078 100644
--- a/src/scss/cdb-components/forms/toogle.scss
+++ b/src/scss/cdb-components/forms/toogle.scss
@@ -6,11 +6,11 @@
 
 
 ```
-  <label class="Text Size-small is-semibold u-rSpace--xl">
-    <span class="u-iBlock">TOOLS</span>
-    <input class="CDB-Toogle u-iBlock" type="checkbox" name="Analysis">
-    <span class="u-iBlock">SQL</span>
-  </label>
+<label class="CDB-Text CDB-Size-small is-semibold u-rSpace--xl">
+  <span class="u-iBlock">TOOLS</span>
+  <input class="CDB-Toogle u-iBlock" type="checkbox" name="Analysis">
+  <span class="u-iBlock">SQL</span>
+</label>
 ```
 */
 
diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss
index cc725f9..bcf7e13 100644
--- a/src/scss/cdb-components/menu.scss
+++ b/src/scss/cdb-components/menu.scss
@@ -7,7 +7,7 @@
 
 ```
 <nav class="CDB-NavMenu">
-  <ul class="CDB-NavMenu-Inner Text is-semibold Size-medium">
+  <ul class="CDB-NavMenu-Inner CDB-Text is-semibold CDB-Size-medium">
     <li class="CDB-NavMenu-Item">
       <a class="CDB-NavMenu-Link" href="#">DATA</a>
     </li>
@@ -16,7 +16,7 @@
     </li>
     <li class="CDB-NavMenu-Item">
       <a class="CDB-NavMenu-Link" href="#">POP-UP</a>
-      <ul class="CDB-NavSubmenu Size-small">
+      <ul class="CDB-NavSubmenu CDB-Size-small">
         <li class="CDB-NavSubmenu-Item is-active">
           <a href="#" class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status">NONE</span></a>
         </li>
@@ -39,8 +39,8 @@
 
 <div style="background: #2E3C43; height: 100px; padding: 20px;">
   <nav class="CDB-NavMenu is-dark">
-    <ul class="CDB-NavMenu-Inner Text is-semibold Size-medium">
-      <li class="CDB-NavMenu-Item Text">
+    <ul class="CDB-NavMenu-Inner CDB-Text is-semibold CDB-Size-medium">
+      <li class="CDB-NavMenu-Item CDB-Text">
         <a class="CDB-NavMenu-Link" href="#">DATA</a>
       </li>
       <li class="CDB-NavMenu-Item">
@@ -48,7 +48,7 @@
       </li>
       <li class="CDB-NavMenu-item is-active">
         <a class="CDB-NavMenu-Link" href="#">POP-UP</a>
-        <ul class="CDB-NavSubmenu Size-small">
+        <ul class="CDB-NavSubmenu CDB-Size-small">
           <li class="CDB-NavSubmenu-Item is-active">
             <a href="#" class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status">NONE</span></a>
           </li>