diff --git a/modules/cpn/cpn.module b/modules/cpn/cpn.module
index 9ee20b0..e7698f7 100644
--- a/modules/cpn/cpn.module
+++ b/modules/cpn/cpn.module
@@ -228,10 +228,10 @@ function cpn_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
         $css = file_create_path('cpn/'. $node->nid .'.css');
         $js = file_create_path('cpn/'. $node->nid .'.js');
         if (is_file($css)) {
-          drupal_add_css($css, 'theme');
+          drupal_add_css($css, 'theme', 'all', FALSE);
         }
         if (is_file($js)) {
-          drupal_add_js($js, 'theme');
+          drupal_add_js($js, 'theme', 'header', FALSE, TRUE, FALSE);
         }
       }
       break;
@@ -287,10 +287,10 @@ function cpn_preprocess_block(&$vars) {
   $css = file_create_path('cpn/'. $vars['block']->module .'-'. $vars['block']->delta .'.css');
   $js = file_create_path('cpn/'. $vars['block']->module .'-'. $vars['block']->delta .'.js');
   if (is_file($css)) {
-    drupal_add_css($css, 'theme');
+    drupal_add_css($css, 'theme', 'all', FALSE);
   }
   if (is_file($js)) {
-    drupal_add_js($js, 'theme');
+    drupal_add_js($js, 'theme', 'header', FALSE, TRUE, FALSE);
   }
 }