diff -up /home/lntw/uc_catalogmenu/uc_catalogmenu.info uc_catalogmenu/uc_catalogmenu.info
--- /home/lntw/uc_catalogmenu/uc_catalogmenu.info	2008-06-19 11:10:41.000000000 -0400
+++ uc_catalogmenu/uc_catalogmenu.info	2009-03-16 15:15:53.000000000 -0400
@@ -1,14 +1,9 @@
+; $Id$
 name = Multi Catalog Menu
 description = Display multiple hierarchical product catalog blocks.
-dependencies = path taxonomy uc_product uc_catalog
-package = "Ubercart - core (optional)"
-
-version = "5.x-1.0-beta1"
-project = "ubercart"
-
-
-; Information added by drupal.org packaging script on 2008-06-19
-version = "5.x-1.0"
-project = "uc_catalogmenu"
-datestamp = "1213888241"
-
+dependencies[] = path
+dependencies[] = taxonomy
+dependencies[] = uc_product
+dependencies[] = uc_catalog
+package = "Ubercart - extra"
+core = 6.x
\ No newline at end of file
diff -up /home/lntw/uc_catalogmenu/uc_catalogmenu.module uc_catalogmenu/uc_catalogmenu.module
--- /home/lntw/uc_catalogmenu/uc_catalogmenu.module	2008-06-19 11:03:58.000000000 -0400
+++ uc_catalogmenu/uc_catalogmenu.module	2009-03-16 15:49:20.000000000 -0400
@@ -1,20 +1,21 @@
 <?php
+// $Id$
+
 /*
-  By Bünyamin AKYILDIZ (bakyildiz)
-  Display multiple hierarchical product catalog menu.
+ * @file
+ * Display multiple hierarchical product catalog menu for Ubercart.
  */
 
 /**
  * Implemention of hook_menu().
  */
-function uc_catalogmenu_menu($may_cache) {
+function uc_catalogmenu_menu() {
  
-  $items[] = array(
-      'path' => 'admin/store/settings/catalog/edit/multiplecatalogblock',
-      'access' => user_access('administer catalog'),
-      'title' => t('Multi Catalog Menu'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('uc_catalogmenu_admin_settings'),
+  $items['admin/store/settings/catalog/edit/multiplecatalogblock'] = array(
+      'access arguments' => array('administer catalog'),
+      'title' => 'Multi Catalog Menu',
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('uc_catalogmenu_admin_settings'),
       'weight' => -1,
       'type' => MENU_LOCAL_TASK,
     );
@@ -30,7 +31,7 @@ function uc_catalogmenu_admin_settings()
   $form['uc_catalogmenu_number'] = array(
     '#type' => 'select',
     '#title' => t('Number of hierarchical product catalog block'),
-    '#description' => t('The total number of independent hierarchical product catalog block.<br>'). t('After save configuration <a href="!url">Click here</a> to goto block configuration page.',
+    '#description' => t('The total number of independent hierarchical product catalog block.<br>') . t('After save configuration <a href="!url">Click here</a> to goto block configuration page.',
               array('!url' => url('admin/build/block'))),
     '#default_value' => variable_get('uc_catalogmenu_number', '2'),
     '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5)),
@@ -75,12 +76,12 @@ function uc_catalogmenu_block($op = 'lis
 
     case 'view':
           $vid = variable_get('uc_catalog_vid', 0);
-          $tree = taxonomy_get_tree($vid,variable_get('uc_catalogmenu_term_id_'. $delta,0));
+          $tree = taxonomy_get_tree($vid, variable_get('uc_catalogmenu_term_id_'. $delta, 0));
           $seq = 0;
           $menu_tree = new uc_treeNode();
           $level = array();
           $curr_depth = 0;
-          foreach ($tree as $knot){
+          foreach ($tree as $knot) {
             $seq++;
             $knot->sequence = $seq;
             $knothole = new uc_treeNode($knot);
@@ -88,15 +89,15 @@ function uc_catalogmenu_block($op = 'lis
             $menu_tree->add_child($knothole);
           }
           // Now, create a structured menu, separate from Drupal's menu.
-          $content .= theme("uc_catalog_block_start");
-          foreach ($menu_tree->children as $branch){
+          $content .= '<ul class="catalog menu">';
+          foreach ($menu_tree->children as $branch) {
             list($inpath, $html) = _uc_catalog_navigation($branch);
             if ($html != 'Main Category')
               $content .= $html;
           }
-          $content .= theme("uc_catalog_block_end");
+          $content .= '</ul>';
           $subject = variable_get('uc_catalog_name', t('Catalog'));
-          if (variable_get('uc_catalog_block_title', true)){
+          if (variable_get('uc_catalog_block_title', TRUE)) {
             $subject = l($subject, 'catalog');
           }
           $block = array('subject' => $subject, 'content' => $content);