Index: trunk/blocks/archives_block.php
===================================================================
--- trunk/blocks/archives_block.php	(revision 194)
+++ trunk/blocks/archives_block.php	(revision 195)
@@ -19,5 +19,5 @@
 	{
 		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_category.html' : trim( $options[1] );
+		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_archives_block.html' : trim( $options[1] );
 		$type = empty( $options[2] ) ? 'monthly' : $options[2] ;
 		$limit  = !is_numeric( $options[3] ) ? 0 : $options[3] ;
Index: trunk/blocks/authors_block.php
===================================================================
--- trunk/blocks/authors_block.php	(revision 194)
+++ trunk/blocks/authors_block.php	(revision 195)
@@ -19,5 +19,5 @@
 	{
 		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_authors.html' : trim( $options[1] );
+		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_authors_block.html' : trim( $options[1] );
 		$optioncount = empty( $options[2] ) ? false : true ;
 		$exclude_admin = empty( $options[3] ) ? false : true ;
Index: trunk/blocks/enhanced_block.php
===================================================================
--- trunk/blocks/enhanced_block.php	(revision 194)
+++ trunk/blocks/enhanced_block.php	(revision 195)
@@ -12,6 +12,6 @@
 ' ) ;
 
-if( ! defined( 'XPRESS_TAG_CLOUD_BLOCK_INCLUDED' ) ) {
-	define( 'XPRESS_TAG_CLOUD_BLOCK_INCLUDED' , 1 ) ;
+if( ! defined( 'XPRESS_ENHANCED_BLOCK_INCLUDED' ) ) {
+	define( 'XPRESS_ENHANCED_BLOCK_INCLUDED' , 1 ) ;
 	
 	function _b_enhanced_edit($options)
Index: trunk/blocks/meta_block.php
===================================================================
--- trunk/blocks/meta_block.php	(revision 194)
+++ trunk/blocks/meta_block.php	(revision 195)
@@ -18,5 +18,5 @@
 	{
 		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_meta.html' : trim( $options[1] );
+		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_meta_block.html' : trim( $options[1] );
 		$wp_link = empty( $options[2] ) ? false : true ;
 		$xoops_link = empty( $options[3] ) ? false : true ;
Index: trunk/blocks/page_block.php
===================================================================
--- trunk/blocks/page_block.php	(revision 194)
+++ trunk/blocks/page_block.php	(revision 195)
@@ -13,5 +13,5 @@
 	
 if( ! defined( 'XPRESS_PAGE_BLOCK_INCLUDED' ) ) {
-	define( 'XPRESS_page_PAGE_INCLUDED' , 1 ) ;
+	define( 'XPRESS_PAGE_BLOCK_INCLUDED' , 1 ) ;
 
 	function _b_page_edit($options)
Index: trunk/blocks/popular_posts_block.php
===================================================================
--- trunk/blocks/popular_posts_block.php	(revision 194)
+++ trunk/blocks/popular_posts_block.php	(revision 195)
@@ -17,5 +17,5 @@
 	{
 		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_popular.html' : trim( $options[1] );
+		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_popular_posts_block.html' : trim( $options[1] );
 		$disp_count = empty( $options[2] ) ? '10' : $options[2] ;
 		$show_month_range = empty( $options[3] ) ? '0' : $options[3] ;
Index: trunk/blocks/tag_cloud_block.php
===================================================================
--- trunk/blocks/tag_cloud_block.php	(revision 194)
+++ trunk/blocks/tag_cloud_block.php	(revision 195)
@@ -18,5 +18,5 @@
 	{
 		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_meta.html' : trim( $options[1] );
+		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_tag_cloud_block.html' : trim( $options[1] );
 		$smallest = !is_numeric( $options[2] ) ? 8 : $options[2] ;
 		$largest = !is_numeric( $options[3] ) ? 22 : $options[3] ;
Index: trunk/blocks/widget_block.php
===================================================================
--- trunk/blocks/widget_block.php	(revision 194)
+++ trunk/blocks/widget_block.php	(revision 195)
@@ -18,5 +18,5 @@
 	{
 		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_widget.html' : trim( $options[1] );
+		$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_widget_block.html' : trim( $options[1] );
     	$selected = array_slice($options,2); // get allowed cats