diff -urp imagecache_actions/imagecache_canvasactions.info imagecache_actions.new/imagecache_canvasactions.info
--- imagecache_actions/imagecache_canvasactions.info	2008-08-19 07:45:20.000000000 -0700
+++ imagecache_actions.new/imagecache_canvasactions.info	2008-09-03 07:48:16.000000000 -0700
@@ -1,12 +1,9 @@
 ; $Id: imagecache_canvasactions.info,v 1.1 2008/05/28 11:45:08 dman Exp $
 name = Imagecache Canvas Actions
 description = Actions for manipulating image canvases layers, including watermark and background effect.
-dependencies = imagecache imageapi
+dependencies[] = imagecache
+dependencies[] = imageapi
 package = ImageCache
-
-
-; Information added by drupal.org packaging script on 2008-08-19
-version = "5.x-2.0"
+version = "6.x-2.0"
 project = "imagecache_actions"
-datestamp = "1219157120"
-
+core = 6.x
Only in imagecache_actions.new/: imagecache_canvasactions.install
diff -urp imagecache_actions/imagecache_coloractions.info imagecache_actions.new/imagecache_coloractions.info
--- imagecache_actions/imagecache_coloractions.info	2008-08-19 07:45:20.000000000 -0700
+++ imagecache_actions.new/imagecache_coloractions.info	2008-09-03 07:49:20.000000000 -0700
@@ -1,12 +1,9 @@
 ; $Id: imagecache_coloractions.info,v 1.1 2008/05/28 11:45:08 dman Exp $
 name = Imagecache Color Actions
 description = Additional ImageCache actions, providing color-shifting, brightness and alpha transparency effects.
-dependencies = imagecache imageapi
+dependencies[] = imagecache
+dependencies[] = imageapi
 package = ImageCache
-
-
-; Information added by drupal.org packaging script on 2008-08-19
-version = "5.x-2.0"
+version = "6.x-2.0"
 project = "imagecache_actions"
-datestamp = "1219157120"
-
+core = 6.x
Only in imagecache_actions.new/: imagecache_coloractions.install
diff -urp imagecache_actions/imagecache_coloractions.module imagecache_actions.new/imagecache_coloractions.module
--- imagecache_actions/imagecache_coloractions.module	2008-05-28 06:18:41.000000000 -0700
+++ imagecache_actions.new/imagecache_coloractions.module	2008-09-03 07:25:36.000000000 -0700
@@ -4,17 +4,17 @@
 /**
  * @file
  * Additional actions for imagecache processing.
- * 
+ *
  * Exposes some of the simpler PHP 'imagefilter' actions (colorshift,
- * brightness, negative) 
- * -  A transparency masker for merging with backgrounds. 
+ * brightness, negative)
+ * -  A transparency masker for merging with backgrounds.
  * -  A pseudo - file conversion feature.
- * 
+ *
  * Compatible with the 2008 revision (imagecache 2)
  *
  * @author dan http://coders.co.nz
  */
- 
+
 require_once('utility.inc');
 
 // During devel, caching is pointless. Flush it
@@ -22,7 +22,7 @@ require_once('utility.inc');
 
 /**
  * Implementation of hook_imagecache_actions().
- * 
+ *
  * Declare available actions, return help text about this filter.
  */
 function imagecache_coloractions_imagecache_actions() {
@@ -52,11 +52,19 @@ function imagecache_coloractions_imageca
   return $actions;
 }
 
+function imagecache_coloractions_theme() {
+  return array(
+    'imagecache_colorshift' => array(
+      'arguments' => array('element' => NULL),
+    ),
+  );
+}
+
 /**
  * Implementation of imagecache_hook_form()
- * 
+ *
  * Settings for colorshift actions.
- * 
+ *
  * @param $action array of settings for this action
  * @return a form definition
  */
@@ -78,9 +86,9 @@ function theme_imagecache_colorshift($el
 
 /**
  * Implementation of hook_image()
- * 
+ *
  * Process the imagecache action on the passed image
- * 
+ *
  * Just converts and passes the vals to the all-purpose 'filter' action
  */
 function imagecache_colorshift_image(&$image, $data = array()) {
@@ -98,19 +106,19 @@ function imagecache_colorshift_image(&$i
 
 /**
  * Implementation of imagecache_hook_form()
- * 
+ *
  * Settings for colorshift actions.
- * 
+ *
  * @param $action array of settings for this action
  * @return a form definition
  */
 function imagecache_brightness_form($action) {
   $form = array();
-  $form['filter_arg1'] = array( 
-    '#type' => 'textfield', 
-    '#title' => t('Brightness'), 
+  $form['filter_arg1'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Brightness'),
     '#description' => t('-255 - +255'),
-    '#default_value' => $action['filter_arg1'], 
+    '#default_value' => $action['filter_arg1'],
     '#size' => 3
   );
   return $form;
@@ -118,7 +126,7 @@ function imagecache_brightness_form($act
 
 /**
  * Implementation of hook_image()
- * 
+ *
  * Process the imagecache action on the passed image
  */
 function imagecache_brightness_image(&$image, $data = array()) {
@@ -136,9 +144,9 @@ function theme_imagecache_brightness($el
 
 /**
  * Implementation of imagecache_hook_form()
- * 
+ *
  * No settings.
- * 
+ *
  * @param $action array of settings for this action
  * @return a form definition
  */
@@ -149,7 +157,7 @@ function imagecache_inverse_form($action
 
 /**
  * Implementation of hook_image()
- * 
+ *
  * Process the imagecache action on the passed image
  */
 function imagecache_inverse_image(&$image, $data = array()) {
@@ -159,14 +167,14 @@ function imagecache_inverse_image(&$imag
 
 
 /**
- * Stub for the image toolkit. 
- * 
+ * Stub for the image toolkit.
+ *
  * Used by brightness and colorize
- * 
- * TODO: other toolkits unimplimented yet. 
+ *
+ * TODO: other toolkits unimplimented yet.
  * Just forward the job to gdtoolkit for
  * now
- * 
+ *
  * @param $image handle on the image definition, including a gd image resource
  * to act upon
  * @param $data settings for this process.
@@ -174,7 +182,7 @@ function imagecache_inverse_image(&$imag
  */
 function imagecache_imagefilter($image, $data) {
   if (! imagecache_gd_imagefilter($image, $data['filter'], $data['filter_arg1'], $data['filter_arg2'], $data['filter_arg3'] )) {
-    watchdog('imagecache', t('imagecache_imagefilter failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, TRUE))), WATCHDOG_ERROR);
+    watchdog('imagecache', 'imagecache_imagefilter failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, TRUE)), WATCHDOG_ERROR);
     return FALSE;
   }
   return TRUE;
@@ -184,7 +192,7 @@ function imagecache_imagefilter($image, 
  * Attempt to run imagefilter, which may or may not be included with your
  * gdtoolkit. If it isn't, a local script is used to emulate the simpler of its
  * functions.
- */  
+ */
 function imagecache_gd_imagefilter($image, $filter, $arg1, $arg2, $arg3) {
   // some distros that allegedly include PHP5 GD2 are faulty.
   // thankyou http://www.weberdev.com/get_example-4601.html
@@ -204,7 +212,7 @@ function imagecache_gd_imagefilter($imag
 
 /**
  * Implementation of imagecache_hook_form()
- * 
+ *
  * @param $action array of settings for this action
  * @return a form definition
  */
@@ -221,7 +229,7 @@ function imagecache_convert_form($action
     'format' => array(
       '#title' => t("File format"),
       '#type' => 'select',
-      '#default_value' => $action['format'], 
+      '#default_value' => $action['format'],
       '#options' => imagecache_file_formats(),
     )
   );
@@ -238,7 +246,7 @@ function theme_imagecache_convert($eleme
 
 /**
  * Implementation of hook_image()
- * 
+ *
  * Process the imagecache action on the passed image
  */
 function imagecache_convert_image(&$image, $data = array()) {
@@ -255,7 +263,7 @@ function imagecache_file_formats() {
 
 
 
-  
+
 /**
  * Need to flush the cache when this module is enabled
  */
diff -urp imagecache_actions/text2canvas.inc imagecache_actions.new/text2canvas.inc
--- imagecache_actions/text2canvas.inc	2008-05-28 04:45:08.000000000 -0700
+++ imagecache_actions.new/text2canvas.inc	2008-09-03 07:25:36.000000000 -0700
@@ -2,7 +2,7 @@
 // $ID: $
 /**
  * Helper functions for the text2canvas action for imagecache
- * 
+ *
  */
 
 /**
@@ -72,14 +72,14 @@ function canvasactions_text2canvas_form(
       '#description' => t('The text string.'),
     )
   );
-  $form['#validate']['canvasactions_text2canvas_validate'] = array() ;
+  $form['#validate'][] = 'canvasactions_text2canvas_validate';
   return $form;
 }
 
-function canvasactions_text2canvas_validate($form_values) {
-  if (! $fontfile = canvasactions_find_font($form_values['fontfile']['#value'], TRUE)) {
+function canvasactions_text2canvas_validate($form, &$form_state) {
+  if (! $fontfile = canvasactions_find_font($form_state['values']['fontfile']['#value'], TRUE)) {
     // Just warn, don't prevent
-    drupal_set_message(t("Unable to confirm that the font %fontfile is available on your system", array('%fontfile' => $form_values['fontfile']['#value'])) );
+    drupal_set_message(t("Unable to confirm that the font %fontfile is available on your system", array('%fontfile' => $form_state['values']['fontfile']['#value'])) );
   }
   else {
     drupal_set_message(t("Font was found at %fontfile", array('%fontfile' => $fontfile)));
@@ -174,4 +174,3 @@ function canvasactions_find_font($fontpa
   // otherwise, just return what we had and hope it's in a system library
   return $fontpath;
 }
-