--- system/classes/site.php	2009-03-05 21:48:26.000000000 -0500
+++ user/classes/site.php	2009-07-28 15:56:26.000000000 -0400
@@ -184,7 +184,7 @@
 				}
 				break;
 			case 'admin':
-				$url = Site::get_url( 'habari' ) . '/admin';
+				$url = Site::get_url( 'habari' ) . '/newadmin';
 				break;
 			case 'admin_theme':
 				$url = Site::get_url( 'habari' ) . '/system/admin';
 
 

--- system/classes/rewriterules.php	2009-04-15 23:37:40.000000000 -0400
+++ user/classes/rewriterules.php	2009-07-28 15:47:49.000000000 -0400
@@ -34,9 +34,9 @@
 			array( 'name' => 'submit_feedback', 'parse_regex' => '%^(?P<id>[0-9]+)/feedback/?$%i', 'build_str' => '{$id}/feedback', 'handler' => 'FeedbackHandler', 'action' => 'add_comment', 'priority' => 8, 'description' => 'Adds a comment to a post' ),
 
 			// User actions
-			array( 'name' => 'admin', 'parse_regex' => '%^admin(?:/?$|/(?P<page>[^/]*))/?$%i', 'build_str' => 'admin/({$page})', 'handler' => 'AdminHandler', 'action' => 'admin', 'priority' => 6, 'description' => 'An admin action' ),
+			array( 'name' => 'admin', 'parse_regex' => '%^newadmin(?:/?$|/(?P<page>[^/]*))/?$%i', 'build_str' => 'newadmin/({$page})', 'handler' => 'AdminHandler', 'action' => 'admin', 'priority' => 6, 'description' => 'An admin action' ),
 			array( 'name' => 'user', 'parse_regex' => '%^user/(?P<page>[^/]*)$%i', 'build_str' => 'user/{$page}', 'handler' => 'UserHandler', 'action' => '{$page}', 'priority' => 7, 'description' => 'A user action or display, for instance the login screen' ),
-			array( 'name' => 'user_profile', 'parse_regex' => '%^admin/(?P<page>user)/(?P<user>[^/]+)/?$%', 'build_str' => 'admin/{$page}/{$user}', 'handler' => 'AdminHandler', 'action' => 'admin', 'priority' => 4, 'description' => 'The profile page for a specific user' ),
+			array( 'name' => 'user_profile', 'parse_regex' => '%^newadmin/(?P<page>user)/(?P<user>[^/]+)/?$%', 'build_str' => 'newadmin/{$page}/{$user}', 'handler' => 'AdminHandler', 'action' => 'admin', 'priority' => 4, 'description' => 'The profile page for a specific user' ),
 
 			// AJAX requests
 			array( 'name' => 'ajax', 'parse_regex' => '%^ajax/(?P<context>[^/]+)/?$%i', 'build_str' => 'ajax/{$context}', 'handler' => 'AjaxHandler', 'action' => 'ajax', 'priority' => 8, 'description' => 'Ajax handling' ),