diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 5dbae02e0a..8d1a03368c 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -1140,7 +1140,7 @@ celerity_register_resource_map(array(
   ),
   'diffusion-source-css' =>
   array(
-    'uri' => '/res/162c8794/rsrc/css/application/diffusion/diffusion-source.css',
+    'uri' => '/res/dcf60c4f/rsrc/css/application/diffusion/diffusion-source.css',
     'type' => 'css',
     'requires' =>
     array(
diff --git a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
index 075bca74e8..d20198a253 100644
--- a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
@@ -110,6 +110,11 @@ final class PhabricatorConduitConsoleController
           ->addCancelButton($this->getApplicationURI())
           ->setValue('Call Method'));
 
+    $form_box = id(new PHUIFormBoxView())
+      ->setHeaderText($method->getAPIMethodName())
+      ->setFormError($status_view)
+      ->setForm($form);
+
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addCrumb(
       id(new PhabricatorCrumbView())
@@ -118,8 +123,7 @@ final class PhabricatorConduitConsoleController
     return $this->buildApplicationPage(
       array(
         $crumbs,
-        $status_view,
-        $form,
+        $form_box,
       ),
       array(
         'title' => $method->getAPIMethodName(),
diff --git a/src/applications/differential/controller/DifferentialRevisionEditController.php b/src/applications/differential/controller/DifferentialRevisionEditController.php
index e31a15deef..3d80481be2 100644
--- a/src/applications/differential/controller/DifferentialRevisionEditController.php
+++ b/src/applications/differential/controller/DifferentialRevisionEditController.php
@@ -184,6 +184,11 @@ final class DifferentialRevisionEditController extends DifferentialController {
       $title = pht('Create New Differential Revision');
     }
 
+    $form_box = id(new PHUIFormBoxView())
+      ->setHeaderText($title)
+      ->setFormError($error_view)
+      ->setForm($form);
+
     $crumbs->addCrumb(
       id(new PhabricatorCrumbView())
         ->setName($title));
@@ -191,8 +196,7 @@ final class DifferentialRevisionEditController extends DifferentialController {
     return $this->buildApplicationPage(
       array(
         $crumbs,
-        $error_view,
-        $form,
+        $form_box,
         $preview),
       array(
         'title' => $title,
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index c75f932258..1db0302cc8 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -610,6 +610,7 @@ final class DiffusionCommitController extends DiffusionController {
 
     $form = id(new AphrontFormView())
       ->setUser($user)
+      ->setShaded(true)
       ->setAction('/audit/addcomment/')
       ->addHiddenInput('commit', $commit->getPHID())
       ->appendChild(
diff --git a/src/applications/diffusion/controller/DiffusionCommitEditController.php b/src/applications/diffusion/controller/DiffusionCommitEditController.php
index 52471ed69d..a84c8a0d0a 100644
--- a/src/applications/diffusion/controller/DiffusionCommitEditController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitEditController.php
@@ -81,13 +81,13 @@ final class DiffusionCommitEditController extends DiffusionController {
       ->addCancelButton('/r'.$callsign.$commit->getCommitIdentifier());
     $form->appendChild($submit);
 
-    $header = new PhabricatorHeaderView();
-    $header->setHeader(pht('Edit Diffusion Commit'));
+    $form_box = id(new PHUIFormBoxView())
+      ->setHeaderText($page_title)
+      ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
-        $header,
-        $form,
+        $form_box,
       ),
       array(
         'title' => $page_title,
diff --git a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
index 7c3ffe2b27..f63c358add 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
@@ -260,8 +260,10 @@ final class PhabricatorPeopleProfilePictureController
         ->setLabel(pht('Use Picture'))
         ->setValue($buttons));
 
-    $upload_head = id(new PhabricatorHeaderView())
-      ->setHeader(pht('Upload New Picture'));
+    $form_box = id(new PHUIFormBoxView())
+      ->setHeaderText($title)
+      ->setFormError($errors)
+      ->setForm($form);
 
     $upload_form = id(new AphrontFormView())
       ->setUser($user)
@@ -282,13 +284,20 @@ final class PhabricatorPeopleProfilePictureController
       $errors = id(new AphrontErrorView())->setErrors($errors);
     }
 
+    $form_box = id(new PHUIFormBoxView())
+      ->setHeaderText($title)
+      ->setFormError($errors)
+      ->setForm($form);
+
+    $upload_box = id(new PHUIFormBoxView())
+      ->setHeaderText(pht('Upload New Picture'))
+      ->setForm($upload_form);
+
     return $this->buildApplicationPage(
       array(
         $crumbs,
-        $errors,
-        $form,
-        $upload_head,
-        $upload_form,
+        $form_box,
+        $upload_box,
       ),
       array(
         'title' => $title,
diff --git a/src/applications/phame/controller/post/PhamePostPublishController.php b/src/applications/phame/controller/post/PhamePostPublishController.php
index 7d24c845ca..240bb2f93b 100644
--- a/src/applications/phame/controller/post/PhamePostPublishController.php
+++ b/src/applications/phame/controller/post/PhamePostPublishController.php
@@ -37,9 +37,6 @@ final class PhamePostPublishController extends PhameController {
       return id(new AphrontRedirectResponse())->setURI($view_uri);
     }
 
-    $header = id(new PhabricatorHeaderView())
-      ->setHeader(pht('Preview Post'));
-
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendChild(
@@ -49,6 +46,10 @@ final class PhamePostPublishController extends PhameController {
 
     $frame = $this->renderPreviewFrame($post);
 
+    $form_box = id(new PHUIFormBoxView())
+      ->setHeaderText(pht('Preview Post'))
+      ->setForm($form);
+
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addCrumb(
       id(new PhabricatorCrumbView())
@@ -59,8 +60,7 @@ final class PhamePostPublishController extends PhameController {
     $nav->appendChild(
       array(
         $crumbs,
-        $header,
-        $form,
+        $form_box,
         $frame,
       ));
 
diff --git a/src/applications/releeph/controller/project/ReleephProjectCreateController.php b/src/applications/releeph/controller/project/ReleephProjectCreateController.php
index 64a686e884..6fbcbf6d8f 100644
--- a/src/applications/releeph/controller/project/ReleephProjectCreateController.php
+++ b/src/applications/releeph/controller/project/ReleephProjectCreateController.php
@@ -108,6 +108,11 @@ final class ReleephProjectCreateController extends ReleephProjectController {
           ->addCancelButton('/releeph/project/')
           ->setValue(pht('Create')));
 
+    $form_box = id(new PHUIFormBoxView())
+      ->setHeaderText(pht('Create New Project'))
+      ->setFormError($error_view)
+      ->setForm($form);
+
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addCrumb(
       id(new PhabricatorCrumbView())
@@ -116,8 +121,7 @@ final class ReleephProjectCreateController extends ReleephProjectController {
     return $this->buildApplicationPage(
       array(
         $crumbs,
-        $error_view,
-        $form,
+        $form_box,
       ),
       array(
         'title' => pht('Create New Project'),
diff --git a/src/applications/repository/controller/PhabricatorRepositoryEditController.php b/src/applications/repository/controller/PhabricatorRepositoryEditController.php
index e37fd9a052..458703c9e5 100644
--- a/src/applications/repository/controller/PhabricatorRepositoryEditController.php
+++ b/src/applications/repository/controller/PhabricatorRepositoryEditController.php
@@ -674,13 +674,13 @@ final class PhabricatorRepositoryEditController
         id(new AphrontFormSubmitControl())
           ->setValue('Save Configuration'));
 
-    $header = id(new PhabricatorHeaderView())
-      ->setHeader(pht('Edit Repository Tracking'));
+    $form_box = id(new PHUIFormBoxView())
+      ->setHeaderText(pht('Edit Repository Tracking'))
+      ->setFormError($error_view)
+      ->setForm($form);
 
     $nav = $this->sideNav;
-    $nav->appendChild($error_view);
-    $nav->appendChild($header);
-    $nav->appendChild($form);
+    $nav->appendChild($form_box);
 
     return $this->buildApplicationPage(
       $nav,
diff --git a/src/view/form/PHUIFormBoxView.php b/src/view/form/PHUIFormBoxView.php
index 60f4894484..16ca8c7de8 100644
--- a/src/view/form/PHUIFormBoxView.php
+++ b/src/view/form/PHUIFormBoxView.php
@@ -16,7 +16,7 @@ final class PHUIFormBoxView extends AphrontView {
     return $this;
   }
 
-  public function setForm(AphrontFormView $form) {
+  public function setForm($form) {
     $this->form = $form;
     return $this;
   }
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-source.css b/webroot/rsrc/css/application/diffusion/diffusion-source.css
index 21d5d61b45..99637ece82 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion-source.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion-source.css
@@ -7,6 +7,7 @@
   width: 100%;
   font-family: "Monaco", Consolas, monospace;
   font-size: 10px;
+  background: #fff;
 }
 
 .diffusion-source tr.phabricator-source-highlight {