diff --git a/template.php b/template.php
index d394b77..09d0982 100644
--- a/template.php
+++ b/template.php
@@ -118,11 +118,12 @@ function tao_preprocess_block(&$vars) {
   $vars['hook'] = 'block';
 
   $vars['attributes_array']['id'] = $vars['block_html_id'];
+  $vars['attributes_array']['class'] = $vars['classes_array'];
 
   $vars['title_attributes_array']['class'][] = $vars['hook'] . '-title';
   $vars['title_attributes_array']['class'][] = 'clearfix';
 
-  $vars['content_attributes_array']['class'][] = $vars['hook'] . 'content';
+  $vars['content_attributes_array']['class'][] = $vars['hook'] . '-content';
   $vars['content_attributes_array']['class'][] = 'clearfix';
   if ($vars['block']->module == 'block') {
     $vars['content_attributes_array']['class'][] = 'prose';
diff --git a/templates/object.tpl.php b/templates/object.tpl.php
index 6d92ab8..df96d97 100644
--- a/templates/object.tpl.php
+++ b/templates/object.tpl.php
@@ -1,6 +1,6 @@
 <?php if (!empty($pre_object)) print render($pre_object) ?>
 
-<div<?php print $title_attributes ?>>
+<div<?php print $attributes ?>>
   <?php if (!empty($title_prefix)) print render($title_prefix); ?>
 
   <?php if (!empty($title)): ?>