diff --git a/src/definitions/collections/breadcrumb.less b/src/definitions/collections/breadcrumb.less
index 10f9a33ea..9cdc65abf 100755
--- a/src/definitions/collections/breadcrumb.less
+++ b/src/definitions/collections/breadcrumb.less
@@ -15,7 +15,7 @@
 
 .breadcrumb() {
 
-@type    : 'element';
+@type    : 'collection';
 @element : 'breadcrumb';
 
 @import '../../theme.config';
diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less
index b2baa258b..e296c35bc 100755
--- a/src/definitions/collections/form.less
+++ b/src/definitions/collections/form.less
@@ -15,7 +15,7 @@
 
 .form() {
 
-@type    : 'element';
+@type    : 'collection';
 @element : 'form';
 
 @import '../../theme.config';
diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less
index dbfc4c9da..c44257bf4 100755
--- a/src/definitions/collections/grid.less
+++ b/src/definitions/collections/grid.less
@@ -15,7 +15,7 @@
 
 .grid() {
 
-@type    : 'element';
+@type    : 'collection';
 @element : 'grid';
 
 @import '../../theme.config';
diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less
index cee80f589..3fdb7e14d 100755
--- a/src/definitions/collections/menu.less
+++ b/src/definitions/collections/menu.less
@@ -16,7 +16,7 @@
 
 .menu() {
 
-@type    : 'element';
+@type    : 'collection';
 @element : 'menu';
 
 @import '../../theme.config';
diff --git a/src/definitions/collections/message.less b/src/definitions/collections/message.less
index 83cb8a3ad..da66d9b67 100755
--- a/src/definitions/collections/message.less
+++ b/src/definitions/collections/message.less
@@ -15,7 +15,7 @@
 
 .message() {
 
-@type    : 'element';
+@type    : 'collection';
 @element : 'message';
 
 @import '../../theme.config';
diff --git a/src/definitions/collections/table.less b/src/definitions/collections/table.less
index 1619968ab..e446c1420 100755
--- a/src/definitions/collections/table.less
+++ b/src/definitions/collections/table.less
@@ -16,7 +16,7 @@
 
 .table() {
 
-@type    : 'element';
+@type    : 'collection';
 @element : 'table';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/accordion.less b/src/definitions/modules/accordion.less
index 0a3e9c485..10318eca6 100755
--- a/src/definitions/modules/accordion.less
+++ b/src/definitions/modules/accordion.less
@@ -14,7 +14,7 @@
 
 .accordion() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'accordion';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/checkbox.less b/src/definitions/modules/checkbox.less
index fa1600957..17201ff76 100755
--- a/src/definitions/modules/checkbox.less
+++ b/src/definitions/modules/checkbox.less
@@ -15,7 +15,7 @@
 
 .checkbox() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'checkbox';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/dimmer.less b/src/definitions/modules/dimmer.less
index 548798906..dcda290e1 100755
--- a/src/definitions/modules/dimmer.less
+++ b/src/definitions/modules/dimmer.less
@@ -15,7 +15,7 @@
 
 .dimmer() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'dimmer';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less
index 855fc6bf7..85f382623 100755
--- a/src/definitions/modules/dropdown.less
+++ b/src/definitions/modules/dropdown.less
@@ -16,7 +16,7 @@
 
 .dropdown() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'dropdown';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/modal.less b/src/definitions/modules/modal.less
index 58e4eba2f..9de7a4d11 100755
--- a/src/definitions/modules/modal.less
+++ b/src/definitions/modules/modal.less
@@ -16,7 +16,7 @@
 
 .modal() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'modal';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/nag.less b/src/definitions/modules/nag.less
index 41e9d146c..38594df77 100755
--- a/src/definitions/modules/nag.less
+++ b/src/definitions/modules/nag.less
@@ -16,7 +16,7 @@
 
 .nag() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'nag';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/popup.less b/src/definitions/modules/popup.less
index 1b6a91983..9a210645e 100755
--- a/src/definitions/modules/popup.less
+++ b/src/definitions/modules/popup.less
@@ -16,7 +16,7 @@
 
 .popup() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'popup';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/progress.less b/src/definitions/modules/progress.less
index 334e620b6..71928b760 100755
--- a/src/definitions/modules/progress.less
+++ b/src/definitions/modules/progress.less
@@ -16,7 +16,7 @@
 
 .progress() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'progress';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/rating.less b/src/definitions/modules/rating.less
index 03fc0421d..1ddc05fe5 100755
--- a/src/definitions/modules/rating.less
+++ b/src/definitions/modules/rating.less
@@ -16,7 +16,7 @@
 
 .rating() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'rating';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/search.less b/src/definitions/modules/search.less
index fdeb1b75a..34f592017 100755
--- a/src/definitions/modules/search.less
+++ b/src/definitions/modules/search.less
@@ -16,7 +16,7 @@
 
 .search() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'search';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/shape.less b/src/definitions/modules/shape.less
index 6d6799522..63bb59afd 100755
--- a/src/definitions/modules/shape.less
+++ b/src/definitions/modules/shape.less
@@ -17,7 +17,7 @@
 
 .shape() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'shape';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/sidebar.less b/src/definitions/modules/sidebar.less
index 5590c7116..5b81dbea5 100755
--- a/src/definitions/modules/sidebar.less
+++ b/src/definitions/modules/sidebar.less
@@ -17,7 +17,7 @@
 
 .sidebar() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'sidebar';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/sticky.less b/src/definitions/modules/sticky.less
index 8d299acb4..0d42b3e88 100755
--- a/src/definitions/modules/sticky.less
+++ b/src/definitions/modules/sticky.less
@@ -16,7 +16,7 @@
 
 .sticky() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'sticky';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/tab.less b/src/definitions/modules/tab.less
index ed3aac94f..48efa104e 100755
--- a/src/definitions/modules/tab.less
+++ b/src/definitions/modules/tab.less
@@ -16,7 +16,7 @@
 
 .tab() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'tab';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/transition.less b/src/definitions/modules/transition.less
index 893fa2deb..b3471a9f5 100755
--- a/src/definitions/modules/transition.less
+++ b/src/definitions/modules/transition.less
@@ -16,7 +16,7 @@
 
 .transition() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'transition';
 
 @import '../../theme.config';
diff --git a/src/definitions/modules/video.less b/src/definitions/modules/video.less
index 5b0f9af30..e764c54da 100755
--- a/src/definitions/modules/video.less
+++ b/src/definitions/modules/video.less
@@ -16,7 +16,7 @@
 
 .video() {
 
-@type    : 'element';
+@type    : 'module';
 @element : 'video';
 
 @import '../../theme.config';
@@ -128,4 +128,4 @@
 
 }
 
-.button();
+.video();
diff --git a/src/definitions/views/ad.less b/src/definitions/views/ad.less
index 7b55741ec..165a01b1f 100644
--- a/src/definitions/views/ad.less
+++ b/src/definitions/views/ad.less
@@ -15,7 +15,7 @@
 
 .ad() {
 
-@type    : 'element';
+@type    : 'view';
 @element : 'ad';
 
 @import '../../theme.config';
diff --git a/src/definitions/views/card.less b/src/definitions/views/card.less
index 6d2c2e527..1d6c6d614 100755
--- a/src/definitions/views/card.less
+++ b/src/definitions/views/card.less
@@ -15,7 +15,7 @@
 
 .card() {
 
-@type    : 'element';
+@type    : 'view';
 @element : 'card';
 
 @import '../../theme.config';
diff --git a/src/definitions/views/comment.less b/src/definitions/views/comment.less
index cd6e78b6a..74f9455ee 100755
--- a/src/definitions/views/comment.less
+++ b/src/definitions/views/comment.less
@@ -16,7 +16,7 @@
 
 .comment() {
 
-@type    : 'element';
+@type    : 'view';
 @element : 'comment';
 
 @import '../../theme.config';
diff --git a/src/definitions/views/feed.less b/src/definitions/views/feed.less
index c70637b12..23154ad1c 100755
--- a/src/definitions/views/feed.less
+++ b/src/definitions/views/feed.less
@@ -15,7 +15,7 @@
 
 .feed() {
 
-@type    : 'element';
+@type    : 'view';
 @element : 'feed';
 
 @import '../../theme.config';
diff --git a/src/definitions/views/item.less b/src/definitions/views/item.less
index e9c8f84d4..0f255da66 100755
--- a/src/definitions/views/item.less
+++ b/src/definitions/views/item.less
@@ -15,7 +15,7 @@
 
 .item() {
 
-@type    : 'element';
+@type    : 'view';
 @element : 'item';
 
 @import '../../theme.config';
diff --git a/src/definitions/views/statistic.less b/src/definitions/views/statistic.less
index 31d14e496..0501a1af1 100755
--- a/src/definitions/views/statistic.less
+++ b/src/definitions/views/statistic.less
@@ -15,7 +15,7 @@
 
 .statistic() {
 
-@type    : 'element';
+@type    : 'view';
 @element : 'statistic';
 
 @import '../../theme.config';
@@ -413,8 +413,6 @@
 }
 
 
-
-
 .loadUIOverrides();
 
 }