diff --git a/templates/blocks/block--sidebar_first.tpl.php b/templates/blocks/block--sidebar_first.tpl.php
index bea57cb..f1bead7 100644
--- a/templates/blocks/block--sidebar_first.tpl.php
+++ b/templates/blocks/block--sidebar_first.tpl.php
@@ -47,7 +47,7 @@
  * @see omega_process_block()
  */
 ?>
-<div id="<?php print $block_html_id; ?>"<?php print $attributes; ?>>
+<div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
 
   <?php print render($title_prefix); ?>
   <?php if ($title): ?>
diff --git a/templates/blocks/block--views--headlines-front-page-block.tpl.php b/templates/blocks/block--views--headlines-front-page-block.tpl.php
index 3316f6f..30897c6 100644
--- a/templates/blocks/block--views--headlines-front-page-block.tpl.php
+++ b/templates/blocks/block--views--headlines-front-page-block.tpl.php
@@ -50,7 +50,7 @@
 
 <section>
   <div id="gcwu-headlines">
-  <div id="<?php print $block_html_id; ?>"<?php print $attributes; ?>>
+  <div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
 
     <?php print render($title_prefix); ?>
 
diff --git a/templates/comment/comment-wrapper.tpl.php b/templates/comment/comment-wrapper.tpl.php
index d1d5f05..aea85de 100644
--- a/templates/comment/comment-wrapper.tpl.php
+++ b/templates/comment/comment-wrapper.tpl.php
@@ -34,7 +34,7 @@
  * @see theme_comment_wrapper()
  */
 ?>
-<section id="comments"<?php print $attributes; ?>>
+<section id="comments" class="<?php print $classes; ?>"<?php print $attributes; ?>>
 
   <?php if ($content['comments'] && $node->type != 'forum'): ?>
     <?php print render($title_prefix); ?>
diff --git a/templates/comment/comment.tpl.php b/templates/comment/comment.tpl.php
index 9456bf1..cb887dd 100644
--- a/templates/comment/comment.tpl.php
+++ b/templates/comment/comment.tpl.php
@@ -1,15 +1,14 @@
 <?php
 /**
  * @file
- * Default theme implementation for comments.
+ * Omega implementation for the display of a single comment.
  *
  * Available variables:
  * - $author: Comment author. Can be link or plain text.
- * - $content: An array of comment items. Use render($content) to print them
- *   all, or print a subset such as render($content['field_example']). Use
+ * - $content: An array of comment items. Use render($content) to print them all
+ *   or print a subset such as render($content['field_example']). Use
  *   hide($content['field_example']) to temporarily suppress the printing of a
  *   given element.
- * - $created: Formatted date and time for when the comment was created.
  *   Preprocess functions can reformat it by calling format_date() with the
  *   desired parameters on the $comment->created variable.
  * - $changed: Formatted date and time for when the comment was last changed.
@@ -17,24 +16,20 @@
  *   desired parameters on the $comment->changed variable.
  * - $new: New comment marker.
  * - $permalink: Comment permalink.
- * - $submitted: Submission information created from $author and $created during
- *   template_preprocess_comment().
- * - $user_picture: The comment author's picture from user-picture.tpl.php.
+ * - $picture: Authors picture.
  * - $signature: Authors signature.
  * - $status: Comment status. Possible values are:
  *   comment-unpublished, comment-published or comment-preview.
  * - $title: Linked title.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
- *   preprocess functions. The default values can be one or more of the
- *   following:
+ *   preprocess functions. The default values one or more of the following:
  *   - comment: The current template type, i.e., "theming hook".
  *   - comment-by-anonymous: Comment by an unregistered user.
  *   - comment-by-node-author: Comment by the author of the parent node.
  *   - comment-preview: When previewing a new or edited comment.
  *   The following applies only to viewers who are registered users:
- *   - comment-unpublished: An unpublished comment visible only to
- *     administrators.
+ *   - comment-unpublished: An unpublished comment visible to administrators.
  *   - comment-by-viewer: Comment by the user currently viewing the page.
  *   - comment-new: New comment since last the visit.
  * - $title_prefix (array): An array containing additional output populated by
@@ -56,10 +51,17 @@
  * @see template_preprocess_comment()
  * @see template_process()
  * @see theme_comment()
+ * @see omega_preprocess_comment()
+ * @see omega_process_comment()
+ *
+ * Hiding Content and Printing it Separately:
+ * Use the hide() function to hide fields and other content, you can render it
+ * later using the render() function. Install the Devel module and use
+ * <?php print dsm($content); ?> to find variable names to hide() or render().
  */
 hide($content['links']);
 ?>
-<article<?php print $attributes; ?>>
+<article class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
   <?php print render($title_prefix); ?>
 
   <?php if ($title || $new): ?>
diff --git a/templates/node/node.tpl.php b/templates/node/node.tpl.php
index 86bd56e..03c98ef 100644
--- a/templates/node/node.tpl.php
+++ b/templates/node/node.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Default theme implementation to display a node.
+ * Omega implementation to display a node.
  *
  * Available variables:
  * - $title: the (sanitized) title of the node.
@@ -15,15 +15,13 @@
  * - $name: Themed username of node author output from theme_username().
  * - $node_url: Direct url of the current node.
  * - $display_submitted: Whether submission information should be displayed.
- * - $submitted: Submission information created from $name and $date during
- *   template_preprocess_node().
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
  *   preprocess functions. The default values can be one or more of the
  *   following:
  *   - node: The current template type, i.e., "theming hook".
  *   - node-[type]: The current node type. For example, if the node is a
- *     "Article" it would result in "node-article". Note that the machine
+ *     "Blog entry" it would result in "node-blog". Note that the machine
  *     name will often be in a short form of the human readable label.
  *   - node-teaser: Nodes in teaser form.
  *   - node-preview: Nodes in preview mode.
@@ -41,7 +39,7 @@
  *
  * Other variables:
  * - $node: Full node object. Contains data that may not be safe.
- * - $type: Node type, i.e. page, article, etc.
+ * - $type: Node type, i.e. story, page, blog, etc.
  * - $comment_count: Number of comments attached to the node.
  * - $uid: User ID of the node author.
  * - $created: Time the node was published formatted in Unix timestamp.
@@ -75,11 +73,21 @@
  * @see template_preprocess()
  * @see template_preprocess_node()
  * @see template_process()
+ * @see omega_preprocess_node()
+ * @see omega_process_node()
+ */
+
+/**
+ * Hiding Content and Printing it Separately
+ *
+ * Use the hide() function to hide fields and other content, you can render it
+ * later using the render() function. Install the Devel module and use
+ * <?php print dsm($content); ?> to find variable names to hide() or render().
  */
 hide($content['comments']);
 hide($content['links']);
 ?>
-<article id="node-<?php print $node->nid; ?>"<?php print $attributes; ?>>
+<article id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
   <?php print render($title_prefix); ?>
   <?php if ($title && !$page): ?>
     <header<?php print $header_attributes; ?>>
diff --git a/templates/taxonomy/taxonomy-term.tpl.php b/templates/taxonomy/taxonomy-term.tpl.php
index b75da8d..107bcd6 100644
--- a/templates/taxonomy/taxonomy-term.tpl.php
+++ b/templates/taxonomy/taxonomy-term.tpl.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Default theme implementation to display a term.
+ * Omega implementation to display a term.
  *
  * Available variables:
  * - $name: the (sanitized) name of the term.
@@ -11,13 +11,13 @@
  *   such as render($content['field_example']). Use
  *   hide($content['field_example']) to temporarily suppress the printing of a
  *   given element.
- * - $term_url: Direct URL of the current term.
+ * - $term_url: Direct url of the current term.
  * - $term_name: Name of the current term.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
- *   preprocess functions. The default values can be one or more of the following:
+ *   preprocess functions. The default values one or more of the following:
  *   - taxonomy-term: The current template type, i.e., "theming hook".
- *   - vocabulary-[vocabulary-name]: The vocabulary to which the term belongs to.
+ *   - vocabulary-[vocabulary-name]: The vocabulary which the term belongs to.
  *     For example, if the term is a "Tag" it would result in "vocabulary-tag".
  *
  * Other variables:
@@ -36,12 +36,10 @@
  * @see template_preprocess()
  * @see template_preprocess_taxonomy_term()
  * @see template_process()
- *
- * @ingroup themeable
  */
 ?>
 <?php if ($content = render($content)): ?>
-<article id="taxonomy-term-<?php print $term->tid; ?>"<?php print $attributes; ?>>
+<article id="taxonomy-term-<?php print $term->tid; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
   <?php print render($title_prefix); ?>
 
   <?php if (!$page): ?>
diff --git a/templates/user/user-profile.tpl.php b/templates/user/user-profile.tpl.php
index 96065b9..5f143cd 100644
--- a/templates/user/user-profile.tpl.php
+++ b/templates/user/user-profile.tpl.php
@@ -31,6 +31,6 @@
  * @see template_preprocess_user_profile()
  */
 ?>
-<article<?php print $attributes; ?>>
+<article class="profile"<?php print $attributes; ?>>
   <?php print render($user_profile); ?>
 </article>