Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rb4afa75048185273ee61a4def2164134f343fda0 -re347450b1cb3a6d44b33482c4a70c42d3e9976d2
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java
===================================================================
diff -u -ree1a14afba7f44e66a40f65b9d1ef3987ad349ff -re347450b1cb3a6d44b33482c4a70c42d3e9976d2
--- lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java	(.../ThemeAction.java)	(revision ee1a14afba7f44e66a40f65b9d1ef3987ad349ff)
+++ lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java	(.../ThemeAction.java)	(revision e347450b1cb3a6d44b33482c4a70c42d3e9976d2)
@@ -113,7 +113,7 @@
 
 		Long themeId = new Long(WebUtil.readLongParam(request,THEME_ID_PARAMETER));
 		IThemeService themeService = getThemeService();
-		String message = themeService.getTheme(themeId);
+		String message = themeService.getThemeWDDX(themeId);
 		return outputPacket(mapping, request, response, message, "message");
 	}
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
===================================================================
diff -u -r2824bf6c972102f7a2071c0f5c8e2e11ad547fc5 -re347450b1cb3a6d44b33482c4a70c42d3e9976d2
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	(.../CssTag.java)	(revision 2824bf6c972102f7a2071c0f5c8e2e11ad547fc5)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	(.../CssTag.java)	(revision e347450b1cb3a6d44b33482c4a70c42d3e9976d2)
@@ -92,13 +92,9 @@
 					if(pageDirection.toLowerCase().equals(RTL_DIR))
 						rtl = true;
 				
-				List themeList = CSSThemeUtil.getAllUserThemes();
+				List<String> themeList = CSSThemeUtil.getAllUserThemes();
 				
-				Iterator i = themeList.iterator();
-				
-				while (i.hasNext())
-				{
-					String theme = (String)i.next();
+				for ( String theme: themeList) {
 					if ( theme != null) {
 						theme = appendStyle(theme, rtl);
 						if (localLinkPath != null)
Index: lams_common/db/sql/updatescripts/alter_201_theme.sql
===================================================================
diff -u
--- lams_common/db/sql/updatescripts/alter_201_theme.sql	(revision 0)
+++ lams_common/db/sql/updatescripts/alter_201_theme.sql	(revision e347450b1cb3a6d44b33482c4a70c42d3e9976d2)
@@ -0,0 +1,16 @@
+-- Script to be run for LAMS 2.0.1 release, on LAMS 2.0 tables.
+-- Add a column to record where the images are for a custom theme.
+
+ALTER TABLE lams_css_theme_ve
+ADD COLUMN image_directory VARCHAR(100);
+
+UPDATE lams_css_theme_ve 
+SET image_directory = "css"
+WHERE name = "defaultHTML";
+
+-- Needed for one of the LI servers
+-- UPDATE lams_css_theme_ve 
+-- SET image_directory = "npsthemecss"
+-- WHERE NAME = "npsthemeHTML";
+
+COMMIT;