diff --git a/core/config/config.php b/core/config/config.php
index 0f57baae..c785deb1 100644
--- a/core/config/config.php
+++ b/core/config/config.php
@@ -119,7 +119,7 @@ $config['extension_prefix'] = 'MY_';
 $config['modules'] = array(
   MODPATH . 'forge',
   THEMEPATH . 'default',
-  THEMEPATH . 'default_admin'
+  THEMEPATH . 'admin_default'
 );
 
 if (defined('TEST_MODE')) {
diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index b5b7adb5..b4f994f9 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -110,11 +110,11 @@ class core_installer {
         ->save();
       access::add_item($root);
 
-      // Save this before setting vars so that module id is set 
+      // Save this before setting vars so that module id is set
       module::set_version("core", 1);
 
       module::set_var("core", "active_theme", "default");
-      module::set_var("core", "active_admin_theme", "default_admin");
+      module::set_var("core", "active_admin_theme", "admin_default");
       module::set_var("core", "page_size", 9);
       module::set_var("core", "thumbnail_size", 200);
       module::set_var("core", "resize_size", 640);
diff --git a/themes/default_admin/css/screen.css b/themes/admin_default/css/screen.css
similarity index 100%
rename from themes/default_admin/css/screen.css
rename to themes/admin_default/css/screen.css
diff --git a/themes/default_admin/images/arrows-ffffff.png b/themes/admin_default/images/arrows-ffffff.png
similarity index 100%
rename from themes/default_admin/images/arrows-ffffff.png
rename to themes/admin_default/images/arrows-ffffff.png
diff --git a/themes/default_admin/images/ico-draggable.png b/themes/admin_default/images/ico-draggable.png
similarity index 100%
rename from themes/default_admin/images/ico-draggable.png
rename to themes/admin_default/images/ico-draggable.png
diff --git a/themes/default_admin/images/ico-error.png b/themes/admin_default/images/ico-error.png
similarity index 100%
rename from themes/default_admin/images/ico-error.png
rename to themes/admin_default/images/ico-error.png
diff --git a/themes/default_admin/images/ico-help.png b/themes/admin_default/images/ico-help.png
similarity index 100%
rename from themes/default_admin/images/ico-help.png
rename to themes/admin_default/images/ico-help.png
diff --git a/themes/default_admin/images/ico-info.png b/themes/admin_default/images/ico-info.png
similarity index 100%
rename from themes/default_admin/images/ico-info.png
rename to themes/admin_default/images/ico-info.png
diff --git a/themes/default_admin/images/ico-success.png b/themes/admin_default/images/ico-success.png
similarity index 100%
rename from themes/default_admin/images/ico-success.png
rename to themes/admin_default/images/ico-success.png
diff --git a/themes/default_admin/images/ico-warning.png b/themes/admin_default/images/ico-warning.png
similarity index 100%
rename from themes/default_admin/images/ico-warning.png
rename to themes/admin_default/images/ico-warning.png
diff --git a/themes/default_admin/images/logo.png b/themes/admin_default/images/logo.png
similarity index 100%
rename from themes/default_admin/images/logo.png
rename to themes/admin_default/images/logo.png
diff --git a/themes/default_admin/images/photostream.png b/themes/admin_default/images/photostream.png
similarity index 100%
rename from themes/default_admin/images/photostream.png
rename to themes/admin_default/images/photostream.png
diff --git a/themes/default_admin/jquery/superfish-navbar.css b/themes/admin_default/jquery/superfish-navbar.css
similarity index 100%
rename from themes/default_admin/jquery/superfish-navbar.css
rename to themes/admin_default/jquery/superfish-navbar.css
diff --git a/themes/default_admin/jquery/superfish.css b/themes/admin_default/jquery/superfish.css
similarity index 100%
rename from themes/default_admin/jquery/superfish.css
rename to themes/admin_default/jquery/superfish.css
diff --git a/themes/default_admin/jquery/superfish.js b/themes/admin_default/jquery/superfish.js
similarity index 100%
rename from themes/default_admin/jquery/superfish.js
rename to themes/admin_default/jquery/superfish.js
diff --git a/themes/default_admin/views/admin.html.php b/themes/admin_default/views/admin.html.php
similarity index 100%
rename from themes/default_admin/views/admin.html.php
rename to themes/admin_default/views/admin.html.php
diff --git a/themes/default_admin/views/dashboard.html.php b/themes/admin_default/views/dashboard.html.php
similarity index 100%
rename from themes/default_admin/views/dashboard.html.php
rename to themes/admin_default/views/dashboard.html.php
diff --git a/themes/default_admin/views/users.html.php b/themes/admin_default/views/users.html.php
similarity index 100%
rename from themes/default_admin/views/users.html.php
rename to themes/admin_default/views/users.html.php