diff --git a/src/applications/files/controller/PhabricatorFileComposeController.php b/src/applications/files/controller/PhabricatorFileComposeController.php
index 1eaafdbad0..6a4536d94a 100644
--- a/src/applications/files/controller/PhabricatorFileComposeController.php
+++ b/src/applications/files/controller/PhabricatorFileComposeController.php
@@ -1,222 +1,219 @@
 <?php
 
 final class PhabricatorFileComposeController
   extends PhabricatorFileController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
 
     $color_map = PhabricatorFilesComposeIconBuiltinFile::getAllColors();
     $icon_map = $this->getIconMap();
 
     if ($request->isFormPost()) {
       $project_phid = $request->getStr('projectPHID');
       if ($project_phid) {
         $project = id(new PhabricatorProjectQuery())
           ->setViewer($viewer)
           ->withPHIDs(array($project_phid))
           ->requireCapabilities(
             array(
               PhabricatorPolicyCapability::CAN_VIEW,
               PhabricatorPolicyCapability::CAN_EDIT,
             ))
           ->executeOne();
         if (!$project) {
           return new Aphront404Response();
         }
       }
 
       $icon = $request->getStr('icon');
       $color = $request->getStr('color');
 
       $composer = id(new PhabricatorFilesComposeIconBuiltinFile())
         ->setIcon($icon)
         ->setColor($color);
 
       $data = $composer->loadBuiltinFileData();
 
       $file = PhabricatorFile::buildFromFileDataOrHash(
         $data,
         array(
           'name' => $composer->getBuiltinDisplayName(),
           'profile' => true,
           'canCDN' => true,
         ));
 
       if ($project_phid) {
         $edit_uri = '/project/manage/'.$project->getID().'/';
 
         $xactions = array();
         $xactions[] = id(new PhabricatorProjectTransaction())
           ->setTransactionType(PhabricatorProjectTransaction::TYPE_IMAGE)
           ->setNewValue($file->getPHID());
 
         $editor = id(new PhabricatorProjectTransactionEditor())
           ->setActor($viewer)
           ->setContentSourceFromRequest($request)
           ->setContinueOnMissingFields(true)
           ->setContinueOnNoEffect(true);
 
         $editor->applyTransactions($project, $xactions);
 
         return id(new AphrontRedirectResponse())->setURI($edit_uri);
       } else {
         $content = array(
           'phid' => $file->getPHID(),
         );
 
         return id(new AphrontAjaxResponse())->setContent($content);
       }
     }
 
     $value_color = head_key($color_map);
     $value_icon = head_key($icon_map);
 
     require_celerity_resource('people-profile-css');
 
     $buttons = array();
     foreach ($color_map as $color => $info) {
       $quip = idx($info, 'quip');
 
       $buttons[] = javelin_tag(
         'button',
         array(
           'class' => 'grey profile-image-button',
           'sigil' => 'has-tooltip compose-select-color',
           'style' => 'margin: 0 8px 8px 0',
           'meta' => array(
             'color' => $color,
             'tip' => $quip,
           ),
         ),
         id(new PHUIIconView())
           ->addClass('compose-background-'.$color));
     }
 
 
     $icons = array();
     foreach ($icon_map as $icon => $spec) {
       $quip = idx($spec, 'quip');
 
       $icons[] = javelin_tag(
         'button',
         array(
           'class' => 'grey profile-image-button',
           'sigil' => 'has-tooltip compose-select-icon',
           'style' => 'margin: 0 8px 8px 0',
           'meta' => array(
             'icon' => $icon,
             'tip' => $quip,
           ),
         ),
         id(new PHUIIconView())
           ->setIcon($icon)
           ->addClass('compose-icon-bg'));
     }
 
     $dialog_id = celerity_generate_unique_node_id();
     $color_input_id = celerity_generate_unique_node_id();
     $icon_input_id = celerity_generate_unique_node_id();
     $preview_id = celerity_generate_unique_node_id();
 
     $preview = id(new PHUIIconView())
       ->setID($preview_id)
       ->addClass('compose-background-'.$value_color)
       ->setIcon($value_icon)
       ->addClass('compose-icon-bg');
 
     $color_input = javelin_tag(
       'input',
       array(
         'type' => 'hidden',
         'name' => 'color',
         'value' => $value_color,
         'id' => $color_input_id,
       ));
 
     $icon_input = javelin_tag(
       'input',
       array(
         'type' => 'hidden',
         'name' => 'icon',
         'value' => $value_icon,
         'id' => $icon_input_id,
       ));
 
     Javelin::initBehavior('phabricator-tooltips');
     Javelin::initBehavior(
       'icon-composer',
       array(
         'dialogID' => $dialog_id,
         'colorInputID' => $color_input_id,
         'iconInputID' => $icon_input_id,
         'previewID' => $preview_id,
         'defaultColor' => $value_color,
         'defaultIcon' => $value_icon,
       ));
 
-    $dialog = id(new AphrontDialogView())
-      ->setUser($viewer)
+    return $this->newDialog()
       ->setFormID($dialog_id)
       ->setClass('compose-dialog')
       ->setTitle(pht('Compose Image'))
       ->appendChild(
         phutil_tag(
           'div',
           array(
             'class' => 'compose-header',
           ),
           pht('Choose Background Color')))
       ->appendChild($buttons)
       ->appendChild(
         phutil_tag(
           'div',
           array(
             'class' => 'compose-header',
           ),
           pht('Choose Icon')))
       ->appendChild($icons)
       ->appendChild(
         phutil_tag(
           'div',
           array(
             'class' => 'compose-header',
           ),
           pht('Preview')))
       ->appendChild($preview)
       ->appendChild($color_input)
       ->appendChild($icon_input)
       ->addCancelButton('/')
       ->addSubmitButton(pht('Save Image'));
-
-    return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function getIconMap() {
     $icon_map = PhabricatorFilesComposeIconBuiltinFile::getAllIcons();
 
     $first = array(
       'fa-briefcase',
       'fa-tags',
       'fa-folder',
       'fa-group',
       'fa-bug',
       'fa-trash-o',
       'fa-calendar',
       'fa-flag-checkered',
       'fa-envelope',
       'fa-truck',
       'fa-lock',
       'fa-umbrella',
       'fa-cloud',
       'fa-building',
       'fa-credit-card',
       'fa-flask',
     );
 
     $icon_map = array_select_keys($icon_map, $first) + $icon_map;
 
     return $icon_map;
   }
 
 }
diff --git a/src/applications/files/controller/PhabricatorFileDeleteController.php b/src/applications/files/controller/PhabricatorFileDeleteController.php
index a07fe2e91a..acca7c9b1c 100644
--- a/src/applications/files/controller/PhabricatorFileDeleteController.php
+++ b/src/applications/files/controller/PhabricatorFileDeleteController.php
@@ -1,45 +1,42 @@
 <?php
 
 final class PhabricatorFileDeleteController extends PhabricatorFileController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
     if (($viewer->getPHID() != $file->getAuthorPHID()) &&
         (!$viewer->getIsAdmin())) {
       return new Aphront403Response();
     }
 
     if ($request->isFormPost()) {
       $file->delete();
       return id(new AphrontRedirectResponse())->setURI('/file/');
     }
 
-    $dialog = new AphrontDialogView();
-    $dialog->setUser($viewer);
-    $dialog->setTitle(pht('Really delete file?'));
-    $dialog->appendChild(hsprintf(
+    return $this->newDialog()
+      ->setTitle(pht('Really delete file?'))
+      ->appendChild(hsprintf(
       '<p>%s</p>',
       pht(
-        "Permanently delete '%s'? This action can not be undone.",
-        $file->getName())));
-    $dialog->addSubmitButton(pht('Delete'));
-    $dialog->addCancelButton($file->getInfoURI());
-
-    return id(new AphrontDialogResponse())->setDialog($dialog);
+        'Permanently delete "%s"? This action can not be undone.',
+        $file->getName())))
+        ->addSubmitButton(pht('Delete'))
+        ->addCancelButton($file->getInfoURI());
   }
 }
diff --git a/src/applications/files/controller/PhabricatorFileEditController.php b/src/applications/files/controller/PhabricatorFileEditController.php
index 9c416b588c..e1b34afd73 100644
--- a/src/applications/files/controller/PhabricatorFileEditController.php
+++ b/src/applications/files/controller/PhabricatorFileEditController.php
@@ -1,106 +1,114 @@
 <?php
 
 final class PhabricatorFileEditController extends PhabricatorFileController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
-    $title = pht('Edit %s', $file->getName());
+    $title = pht('Edit File: %s', $file->getName());
     $file_name = $file->getName();
+    $header_icon = 'fa-pencil';
     $view_uri = '/'.$file->getMonogram();
     $error_name = true;
     $validation_exception = null;
 
     if ($request->isFormPost()) {
       $can_view = $request->getStr('canView');
       $file_name = $request->getStr('name');
       $errors = array();
 
       $type_name = PhabricatorFileTransaction::TYPE_NAME;
 
       $xactions = array();
 
       $xactions[] = id(new PhabricatorFileTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
         ->setNewValue($can_view);
 
       $xactions[] = id(new PhabricatorFileTransaction())
         ->setTransactionType(PhabricatorFileTransaction::TYPE_NAME)
         ->setNewValue($file_name);
 
       $editor = id(new PhabricatorFileEditor())
         ->setActor($viewer)
         ->setContentSourceFromRequest($request)
         ->setContinueOnNoEffect(true);
 
       try {
         $editor->applyTransactions($file, $xactions);
         return id(new AphrontRedirectResponse())->setURI($view_uri);
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
         $validation_exception = $ex;
         $error_name = $ex->getShortMessage($type_name);
 
         $file->setViewPolicy($can_view);
       }
     }
 
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
       ->setObject($file)
       ->execute();
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
        ->appendChild(
         id(new AphrontFormTextControl())
         ->setName('name')
         ->setValue($file_name)
         ->setLabel(pht('Name'))
         ->setError($error_name))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($viewer)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
           ->setPolicyObject($file)
           ->setPolicies($policies)
           ->setName('canView'))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($view_uri)
           ->setValue(pht('Save Changes')));
 
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb($file->getMonogram(), $view_uri)
-      ->addTextCrumb(pht('Edit'));
+      ->addTextCrumb(pht('Edit'))
+      ->setBorder(true);
 
-    $object_box = id(new PHUIObjectBoxView())
+    $box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setValidationException($validation_exception)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->appendChild($form);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
-        $object_box,
-      ),
-      array(
-        'title' => $title,
-      ));
+    $header = id(new PHUIHeaderView())
+      ->setHeader($title)
+      ->setHeaderIcon($header_icon);
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter($box);
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
+
   }
 
 }
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
index 2731b7f4bb..66050b697e 100644
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -1,373 +1,377 @@
 <?php
 
 final class PhabricatorFileInfoController extends PhabricatorFileController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
     $phid = $request->getURIData('phid');
 
     if ($phid) {
       $file = id(new PhabricatorFileQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($phid))
         ->executeOne();
 
       if (!$file) {
         return new Aphront404Response();
       }
       return id(new AphrontRedirectResponse())->setURI($file->getInfoURI());
     }
     $file = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
     $phid = $file->getPHID();
 
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setPolicyObject($file)
-      ->setHeader($file->getName());
+      ->setHeader($file->getName())
+      ->setHeaderIcon('fa-file-o');
 
     $ttl = $file->getTTL();
     if ($ttl !== null) {
       $ttl_tag = id(new PHUITagView())
         ->setType(PHUITagView::TYPE_STATE)
         ->setBackgroundColor(PHUITagView::COLOR_YELLOW)
         ->setName(pht('Temporary'));
       $header->addTag($ttl_tag);
     }
 
     $partial = $file->getIsPartial();
     if ($partial) {
       $partial_tag = id(new PHUITagView())
         ->setType(PHUITagView::TYPE_STATE)
         ->setBackgroundColor(PHUITagView::COLOR_ORANGE)
         ->setName(pht('Partial Upload'));
       $header->addTag($partial_tag);
     }
 
-    $actions = $this->buildActionView($file);
+    $curtain = $this->buildCurtainView($file);
     $timeline = $this->buildTransactionView($file);
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(
       'F'.$file->getID(),
       $this->getApplicationURI("/info/{$phid}/"));
+    $crumbs->setBorder(true);
 
     $object_box = id(new PHUIObjectBoxView())
-      ->setHeader($header);
+      ->setHeaderText(pht('File'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
 
-    $this->buildPropertyViews($object_box, $file, $actions);
+    $this->buildPropertyViews($object_box, $file);
+    $title = $file->getName();
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setCurtain($curtain)
+      ->setMainColumn(array(
         $object_box,
         $timeline,
-      ),
-      array(
-        'title' => $file->getName(),
-        'pageObjects' => array($file->getPHID()),
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->setPageObjectPHIDs(array($file->getPHID()))
+      ->appendChild($view);
+
   }
 
   private function buildTransactionView(PhabricatorFile $file) {
     $viewer = $this->getViewer();
 
     $timeline = $this->buildTransactionTimeline(
       $file,
       new PhabricatorFileTransactionQuery());
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
 
     $add_comment_header = $is_serious
       ? pht('Add Comment')
       : pht('Question File Integrity');
 
     $draft = PhabricatorDraft::newFromUserAndKey($viewer, $file->getPHID());
 
     $add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
       ->setUser($viewer)
       ->setObjectPHID($file->getPHID())
       ->setDraft($draft)
       ->setHeaderText($add_comment_header)
       ->setAction($this->getApplicationURI('/comment/'.$file->getID().'/'))
       ->setSubmitButtonName(pht('Add Comment'));
 
     return array(
       $timeline,
       $add_comment_form,
     );
   }
 
-  private function buildActionView(PhabricatorFile $file) {
+  private function buildCurtainView(PhabricatorFile $file) {
     $viewer = $this->getViewer();
 
     $id = $file->getID();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $file,
       PhabricatorPolicyCapability::CAN_EDIT);
 
-    $view = id(new PhabricatorActionListView())
-      ->setUser($viewer)
-      ->setObject($file);
+    $curtain = $this->newCurtainView($file);
 
     $can_download = !$file->getIsPartial();
 
     if ($file->isViewableInBrowser()) {
-      $view->addAction(
+      $curtain->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('View File'))
           ->setIcon('fa-file-o')
           ->setHref($file->getViewURI())
           ->setDisabled(!$can_download)
           ->setWorkflow(!$can_download));
     } else {
-      $view->addAction(
+      $curtain->addAction(
         id(new PhabricatorActionView())
           ->setUser($viewer)
           ->setRenderAsForm($can_download)
           ->setDownload($can_download)
           ->setName(pht('Download File'))
           ->setIcon('fa-download')
           ->setHref($file->getViewURI())
           ->setDisabled(!$can_download)
           ->setWorkflow(!$can_download));
     }
 
-    $view->addAction(
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit File'))
         ->setIcon('fa-pencil')
         ->setHref($this->getApplicationURI("/edit/{$id}/"))
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit));
 
-    $view->addAction(
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Delete File'))
         ->setIcon('fa-times')
         ->setHref($this->getApplicationURI("/delete/{$id}/"))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit));
 
-    $view->addAction(
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('View Transforms'))
         ->setIcon('fa-crop')
         ->setHref($this->getApplicationURI("/transforms/{$id}/")));
 
-    return $view;
+    return $curtain;
   }
 
   private function buildPropertyViews(
     PHUIObjectBoxView $box,
-    PhabricatorFile $file,
-    PhabricatorActionListView $actions) {
+    PhabricatorFile $file) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $properties = id(new PHUIPropertyListView());
-    $properties->setActionList($actions);
     $box->addPropertyList($properties, pht('Details'));
 
     if ($file->getAuthorPHID()) {
       $properties->addProperty(
         pht('Author'),
         $viewer->renderHandle($file->getAuthorPHID()));
     }
 
     $properties->addProperty(
       pht('Created'),
       phabricator_datetime($file->getDateCreated(), $viewer));
 
 
     $finfo = id(new PHUIPropertyListView());
     $box->addPropertyList($finfo, pht('File Info'));
 
     $finfo->addProperty(
       pht('Size'),
       phutil_format_bytes($file->getByteSize()));
 
     $finfo->addProperty(
       pht('Mime Type'),
       $file->getMimeType());
 
     $width = $file->getImageWidth();
     if ($width) {
       $finfo->addProperty(
         pht('Width'),
         pht('%s px', new PhutilNumber($width)));
     }
 
     $height = $file->getImageHeight();
     if ($height) {
       $finfo->addProperty(
         pht('Height'),
         pht('%s px', new PhutilNumber($height)));
     }
 
     $is_image = $file->isViewableImage();
     if ($is_image) {
       $image_string = pht('Yes');
       $cache_string = $file->getCanCDN() ? pht('Yes') : pht('No');
     } else {
       $image_string = pht('No');
       $cache_string = pht('Not Applicable');
     }
 
     $finfo->addProperty(pht('Viewable Image'), $image_string);
     $finfo->addProperty(pht('Cacheable'), $cache_string);
 
     $builtin = $file->getBuiltinName();
     if ($builtin === null) {
       $builtin_string = pht('No');
     } else {
       $builtin_string = $builtin;
     }
 
     $finfo->addProperty(pht('Builtin'), $builtin_string);
 
     $is_profile = $file->getIsProfileImage()
       ? pht('Yes')
       : pht('No');
 
     $finfo->addProperty(pht('Profile'), $is_profile);
 
     $storage_properties = new PHUIPropertyListView();
     $box->addPropertyList($storage_properties, pht('Storage'));
 
     $storage_properties->addProperty(
       pht('Engine'),
       $file->getStorageEngine());
 
     $storage_properties->addProperty(
       pht('Format'),
       $file->getStorageFormat());
 
     $storage_properties->addProperty(
       pht('Handle'),
       $file->getStorageHandle());
 
 
     $phids = $file->getObjectPHIDs();
     if ($phids) {
       $attached = new PHUIPropertyListView();
       $box->addPropertyList($attached, pht('Attached'));
 
       $attached->addProperty(
         pht('Attached To'),
         $viewer->renderHandleList($phids));
     }
 
     if ($file->isViewableImage()) {
       $image = phutil_tag(
         'img',
         array(
           'src' => $file->getViewURI(),
           'class' => 'phui-property-list-image',
         ));
 
       $linked_image = phutil_tag(
         'a',
         array(
           'href' => $file->getViewURI(),
         ),
         $image);
 
       $media = id(new PHUIPropertyListView())
         ->addImageContent($linked_image);
 
       $box->addPropertyList($media);
     } else if ($file->isAudio()) {
       $audio = phutil_tag(
         'audio',
         array(
           'controls' => 'controls',
           'class' => 'phui-property-list-audio',
         ),
         phutil_tag(
           'source',
           array(
             'src' => $file->getViewURI(),
             'type' => $file->getMimeType(),
           )));
       $media = id(new PHUIPropertyListView())
         ->addImageContent($audio);
 
       $box->addPropertyList($media);
     }
 
     $engine = null;
     try {
       $engine = $file->instantiateStorageEngine();
     } catch (Exception $ex) {
       // Don't bother raising this anywhere for now.
     }
 
     if ($engine) {
       if ($engine->isChunkEngine()) {
         $chunkinfo = new PHUIPropertyListView();
         $box->addPropertyList($chunkinfo, pht('Chunks'));
 
         $chunks = id(new PhabricatorFileChunkQuery())
           ->setViewer($viewer)
           ->withChunkHandles(array($file->getStorageHandle()))
           ->execute();
         $chunks = msort($chunks, 'getByteStart');
 
         $rows = array();
         $completed = array();
         foreach ($chunks as $chunk) {
           $is_complete = $chunk->getDataFilePHID();
 
           $rows[] = array(
             $chunk->getByteStart(),
             $chunk->getByteEnd(),
             ($is_complete ? pht('Yes') : pht('No')),
           );
 
           if ($is_complete) {
             $completed[] = $chunk;
           }
         }
 
         $table = id(new AphrontTableView($rows))
           ->setHeaders(
             array(
               pht('Offset'),
               pht('End'),
               pht('Complete'),
             ))
           ->setColumnClasses(
             array(
               '',
               '',
               'wide',
             ));
 
         $chunkinfo->addProperty(
           pht('Total Chunks'),
           count($chunks));
 
         $chunkinfo->addProperty(
           pht('Completed Chunks'),
           count($completed));
 
         $chunkinfo->addRawContent($table);
       }
     }
 
   }
 
 }
diff --git a/src/applications/files/controller/PhabricatorFileTransformListController.php b/src/applications/files/controller/PhabricatorFileTransformListController.php
index 767254ad3a..026f60320e 100644
--- a/src/applications/files/controller/PhabricatorFileTransformListController.php
+++ b/src/applications/files/controller/PhabricatorFileTransformListController.php
@@ -1,138 +1,147 @@
 <?php
 
 final class PhabricatorFileTransformListController
   extends PhabricatorFileController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withIDs(array($request->getURIData('id')))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
     $monogram = $file->getMonogram();
 
     $xdst = id(new PhabricatorTransformedFile())->loadAllWhere(
       'transformedPHID = %s',
       $file->getPHID());
 
     $dst_rows = array();
     foreach ($xdst as $source) {
       $dst_rows[] = array(
         $source->getTransform(),
         $viewer->renderHandle($source->getOriginalPHID()),
       );
     }
     $dst_table = id(new AphrontTableView($dst_rows))
       ->setHeaders(
         array(
           pht('Key'),
           pht('Source'),
         ))
       ->setColumnClasses(
         array(
           '',
           'wide',
         ))
       ->setNoDataString(
         pht(
           'This file was not created by transforming another file.'));
 
     $xsrc = id(new PhabricatorTransformedFile())->loadAllWhere(
       'originalPHID = %s',
       $file->getPHID());
     $xsrc = mpull($xsrc, 'getTransformedPHID', 'getTransform');
 
     $src_rows = array();
     $xforms = PhabricatorFileTransform::getAllTransforms();
     foreach ($xforms as $xform) {
       $dst_phid = idx($xsrc, $xform->getTransformKey());
 
       if ($xform->canApplyTransform($file)) {
         $can_apply = pht('Yes');
 
         $view_href = $file->getURIForTransform($xform);
         $view_href = new PhutilURI($view_href);
         $view_href->setQueryParam('regenerate', 'true');
 
         $view_text = pht('Regenerate');
 
         $view_link = phutil_tag(
           'a',
           array(
             'class' => 'small grey button',
             'href' => $view_href,
           ),
           $view_text);
       } else {
         $can_apply = phutil_tag('em', array(), pht('No'));
         $view_link = phutil_tag('em', array(), pht('None'));
       }
 
       if ($dst_phid) {
         $dst_link = $viewer->renderHandle($dst_phid);
       } else {
         $dst_link = phutil_tag('em', array(), pht('None'));
       }
 
       $src_rows[] = array(
         $xform->getTransformName(),
         $xform->getTransformKey(),
         $can_apply,
         $dst_link,
         $view_link,
       );
     }
 
     $src_table = id(new AphrontTableView($src_rows))
       ->setHeaders(
         array(
           pht('Name'),
           pht('Key'),
           pht('Supported'),
           pht('Transform'),
           pht('View'),
         ))
       ->setColumnClasses(
         array(
           'wide',
           '',
           '',
           '',
           'action',
         ));
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($monogram, '/'.$monogram);
     $crumbs->addTextCrumb(pht('Transforms'));
+    $crumbs->setBorder(true);
 
     $dst_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('File Sources'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setTable($dst_table);
 
     $src_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Available Transforms'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setTable($src_table);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
+    $title = pht('%s Transforms', $file->getName());
+
+    $header = id(new PHUIHeaderView())
+      ->setHeader($title)
+      ->setHeaderIcon('fa-arrows-alt');
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
         $dst_box,
         $src_box,
-      ),
-      array(
-        'title' => array(
-          pht('%s %s', $monogram, $file->getName()),
-          pht('Tranforms'),
-        ),
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
+
   }
 }
diff --git a/src/applications/files/controller/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php
index a02b298f25..3be0ca3968 100644
--- a/src/applications/files/controller/PhabricatorFileUploadController.php
+++ b/src/applications/files/controller/PhabricatorFileUploadController.php
@@ -1,107 +1,115 @@
 <?php
 
 final class PhabricatorFileUploadController extends PhabricatorFileController {
 
   public function isGlobalDragAndDropUploadEnabled() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getUser();
 
     $file = PhabricatorFile::initializeNewFile();
 
     $e_file = true;
     $errors = array();
     if ($request->isFormPost()) {
       $view_policy = $request->getStr('viewPolicy');
 
       if (!$request->getFileExists('file')) {
         $e_file = pht('Required');
         $errors[] = pht('You must select a file to upload.');
       } else {
         $file = PhabricatorFile::newFromPHPUpload(
           idx($_FILES, 'file'),
           array(
             'name'        => $request->getStr('name'),
             'authorPHID'  => $viewer->getPHID(),
             'viewPolicy'  => $view_policy,
             'isExplicitUpload' => true,
           ));
       }
 
       if (!$errors) {
         return id(new AphrontRedirectResponse())->setURI($file->getInfoURI());
       }
 
       $file->setViewPolicy($view_policy);
     }
 
     $support_id = celerity_generate_unique_node_id();
     $instructions = id(new AphrontFormMarkupControl())
       ->setControlID($support_id)
       ->setControlStyle('display: none')
       ->setValue(hsprintf(
         '<br /><br /><strong>%s</strong> %s<br /><br />',
         pht('Drag and Drop:'),
         pht(
           'You can also upload files by dragging and dropping them from your '.
           'desktop onto this page or the Phabricator home page.')));
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
       ->setObject($file)
       ->execute();
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->setEncType('multipart/form-data')
       ->appendChild(
         id(new AphrontFormFileControl())
           ->setLabel(pht('File'))
           ->setName('file')
           ->setError($e_file))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Name'))
           ->setName('name')
           ->setValue($request->getStr('name')))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($viewer)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
           ->setPolicyObject($file)
           ->setPolicies($policies)
           ->setName('viewPolicy'))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Upload'))
           ->addCancelButton('/file/'))
       ->appendChild($instructions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Upload'), $request->getRequestURI());
+    $crumbs->setBorder(true);
 
     $title = pht('Upload File');
 
     $global_upload = id(new PhabricatorGlobalUploadTargetView())
       ->setUser($viewer)
       ->setShowIfSupportedID($support_id);
 
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText($title)
+      ->setHeaderText(pht('File'))
       ->setFormErrors($errors)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
+    $header = id(new PHUIHeaderView())
+      ->setHeader($title)
+      ->setHeaderIcon('fa-upload');
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
         $form_box,
         $global_upload,
-      ),
-      array(
-        'title' => $title,
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
 }
diff --git a/src/applications/files/controller/PhabricatorFileUploadDialogController.php b/src/applications/files/controller/PhabricatorFileUploadDialogController.php
index dd22caa74a..cf13f4d694 100644
--- a/src/applications/files/controller/PhabricatorFileUploadDialogController.php
+++ b/src/applications/files/controller/PhabricatorFileUploadDialogController.php
@@ -1,19 +1,17 @@
 <?php
 
 final class PhabricatorFileUploadDialogController
   extends PhabricatorFileController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
 
-    $dialog = id(new AphrontDialogView())
-      ->setUser($viewer)
+    return $this->newDialog()
       ->setTitle(pht('Upload File'))
       ->appendChild(pht(
         'To add files, drag and drop them into the comment text area.'))
       ->addCancelButton('/', pht('Close'));
 
-    return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }