--- twitter-pull-listing.tpl.php	2010-01-06 23:25:46.000000000 -0500
+++ twitter-pull-listing.tpl.php-new	2010-01-11 15:29:41.000000000 -0500
@@ -31,12 +31,12 @@ drupal_add_css (drupal_get_path('module'
     <?php foreach ($tweets as $tweet):  ?>
       <li>
         <div class="tweet-authorphoto"><img src="<?php print $tweet->userphoto; ?>"></div>
-        <span class="tweet-author"><?php print l($tweet->username, 'http://twitter.com/' . $tweet->username); ?></span>      
-        <span class="tweet-text"><?php print twitter_pull_add_links($tweet->text); ?></span>
-        <div class="tweet-time"><?php print l(format_interval(time() - $tweet->timestamp) . ' ' . t('ago'), 'http://twitter.com/' . $tweet->username . '/status/' . $tweet->id);?></div>   
+        <span class="tweet-author"><?php print l($tweet->username, $tweet->url_root . $tweet->username); ?></span>      
+        <span class="tweet-text"><?php print twitter_pull_add_links($tweet); ?></span>
+        <div class="tweet-time"><?php print l(format_interval(time() - $tweet->timestamp) . ' ' . t('ago'), $tweet->url);?></div>   
         <div class="tweet-divider"></div>  
       </li>
     <?php endforeach; ?>
     </ul>
   <?php endif; ?>
-</div>
\ No newline at end of file
+</div>