diff --git a/forms/AutocompleteTextField.php b/forms/AutocompleteTextField.php
index b195f20f5..a07b3bbfc 100644
--- a/forms/AutocompleteTextField.php
+++ b/forms/AutocompleteTextField.php
@@ -19,7 +19,7 @@ class AutocompleteTextField extends TextField {
 	}
 	
 	function Field() {
-		// Requirements::javascript('sapphire/javascript/AutocompleteTextField.js');
+		// Requirements::javascript(SAPPHIRE_DIR . '/javascript/AutocompleteTextField.js');
 		$attributes = array(
 			'class' => "{$this->class} text " . $this->extraClass(),
 			'type' => 'text',
diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index bdd281ec6..0936b7678 100755
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -26,7 +26,7 @@ class HtmlEditorField extends TextareaField {
 	 */
 	function Field() {
 		Requirements::javascript(MCE_ROOT . "tiny_mce_src.js");
-		Requirements::javascript("jsparty/tiny_mce_improvements.js");
+		Requirements::javascript(THIRDPARTY_DIR . "/tiny_mce_improvements.js");
 
 		// Don't allow unclosed tags - they will break the whole application ;-)		
 		$cleanVal = $this->value;
diff --git a/forms/HtmlOneLineField.php b/forms/HtmlOneLineField.php
index b37277555..1b21d7019 100755
--- a/forms/HtmlOneLineField.php
+++ b/forms/HtmlOneLineField.php
@@ -15,7 +15,7 @@ class HtmlOneLineField extends TextField {
 	 */
 	function Field() {
 		Requirements::javascript(MCE_ROOT . "tiny_mce_src.js");
-		Requirements::javascript("jsparty/tiny_mce_improvements.js");
+		Requirements::javascript(THIRDPARTY_DIR . "/tiny_mce_improvements.js");
 
 		// Don't allow unclosed tags - they will break the whole application ;-)		
 		$cleanVal = $this->value;
diff --git a/forms/TabSet.php b/forms/TabSet.php
index 8fa9695e3..c65a74126 100644
--- a/forms/TabSet.php
+++ b/forms/TabSet.php
@@ -28,12 +28,12 @@ class TabSet extends CompositeField {
 	 * The HTML is a standardised format, containing a <ul;
 	 */
 	public function FieldHolder() {
-		Requirements::javascript("jsparty/loader.js");
-		Requirements::javascript("jsparty/prototype.js");
-		Requirements::javascript("jsparty/behaviour.js");
-		Requirements::javascript("jsparty/prototype_improvements.js");
-		Requirements::javascript("jsparty/tabstrip/tabstrip.js");
-		Requirements::css("jsparty/tabstrip/tabstrip.css");
+		Requirements::javascript(THIRDPARTY_DIR . "/loader.js");
+		Requirements::javascript(THIRDPARTY_DIR . "/prototype.js");
+		Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js");
+		Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js");
+		Requirements::javascript(THIRDPARTY_DIR . "/tabstrip/tabstrip.js");
+		Requirements::css(THIRDPARTY_DIR . "/tabstrip/tabstrip.css");
 		
 		return $this->renderWith("TabSetFieldHolder");
 	}