diff --git a/commons.install b/commons.install
index bdcbf57..425d99e 100644
--- a/commons.install
+++ b/commons.install
@@ -58,7 +58,7 @@ function commons_requirements($phase) {
  */
 function commons_install() {
   // Enable the Origins theme and set it as the default.
-  theme_enable(array('adaptivetheme', 'commons_origins', 'adaptivetheme_admin'));
+  theme_enable(array('adaptivetheme', 'commons_origins'));
 
     // The Bartik theme is automatically enabled during installation. Disable it.
   db_update('system')
@@ -70,7 +70,7 @@ function commons_install() {
   // Set the default and administration themes.
   variable_set('theme_default', 'commons_origins');
   // Set a default administrative theme:
-  variable_set('admin_theme', 'adaptivetheme_admin');
+  variable_set('admin_theme', 'ember');
   variable_set('node_admin_theme', FALSE);
 
   // Do not use the administration theme when editing or creating content.
@@ -261,3 +261,11 @@ function commons_update_3110() {
   module_enable($module_list);
   return array();
 }
+
+/**
+ * Change the administration theme to Ember.
+ */
+function commons_update_3111() {
+  variable_set('admin_theme', 'ember');
+  return array();
+}
diff --git a/drupal-org.make b/drupal-org.make
index 0102da5..d18530f 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -490,6 +490,13 @@ projects[adaptivetheme][patch][] = "http://drupal.org/files/remove-comment-creat
 ; https://drupal.org/comment/8289329#comment-8289329
 projects[adaptivetheme][patch][] = "https://drupal.org/files/issues/add-link-button-styling-2159783-1.patch"
 
+projects[ember][type] = "theme"
+projects[ember][subdir] = "contrib"
+projects[ember][download][type] = "git"
+projects[ember][download][url] = "http://git.drupal.org/project/ember.git"
+projects[ember][download][branch] = "7.x-2.x"
+projects[ember][download][revision] = "5b8b0f6"
+
 projects[sky][type] = "theme"
 projects[sky][subdir] = "contrib"
 projects[sky][version] = "3.0-rc1"
diff --git a/modules/commons/commons_media/commons_media.install b/modules/commons/commons_media/commons_media.install
new file mode 100644
index 0000000..f742108
--- /dev/null
+++ b/modules/commons/commons_media/commons_media.install
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Change the media browser theme to Ember.
+ */
+function commons_media_update_7301() {
+  $revert = array(
+    'commons_media' => array('variable'),
+  );
+  features_revert($revert);
+  return array();
+}
diff --git a/modules/commons/commons_media/commons_media.strongarm.inc b/modules/commons/commons_media/commons_media.strongarm.inc
index 166e05d..501c614 100644
--- a/modules/commons/commons_media/commons_media.strongarm.inc
+++ b/modules/commons/commons_media/commons_media.strongarm.inc
@@ -14,7 +14,7 @@ function commons_media_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'media__dialog_theme';
-  $strongarm->value = 'commons_origins';
+  $strongarm->value = 'ember';
   $export['media__dialog_theme'] = $strongarm;
 
   return $export;