Index: trunk/blocks/archives_block.php
===================================================================
--- trunk/blocks/archives_block.php	(revision 145)
+++ trunk/blocks/archives_block.php	(revision 183)
@@ -30,39 +30,39 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$a_month = _MB_XPRESS_ARC_MONTH ;
-		$a_week = _MB_XPRESS_ARC_WEEK ;		
+		$a_month = _MB_XP2_ARC_MONTH ;
+		$a_week = _MB_XP2_ARC_WEEK ;		
 
-		$form .= _MB_XPRESS_ARC_TYPE .": ";
+		$form .= _MB_XP2_ARC_TYPE .": ";
 		$form .=  "<select name='options[2]'>";
 		if ($type =='yearly')
-			$form .=  "<option value='yearly' selected='selected'>". _MB_XPRESS_ARC_YEAR;
+			$form .=  "<option value='yearly' selected='selected'>". _MB_XP2_ARC_YEAR;
 		else
-			$form .=  "<option value='yearly'>". _MB_XPRESS_ARC_YEAR;
+			$form .=  "<option value='yearly'>". _MB_XP2_ARC_YEAR;
 		
 		if ($type =='monthly')
-			$form .=  "<option value='monthly' selected='selected'>". _MB_XPRESS_ARC_MONTH;
+			$form .=  "<option value='monthly' selected='selected'>". _MB_XP2_ARC_MONTH;
 		else
-			$form .=  "<option value='monthly'>". _MB_XPRESS_ARC_MONTH;
+			$form .=  "<option value='monthly'>". _MB_XP2_ARC_MONTH;
 		
 		if ($type =='weekly')
-			$form .=  "<option value='weekly' selected='selected'>". _MB_XPRESS_ARC_WEEK;
+			$form .=  "<option value='weekly' selected='selected'>". _MB_XP2_ARC_WEEK;
 		else
-			$form .=  "<option value='weekly'>". _MB_XPRESS_ARC_WEEK;
+			$form .=  "<option value='weekly'>". _MB_XP2_ARC_WEEK;
 		
 		if ($type =='daily')
-			$form .=  "<option value='daily' selected='selected'>". _MB_XPRESS_ARC_DAY;
+			$form .=  "<option value='daily' selected='selected'>". _MB_XP2_ARC_DAY;
 		else
-			$form .=  "<option value='daily'>". _MB_XPRESS_ARC_DAY;
+			$form .=  "<option value='daily'>". _MB_XP2_ARC_DAY;
 
 		if ($type =='postbypost')
-			$form .=  "<option value='postbypost' selected='selected'>". _MB_XPRESS_ARC_POST;
+			$form .=  "<option value='postbypost' selected='selected'>". _MB_XP2_ARC_POST;
 		else
-			$form .=  "<option value='postbypost'>". _MB_XPRESS_ARC_POST;
+			$form .=  "<option value='postbypost'>". _MB_XP2_ARC_POST;
 
 		$form .=  "</select><br/>";
 		
-		$form .= "<br />" . _MB_XPRESS_COUNT_ZERO_ALL . "  <input type='text' name='options[3]' value='" . $limit . "' />";
-		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_post_count);
-		$form .= "<br />" . yes_no_radio_option('options[5]', _MB_XPRESS_SHOW_DROP_DOWN , $drop_down);
+		$form .= "<br />" . _MB_XP2_COUNT_ZERO_ALL . "  <input type='text' name='options[3]' value='" . $limit . "' />";
+		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XP2_SHOW_NUM_OF_POST , $show_post_count);
+		$form .= "<br />" . yes_no_radio_option('options[5]', _MB_XP2_SHOW_DROP_DOWN , $drop_down);
 //	    $form .="<br /><input type='text' size='60' name='options[5]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
 	    
Index: trunk/blocks/authors_block.php
===================================================================
--- trunk/blocks/authors_block.php	(revision 145)
+++ trunk/blocks/authors_block.php	(revision 183)
@@ -30,8 +30,8 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= yes_no_radio_option('options[2]', _MB_XPRESS_SHOW_NUM_OF_POST , $optioncount);
-		$form .= "<br />" . yes_no_radio_option('options[3]', _MB_XPRESS_EXCLUEDEADMIN , $exclude_admin);
-		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_FULLNAME , $show_fullname);
-				$form .= "<br />" . yes_no_radio_option('options[5]', _MB_XPRESS_HIDE_EMPTY , $hide_empty);
+		$form .= yes_no_radio_option('options[2]', _MB_XP2_SHOW_NUM_OF_POST , $optioncount);
+		$form .= "<br />" . yes_no_radio_option('options[3]', _MB_XP2_EXCLUEDEADMIN , $exclude_admin);
+		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XP2_SHOW_FULLNAME , $show_fullname);
+				$form .= "<br />" . yes_no_radio_option('options[5]', _MB_XP2_HIDE_EMPTY , $hide_empty);
 //	    $form .="<br /><input type='text' size='60' name='options[4]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
 	    
Index: trunk/blocks/calender_block.php
===================================================================
--- trunk/blocks/calender_block.php	(revision 145)
+++ trunk/blocks/calender_block.php	(revision 183)
@@ -28,6 +28,6 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_SUN_COLOR .": <input type='text' name='options[2]' value='" . $sun_color . "' /><br />\n";
-		$form .= _MB_XPRESS_SAT_COLOR .": <input type='text' name='options[3]' value='" . $sat_color . "' /><br />\n";
+		$form .= _MB_XP2_SUN_COLOR .": <input type='text' name='options[2]' value='" . $sun_color . "' /><br />\n";
+		$form .= _MB_XP2_SAT_COLOR .": <input type='text' name='options[3]' value='" . $sat_color . "' /><br />\n";
 
 		return $form;
Index: trunk/blocks/category_block.php
===================================================================
--- trunk/blocks/category_block.php	(revision 145)
+++ trunk/blocks/category_block.php	(revision 183)
@@ -37,41 +37,41 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_CAT_ALL_STR . "  <input type='text' name='options[2]' value='" . $show_option_all . "' /><br />";
-		$form .= _MB_XPRESS_CAT_ORDERBY .": ";
+		$form .= _MB_XP2_CAT_ALL_STR . "  <input type='text' name='options[2]' value='" . $show_option_all . "' /><br />";
+		$form .= _MB_XP2_CAT_ORDERBY .": ";
 		$form .=  "<select name='options[3]'>";
 		if ($orderby =='name')
-			$form .=  "<option value='name' selected='selected'>". _MB_XPRESS_CAT_NAME;
+			$form .=  "<option value='name' selected='selected'>". _MB_XP2_CAT_NAME;
 		else
-			$form .=  "<option value='name'>". _MB_XPRESS_CAT_NAME;
+			$form .=  "<option value='name'>". _MB_XP2_CAT_NAME;
 		if ($orderby =='count')
-			$form .=  "<option value='count' selected='selected'>". _MB_XPRESS_CAT_COUNT;
+			$form .=  "<option value='count' selected='selected'>". _MB_XP2_CAT_COUNT;
 		else
-			$form .=  "<option value='count'>". _MB_XPRESS_CAT_COUNT;
+			$form .=  "<option value='count'>". _MB_XP2_CAT_COUNT;
 		if ($orderby =='ID')
-			$form .=  "<option value='ID' selected='selected'>". _MB_XPRESS_CAT_ID;
+			$form .=  "<option value='ID' selected='selected'>". _MB_XP2_CAT_ID;
 		else
-			$form .=  "<option value='ID'>". _MB_XPRESS_CAT_ID;
+			$form .=  "<option value='ID'>". _MB_XP2_CAT_ID;
 		$form .=  "</select><br/>";
 		
-		$form .= _MB_XPRESS_SORT_ORDER .": ";
+		$form .= _MB_XP2_SORT_ORDER .": ";
 		$form .=  "<select name='options[4]'>";
 		if ($order =='ASC')
-			$form .=  "<option value='ASC' selected='selected'>" . _MB_XPRESS_SORT_ASC;
+			$form .=  "<option value='ASC' selected='selected'>" . _MB_XP2_SORT_ASC;
 		else
-			$form .=  "<option value='ASC'>" . _MB_XPRESS_SORT_ASC;
+			$form .=  "<option value='ASC'>" . _MB_XP2_SORT_ASC;
 		if ($order =='DESC')
-			$form .=  "<option value='DESC' selected='selected'>" . _MB_XPRESS_SORT_DESC;
+			$form .=  "<option value='DESC' selected='selected'>" . _MB_XP2_SORT_DESC;
 		else
-			$form .=  "<option value='DESC'>" . _MB_XPRESS_SORT_DESC;
+			$form .=  "<option value='DESC'>" . _MB_XP2_SORT_DESC;
 		$form .=  "</select><br/>";
 		
-		$form .= yes_no_radio_option('options[5]', _MB_XPRESS_SHOW_LAST_UPDATE , $show_last_updated) . "<br />" ;
-		$form .= yes_no_radio_option('options[6]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_count) . "<br />" ;
-		$form .= yes_no_radio_option('options[7]', _MB_XPRESS_CAT_HIDE_EMPTY , $hide_empty) . "<br />" ;
-		$form .= yes_no_radio_option('options[8]', _MB_XPRESS_DESC_FOR_TITLE , $use_desc_for_title) . "<br />" ;
-		$form .= _MB_XPRESS_CAT_EXCLUDE . "  <input type='text' name='options[9]' value='" . $exclude . "' size ='60' /><br />";
-		$form .= _MB_XPRESS_CAT_INCLUDE . "  <input type='text' name='options[10]' value='" . $includes . "' size ='60' /><br />";
-		$form .= yes_no_radio_option('options[11]', _MB_XPRESS_CAT_HIERARCHICAL , $hierarchical) . "<br />" ;
-		$form .= _MB_XPRESS_CAT_DEPTH . "  <input type='text' name='options[12]' value='" . $depth . "' size ='8' /><br />";
+		$form .= yes_no_radio_option('options[5]', _MB_XP2_SHOW_LAST_UPDATE , $show_last_updated) . "<br />" ;
+		$form .= yes_no_radio_option('options[6]', _MB_XP2_SHOW_NUM_OF_POST , $show_count) . "<br />" ;
+		$form .= yes_no_radio_option('options[7]', _MB_XP2_CAT_HIDE_EMPTY , $hide_empty) . "<br />" ;
+		$form .= yes_no_radio_option('options[8]', _MB_XP2_DESC_FOR_TITLE , $use_desc_for_title) . "<br />" ;
+		$form .= _MB_XP2_CAT_EXCLUDE . "  <input type='text' name='options[9]' value='" . $exclude . "' size ='60' /><br />";
+		$form .= _MB_XP2_CAT_INCLUDE . "  <input type='text' name='options[10]' value='" . $includes . "' size ='60' /><br />";
+		$form .= yes_no_radio_option('options[11]', _MB_XP2_CAT_HIERARCHICAL , $hierarchical) . "<br />" ;
+		$form .= _MB_XP2_CAT_DEPTH . "  <input type='text' name='options[12]' value='" . $depth . "' size ='8' /><br />";
 		return $form;
 	}
Index: trunk/blocks/enhanced_block.php
===================================================================
--- trunk/blocks/enhanced_block.php	(revision 145)
+++ trunk/blocks/enhanced_block.php	(revision 183)
@@ -25,7 +25,7 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_ENHACED_FILE .":<br />\n";
-		$form .= '&emsp;' . _MB_XPRESS_FILE_NAME . ": my_<input type='text' name='options[2]' value='" . $include_file . "' />_block.php<br>\n";
-		$form .= '&emsp;' . _MB_XPRESS_MAKE_ENHACED_FILE . "<br>\n";
+		$form .= _MB_XP2_ENHACED_FILE .":<br />\n";
+		$form .= '&emsp;' . _MB_XP2_FILE_NAME . ": my_<input type='text' name='options[2]' value='" . $include_file . "' />_block.php<br>\n";
+		$form .= '&emsp;' . _MB_XP2_MAKE_ENHACED_FILE . "<br>\n";
 		return $form;
 	}
Index: trunk/blocks/meta_block.php
===================================================================
--- trunk/blocks/meta_block.php	(revision 145)
+++ trunk/blocks/meta_block.php	(revision 183)
@@ -33,12 +33,12 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= yes_no_radio_option('options[2]', _MB_XPRESS_META_WP_LINK , $wp_link) . "<br />\n";
-		$form .= yes_no_radio_option('options[3]', _MB_XPRESS_META_XOOPS_LINK , $xoops_link) . "<br />\n";
-		$form .= yes_no_radio_option('options[4]', _MB_XPRESS_META_POST_RSS , $post_rss) . "<br />\n";
-		$form .= yes_no_radio_option('options[5]', _MB_XPRESS_META_COMMENT_RSS , $comment_rss) . "<br />\n";
-		$form .= yes_no_radio_option('options[6]', _MB_XPRESS_META_POST_NEW , $post_new) . "<br />\n";
-		$form .= yes_no_radio_option('options[7]', _MB_XPRESS_META_ADMIN , $admin_edit) . "<br />\n";
-		$form .= yes_no_radio_option('options[8]', _MB_XPRESS_META_README , $readme) . "<br />\n";
-		$form .= yes_no_radio_option('options[9]', _MB_XPRESS_META_CH_STYLE , $ch_style) . "\n";
+		$form .= yes_no_radio_option('options[2]', _MB_XP2_META_WP_LINK , $wp_link) . "<br />\n";
+		$form .= yes_no_radio_option('options[3]', _MB_XP2_META_XOOPS_LINK , $xoops_link) . "<br />\n";
+		$form .= yes_no_radio_option('options[4]', _MB_XP2_META_POST_RSS , $post_rss) . "<br />\n";
+		$form .= yes_no_radio_option('options[5]', _MB_XP2_META_COMMENT_RSS , $comment_rss) . "<br />\n";
+		$form .= yes_no_radio_option('options[6]', _MB_XP2_META_POST_NEW , $post_new) . "<br />\n";
+		$form .= yes_no_radio_option('options[7]', _MB_XP2_META_ADMIN , $admin_edit) . "<br />\n";
+		$form .= yes_no_radio_option('options[8]', _MB_XP2_META_README , $readme) . "<br />\n";
+		$form .= yes_no_radio_option('options[9]', _MB_XP2_META_CH_STYLE , $ch_style) . "\n";
 	    
 		return $form;
Index: trunk/blocks/page_block.php
===================================================================
--- trunk/blocks/page_block.php	(revision 145)
+++ trunk/blocks/page_block.php	(revision 183)
@@ -37,86 +37,86 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_PAGE_ORDERBY .": ";
+		$form .= _MB_XP2_PAGE_ORDERBY .": ";
 		$form .=  "<select name='options[2]'>";
 		
 		if ($sort_column =='post_title')
-			$form .=  "<option value='post_title' selected='selected'>". _MB_XPRESS_PAGE_TITLE;
+			$form .=  "<option value='post_title' selected='selected'>". _MB_XP2_PAGE_TITLE;
 		else
-			$form .=  "<option value='post_title'>". _MB_XPRESS_PAGE_TITLE;
+			$form .=  "<option value='post_title'>". _MB_XP2_PAGE_TITLE;
 		
 		if ($sort_column =='menu_order')
-			$form .=  "<option value='menu_order' selected='selected'>". _MB_XPRESS_PAGE_MENU_ORDER;
+			$form .=  "<option value='menu_order' selected='selected'>". _MB_XP2_PAGE_MENU_ORDER;
 		else
-			$form .=  "<option value='menu_order'>". _MB_XPRESS_PAGE_MENU_ORDER;
+			$form .=  "<option value='menu_order'>". _MB_XP2_PAGE_MENU_ORDER;
 		
 		if ($sort_column =='post_date')
-			$form .=  "<option value='post_date' selected='selected'>". _MB_XPRESS_PAGE_POST_DATE;
+			$form .=  "<option value='post_date' selected='selected'>". _MB_XP2_PAGE_POST_DATE;
 		else
-			$form .=  "<option value='post_date'>". _MB_XPRESS_PAGE_POST_DATE;
+			$form .=  "<option value='post_date'>". _MB_XP2_PAGE_POST_DATE;
 		
 		if ($sort_column =='post_modified')
-			$form .=  "<option value='post_modified' selected='selected'>". _MB_XPRESS_PAGE_POST_MODIFY;
+			$form .=  "<option value='post_modified' selected='selected'>". _MB_XP2_PAGE_POST_MODIFY;
 		else
-			$form .=  "<option value='post_modified'>". _MB_XPRESS_PAGE_POST_MODIFY;
+			$form .=  "<option value='post_modified'>". _MB_XP2_PAGE_POST_MODIFY;
 		
 		if ($sort_column =='ID')
-			$form .=  "<option value='ID' selected='selected'>". _MB_XPRESS_PAGE_ID;
+			$form .=  "<option value='ID' selected='selected'>". _MB_XP2_PAGE_ID;
 		else
-			$form .=  "<option value='ID'>". _MB_XPRESS_PAGE_ID;
+			$form .=  "<option value='ID'>". _MB_XP2_PAGE_ID;
 		
 		if ($sort_column =='post_author')
-			$form .=  "<option value='post_author' selected='selected'>". _MB_XPRESS_PAGE_AUTHOR;
+			$form .=  "<option value='post_author' selected='selected'>". _MB_XP2_PAGE_AUTHOR;
 		else
-			$form .=  "<option value='post_author'>". _MB_XPRESS_PAGE_AUTHOR;
+			$form .=  "<option value='post_author'>". _MB_XP2_PAGE_AUTHOR;
 		
 		if ($sort_column =='post_name')
-			$form .=  "<option value='post_name' selected='selected'>". _MB_XPRESS_PAGE_SLUG;
+			$form .=  "<option value='post_name' selected='selected'>". _MB_XP2_PAGE_SLUG;
 		else
-			$form .=  "<option value='post_name'>". _MB_XPRESS_PAGE_SLUG;
+			$form .=  "<option value='post_name'>". _MB_XP2_PAGE_SLUG;
 		
 		$form .=  "</select><br/>";
 		
 		
-		$form .= _MB_XPRESS_SORT_ORDER .": ";
+		$form .= _MB_XP2_SORT_ORDER .": ";
 		$form .=  "<select name='options[3]'>";
 		if ($sort_order =='asc')
-			$form .=  "<option value='asc' selected='selected'>" . _MB_XPRESS_SORT_ASC;
+			$form .=  "<option value='asc' selected='selected'>" . _MB_XP2_SORT_ASC;
 		else
-			$form .=  "<option value='asc'>" . _MB_XPRESS_SORT_ASC;
+			$form .=  "<option value='asc'>" . _MB_XP2_SORT_ASC;
 		if ($sort_order =='desc')
-			$form .=  "<option value='desc' selected='selected'>" . _MB_XPRESS_SORT_DESC;
+			$form .=  "<option value='desc' selected='selected'>" . _MB_XP2_SORT_DESC;
 		else
-			$form .=  "<option value='desc'>" . _MB_XPRESS_SORT_DESC;
+			$form .=  "<option value='desc'>" . _MB_XP2_SORT_DESC;
 		$form .=  "</select><br/>\n";
 		
-		$form .= _MB_XPRESS_PAGE_EXCLUDE . "  <input type='text' name='options[4]' value='" . $exclude . "' size ='60' /><br />\n";
-		$form .= _MB_XPRESS_PAGE_EXCLUDE_TREE . "  <input type='text' name='options[5]' value='" . $exclude_tree . "' size ='8' /><br />\n";
-		$form .= _MB_XPRESS_PAGE_INCLUDE . "  <input type='text' name='options[6]' value='" . $includes . "' size ='60' /><br />\n";
-		$form .= _MB_XPRESS_PAGE_DEPTH . "  <input type='text' name='options[7]' value='" . $depth . "' size ='8' /><br />";
-		$form .= _MB_XPRESS_PAGE_CHILD_OF . "  <input type='text' name='options[8]' value='" . $child_of . "' size ='8' /><br />";
+		$form .= _MB_XP2_PAGE_EXCLUDE . "  <input type='text' name='options[4]' value='" . $exclude . "' size ='60' /><br />\n";
+		$form .= _MB_XP2_PAGE_EXCLUDE_TREE . "  <input type='text' name='options[5]' value='" . $exclude_tree . "' size ='8' /><br />\n";
+		$form .= _MB_XP2_PAGE_INCLUDE . "  <input type='text' name='options[6]' value='" . $includes . "' size ='60' /><br />\n";
+		$form .= _MB_XP2_PAGE_DEPTH . "  <input type='text' name='options[7]' value='" . $depth . "' size ='8' /><br />";
+		$form .= _MB_XP2_PAGE_CHILD_OF . "  <input type='text' name='options[8]' value='" . $child_of . "' size ='8' /><br />";
 
-		$form .= _MB_XPRESS_SHOW_DATE_SELECT .": ";
+		$form .= _MB_XP2_SHOW_DATE_SELECT .": ";
 		$form .=  "<select name='options[9]'>";
 		if ($show_date =='none')
-			$form .=  "<option value='none' selected='selected'>" . _MB_XPRESS_SHOW_DATE_NONE;
+			$form .=  "<option value='none' selected='selected'>" . _MB_XP2_SHOW_DATE_NONE;
 		else
-			$form .=  "<option value='none'>" . _MB_XPRESS_SHOW_DATE_NONE;
+			$form .=  "<option value='none'>" . _MB_XP2_SHOW_DATE_NONE;
 
 		if ($show_date =='post_date')
-			$form .=  "<option value='post_date' selected='selected'>" . _MB_XPRESS_SHOW_POST_DATE;
+			$form .=  "<option value='post_date' selected='selected'>" . _MB_XP2_SHOW_POST_DATE;
 		else
-			$form .=  "<option value='post_date'>" . _MB_XPRESS_SHOW_POST_DATE;
+			$form .=  "<option value='post_date'>" . _MB_XP2_SHOW_POST_DATE;
 
 		if ($show_date =='modified')
-			$form .=  "<option value='modified' selected='selected'>" . _MB_XPRESS_SHOW_MODIFY_DATE;
+			$form .=  "<option value='modified' selected='selected'>" . _MB_XP2_SHOW_MODIFY_DATE;
 		else
-			$form .=  "<option value='modified'>" . _MB_XPRESS_SHOW_MODIFY_DATE;
+			$form .=  "<option value='modified'>" . _MB_XP2_SHOW_MODIFY_DATE;
 		
 		$form .=  "</select><br/>\n";
 
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[10]' value='" . $date_format . "' /><br />\n";
-		$form .= yes_no_radio_option('options[11]', _MB_XPRESS_PAGE_HIERARCHICAL , $hierarchical) . "<br />" ;
-		$form .= _MB_XPRESS_PAGE_META_KEY . "  <input type='text' name='options[12]' value='" . $meta_key . "' size ='40' /><br />\n";
-		$form .= _MB_XPRESS_PAGE_META_VALUE . "  <input type='text' name='options[12]' value='" . $meta_value . "' size ='40' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[10]' value='" . $date_format . "' /><br />\n";
+		$form .= yes_no_radio_option('options[11]', _MB_XP2_PAGE_HIERARCHICAL , $hierarchical) . "<br />" ;
+		$form .= _MB_XP2_PAGE_META_KEY . "  <input type='text' name='options[12]' value='" . $meta_key . "' size ='40' /><br />\n";
+		$form .= _MB_XP2_PAGE_META_VALUE . "  <input type='text' name='options[12]' value='" . $meta_value . "' size ='40' /><br />\n";
     
 		return $form;
Index: trunk/blocks/popular_posts_block.php
===================================================================
--- trunk/blocks/popular_posts_block.php	(revision 145)
+++ trunk/blocks/popular_posts_block.php	(revision 183)
@@ -32,16 +32,16 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
 		$form .= "<br />\n";
-		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-		$form .= _MB_MONTH_RANGE .": <input type='text' name='options[3]' value='" . $show_month_range . "' /><br />\n";
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[4]' value='" . $date_format . "' /><br />\n";
-		$form .= _MB_XPRESS_TIME_FORMAT .": <input type='text' name='options[5]' value='" . $time_format . "' /><br />\n";
+		$form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+		$form .= _MB_XP2_MONTH_RANGE .": <input type='text' name='options[3]' value='" . $show_month_range . "' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[4]' value='" . $date_format . "' /><br />\n";
+		$form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[5]' value='" . $time_format . "' /><br />\n";
 		$form .= "<br />\n";
-		$form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[6]' value='" . $tag_select . "' /><br />\n";	
-	    $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
+		$form .= _MB_XP2_TAGS_SELECT .": <input type='text' name='options[6]' value='" . $tag_select . "' /><br />\n";	
+	    $form .= _MB_XP2_CATS_SELECT ."<br />\n";
 	    $isAll = (count($selected)==0||empty($selected[0]))?true:false;
 	    $form .= "&nbsp;&nbsp;<select name=\"options[]\" multiple=\"multiple\">";
 	    $form .= "<option value=\"0\" ";
 	    if ($isAll) $form .= " selected=\"selected\"";
-	    $form .= ">"._MB_XPRESS_ALL ."</option>";
+	    $form .= ">"._MB_XP2_ALL ."</option>";
 		ob_start();
 		dropdown_cats_options('ID','asc',$selected);
Index: trunk/blocks/recent_comments_block.php
===================================================================
--- trunk/blocks/recent_comments_block.php	(revision 145)
+++ trunk/blocks/recent_comments_block.php	(revision 183)
@@ -32,30 +32,30 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-		$form .= _MB_XPRESS_LENGTH .": <input type='text' name='options[3]' value='" . $disp_length . "' /><br />\n";
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[4]' value='" . $date_format . "' /><br />\n";
-		$form .= _MB_XPRESS_TIME_FORMAT .": <input type='text' name='options[5]' value='" . $time_format . "' /><br />\n";
+		$form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+		$form .= _MB_XP2_LENGTH .": <input type='text' name='options[3]' value='" . $disp_length . "' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[4]' value='" . $date_format . "' /><br />\n";
+		$form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[5]' value='" . $time_format . "' /><br />\n";
 	    $form .= "<br />\n";
-	    $form .= _MB_XPRESS_COM_TYPE . "<br />\n";
+	    $form .= _MB_XP2_COM_TYPE . "<br />\n";
 	    $isAll = (count($selected)==0||empty($selected[0]))?true:false;
 	    $form .= "&nbsp;&nbsp;<select name=\"options[]\" multiple=\"multiple\">";
 		    $form .= "<option value=\"0\" ";
 		    if ($isAll) $form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_ALL ."</option>";
+		    $form .= ">"._MB_XP2_ALL ."</option>";
 
 		    $form .= "<option value=\"1\" ";
 		    if (in_array(1, $selected))
 				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_COMMENT ."</option>";
+		    $form .= ">"._MB_XP2_COMMENT ."</option>";
 
 		    $form .= "<option value=\"2\" ";
 		    if (in_array(2, $selected))
 				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_TRUCKBACK ."</option>";
+		    $form .= ">"._MB_XP2_TRUCKBACK ."</option>";
 
 		    $form .= "<option value=\"3\" ";
 		    if (in_array(3, $selected))
 				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_PINGBACK ."</option>";
+		    $form .= ">"._MB_XP2_PINGBACK ."</option>";
 		$form .= "</select><br />";
 		//	    $form .="<br /><input type='text' size='60' name='options[5]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
Index: trunk/blocks/recent_posts_content_block.php
===================================================================
--- trunk/blocks/recent_posts_content_block.php	(revision 145)
+++ trunk/blocks/recent_posts_content_block.php	(revision 183)
@@ -34,18 +34,18 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-		$form .= yes_no_radio_option('options[3]', _MB_XPRESS_P_EXCERPT , $excerpt) . "<br />\n";
-		$form .= _MB_XPRESS_P_EXCERPT_SIZE .": <input type='text' name='options[4]' value='" . $excerpt_size . "' /><br />\n";
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
-		$form .= _MB_XPRESS_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
+		$form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+		$form .= yes_no_radio_option('options[3]', _MB_XP2_P_EXCERPT , $excerpt) . "<br />\n";
+		$form .= _MB_XP2_P_EXCERPT_SIZE .": <input type='text' name='options[4]' value='" . $excerpt_size . "' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
+		$form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
 		
 		$form .= "<br />\n";
-		$form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[7]' value='" . $tag_select . "' /><br />\n";
-	    $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
+		$form .= _MB_XP2_TAGS_SELECT .": <input type='text' name='options[7]' value='" . $tag_select . "' /><br />\n";
+	    $form .= _MB_XP2_CATS_SELECT ."<br />\n";
 	    $isAll = (count($selected)==0||empty($selected[0]))?true:false;
 	    $form .= "&nbsp;&nbsp;<select name=\"options[]\" multiple=\"multiple\">\n";
 	    $form .= "\t<option value=\"0\" ";
 	    if ($isAll) $form .= " selected=\"selected\"";
-	    $form .= ">"._MB_XPRESS_ALL ."</option>\n";
+	    $form .= ">"._MB_XP2_ALL ."</option>\n";
 		ob_start();
 		dropdown_cats_options('ID','asc',$selected);
Index: trunk/blocks/recent_posts_list_block.php
===================================================================
--- trunk/blocks/recent_posts_list_block.php	(revision 145)
+++ trunk/blocks/recent_posts_list_block.php	(revision 183)
@@ -33,18 +33,18 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
 		$form .= "<br />\n";	
-		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-		$form .= _MB_XPRESS_REDNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_red . "' /><br />\n";
-		$form .= _MB_XPRESS_GREENNEW_DAYS .": <input type='text' name='options[4]' value='" . $disp_green . "' /><br />\n";
-		$form .= _MB_XPRESS_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
-		$form .= _MB_XPRESS_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
+		$form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+		$form .= _MB_XP2_REDNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_red . "' /><br />\n";
+		$form .= _MB_XP2_GREENNEW_DAYS .": <input type='text' name='options[4]' value='" . $disp_green . "' /><br />\n";
+		$form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
+		$form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
 		
 	    $form .= "<br />\n";
-		$form .= _MB_XPRESS_TAGS_SELECT .": <input type='text' name='options[7]' value='" . $tag_select . "' /><br />\n";
-	    $form .= _MB_XPRESS_CATS_SELECT ."<br />\n";
+		$form .= _MB_XP2_TAGS_SELECT .": <input type='text' name='options[7]' value='" . $tag_select . "' /><br />\n";
+	    $form .= _MB_XP2_CATS_SELECT ."<br />\n";
 	    $isAll = (count($selected)==0||empty($selected[0]))?true:false;
 	    $form .= "&nbsp;&nbsp;<select name=\"options[]\" multiple=\"multiple\">\n";
 	    $form .= "\t<option value=\"0\" ";
 	    if ($isAll) $form .= " selected=\"selected\"";
-	    $form .= ">"._MB_XPRESS_ALL ."</option>\n";
+	    $form .= ">"._MB_XP2_ALL ."</option>\n";
 		ob_start();
 		dropdown_cats_options('ID','asc',$selected);
Index: trunk/blocks/search_block.php
===================================================================
--- trunk/blocks/search_block.php	(revision 145)
+++ trunk/blocks/search_block.php	(revision 183)
@@ -27,5 +27,5 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";		
-		$form .= _MB_XPRESS_SEARCH_LENGTH .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
+		$form .= _MB_XP2_SEARCH_LENGTH .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
 //	    $form .="<br /><input type='text' size='60' name='options[2]' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
 
Index: trunk/blocks/tag_cloud_block.php
===================================================================
--- trunk/blocks/tag_cloud_block.php	(revision 145)
+++ trunk/blocks/tag_cloud_block.php	(revision 183)
@@ -34,7 +34,7 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_CLOUD_SMALLEST .": <input type='text' size='4' name='options[2]' value='" . $smallest . "' /><br />";
-		$form .= _MB_XPRESS_CLOUD_LARGEST .": <input type='text' size='4' name='options[3]' value='" . $largest . "' /><br />";
-		$form .= _MB_XPRESS_CLOUD_UNIT .": ";
+		$form .= _MB_XP2_CLOUD_SMALLEST .": <input type='text' size='4' name='options[2]' value='" . $smallest . "' /><br />";
+		$form .= _MB_XP2_CLOUD_LARGEST .": <input type='text' size='4' name='options[3]' value='" . $largest . "' /><br />";
+		$form .= _MB_XP2_CLOUD_UNIT .": ";
 		$form .=  "<select name='options[4]'>";
 		if ($unit =='pt')
@@ -56,48 +56,48 @@
 		$form .=  "</select><br/>";
 		
-		$form .= _MB_XPRESS_CLOUD_NUMBER .": <input type='text' size='4' name='options[5]' value='" . $number . "' /><br />";
+		$form .= _MB_XP2_CLOUD_NUMBER .": <input type='text' size='4' name='options[5]' value='" . $number . "' /><br />";
 		
-		$form .= _MB_XPRESS_CLOUD_FORMAT .": ";
+		$form .= _MB_XP2_CLOUD_FORMAT .": ";
 		$form .=  "<select name='options[6]'>";
 		if ($format =='flat')
-			$form .=  "<option value='flat' selected='selected'>" . _MB_XPRESS_FLAT;
+			$form .=  "<option value='flat' selected='selected'>" . _MB_XP2_FLAT;
 		else
-			$form .=  "<option value='flat'>" . _MB_XPRESS_FLAT;
+			$form .=  "<option value='flat'>" . _MB_XP2_FLAT;
 		if ($format =='list')
-			$form .=  "<option value='list' selected='selected'>". _MB_XPRESS_LIST;
+			$form .=  "<option value='list' selected='selected'>". _MB_XP2_LIST;
 		else
-			$form .=  "<option value='list'>". _MB_XPRESS_LIST;
+			$form .=  "<option value='list'>". _MB_XP2_LIST;
 		$form .=  "</select><br/>";
 				
-		$form .= _MB_XPRESS_CLOUD_ORDERBY .": ";
+		$form .= _MB_XP2_CLOUD_ORDERBY .": ";
 		$form .=  "<select name='options[7]'>";
 		if ($orderby =='name')
-			$form .=  "<option value='name' selected='selected'>". _MB_XPRESS_TAG_NAME;
+			$form .=  "<option value='name' selected='selected'>". _MB_XP2_TAG_NAME;
 		else
-			$form .=  "<option value='name'>". _MB_XPRESS_TAG_NAME;
+			$form .=  "<option value='name'>". _MB_XP2_TAG_NAME;
 		if ($orderby =='count')
-			$form .=  "<option value='count' selected='selected'>". _MB_XPRESS_TAG_COUNT;
+			$form .=  "<option value='count' selected='selected'>". _MB_XP2_TAG_COUNT;
 		else
-			$form .=  "<option value='count'>". _MB_XPRESS_TAG_COUNT;
+			$form .=  "<option value='count'>". _MB_XP2_TAG_COUNT;
 		$form .=  "</select><br/>";
 
-		$form .= _MB_XPRESS_CLOUD_ORDER .": ";
+		$form .= _MB_XP2_CLOUD_ORDER .": ";
 		$form .=  "<select name='options[8]'>";
 		if ($order =='ASC')
-			$form .=  "<option value='ASC' selected='selected'>" . _MB_XPRESS_SORT_ASC;
+			$form .=  "<option value='ASC' selected='selected'>" . _MB_XP2_SORT_ASC;
 		else
-			$form .=  "<option value='ASC'>" . _MB_XPRESS_SORT_ASC;
+			$form .=  "<option value='ASC'>" . _MB_XP2_SORT_ASC;
 		if ($order =='DESC')
-			$form .=  "<option value='DESC' selected='selected'>" . _MB_XPRESS_SORT_DESC;
+			$form .=  "<option value='DESC' selected='selected'>" . _MB_XP2_SORT_DESC;
 		else
-			$form .=  "<option value='DESC'>" . _MB_XPRESS_SORT_DESC;
+			$form .=  "<option value='DESC'>" . _MB_XP2_SORT_DESC;
 		if ($order =='RAND')
-			$form .=  "<option value='RAND' selected='selected'>" . _MB_XPRESS_RAND;
+			$form .=  "<option value='RAND' selected='selected'>" . _MB_XP2_RAND;
 		else
-			$form .=  "<option value='RAND'>" . _MB_XPRESS_RAND;
+			$form .=  "<option value='RAND'>" . _MB_XP2_RAND;
 		$form .=  "</select><br/>";
 
-		$form .= _MB_XPRESS_CLOUD_EXCLUDE .": <input type='text' size='25' name='options[9]' value='" . $exclude . "' /><br />";
-		$form .= _MB_XPRESS_CLOUD_INCLUDE .": <input type='text' size='25' name='options[10]' value='" . $wp_include . "' /><br />";
+		$form .= _MB_XP2_CLOUD_EXCLUDE .": <input type='text' size='25' name='options[9]' value='" . $exclude . "' /><br />";
+		$form .= _MB_XP2_CLOUD_INCLUDE .": <input type='text' size='25' name='options[10]' value='" . $wp_include . "' /><br />";
 
 
Index: trunk/blocks/widget_block.php
===================================================================
--- trunk/blocks/widget_block.php	(revision 145)
+++ trunk/blocks/widget_block.php	(revision 183)
@@ -30,5 +30,5 @@
 	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
 		$form .= "<br />";
-		$form .= _MB_XPRESS_SELECT_WIDGET .":<br />\n";
+		$form .= _MB_XP2_SELECT_WIDGET .":<br />\n";
 		$form .= "&nbsp;&nbsp;&nbsp;<select name='options[]' multiple=\"multiple\">\n";
 		$sidebars_widgets = wp_get_sidebars_widgets();