diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php
index 0b6899b..f6affc4 100644
--- a/templates/editbookmark.tpl.php
+++ b/templates/editbookmark.tpl.php
@@ -44,7 +44,7 @@ switch ($row['bStatus']) {
     <th align="left"><?php echo T_('Tags'); ?></th>
     <td class="scuttletheme">
     <span dojoType="dojo.data.ItemFileReadStore" jsId="memberTagStore" url="<?php echo $GLOBALS['root']?>ajax/gettags.php"></span>
-    <input type="text" dojoType="dojox.widget.MultiComboBox" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" store="memberTagStore" delimiter="," searchAttr="tag" hasDownArrow="false"/></td>
+    <input type="text" dojoType="dojox.form.MultiComboBox" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" store="memberTagStore" delimiter="," searchAttr="tag" hasDownArrow="false"/></td>
     <td>&larr; <?php echo T_('Comma-separated'); ?></td>
 </tr>
 
diff --git a/templates/top.inc.php b/templates/top.inc.php
index 46698d0..dca9036 100644
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -23,21 +23,23 @@ if(isset($rsschannels)) {
 	src="<?php echo $GLOBALS['root']; ?>jsScuttle.php"></script>
 
 <link rel="stylesheet" type="text/css"
-	href="<?php echo $GLOBALS['root']; ?>includes/js/dijit/themes/tundra/tundra.css">
+	href="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dijit/themes/tundra/tundra.css">
 
-<script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/js/dojo/dojo.js"
+<script type="text/javascript"
+	src="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dojo/dojo.xd.js"
 	djConfig="parseOnLoad:true, isDebug:false, usePlainJson:true"></script>
 
 <script type="text/javascript">
 dojo.require("dojo.parser");
 dojo.require("dojo.data.ItemFileReadStore");
-dojo.require("dojox.widget.MultiComboBox");     
+dojo.require("dojox.form.MultiComboBox");     
 </script>
 <?php endif ?>
 
 </head>
 
-<body class="tundra"> <!-- the tundra class is used by Dojo widgets --> 
+<body class="tundra">
+<!-- the tundra class is used by Dojo widgets -->
 
 <?php
 $headerstyle = '';
