diff --git a/core/includes/form.inc b/core/includes/form.inc
index 87f8edf..ed6929c 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -1575,7 +1575,15 @@ function theme_tableselect($variables) {
       array_unshift($header, '');
     }
   }
-  return theme('table', array('header' => $header, 'rows' => $rows, 'empty' => $element['#empty'], 'attributes' => $element['#attributes']));
+  $table = array(
+    '#theme' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+    '#empty' => $element['#empty'],
+    '#attributes' => $element['#attributes'],
+  );
+
+  return drupal_render($table);
 }
 
 /**
@@ -2773,13 +2781,29 @@ function theme_form_element($variables) {
   switch ($element['#title_display']) {
     case 'before':
     case 'invisible':
-      $output .= ' ' . theme('form_element_label', $variables);
+      $form_element_label = array(
+        '#theme' => 'form_element_label',
+        '#required' => !empty($variables['#required']) ? $variables['#required'] : '',
+        '#title' => !empty($variables['#title']) ? $variables['#title'] : '',
+        '#id' => !empty($variables['#id']) ? $variables['#id'] : '',
+        '#value' => !empty($variables['#value']) ? $variables['#value'] : '',
+        '#description' => !empty($variables['#description']) ? $variables['#description'] : '',
+      );
+      $output .= ' ' . drupal_render($form_element_label);
       $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n";
       break;
 
     case 'after':
       $output .= ' ' . $prefix . $element['#children'] . $suffix;
-      $output .= ' ' . theme('form_element_label', $variables) . "\n";
+      $form_element_label = array(
+        '#theme' => 'form_element_label',
+        '#required' => !empty($variables['#required']) ? $variables['#required'] : '',
+        '#title' => !empty($variables['#title']) ? $variables['#title'] : '',
+        '#id' => !empty($variables['#id']) ? $variables['#id'] : '',
+        '#value' => !empty($variables['#value']) ? $variables['#value'] : '',
+        '#description' => !empty($variables['#description']) ? $variables['#description'] : '',
+      );
+      $output .= ' ' . drupal_render($form_element_label) . "\n";
       break;
 
     case 'none':
@@ -2851,7 +2875,11 @@ function theme_form_element_label($variables) {
   }
 
   // If the element is required, a required marker is appended to the label.
-  $required = !empty($element['#required']) ? theme('form_required_marker', array('element' => $element)) : '';
+  $form_required_marker = array(
+    '#theme' => 'form_required_marker',
+    '#element' => $element,
+  );
+  $required = !empty($element['#required']) ? drupal_render($form_required_marker) : '';
 
   $title = filter_xss_admin($element['#title']);