diff --git a/templates/EditableFormField.ss b/templates/EditableFormField.ss
index a8c4fbd..26c8e0e 100755
--- a/templates/EditableFormField.ss
+++ b/templates/EditableFormField.ss
@@ -2,9 +2,9 @@
 <li class="$ClassName EditableFormField" id="$Name.ATT EditableItem_$Pos $Name">
 	<div class="fieldInfo">
 		<% if canEdit %>
-			<img class="fieldHandler" src="framework/images/drag.gif" alt="<% _t('DRAG', 'Drag to rearrange order of fields') %>" />
+			<img class="fieldHandler" src="$ModulePath(framework)/images/drag.gif" alt="<% _t('DRAG', 'Drag to rearrange order of fields') %>" />
 		<% else %>
-			<img class="fieldHandler" src="framework/images/drag_readonly.gif" alt="<% _t('LOCKED', 'These fields cannot be modified') %>" />
+			<img class="fieldHandler" src="$ModulePath(framework)/images/drag_readonly.gif" alt="<% _t('LOCKED', 'These fields cannot be modified') %>" />
 		<% end_if %>
 	
 		<img class="icon" src="$Icon" alt="$ClassName" title="$singular_name" />
diff --git a/templates/EditableOption.ss b/templates/EditableOption.ss
index 05b2d18..f67535a 100644
--- a/templates/EditableOption.ss
+++ b/templates/EditableOption.ss
@@ -1,11 +1,11 @@
 <li>
-	<img class="handle" src="framework/images/drag.gif" alt="<% _t('DRAG', 'Drag to rearrange order of options') %>" />
+	<img class="handle" src="$ModulePath(framework)/images/drag.gif" alt="<% _t('DRAG', 'Drag to rearrange order of options') %>" />
 	<input type="text" name="{$FieldName}[Title]" value="$Title" />
 	<input type="hidden" class="sortOptionHidden hidden" name="{$FieldName}[Sort]" value="$Sort" />
 	
 	<% if canEdit %>
-		<a href="$ID" class="deleteOption"><img src="cms/images/delete.gif" alt="<% _t('DELETE', 'Remove this option') %>" /></a>	
+		<a href="$ID" class="deleteOption"><img src="$ModulePath(cms)/images/delete.gif" alt="<% _t('DELETE', 'Remove this option') %>" /></a>
 	<% else %>
-		<img src="cms/images/locked.gif" alt="<% _t('LOCKED', 'These fields cannot be modified') %>" />	
+		<img src="$ModulePath(cms)/images/locked.gif" alt="<% _t('LOCKED', 'These fields cannot be modified') %>" />	
 	<% end_if %>
 </li>
\ No newline at end of file
diff --git a/templates/FieldEditor.ss b/templates/FieldEditor.ss
index c9b7dd5..58c5938 100755
--- a/templates/FieldEditor.ss
+++ b/templates/FieldEditor.ss
@@ -1,8 +1,7 @@
 <% require css(userforms/css/FieldEditor.css) %>
-<% require javascript(framework/thirdparty/jquery-ui/jquery-ui.js) %> 
 <% require javascript(userforms/javascript/UserForm.js) %>
 
-<div class="FieldEditor <% if canEdit %><% else %>readonly<% end_if %>" id="Fields">
+<div class="FieldEditor <% if canEdit %><% else %>readonly<% end_if %>" id="Fields" $AttributesHTML>
 	
 	<div class="FieldListHold">
 		<ul class="FieldList" id="Fields_fields">