--- template.php.orig	2009-06-13 03:22:57.000000000 -0700
+++ template.php	2009-07-08 19:49:48.000000000 -0700
@@ -282,10 +282,10 @@ function acquia_marina_preprocess_node(&
         theme_get_setting('readmore_prefix_'. $node_content_type),
         theme_get_setting('readmore_suffix_'. $node_content_type),
         t(theme_get_setting('readmore_'. $node_content_type)),
-        'node/'. $vars['node']->nid,
+	$vars['node']->links['node_read_more']['href'],
         array(
           'attributes' => array('title' => t(theme_get_setting('readmore_title_'. $node_content_type))), 
-          'query' => NULL, 'fragment' => NULL, 'absolute' => FALSE, 'html' => TRUE
+          'query' => NULL, 'fragment' => $vars['node']->links['node_read_more']['fragment'], 'absolute' => FALSE, 'html' => TRUE
         )
       ),
       'attributes' => array('class' => 'readmore-item'),
@@ -300,10 +300,10 @@ function acquia_marina_preprocess_node(&
           theme_get_setting('comment_add_prefix_'. $node_content_type),
           theme_get_setting('comment_add_suffix_'. $node_content_type),
           t(theme_get_setting('comment_add_'. $node_content_type)),
-          "comment/reply/".$vars['node']->nid,
+	  $vars['node']->links['comment_add']['href'],
           array(
             'attributes' => array('title' => t(theme_get_setting('comment_add_title_'. $node_content_type))), 
-            'query' => NULL, 'fragment' => 'comment-form', 'absolute' => FALSE, 'html' => TRUE
+            'query' => NULL, 'fragment' => $vars['node']->links['comment_add']['fragment'], 'absolute' => FALSE, 'html' => TRUE
           )
         ),
         'attributes' => array('class' => 'comment-add-item'),
@@ -316,10 +316,10 @@ function acquia_marina_preprocess_node(&
           theme_get_setting('comment_node_prefix_'. $node_content_type),
           theme_get_setting('comment_node_suffix_'. $node_content_type),
           t(theme_get_setting('comment_node_'. $node_content_type)),
-          "comment/reply/".$vars['node']->nid,
+	  $vars['node']->links['comment_add']['href'],
           array(
             'attributes' => array('title' => t(theme_get_setting('comment_node_title_'. $node_content_type))), 
-            'query' => NULL, 'fragment' => 'comment-form', 'absolute' => FALSE, 'html' => TRUE
+            'query' => NULL, 'fragment' => $vars['node']->links['comment_add']['fragment'], 'absolute' => FALSE, 'html' => TRUE
           )
         ),
         'attributes' => array('class' => 'comment-node-item'),
@@ -338,10 +338,10 @@ function acquia_marina_preprocess_node(&
           t(theme_get_setting('comment_new_singular_'. $node_content_type)),
           t(theme_get_setting('comment_new_plural_'. $node_content_type))
         ),
-        "node/".$vars['node']->nid,
+        $vars['node']->links['comment_new_comments']['href'],
         array(
           'attributes' => array('title' => t(theme_get_setting('comment_new_title_'. $node_content_type))), 
-          'query' => NULL, 'fragment' => 'new', 'absolute' => FALSE, 'html' => TRUE
+          'query' => NULL, 'fragment' => $vars['node']->links['comment_new_comments']['fragment'], 'absolute' => FALSE, 'html' => TRUE
         )
       ),
       'attributes' => array('class' => 'comment-new-item'),
@@ -359,10 +359,10 @@ function acquia_marina_preprocess_node(&
           t(theme_get_setting('comment_singular_'. $node_content_type)),
           t(theme_get_setting('comment_plural_'. $node_content_type))
         ),
-        "node/".$vars['node']->nid,
+        $vars['node']->links['comment_comments']['href'],
         array(
           'attributes' => array('title' => t(theme_get_setting('comment_title_'. $node_content_type))), 
-          'query' => NULL, 'fragment' => 'comments', 'absolute' => FALSE, 'html' => TRUE
+          'query' => NULL, 'fragment' => $vars['node']->links['comment_comments']['fragment'], 'absolute' => FALSE, 'html' => TRUE
         )
       ),
       'attributes' => array('class' => 'comment-item'),