diff --git a/modules/block/block.tpl.php b/modules/block/block.tpl.php
index f0bfa5c..411ff99 100644
--- a/modules/block/block.tpl.php
+++ b/modules/block/block.tpl.php
@@ -5,6 +5,8 @@
  * Default theme implementation to display a block.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $block->subject: Block title.
  * - $content: Block content.
  * - $block->module: Module that generated the block.
@@ -18,6 +20,8 @@
  *   - block-[module]: The module generating the block. For example, the user
  *     module is responsible for handling the default user navigation block. In
  *     that case the class would be 'block-user'.
+ * - $title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
  * - $title_prefix (array): An array containing additional output populated by
  *   modules, intended to be displayed in front of the main title tag that
  *   appears in the template.
diff --git a/modules/comment/comment-wrapper.tpl.php b/modules/comment/comment-wrapper.tpl.php
index c691459..d42c2a8 100644
--- a/modules/comment/comment-wrapper.tpl.php
+++ b/modules/comment/comment-wrapper.tpl.php
@@ -5,6 +5,8 @@
  * Default theme implementation to provide an HTML container for comments.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $content: The array of content-related elements for the node. Use
  *   render($content) to print them all, or
  *   print a subset such as render($content['comment_form']).
diff --git a/modules/comment/comment.tpl.php b/modules/comment/comment.tpl.php
index 8298473..569da07 100644
--- a/modules/comment/comment.tpl.php
+++ b/modules/comment/comment.tpl.php
@@ -5,6 +5,8 @@
  * Default theme implementation for comments.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $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
@@ -25,6 +27,8 @@
  * - $status: Comment status. Possible values are:
  *   comment-unpublished, comment-published or comment-preview.
  * - $title: Linked title.
+ * - $title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
  * - $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:
diff --git a/modules/field/theme/field.tpl.php b/modules/field/theme/field.tpl.php
index f0f9d58..87e3611 100644
--- a/modules/field/theme/field.tpl.php
+++ b/modules/field/theme/field.tpl.php
@@ -8,6 +8,8 @@
  * @see theme_field()
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $items: An array of field values. Use render() to output them.
  * - $label: The item label.
  * - $label_hidden: Whether the label display is set to 'hidden'.
@@ -23,7 +25,10 @@
  *     field type is "text" it would result in "field-type-text".
  *   - field-label-[label_display]: The current label position. For example, if
  *     the label position is "above" it would result in "field-label-above".
- *
+ * - $content_attributes: Same as attributes, except applied to the field
+ *   item that appears in the template.
+ * - $title_attributes: Same as attributes, except applied to the main field
+ *   label that appears in the template.
  * Other variables:
  * - $element['#object']: The entity to which the field is attached.
  * - $element['#view_mode']: View mode, e.g. 'full', 'teaser'...
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 4c358a1..27b8501 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -5,6 +5,8 @@
  * Default theme implementation to display a node.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $title: the (sanitized) title of the node.
  * - $content: An array of node items. Use render($content) to print them all,
  *   or print a subset such as render($content['field_example']). Use
@@ -33,6 +35,8 @@
  *   - node-sticky: Nodes ordered above other non-sticky nodes in teaser
  *     listings.
  *   - node-unpublished: Unpublished nodes visible only to administrators.
+ * - $title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
  * - $title_prefix (array): An array containing additional output populated by
  *   modules, intended to be displayed in front of the main title tag that
  *   appears in the template.
diff --git a/modules/overlay/overlay.tpl.php b/modules/overlay/overlay.tpl.php
index df86337..50d0f7e 100644
--- a/modules/overlay/overlay.tpl.php
+++ b/modules/overlay/overlay.tpl.php
@@ -5,6 +5,8 @@
  * Default theme implementation to display a page in the overlay.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $title: the (sanitized) title of the page.
  * - $page: The rendered page content.
  * - $tabs (array): Tabs linking to any sub-pages beneath the current page
diff --git a/modules/search/search-result.tpl.php b/modules/search/search-result.tpl.php
index 5f2e8bd..e443aa3 100644
--- a/modules/search/search-result.tpl.php
+++ b/modules/search/search-result.tpl.php
@@ -9,6 +9,8 @@
  * dependent to one another sharing the markup for definition lists.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $url: URL of the result.
  * - $title: Title of the result.
  * - $snippet: A small preview of the result. Does not apply to user searches.
diff --git a/modules/system/html.tpl.php b/modules/system/html.tpl.php
index c3e24c9..57db5fa 100644
--- a/modules/system/html.tpl.php
+++ b/modules/system/html.tpl.php
@@ -6,6 +6,8 @@
  * Drupal page.
  *
  * Variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the body tag of this template.
  * - $css: An array of CSS files for the current page.
  * - $language: (object) The language the site is being displayed in.
  *   $language->language contains its textual representation.
diff --git a/modules/user/user-profile-category.tpl.php b/modules/user/user-profile-category.tpl.php
index 0a86c76..75b89eb 100644
--- a/modules/user/user-profile-category.tpl.php
+++ b/modules/user/user-profile-category.tpl.php
@@ -16,6 +16,8 @@
  *      where all items and categories are collected and printed out.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the dl tag of this template.
  * - $title: Category title for the group of items.
  * - $profile_items: All the items for the group rendered through
  *   user-profile-item.tpl.php.
diff --git a/modules/user/user-profile-item.tpl.php b/modules/user/user-profile-item.tpl.php
index 042d43a..ca33c7c 100644
--- a/modules/user/user-profile-item.tpl.php
+++ b/modules/user/user-profile-item.tpl.php
@@ -15,6 +15,8 @@
  *      where all items and categories are collected and printed out.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the dt and dd tags of this template.
  * - $title: Field title for the profile item.
  * - $value: User defined value for the profile item or data from a module.
  * - $attributes: HTML attributes. Usually renders classes.
diff --git a/modules/user/user-profile.tpl.php b/modules/user/user-profile.tpl.php
index 0a64fed..c2711a3 100644
--- a/modules/user/user-profile.tpl.php
+++ b/modules/user/user-profile.tpl.php
@@ -16,6 +16,8 @@
  * is available for showing the account picture.
  *
  * Available variables:
+ *   - $attributes: array of HTML attributes populated by modules, intended to
+ *     be added to the main container tag of this template.
  *   - $user_profile: An array of profile items. Use render() to print them.
  *   - Field variables: for each field instance attached to the user a
  *     corresponding variable is defined; e.g., $account->field_example has a
diff --git a/themes/bartik/templates/comment-wrapper.tpl.php b/themes/bartik/templates/comment-wrapper.tpl.php
index c0ca74b..6065972 100644
--- a/themes/bartik/templates/comment-wrapper.tpl.php
+++ b/themes/bartik/templates/comment-wrapper.tpl.php
@@ -5,6 +5,8 @@
  * Bartik's theme implementation to provide an HTML container for comments.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $content: The array of content-related elements for the node. Use
  *   render($content) to print them all, or
  *   print a subset such as render($content['comment_form']).
diff --git a/themes/bartik/templates/comment.tpl.php b/themes/bartik/templates/comment.tpl.php
index d64487d..69cdaf4 100644
--- a/themes/bartik/templates/comment.tpl.php
+++ b/themes/bartik/templates/comment.tpl.php
@@ -5,6 +5,8 @@
  * Bartik's theme implementation for comments.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $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
@@ -25,6 +27,8 @@
  * - $status: Comment status. Possible values are:
  *   comment-unpublished, comment-published or comment-preview.
  * - $title: Linked title.
+ * - $title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
  * - $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:
diff --git a/themes/bartik/templates/node.tpl.php b/themes/bartik/templates/node.tpl.php
index df5b454..0879d3e 100644
--- a/themes/bartik/templates/node.tpl.php
+++ b/themes/bartik/templates/node.tpl.php
@@ -5,6 +5,8 @@
  * Bartik's theme implementation to display a node.
  *
  * Available variables:
+ * - $attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
  * - $title: the (sanitized) title of the node.
  * - $content: An array of node items. Use render($content) to print them all,
  *   or print a subset such as render($content['field_example']). Use
@@ -33,6 +35,8 @@
  *   - node-sticky: Nodes ordered above other non-sticky nodes in teaser
  *     listings.
  *   - node-unpublished: Unpublished nodes visible only to administrators.
+ * - $title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
  * - $title_prefix (array): An array containing additional output populated by
  *   modules, intended to be displayed in front of the main title tag that
  *   appears in the template.
diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php
index 952cc01..a269477 100644
--- a/themes/garland/comment.tpl.php
+++ b/themes/garland/comment.tpl.php
@@ -1,5 +1,3 @@
-<?php
-?>
 <div class="<?php print $classes . ' ' . $zebra; ?>"<?php print $attributes; ?>>
 
   <div class="clearfix">
diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index 27808f4..249fe82 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -1,5 +1,3 @@
-<?php
-?>
 <div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
 
   <?php print $user_picture; ?>