diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 94017b350..414fa6fae 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -400,7 +400,14 @@ class Controller extends BaseController
                 return Response::make($responseContents, 406);
              }
             catch (Exception $ex) {
-                return Response::make($ex->getMessage(), 500);
+                /*
+                 * Display a "dumbed down" error if custom page is activated
+                 * otherwise display a more detailed error.
+                 */
+                if (Config::get('cms.customErrorPage', false))
+                    return Response::make($ex->getMessage(), 500);
+
+                return Response::make(sprintf('"%s" on line %s of %s', $ex->getMessage(), $ex->getLine(), $ex->getFile()), 500);
             }
         }
 
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index 8c85a8f3f..15039312b 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -195,10 +195,16 @@ class Updates extends Controller
                 $plugins[$code] = array_get($plugin, 'hash', null);
             }
 
+            $themes = [];
+            $themeList = array_get($result, 'themes', []);
+            foreach ($themeList as $code => $theme) {
+                $themes[$code] = array_get($theme, 'hash', null);
+            }
+
             /*
              * Update steps
              */
-            $updateSteps = $this->buildUpdateSteps($core, $plugins);
+            $updateSteps = $this->buildUpdateSteps($core, $plugins, $themes);
 
             /*
              * Finish up
diff --git a/modules/system/controllers/updates/_update_list.htm b/modules/system/controllers/updates/_update_list.htm
index 3ec0e7c5a..9949ebaaa 100644
--- a/modules/system/controllers/updates/_update_list.htm
+++ b/modules/system/controllers/updates/_update_list.htm
@@ -16,7 +16,7 @@
                             <i class="icon-cube"></i>
                             <?= e(trans('system::lang.system.name')) ?>
                             <?php if ($core['old_build']): ?>
-                                <?= e(trans('system::lang.updates.core_build_old', ['build'=>$core['old_build']])) ?>
+                                <small><?= e(trans('system::lang.updates.core_build_old', ['build'=>$core['old_build']])) ?></small>
                             <?php endif ?>
                         </h5>
                         <dl>