diff --git a/plugins/content_types/user_context/user_picture.inc b/plugins/content_types/user_context/user_picture.inc
index f8a9e8a..a3783d3 100644
--- a/plugins/content_types/user_context/user_picture.inc
+++ b/plugins/content_types/user_context/user_picture.inc
@@ -30,8 +30,14 @@ function ctools_user_picture_content_type_render($subtype, $conf, $panel_args, $
   $block = new stdClass();
   $block->module = 'user-profile';
   $block->title = check_plain($account->name);
-  $block->content = theme('user_picture', array('account' => $account));
 
+  $element['user_picture'] = array(
+    '#theme' => 'user_picture',
+    '#signature' => $account,
+  );
+
+
+  $block->content = $element;
   return $block;
 }
 
diff --git a/plugins/content_types/user_context/user_signature.inc b/plugins/content_types/user_context/user_signature.inc
index 529b655..d1b3be9 100644
--- a/plugins/content_types/user_context/user_signature.inc
+++ b/plugins/content_types/user_context/user_signature.inc
@@ -18,11 +18,15 @@ function ctools_user_signature_content_type_render($subtype, $conf, $panel_args,
   $block->module = 'term-list';
 
   if ($account === FALSE || ($account->access == 0 && !user_access('administer users'))) {
-    return NULL;
+    return;
   }
 
-  $block->content = theme('user_signature', $account->signature);
+  $element['user_signature'] = array(
+    '#theme' => 'user_signature',
+    '#signature' => $account->signature,
+  );
 
+  $block->content = $element;
   return $block;
 }