diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index e7839f942..03d9f7ae6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -351,10 +351,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         
         map.put("urls", getUrls(themeDir, urlBuilder)); 
 
-        // This value will be available to any template as a path for adding a new stylesheet.
-        // It does not contain the context path, because the methods to generate the href
-        // attribute from the string passed in by the template automatically add the context path.
-        map.put("themeStylesheetDir", themeDir + "/css");
+        map.put("themeDir", themeDir);
 
         map.put("stylesheets", getStylesheetList(themeDir));
         map.put("scripts", getScriptList(themeDir));
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Files.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Files.java
index fa0f471f7..e0c2b3152 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Files.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Files.java
@@ -40,7 +40,7 @@ public abstract class Files extends BaseTemplateModel {
         if (!path.startsWith("/")) {
             path = "/" + path;
         }
-        path = themeDir + getThemeSubDir() + path;
+        path = themeDir + path;
         add(path);
     }
     
@@ -62,8 +62,7 @@ public abstract class Files extends BaseTemplateModel {
     public String dump() {
         return list.toString();
     }
-    
-    protected abstract String getThemeSubDir();
+
     protected abstract String getTag(String url);
     
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Scripts.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Scripts.java
index f735ffc1b..b0fc16fdb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Scripts.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Scripts.java
@@ -3,8 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.web.templatemodels.files;
 
 public class Scripts extends Files {
-    
-    protected static final String THEME_SUBDIR = "/js";
 
     public Scripts() { }
     
@@ -15,8 +13,4 @@ public class Scripts extends Files {
     protected String getTag(String url) {
         return "<script type=\"text/javascript\" src=\"" + url + "\"></script>\n";
     }
-
-    protected String getThemeSubDir() {
-        return THEME_SUBDIR;
-    }
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Stylesheets.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Stylesheets.java
index 4fd66c450..7d4051b35 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Stylesheets.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/files/Stylesheets.java
@@ -3,8 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.web.templatemodels.files;
 
 public class Stylesheets extends Files {
- 
-    protected static final String THEME_SUBDIR = "/css";
     
     public Stylesheets() { }
     
@@ -15,9 +13,5 @@ public class Stylesheets extends Files {
     protected String getTag(String url) {
         return "<link rel=\"stylesheet\" href=\"" + url + "\" />\n";
     }
-    
-    protected String getThemeSubDir() {
-        return THEME_SUBDIR;
-    }
 
 }
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
index f216d7239..98c4d2cd0 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
@@ -7,7 +7,7 @@ ${scripts.add("/js/jquery_plugins/jcrop/jquery.Jcrop.js")}
 ${scripts.add("/js/imageUpload/cropImage.js")}
 
 
-${stylesheets.addFromTheme("/uploadImages.css")}
+${stylesheets.addFromTheme("/css/uploadImages.css")}
 ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
 
 
@@ -21,34 +21,35 @@ ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
 		width="500" height="${(500*imageHeight)/imageWidth}" 
 </#if>	   
 </#macro>-->
-			
+
 
 <div id="photoCroppingContainer">
-       <h2>Photo Upload</h2>
-       <!-- This is the image we're attaching Jcrop to -->
-       <div id="photoCroppingPreview">
-              <h6>Current Photo </h6>
-              <p class="photoCroppingTitleBody">Your profile photo will look like the image below. </p>
-              <div style="width:115px;height:115px;overflow:hidden;border:1px solid green;"> <img src="${imageUrl}" id="preview" /> </div>
-              <div id="photoCroppingHowTo">
-                     <p class="photoCroppingNote">To make adjustments, you can drag around and resize the photo to the right. When you are happy with your photo click the "Save Photo" button. </p>
-                     <form id="cropImage" action="${formAction}"  method="post">
+    <h2>Photo Upload</h2>
+    <!-- This is the image we're attaching Jcrop to -->
+    <div id="photoCroppingPreview">
+        <h6>Current Photo </h6>
+        <p class="photoCroppingTitleBody">Your profile photo will look like the image below. </p>
+        <div style="width:115px;height:115px;overflow:hidden;border:1px solid green;">
+            <img src="${imageUrl}" id="preview" />
+        </div>
+        <div id="photoCroppingHowTo">
+            <p class="photoCroppingNote">To make adjustments, you can drag around and resize the photo to the right. When you are happy with your photo click the "Save Photo" button. </p>
+            <form id="cropImage" action="${formAction}"  method="post">
                      
-                     <!-- Javascript will populate these values -->
-                     <input type="hidden" name="x" value="" />
-                     <input type="hidden" name="y" value="" />
-                     <input type="hidden" name="w" value="" />
-                     <input type="hidden" name="h" value="" />
+            <!-- Javascript will populate these values -->
+            <input type="hidden" name="x" value="" />
+            <input type="hidden" name="y" value="" />
+            <input type="hidden" name="w" value="" />
+            <input type="hidden" name="h" value="" />
                                           
-                     <input  type="submit" value="Save photo">
-                     or <a class="cancelUpload"  href="${cancelUrl}">Cancel</a>
-                     </form>
-              </div>
-       </div>
-       <div id="photoCropping">
-             
-                     <img style="border:1px solid green;" src="${imageUrl}" <#--<@newImageSize/>--> id="cropbox" />
-                   
+            <input  type="submit" value="Save photo">
+                or <a class="cancelUpload"  href="${cancelUrl}">Cancel</a>
+            </form>
        </div>
+    </div>
+    
+    <div id="photoCropping">
+        <img style="border:1px solid green;" src="${imageUrl}" <#--<@newImageSize/>--> id="cropbox" />
+    </div>
 </div>
 <div class="clear"></div>
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
index e1c138e2c..27411649c 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
@@ -5,38 +5,30 @@
 ${scripts.add("/js/jquery.js")}
 ${scripts.add("/js/imageUpload/imageUploadUtils.js")}
 
-
-
-${stylesheets.addFromTheme("/uploadImages.css")}
-
-
-
+${stylesheets.addFromTheme("/css/uploadImages.css")}
 
 <div id="photoUploadContainer">
-       <h2>Photo Upload</h2>
-       
-       
-       <#if errorMessage??>
- 		 <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"/>
-                  <p>${errorMessage}</p>
-           </div>
-		</#if>
-		 
-		
-		
-       <div id="photoUploadDefaultImageContainer">
-              <h6>Current Photo</h6>
-              <img src="${thumbnailUrl}" width="115" height="115" /> </div>
+    <h2>Photo Upload</h2>
               
-       <div id="photoUploadForm">
-       
-              <form action="${formAction}" enctype="multipart/form-data" method="post">
-                     <label>Upload a photo <span> (JPEG, GIF or PNG)</span></label>
-                     <input id="datafile" type="file" name="datafile" size="30" />
-                     <input type="submit" value="Upload photo"/> 
-                     <span class="or"> or 
-                     <a class="cancelUpload"  href="${cancelUrl}">Cancel</a></span>
-              </form>
-       </div>
+    <#if errorMessage??>
+        <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"/>
+            <p>${errorMessage}</p>
+        </div>
+    </#if>
+
+    <div id="photoUploadDefaultImageContainer">
+        <h6>Current Photo</h6>
+        <img src="${thumbnailUrl}" width="115" height="115" /> 
+    </div>
+              
+    <div id="photoUploadForm">
+        <form action="${formAction}" enctype="multipart/form-data" method="post">
+            <label>Upload a photo <span> (JPEG, GIF or PNG)</span></label>
+            <input id="datafile" type="file" name="datafile" size="30" />
+            <input type="submit" value="Upload photo"/> 
+            <span class="or"> or 
+            <a class="cancelUpload"  href="${cancelUrl}">Cancel</a></span>
+        </form>
+    </div>
 </div>
 
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
index c3178b1ca..de07371b9 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
@@ -5,32 +5,28 @@
 ${scripts.add("/js/jquery.js")}
 ${scripts.add("/js/imageUpload/imageUploadUtils.js")}
 
-
-
-${stylesheets.addFromTheme("/uploadImages.css")}
-
-
+${stylesheets.addFromTheme("/css/uploadImages.css")}
 
 <div id="photoUploadContainer">
-       <h2>Photo Upload</h2>
-        <#if errorMessage??>
- 		 <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"/>
-                  <p>${errorMessage}</p>
-           </div>
-		</#if>
-       <div id="photoUploadDefaultImageContainer">
-              <h6>Current Photo</h6>
-              <img src="${thumbnailUrl}" width="115" />
-       <a class="thumbnail" href="${deleteUrl}">Delete photo</a></div>
+    <h2>Photo Upload</h2>
+    <#if errorMessage??>
+        <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"/>
+            <p>${errorMessage}</p>
+        </div>
+    </#if>
+    <div id="photoUploadDefaultImageContainer">
+        <h6>Current Photo</h6>
+            <img src="${thumbnailUrl}" width="115" />
+            <a class="thumbnail" href="${deleteUrl}">Delete photo</a>
+    </div>
        
-       <div id="photoUploadForm">
-              <form action="${formAction}" enctype="multipart/form-data" method="post">
-                     <label>Replace Photo <span> (JPEG, GIF or PNG)</span></label>
-                     <input  type="file" name="datafile" size="30">
-                     <input   type="submit" value="Upload photo"> 
-                     <span class="or"> or 
-                     <a class="cancelUpload"  href="${cancelUrl}">Cancel</a></span>
-                     
-              </form>
-       </div>
+    <div id="photoUploadForm">
+        <form action="${formAction}" enctype="multipart/form-data" method="post">
+            <label>Replace Photo <span> (JPEG, GIF or PNG)</span></label>
+            <input  type="file" name="datafile" size="30">
+            <input   type="submit" value="Upload photo"> 
+            <span class="or"> or 
+            <a class="cancelUpload"  href="${cancelUrl}">Cancel</a></span>
+         </form>
+    </div>
 </div>
diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl
index 01d0882e9..0232d309e 100644
--- a/webapp/web/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual.ftl
@@ -80,7 +80,7 @@
 
 </div> <!-- #personWrap -->
 
-${stylesheets.addFromTheme("/entity.css")}
+${stylesheets.addFromTheme("/css/entity.css")}
                            
 <#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) -->
 ${headScripts.add("/js/jquery.js",
diff --git a/webapp/web/templates/freemarker/body/login/login-main.ftl b/webapp/web/templates/freemarker/body/login/login-main.ftl
index a4caf2968..5ec0b2071 100644
--- a/webapp/web/templates/freemarker/body/login/login-main.ftl
+++ b/webapp/web/templates/freemarker/body/login/login-main.ftl
@@ -6,6 +6,5 @@
     <#include loginTemplate>
     
     ${stylesheets.add("/css/login.css")}
-    ${stylesheets.addFromTheme("/css/formedit.css")}
     ${scripts.add("/js/jquery.js", "/js/login/loginUtils.js")}
 </#if>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
index 90328365b..117794b48 100644
--- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
+++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
@@ -41,7 +41,7 @@
     <#-- Paging controls -->
     <#if (pagingLinks?size > 0)>
         <div class="searchpages">
-        Pages: 
+            Pages: 
             <#if prevPage??><a class="prev" href="${prevPage}">Previous</a></#if>
             <#list pagingLinks as link>
                 <#if link.url??>
@@ -56,4 +56,4 @@
 
 </div> <!-- end contentsBrowseGroup -->
 
-${stylesheets.addFromTheme("search.css")}
\ No newline at end of file
+${stylesheets.addFromTheme("/css/search.css")}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/test.ftl b/webapp/web/templates/freemarker/body/test.ftl
index d1e6b2ae3..9e7b961a9 100644
--- a/webapp/web/templates/freemarker/body/test.ftl
+++ b/webapp/web/templates/freemarker/body/test.ftl
@@ -54,8 +54,8 @@
 <@dump var="zoo1" />
 
 
-${stylesheets.addFromTheme("/sstest.css", "/sstest2.css")}
-${scripts.addFromTheme("/jstest.js")}
+${stylesheets.addFromTheme("/css/sstest.css", "/css/sstest2.css")}
+${scripts.addFromTheme("/js/jstest.js")}
 ${scripts.add("/js/script1.js", "/js/script2.js", "/js/script3.js")}
 
 
diff --git a/webapp/web/templates/freemarker/page/page.ftl b/webapp/web/templates/freemarker/page/page.ftl
index bab4996f1..b02034976 100644
--- a/webapp/web/templates/freemarker/page/page.ftl
+++ b/webapp/web/templates/freemarker/page/page.ftl
@@ -41,8 +41,8 @@
 Three ways to add a stylesheet:
 
 A. In theme directory:
-${stylesheets.addFromTheme("/sample.css")}
-${stylesheets.add(themeStylesheetDir + "/sample.css")}
+${stylesheets.addFromTheme("/css/sample.css")}
+${stylesheets.add(themeDir + "/css/sample.css")}
 
 B. Any location
 ${stylesheets.add("/edit/forms/css/sample.css)"}
@@ -50,7 +50,7 @@ ${stylesheets.add("/edit/forms/css/sample.css)"}
 To add a script: 
 
 A. In theme directory:
-${scripts.addFromTheme("/sample.js")}
+${scripts.addFromTheme("/css/sample.js")}
 
 B. Any location
 ${scripts("/edit/forms/js/sample.js)"}