diff --git a/components-list.json b/components-list.json
index 32fcb679..8852111a 100644
--- a/components-list.json
+++ b/components-list.json
@@ -26,9 +26,9 @@
             ]
         },
         {
-            "name":"alert",
-            "longname":"Alerts",
-            "path":"components/alert",
+            "name":"message",
+            "longname":"Messages",
+            "path":"components/message",
             "skins":[
                 {
                     "classname":"warn",
@@ -148,9 +148,9 @@
             "skins":[]
         },
         {
-            "name":"toggler",
-            "longname":"Toggler",
-            "path":"components/toggler",
+            "name":"toggle",
+            "longname":"Toggle",
+            "path":"components/toggle",
             "skins":[]
         },
         {
diff --git a/components/box/box.handlebars b/components/box/box.handlebars
index a5fb163e..5903d1ed 100644
--- a/components/box/box.handlebars
+++ b/components/box/box.handlebars
@@ -1,6 +1,6 @@
 <div class="box {{classname}}">
     <div class="boxHead">
-        <h3 class="boxHead">{{title}}</h3>
+        <h3 class="boxHeading">{{title}}</h3>
     </div>
     <div class="boxBody">
         <p>{{body}}</p>
diff --git a/components/box/skin/_boxSimple.scss b/components/box/skin/_boxSimple.scss
index fb1b1e4f..556a8f33 100644
--- a/components/box/skin/_boxSimple.scss
+++ b/components/box/skin/_boxSimple.scss
@@ -1,4 +1,6 @@
-._boxSimple {
-    border: 1px solid #ccc;
-    background: 1px solid #555;
+@mixin ooBox() {
+    .boxSimple {
+        border: 1px solid #ccc;
+        background: 1px solid #555;
+    }
 }
\ No newline at end of file
diff --git a/components/alert/_alert.scss b/components/message/_message.scss
similarity index 100%
rename from components/alert/_alert.scss
rename to components/message/_message.scss
diff --git a/components/alert/alert.handlebars b/components/message/message.handlebars
similarity index 100%
rename from components/alert/alert.handlebars
rename to components/message/message.handlebars
diff --git a/components/alert/alert_doc.handlebars b/components/message/message_doc.handlebars
similarity index 100%
rename from components/alert/alert_doc.handlebars
rename to components/message/message_doc.handlebars
diff --git a/components/toggler/_toggler.scss b/components/toggle/_toggle.scss
similarity index 100%
rename from components/toggler/_toggler.scss
rename to components/toggle/_toggle.scss
diff --git a/components/toggler/toggler.handlebars b/components/toggle/toggle.handlebars
similarity index 100%
rename from components/toggler/toggler.handlebars
rename to components/toggle/toggle.handlebars
diff --git a/components/toggler/toggler_doc.handlebars b/components/toggle/toggle_doc.handlebars
similarity index 100%
rename from components/toggler/toggler_doc.handlebars
rename to components/toggle/toggle_doc.handlebars