diff --git a/templates/block.tpl.php b/templates/block.tpl.php
index 918b7b0..beaf727 100644
--- a/templates/block.tpl.php
+++ b/templates/block.tpl.php
@@ -1,8 +1,10 @@
-<div id="<?php print $block_html_id; ?>" class="block">
+<div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>">
 
+  <?php print render($title_prefix); ?>
   <?php if (!empty($block->subject)): ?>
     <h4><?php print $block->subject; ?></h4>
   <?php endif; ?>
+  <?php print render($title_suffix); ?>
 
   <?php print $content; ?>
 
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index c85167e..664f4ad 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -35,8 +35,10 @@
   <?php if ($page['sidebar_first']): ?>
     <div id="maincol">
   <?php endif; ?>
-      <?php if ($action_links): ?><ul class="action-links clearfix"><?php print render($action_links); ?></ul><?php endif; ?>
-      <?php print render($page['content']); ?>
+  <?php print render($title_prefix); ?>
+  <?php print render($title_suffix); ?>
+  <?php if ($action_links): ?><ul class="action-links clearfix"><?php print render($action_links); ?></ul><?php endif; ?>
+  <?php print render($page['content']); ?>
   <?php if ($page['sidebar_first']): ?>
     </div>
     <div id="sidecol">