diff -ur scuttle-0.7.1.orig/templates/bookmarks.tpl.php scuttle-0.7.1/templates/bookmarks.tpl.php
--- scuttle-0.7.1.orig/templates/bookmarks.tpl.php	2006-04-01 16:40:41.000000000 +0200
+++ scuttle-0.7.1/templates/bookmarks.tpl.php	2006-04-01 16:41:58.000000000 +0200
@@ -15,12 +15,12 @@
 
 <p id="sort">
     <?php echo T_("Sort by:"); ?>
-    <a href="?sort=date_desc"><?php echo T_("Date"); ?></a><span> / </span>
-    <a href="?sort=title_asc"><?php echo T_("Title"); ?></a><span> / </span>
+    <a href="?sort=date_desc" target="_self"><?php echo T_("Date"); ?></a><span> / </span>
+    <a href="?sort=title_asc" target="_self"><?php echo T_("Title"); ?></a><span> / </span>
     <?php
     if (!isset($hash)) {
     ?>
-    <a href="?sort=url_asc"><?php echo T_("URL"); ?></a>
+    <a href="?sort=url_asc" target="_self"><?php echo T_("URL"); ?></a>
     <?php
     }
     ?>
@@ -47,7 +47,7 @@
         $tags = $row['tags'];
         foreach(array_keys($tags) as $key) {
             $tag =& $tags[$key];
-            $cats .= '<a href="'. $GLOBALS['root'] . sprintf($cat_url, filter($user, 'url'), filter($tag,'url')) .'" rel="tag">'. filter($tag) .'</a>, ';
+            $cats .= '<a href="'. $GLOBALS['root'] . sprintf($cat_url, filter($user, 'url'), filter($tag,'url')) .'" rel="tag" target="_self">'. filter($tag) .'</a>, ';
         }
         $cats = substr($cats, 0, -2);
         if ($cats != '') {
@@ -57,19 +57,19 @@
         // Edit and delete links
         $edit = '';
         if ($bookmarkservice->editAllowed($row['bId'])) {
-            $edit = ' - <a href="'. $GLOBALS['root'] .'edit.php/'. $row['bId'] .'">'. T_('Edit') .'</a><script type="text/javascript">document.write(" - <a href=\"#\" onclick=\"deleteBookmark(this, '. $row['bId'] .'); return false;\">'. T_('Delete') .'<\/a>");</script>';
+            $edit = ' - <a href="'. $GLOBALS['root'] .'edit.php/'. $row['bId'] .'" target="_self">'. T_('Edit') .'</a><script type="text/javascript">document.write(" - <a href=\"#\" onclick=\"deleteBookmark(this, '. $row['bId'] .'); return false;\">'. T_('Delete') .'<\/a>");</script>';
         }
 
         // User attribution
         $copy = '';
         if (!isset($user) || isset($watched)) {
-            $copy = ' '. T_('by') .' <a href="'. $GLOBALS['root'] .'bookmarks.php/'. $row['username'] .'">'. $row['username'] .'</a>';
+            $copy = ' '. T_('by') .' <a href="'. $GLOBALS['root'] .'bookmarks.php/'. $row['username'] .'" target="_self">'. $row['username'] .'</a>';
         }
 
         // Udders!
         if (!isset($hash)) {
             $others = $bookmarkservice->countOthers($row['bAddress']);
-            $ostart = '<a href="'. $GLOBALS['root'] .'history.php/'. $row['bHash'] .'">';
+            $ostart = '<a href="'. $GLOBALS['root'] .'history.php/'. $row['bHash'] .'" target="_self">';
             $oend = '</a>';
             switch ($others) {
                 case 0:
@@ -87,7 +87,7 @@
             // Get the username of the current user
             $currentUser = $userservice->getCurrentUser();
             $currentUsername = $currentUser[$userservice->getFieldName('username')];
-            $copy .= ' - <a href="'. $GLOBALS['root'] .'bookmarks.php/'. $currentUsername .'?action=add&amp;address='. urlencode($row['bAddress']) .'&amp;title='. urlencode(filter($row['bTitle'])) .'">'. T_('Copy') .'</a>';   
+            $copy .= ' - <a href="'. $GLOBALS['root'] .'bookmarks.php/'. $currentUsername .'?action=add&amp;address='. urlencode($row['bAddress']) .'&amp;title='. urlencode(filter($row['bTitle'])) .'" target="_self">'. T_('Copy') .'</a>';   
         }
 
         // Nofollow option
@@ -139,8 +139,8 @@
         $prev = $page - 1;
         $prev = 'page='. $prev;
         $start = ($page - 1) * $perpage;
-        $bfirst= '<a href="'. $GLOBALS['root'] . sprintf($nav_url, $user, $currenttag, '') . $sortQue .'">'. T_('First') .'</a>';
-        $bprev = '<a href="'. $GLOBALS['root'] . sprintf($nav_url, $user, $currenttag, '?') . $prev . $sortAmp .'">'. T_('Previous') .'</a>';
+        $bfirst= '<a href="'. $GLOBALS['root'] . sprintf($nav_url, $user, $currenttag, '') . $sortQue .'" target="_self">'. T_('First') .'</a>';
+        $bprev = '<a href="'. $GLOBALS['root'] . sprintf($nav_url, $user, $currenttag, '?') . $prev . $sortAmp .'" target="_self">'. T_('Previous') .'</a>';
     }
     
     // Next
@@ -150,8 +150,8 @@
         $bnext = '<span class="disable">'. T_('Next') .'</span>';
         $blast = '<span class="disable">'. T_('Last') .'</span>';
     } else {
-        $bnext = '<a href="'. $GLOBALS['root'] . sprintf($nav_url, $user, $currenttag, '?page=') . $next . $sortAmp .'">'. T_('Next') .'</a>';
-        $blast = '<a href="'. $GLOBALS['root'] . sprintf($nav_url, $user, $currenttag, '?page=') . $totalpages . $sortAmp .'">'. T_('Last') .'</a>';
+        $bnext = '<a href="'. $GLOBALS['root'] . sprintf($nav_url, $user, $currenttag, '?page=') . $next . $sortAmp .'" target="_self">'. T_('Next') .'</a>';
+        $blast = '<a href="'. $GLOBALS['root'] . sprintf($nav_url, $user, $currenttag, '?page=') . $totalpages . $sortAmp .'" target="_self">'. T_('Last') .'</a>';
     }
     echo '<p class="paging">'. $bfirst .'<span> / </span>'. $bprev .'<span> / </span>'. $bnext .'<span> / </span>'. $blast .'<span> / </span>'. sprintf(T_('Page %d of %d'), $page, $totalpages) .'</p>';
 } else {
@@ -163,4 +163,4 @@
 }
 $this->includeTemplate('sidebar.tpl');
 $this->includeTemplate($GLOBALS['bottom_include']);
-?>
\ No newline at end of file
+?>
diff -ur scuttle-0.7.1.orig/templates/toolbar.inc.php scuttle-0.7.1/templates/toolbar.inc.php
--- scuttle-0.7.1.orig/templates/toolbar.inc.php	2006-04-01 16:40:41.000000000 +0200
+++ scuttle-0.7.1/templates/toolbar.inc.php	2006-04-01 16:48:14.000000000 +0200
@@ -8,12 +8,12 @@
 ?>
 
     <p id="navigation">
-        <a href="<?= $GLOBALS['root'] ?>bookmarks.php/<?= $cUser ?>"><?= T_('Bookmarks') ?></a><span> / </span>
-        <a href="<?= $GLOBALS['root'] ?>watched.php/<?= $cUser ?>"><?= T_('Watchlist') ?></a><span> / </span>
-        <a href="<?= $GLOBALS['root'] ?>bookmarks.php/<?= $cUser ?>?action=add"><?= T_('Add a Bookmark') ?></a>
+        <a href="<?= $GLOBALS['root'] ?>bookmarks.php/<?= $cUser ?>" target="_self"><?= T_('Bookmarks') ?></a><span> / </span>
+        <a href="<?= $GLOBALS['root'] ?>watched.php/<?= $cUser ?>" target="_self"><?= T_('Watchlist') ?></a><span> / </span>
+        <a href="<?= $GLOBALS['root'] ?>bookmarks.php/<?= $cUser ?>?action=add" target="_self"><?= T_('Add a Bookmark') ?></a>
     </p>
     <p id="access">
-        <a href="<?= $GLOBALS['root'] ?>?action=logout"><?= T_('Log Out') ?></a>
+        <a href="<?= $GLOBALS['root'] ?>?action=logout" target="_self"><?= T_('Log Out') ?></a>
     </p>
 
 <?php
@@ -21,13 +21,13 @@
 ?>
 
     <p id="navigation">
-        <a href="<?= $GLOBALS['root'] ?>about.php"><?= T_('About') ?></a>
+        <a href="<?= $GLOBALS['root'] ?>about.php" target="_self"><?= T_('About') ?></a>
     </p>
     <p id="access">
-        <a href="<?= $GLOBALS['root'] ?>register.php"><?= T_('Register') ?></a><span> / </span>
-        <a href="<?= $GLOBALS['root'] ?>login.php"><?= T_('Log In') ?></a>
+        <a href="<?= $GLOBALS['root'] ?>register.php" target="_self"><?= T_('Register') ?></a><span> / </span>
+        <a href="<?= $GLOBALS['root'] ?>login.php" target="_self"><?= T_('Log In') ?></a>
     </p>
 
 <?php
 }
-?>
\ No newline at end of file
+?>
Only in scuttle-0.7.1/templates: toolbar.inc.php.orig
diff -ur scuttle-0.7.1.orig/templates/top.inc.php scuttle-0.7.1/templates/top.inc.php
--- scuttle-0.7.1.orig/templates/top.inc.php	2006-04-01 16:40:41.000000000 +0200
+++ scuttle-0.7.1/templates/top.inc.php	2006-04-01 16:41:58.000000000 +0200
@@ -25,7 +25,7 @@
 ?>
 
 <div id="header"<?php echo $headerstyle; ?>>
-    <h1><a href="<?php echo $GLOBALS['root']; ?>"><?php echo $GLOBALS['sitename']; ?></a></h1>
+    <h1><a href="<?php echo $GLOBALS['root']; ?>" target="_self"><?php echo $GLOBALS['sitename']; ?></a></h1>
     <?php
     if(!isset($_GET['popup'])) {
         $this->includeTemplate('toolbar.inc');
@@ -43,4 +43,4 @@
 
 if (isset($msg))
     echo '<p class="success">'. $msg ."</p>\n";
-?>
\ No newline at end of file
+?>