diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less
index 5d3d75a0f..9abf05066 100755
--- a/src/definitions/elements/button.less
+++ b/src/definitions/elements/button.less
@@ -13,6 +13,8 @@
             Theme
 *******************************/
 
+.button() {
+
 @type    : 'element';
 @element : 'button';
 
@@ -2405,3 +2407,7 @@
 }
 
 .loadUIOverrides();
+
+}
+
+.button();
\ No newline at end of file
diff --git a/src/definitions/elements/divider.less b/src/definitions/elements/divider.less
index 9eae12921..7cb003665 100755
--- a/src/definitions/elements/divider.less
+++ b/src/definitions/elements/divider.less
@@ -13,6 +13,8 @@
             Theme
 *******************************/
 
+.divider() {
+
 @type    : 'element';
 @element : 'divider';
 
@@ -252,3 +254,7 @@
 
 
 .loadUIOverrides();
+
+}
+
+.divider();
diff --git a/src/definitions/elements/flag.less b/src/definitions/elements/flag.less
index 7bcd08823..6dc4e3399 100755
--- a/src/definitions/elements/flag.less
+++ b/src/definitions/elements/flag.less
@@ -9,15 +9,23 @@
  *
  */
 
+
 /*******************************
             Theme
 *******************************/
 
+.flag() {
+
 @type    : 'element';
 @element : 'flag';
 
 @import '../../theme.config';
 
+
+/*******************************
+             Flag
+*******************************/
+
 i.flag:not(.icon) {
   display: inline-block;
 
@@ -35,6 +43,7 @@ i.flag:not(.icon) {
   backface-visibility: hidden;
 }
 
+/* Sprite */
 i.flag:not(.icon):before {
   display: inline-block;
   content: '';
@@ -44,3 +53,7 @@ i.flag:not(.icon):before {
 }
 
 .loadUIOverrides();
+
+}
+
+.flag();
diff --git a/src/definitions/elements/header.less b/src/definitions/elements/header.less
index 267675fd0..60f8ce08d 100755
--- a/src/definitions/elements/header.less
+++ b/src/definitions/elements/header.less
@@ -9,15 +9,19 @@
  *
  */
 
+
 /*******************************
             Theme
 *******************************/
 
+.header() {
+
 @type    : 'element';
 @element : 'header';
 
 @import '../../theme.config';
 
+
 /*******************************
             Header
 *******************************/
@@ -615,4 +619,8 @@ a.ui.inverted.yellow.header:hover {
   font-size: @medium;
 }
 
-.loadUIOverrides();
\ No newline at end of file
+.loadUIOverrides();
+
+}
+
+.header();
\ No newline at end of file
diff --git a/src/definitions/elements/icon.less b/src/definitions/elements/icon.less
index 67258acf6..28d38be24 100755
--- a/src/definitions/elements/icon.less
+++ b/src/definitions/elements/icon.less
@@ -9,15 +9,19 @@
  *
  */
 
+
 /*******************************
             Theme
 *******************************/
 
+.icon() {
+
 @type    : 'element';
 @element : 'icon';
 
 @import '../../theme.config';
 
+
 /*******************************
              Icon
 *******************************/
@@ -343,3 +347,7 @@ i.massive.icon {
 }
 
 .loadUIOverrides();
+
+}
+
+.icon();
diff --git a/src/definitions/elements/image.less b/src/definitions/elements/image.less
index 30fd22adc..d7112edeb 100755
--- a/src/definitions/elements/image.less
+++ b/src/definitions/elements/image.less
@@ -9,10 +9,13 @@
  *
  */
 
+
 /*******************************
             Theme
 *******************************/
 
+.image() {
+
 @type    : 'element';
 @element : 'image';
 
@@ -284,4 +287,8 @@ img.ui.bordered.image {
   margin: 0em @imageHorizontalMargin @imageVerticalMargin;
 }
 
-.loadUIOverrides();
\ No newline at end of file
+.loadUIOverrides();
+
+}
+
+.image();
\ No newline at end of file
diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less
index 87e6da48b..4dd24a782 100755
--- a/src/definitions/elements/input.less
+++ b/src/definitions/elements/input.less
@@ -13,6 +13,8 @@
             Theme
 *******************************/
 
+.input() {
+
 @type    : 'element';
 @element : 'input';
 
@@ -459,4 +461,8 @@
   font-size: @massive;
 }
 
-.loadUIOverrides();
\ No newline at end of file
+.loadUIOverrides();
+
+}
+
+.input();
\ No newline at end of file
diff --git a/src/definitions/elements/label.less b/src/definitions/elements/label.less
index 75d80b1dd..46d28983a 100755
--- a/src/definitions/elements/label.less
+++ b/src/definitions/elements/label.less
@@ -9,10 +9,13 @@
  *
  */
 
+
 /*******************************
             Theme
 *******************************/
 
+.label() {
+
 @type    : 'element';
 @element : 'label';
 
@@ -939,3 +942,7 @@ a.ui.yellow.label:hover:before {
 }
 
 .loadUIOverrides();
+
+}
+
+.label();
diff --git a/src/definitions/elements/list.less b/src/definitions/elements/list.less
index fab7ea870..62542f8cb 100755
--- a/src/definitions/elements/list.less
+++ b/src/definitions/elements/list.less
@@ -13,6 +13,8 @@
             Theme
 *******************************/
 
+.list() {
+
 @type    : 'element';
 @element : 'list';
 
@@ -880,3 +882,7 @@ ol.ui.horizontal.list li:before,
 }
 
 .loadUIOverrides();
+
+}
+
+.list();
diff --git a/src/definitions/elements/loader.less b/src/definitions/elements/loader.less
index 2f1a2e20f..bc844ec05 100755
--- a/src/definitions/elements/loader.less
+++ b/src/definitions/elements/loader.less
@@ -8,17 +8,17 @@
  * http://opensource.org/licenses/MIT
  *
  */
-
 /*******************************
             Theme
 *******************************/
 
+.loader() {
+
 @type    : 'element';
 @element : 'loader';
 
 @import '../../theme.config';
 
-
 /*******************************
             Loader
 *******************************/
@@ -260,3 +260,7 @@
 }
 
 .loadUIOverrides();
+
+}
+
+.loader();
diff --git a/src/definitions/elements/rail.less b/src/definitions/elements/rail.less
index 55efab433..8423a1453 100755
--- a/src/definitions/elements/rail.less
+++ b/src/definitions/elements/rail.less
@@ -13,6 +13,8 @@
             Theme
 *******************************/
 
+.rail() {
+
 @type    : 'element';
 @element : 'rail';
 
@@ -123,4 +125,8 @@
 
 
 
-.loadUIOverrides();
\ No newline at end of file
+.loadUIOverrides();
+
+}
+
+.rail();
\ No newline at end of file
diff --git a/src/definitions/elements/reveal.less b/src/definitions/elements/reveal.less
index 357c6640a..4fa3abedd 100755
--- a/src/definitions/elements/reveal.less
+++ b/src/definitions/elements/reveal.less
@@ -13,12 +13,13 @@
             Theme
 *******************************/
 
+.reveal() {
+
 @type    : 'element';
 @element : 'reveal';
 
 @import '../../theme.config';
 
-
 /*******************************
             Reveal
 *******************************/
@@ -257,3 +258,7 @@
 }
 
 .loadUIOverrides();
+
+}
+
+.reveal();
diff --git a/src/definitions/elements/segment.less b/src/definitions/elements/segment.less
index eb805d88c..c41e55730 100755
--- a/src/definitions/elements/segment.less
+++ b/src/definitions/elements/segment.less
@@ -13,12 +13,13 @@
             Theme
 *******************************/
 
+.segment() {
+
 @type    : 'element';
 @element : 'segment';
 
 @import '../../theme.config';
 
-
 /*******************************
             Segment
 *******************************/
@@ -579,3 +580,7 @@
 }
 
 .loadUIOverrides();
+
+}
+
+.segment();
diff --git a/src/definitions/elements/step.less b/src/definitions/elements/step.less
index 8606fe998..8e1257a4f 100755
--- a/src/definitions/elements/step.less
+++ b/src/definitions/elements/step.less
@@ -1,5 +1,5 @@
 /*
- * # Semantic - Steps
+ * # Semantic - Step
  * http://github.com/semantic-org/semantic-ui/
  *
  *
@@ -9,10 +9,17 @@
  *
  */
 
+
 /*******************************
-            Theme
+             Step
 *******************************/
 
+.step() {
+
+/*--------------
+   Load Theme
+---------------*/
+
 @type    : 'element';
 @element : 'step';
 
@@ -422,4 +429,8 @@
   font-size: @large;
 }
 
-.loadUIOverrides();
\ No newline at end of file
+.loadUIOverrides();
+
+}
+
+.step();
\ No newline at end of file