diff --git a/core/modules/comment/comment-wrapper.tpl.php b/core/modules/comment/comment-wrapper.tpl.php
index 5e58a67..bfaf5e7 100644
--- a/core/modules/comment/comment-wrapper.tpl.php
+++ b/core/modules/comment/comment-wrapper.tpl.php
@@ -33,6 +33,8 @@
  *
  * @see template_preprocess_comment_wrapper()
  * @see theme_comment_wrapper()
+ *
+ * @ingroup themable
  */
 ?>
 <section id="comments" class="<?php print $classes; ?>"<?php print $attributes; ?>>
diff --git a/core/modules/comment/comment.tpl.php b/core/modules/comment/comment.tpl.php
index 6a17387..1adcc57 100644
--- a/core/modules/comment/comment.tpl.php
+++ b/core/modules/comment/comment.tpl.php
@@ -56,6 +56,8 @@
  * @see template_preprocess_comment()
  * @see template_process()
  * @see theme_comment()
+ *
+ * @ingroup themable
  */
 ?>
 <article class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
diff --git a/core/modules/field/theme/field.tpl.php b/core/modules/field/theme/field.tpl.php
index a6d7a96..506b634 100644
--- a/core/modules/field/theme/field.tpl.php
+++ b/core/modules/field/theme/field.tpl.php
@@ -40,6 +40,8 @@
  *
  * @see template_preprocess_field()
  * @see theme_field()
+ *
+ * @ingroup themable
  */
 ?>
 <!--
diff --git a/core/modules/forum/forum-icon.tpl.php b/core/modules/forum/forum-icon.tpl.php
index 9cf2cd8..e096611 100644
--- a/core/modules/forum/forum-icon.tpl.php
+++ b/core/modules/forum/forum-icon.tpl.php
@@ -12,6 +12,8 @@
  *
  * @see template_preprocess_forum_icon()
  * @see theme_forum_icon()
+ *
+ * @ingroup themable
  */
 ?>
 <div class="topic-status-<?php print $icon_class ?>" title="<?php print $icon_title ?>">
diff --git a/core/modules/forum/forum-list.tpl.php b/core/modules/forum/forum-list.tpl.php
index 257cea9..1042f70 100644
--- a/core/modules/forum/forum-list.tpl.php
+++ b/core/modules/forum/forum-list.tpl.php
@@ -30,6 +30,8 @@
  *
  * @see template_preprocess_forum_list()
  * @see theme_forum_list()
+ *
+ * @ingroup themable
  */
 ?>
 <table id="forum-<?php print $forum_id; ?>">
diff --git a/core/modules/forum/forum-submitted.tpl.php b/core/modules/forum/forum-submitted.tpl.php
index d310448..38f1a1b 100644
--- a/core/modules/forum/forum-submitted.tpl.php
+++ b/core/modules/forum/forum-submitted.tpl.php
@@ -14,6 +14,8 @@
  *
  * @see template_preprocess_forum_submitted()
  * @see theme_forum_submitted()
+ *
+ * @ingroup themable
  */
 ?>
 <?php if ($time): ?>
diff --git a/core/modules/forum/forum-topic-list.tpl.php b/core/modules/forum/forum-topic-list.tpl.php
index 3390703..36c5d65 100644
--- a/core/modules/forum/forum-topic-list.tpl.php
+++ b/core/modules/forum/forum-topic-list.tpl.php
@@ -31,6 +31,8 @@
  *
  * @see template_preprocess_forum_topic_list()
  * @see theme_forum_topic_list()
+ *
+ * @ingroup themable
  */
 ?>
 <table id="forum-topic-<?php print $topic_id; ?>">
diff --git a/core/modules/forum/forums.tpl.php b/core/modules/forum/forums.tpl.php
index 55a760f..1a234f4 100644
--- a/core/modules/forum/forums.tpl.php
+++ b/core/modules/forum/forums.tpl.php
@@ -12,6 +12,8 @@
  *
  * @see template_preprocess_forums()
  * @see theme_forums()
+ *
+ * @ingroup themable
  */
 ?>
 <?php if ($forums_defined): ?>
diff --git a/core/modules/node/node.tpl.php b/core/modules/node/node.tpl.php
index a251ecc..1f489e7 100644
--- a/core/modules/node/node.tpl.php
+++ b/core/modules/node/node.tpl.php
@@ -76,6 +76,8 @@
  * @see template_preprocess()
  * @see template_preprocess_node()
  * @see template_process()
+ *
+ * @ingroup themable
  */
 ?>
 <article id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
diff --git a/core/modules/overlay/overlay.tpl.php b/core/modules/overlay/overlay.tpl.php
index 54b10af..fc43899 100644
--- a/core/modules/overlay/overlay.tpl.php
+++ b/core/modules/overlay/overlay.tpl.php
@@ -17,6 +17,8 @@
  * @see template_preprocess()
  * @see template_preprocess_overlay()
  * @see template_process()
+ *
+ * @ingroup themable
  */
 ?>
 
diff --git a/core/modules/poll/poll-results.tpl.php b/core/modules/poll/poll-results.tpl.php
index 4eb0fe2..328f640 100644
--- a/core/modules/poll/poll-results.tpl.php
+++ b/core/modules/poll/poll-results.tpl.php
@@ -15,6 +15,8 @@
  * - $vote: The choice number of the current user's vote.
  *
  * @see template_preprocess_poll_results()
+ *
+ * @ingroup themable
  */
 ?>
 <article class="poll">
diff --git a/core/modules/poll/poll-vote.tpl.php b/core/modules/poll/poll-vote.tpl.php
index a749f91..a7c7c13 100644
--- a/core/modules/poll/poll-vote.tpl.php
+++ b/core/modules/poll/poll-vote.tpl.php
@@ -12,6 +12,8 @@
  *   form_alter hooks.
  *
  * @see template_preprocess_poll_vote()
+ *
+ * @ingroup themable
  */
 ?>
 <article class="poll">
diff --git a/core/modules/search/search-result.tpl.php b/core/modules/search/search-result.tpl.php
index 949452a..59a2ccd 100644
--- a/core/modules/search/search-result.tpl.php
+++ b/core/modules/search/search-result.tpl.php
@@ -60,6 +60,8 @@
  * @see template_preprocess()
  * @see template_preprocess_search_result()
  * @see template_process()
+ *
+ * @ingroup themable
  */
 ?>
 <li class="<?php print $classes; ?>"<?php print $attributes; ?>>
diff --git a/core/modules/search/search-results.tpl.php b/core/modules/search/search-results.tpl.php
index e35be1e..f6d034e 100644
--- a/core/modules/search/search-results.tpl.php
+++ b/core/modules/search/search-results.tpl.php
@@ -19,6 +19,8 @@
  *
  *
  * @see template_preprocess_search_results()
+ *
+ * @ingroup themable
  */
 ?>
 <?php if ($search_results): ?>
diff --git a/core/modules/system/html.tpl.php b/core/modules/system/html.tpl.php
index 960eefb..f46cfc8 100644
--- a/core/modules/system/html.tpl.php
+++ b/core/modules/system/html.tpl.php
@@ -38,6 +38,8 @@
  * @see template_preprocess()
  * @see template_preprocess_html()
  * @see template_process()
+ *
+ * @ingroup themable
  */
 ?><!DOCTYPE html>
 <html<?php print $html_attributes; ?>>
diff --git a/core/modules/system/maintenance-page.tpl.php b/core/modules/system/maintenance-page.tpl.php
index 5cde0ff..4832166 100644
--- a/core/modules/system/maintenance-page.tpl.php
+++ b/core/modules/system/maintenance-page.tpl.php
@@ -9,6 +9,8 @@
  *
  * @see template_preprocess()
  * @see template_preprocess_maintenance_page()
+ *
+ * @ingroup themable
  */
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
diff --git a/core/modules/system/page.tpl.php b/core/modules/system/page.tpl.php
index 578c56a..6077186 100644
--- a/core/modules/system/page.tpl.php
+++ b/core/modules/system/page.tpl.php
@@ -64,6 +64,8 @@
  * @see template_preprocess()
  * @see template_preprocess_page()
  * @see template_process()
+ *
+ * @ingroup themable
  */
 ?>
 
diff --git a/core/modules/system/region.tpl.php b/core/modules/system/region.tpl.php
index b29e24f..f48ccec 100644
--- a/core/modules/system/region.tpl.php
+++ b/core/modules/system/region.tpl.php
@@ -24,6 +24,8 @@
  * @see template_preprocess()
  * @see template_preprocess_region()
  * @see template_process()
+ *
+ * @ingroup themable
  */
 ?>
 <?php if ($content): ?>
diff --git a/core/modules/taxonomy/taxonomy-term.tpl.php b/core/modules/taxonomy/taxonomy-term.tpl.php
index b1ff20e..d663977 100644
--- a/core/modules/taxonomy/taxonomy-term.tpl.php
+++ b/core/modules/taxonomy/taxonomy-term.tpl.php
@@ -36,6 +36,8 @@
  * @see template_preprocess()
  * @see template_preprocess_taxonomy_term()
  * @see template_process()
+ *
+ * @ingroup themable
  */
 ?>
 <div id="taxonomy-term-<?php print $term->tid; ?>" class="<?php print $classes; ?>">
diff --git a/core/modules/toolbar/toolbar.tpl.php b/core/modules/toolbar/toolbar.tpl.php
index 6f303b1..40297b7 100644
--- a/core/modules/toolbar/toolbar.tpl.php
+++ b/core/modules/toolbar/toolbar.tpl.php
@@ -19,6 +19,8 @@
  *
  * @see template_preprocess()
  * @see template_preprocess_toolbar()
+ *
+ * @ingroup themable
  */
 ?>
 <nav id="toolbar" role="navigation" class="<?php print $classes; ?> clearfix">
diff --git a/core/modules/user/user-picture.tpl.php b/core/modules/user/user-picture.tpl.php
index a33d266..6afe0ca 100644
--- a/core/modules/user/user-picture.tpl.php
+++ b/core/modules/user/user-picture.tpl.php
@@ -12,6 +12,8 @@
  *   check_plain() before use.
  *
  * @see template_preprocess_user_picture()
+ *
+ * @ingroup themable
  */
 ?>
 <?php if ($user_picture): ?>
diff --git a/core/modules/user/user-profile.tpl.php b/core/modules/user/user-profile.tpl.php
index 940d47f..5758fa0 100644
--- a/core/modules/user/user-profile.tpl.php
+++ b/core/modules/user/user-profile.tpl.php
@@ -26,6 +26,8 @@
  *     language negotiation rule that was previously applied.
  *
  * @see template_preprocess_user_profile()
+ *
+ * @ingroup themable
  */
 ?>
 <article class="profile"<?php print $attributes; ?>>