Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -411,5 +411,8 @@
 admin.themes.makeDefault  =Make default
 admin.themes.deleteConfirm  =Are you sure you want to delete this theme?
 admin.themes.nameAlreadyExists  =Please enter a new unused theme name, or click the edit icon to edit.
+admin.themes.type  =Type
+admin.themes.html  =HTML
+admin.themes.flash  =Flash
 
 #======= End labels: Exported 391 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -411,5 +411,8 @@
 admin.themes.makeDefault  =Make default
 admin.themes.deleteConfirm  =Are you sure you want to delete this theme?
 admin.themes.nameAlreadyExists  =Please enter a new unused theme name, or click the edit icon to edit.
+admin.themes.type  =Type
+admin.themes.html  =HTML
+admin.themes.flash  =Flash
 
 #======= End labels: Exported 391 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -r16a173502ea5c23248e95a73afd859ea77d0ac23 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision 16a173502ea5c23248e95a73afd859ea77d0ac23)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -46,7 +46,7 @@
 import org.lamsfoundation.lams.admin.web.dto.V1OrgRightDTO;
 import org.lamsfoundation.lams.admin.web.dto.V1OrganisationDTO;
 import org.lamsfoundation.lams.admin.web.dto.V1UserDTO;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
@@ -657,7 +657,7 @@
 		}
 		
 		String flashId = parseStringCell(row.getCell(FLASH_THEME));
-		CSSThemeVisualElement flashTheme = getFlashTheme(flashId);
+		Theme flashTheme = getFlashTheme(flashId);
 		if (flashTheme==null) {
 			args[0] = "("+flashId+")";
 			rowResult.add(messageService.getMessage("error.flash.theme.invalid", args));
@@ -667,7 +667,7 @@
 		}
 
 		String htmlId = parseStringCell(row.getCell(HTML_THEME));
-		CSSThemeVisualElement htmlTheme = getHtmlTheme(htmlId);
+		Theme htmlTheme = getHtmlTheme(htmlId);
 		if (htmlTheme==null) {
 			args[0] = "("+htmlId+")";
 			rowResult.add(messageService.getMessage("error.html.theme.invalid", args));
@@ -850,26 +850,26 @@
 		return true;
 	}
 
-	// set CSSThemeVisualElement to default flash theme if cell is empty
-	private CSSThemeVisualElement getFlashTheme(String flashId){
+	// set Theme to default flash theme if cell is empty
+	private Theme getFlashTheme(String flashId){
 		if (flashId==null || flashId=="") {
 			return service.getDefaultFlashTheme();
 		} else {
 			try {
-				return (CSSThemeVisualElement)service.findById(CSSThemeVisualElement.class, new Long(flashId));
+				return (Theme)service.findById(Theme.class, new Long(flashId));
 			} catch (Exception e) {
 				return null;
 			}
 		}
 	}
 	
-	// set CSSThemeVisualElement to default html theme if cell is empty
-	private CSSThemeVisualElement getHtmlTheme(String htmlId){
+	// set Theme to default html theme if cell is empty
+	private Theme getHtmlTheme(String htmlId){
 		if (htmlId==null || htmlId=="") {
 			return service.getDefaultHtmlTheme();
 		} else {
 			try {
-				return (CSSThemeVisualElement)service.findById(CSSThemeVisualElement.class, new Long(htmlId));
+				return (Theme)service.findById(Theme.class, new Long(htmlId));
 			} catch (Exception e) {
 				return null;
 			}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java	(.../ThemeManagementAction.java)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java	(.../ThemeManagementAction.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -33,7 +33,7 @@
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.admin.web.form.ThemeForm;
 import org.lamsfoundation.lams.config.ConfigurationItem;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.service.IThemeService;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.util.CSSThemeUtil;
@@ -59,32 +59,33 @@
     private static IThemeService themeService;
     private static Configuration configurationService;
 
-    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 	// check permission
 	if (!request.isUserInRole(Role.SYSADMIN)) {
 	    request.setAttribute("errorName", "RegisterAction");
-	    request.setAttribute("errorMessage", AdminServiceProxy.getMessageService(getServlet().getServletContext())
-		    .getMessage("error.authorisation"));
+	    request.setAttribute("errorMessage", AdminServiceProxy.getMessageService(getServlet().getServletContext()).getMessage("error.authorisation"));
 	    return mapping.findForward("error");
 	}
 
 	if (themeService == null) {
 	    themeService = AdminServiceProxy.getThemeService(getServlet().getServletContext());
 	}
 
-	List<CSSThemeVisualElement> themes = themeService.getAllThemes();
+	// Get all the themes
+	List<Theme> themes = themeService.getAllThemes();
 
-	String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
-	for (CSSThemeVisualElement theme : themes) {
+	// Flag the default and un-editable themes
+	String currentCSSTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
+	String currentFlashTheme = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME);
+	for (Theme theme : themes) {
 	    theme.setCurrentDefaultTheme(Boolean.FALSE);
-	    if (theme.getName().equals(currentTheme)) {
+	    if (theme.getName().equals(currentCSSTheme) || theme.getName().equals(currentFlashTheme)) {
 		theme.setCurrentDefaultTheme(Boolean.TRUE);
 	    }
 
 	    theme.setNotEditable(Boolean.FALSE);
-	    if (theme.getName().equals(CSSThemeUtil.DEFAULT_HTML_THEME)) {
+	    if (theme.getName().equals(CSSThemeUtil.DEFAULT_HTML_THEME) || theme.getName().equals(CSSThemeUtil.DEFAULT_FLASH_THEME)) {
 		theme.setNotEditable(Boolean.TRUE);
 	    }
 	}
@@ -93,54 +94,77 @@
 	return mapping.findForward("success");
     }
 
-    public ActionForward addOrEditTheme(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public ActionForward addOrEditTheme(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
 	ThemeForm themeForm = (ThemeForm) form;
 
-	CSSThemeVisualElement theme = null;
 
+	// Update the theme
+	Theme theme = null;
 	if (themeForm.getId() != null && themeForm.getId() != 0) {
 	    theme = themeService.getTheme(themeForm.getId());
 	} else {
-	    theme = new CSSThemeVisualElement();
+	    theme = new Theme();
 	}
 	updateThemeFromForm(theme, themeForm);
-
 	themeService.saveOrUpdateTheme(theme);
 
+	// Set the theme as default, or disable it as default.
+	// Disabling restores the system default
 	if (themeForm.getCurrentDefaultTheme() != null && themeForm.getCurrentDefaultTheme() == true) {
-	    Configuration.updateItem(ConfigurationKeys.DEFAULT_HTML_THEME, themeForm.getName());
-	    getConfiguration().persistUpdate();
-	} else {
-	    String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
-	    if (themeForm.getName().equals(currentTheme)) {
-		Configuration.updateItem(ConfigurationKeys.DEFAULT_HTML_THEME, CSSThemeUtil.DEFAULT_HTML_THEME);
+	    if (Integer.parseInt(themeForm.getType()) == Theme.TYPE_CSS) {
+		Configuration.updateItem(ConfigurationKeys.DEFAULT_HTML_THEME, themeForm.getName());
 		getConfiguration().persistUpdate();
+	    } else {
+		Configuration.updateItem(ConfigurationKeys.DEFAULT_FLASH_THEME, themeForm.getName());
+		getConfiguration().persistUpdate();
 	    }
+	} else {
+	    if (Integer.parseInt(themeForm.getType()) == Theme.TYPE_CSS) {
+		String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
+		if (themeForm.getName().equals(currentTheme)) {
+		    Configuration.updateItem(ConfigurationKeys.DEFAULT_HTML_THEME, CSSThemeUtil.DEFAULT_HTML_THEME);
+		    getConfiguration().persistUpdate();
+		}
+	    } else {
+		String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME);
+		if (themeForm.getName().equals(currentTheme)) {
+		    Configuration.updateItem(ConfigurationKeys.DEFAULT_FLASH_THEME, CSSThemeUtil.DEFAULT_FLASH_THEME);
+		    getConfiguration().persistUpdate();
+		}
+	    }
 	}
 	themeForm.clear();
 	return unspecified(mapping, themeForm, request, response);
     }
 
-    public ActionForward removeTheme(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public ActionForward removeTheme(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+	
+	// Remove the theme
 	ThemeForm themeForm = (ThemeForm) form;
 	if (themeForm.getId() != null) {
 	    themeService.removeTheme(themeForm.getId());
 	}
 
-	String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
-	if (themeForm.getName().equals(currentTheme)) {
-	    Configuration.updateItem(ConfigurationKeys.DEFAULT_HTML_THEME, CSSThemeUtil.DEFAULT_HTML_THEME);
-	    getConfiguration().persistUpdate();
+	// If it was the default, restore the system default
+	if (Integer.parseInt(themeForm.getType()) == Theme.TYPE_CSS) {
+	    String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
+	    if (themeForm.getName().equals(currentTheme)) {
+		Configuration.updateItem(ConfigurationKeys.DEFAULT_HTML_THEME, CSSThemeUtil.DEFAULT_HTML_THEME);
+		getConfiguration().persistUpdate();
+	    }
+	} else {
+	    String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME);
+	    if (themeForm.getName().equals(currentTheme)) {
+		Configuration.updateItem(ConfigurationKeys.DEFAULT_FLASH_THEME, CSSThemeUtil.DEFAULT_FLASH_THEME);
+		getConfiguration().persistUpdate();
+	    }
 	}
 
 	themeForm.clear();
 	return unspecified(mapping, themeForm, request, response);
     }
 
-    public ActionForward setAsDefault(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public ActionForward setAsDefault(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
 	ThemeForm themeForm = (ThemeForm) form;
 	if (themeForm.getName() != null) {
 	    Configuration.updateItem(ConfigurationKeys.DEFAULT_HTML_THEME, themeForm.getName());
@@ -150,18 +174,17 @@
 	return unspecified(mapping, themeForm, request, response);
     }
 
-    private CSSThemeVisualElement updateThemeFromForm(CSSThemeVisualElement theme, ThemeForm form) {
+    private Theme updateThemeFromForm(Theme theme, ThemeForm form) {
 	theme.setName(form.getName());
 	theme.setDescription(form.getDescription());
 	theme.setImageDirectory(form.getImageDirectory());
-	theme.setTheme(Boolean.TRUE);
+	theme.setType(Integer.parseInt(form.getType()));
 	return theme;
     }
 
     private Configuration getConfiguration() {
 	if (configurationService == null) {
-	    WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
-		    .getServletContext());
+	    WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
 	    configurationService = (Configuration) ctx.getBean("configurationService");
 
 	}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java	(.../ThemeForm.java)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java	(.../ThemeForm.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -44,6 +44,7 @@
     private String description;
     private String imageDirectory;
     private Boolean currentDefaultTheme;
+    private String type;
 
     public String getMethod() {
         return method;
@@ -81,14 +82,20 @@
     public void setCurrentDefaultTheme(Boolean currentDefaultTheme) {
         this.currentDefaultTheme = currentDefaultTheme;
     }
-    
+    public String getType() {
+        return type;
+    }
+    public void setType(String type) {
+        this.type = type;
+    }
     public void clear() {
 	this.method = null;
 	this.id = null;
 	this.name = null;
 	this.description = null;
 	this.imageDirectory = null;
 	this.currentDefaultTheme = null;
+	this.type = null;
     }
 }
 	
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -3,7 +3,7 @@
 
 <script type="text/javascript">
 <!--
-	function editTheme(name, description, imageDirectory, id, currentDefaultTheme) {
+	function editTheme(name, description, imageDirectory, id, currentDefaultTheme, type) {
 		document.getElementById("name").value = name;
 		document.getElementById("description").value = description;
 		document.getElementById("imageDirectory").value = imageDirectory;
@@ -14,10 +14,9 @@
 		if(currentDefaultTheme == "true") {
 			document.getElementById("currentDefaultTheme").checked = true;
 		}
-
-		document.getElementById("cancelEdit").style.display="block";
-
+		document.getElementById("type").options[type -1].selected = true;
 		
+		document.getElementById("cancelEdit").style.display="block";
 		document.getElementById("normalSave").style.display="none";
 	}
 
@@ -29,13 +28,15 @@
 		document.getElementById("currentDefaultTheme").checked = false;
 		document.getElementById("cancelEdit").style.display="none";
 		document.getElementById("normalSave").style.display="block";
+		document.getElementById("type").options[0].selected = true;
 	}
 
-	function removeTheme(id, name) {
+	function removeTheme(id, name, type) {
 		var answer = confirm('<fmt:message key="admin.themes.deleteConfirm" />')
 		if (answer) {
 			document.getElementById("name").value = name;
 			document.getElementById("id").value = id;
+			document.getElementById("type").options[type -1].selected = true;
 			document.getElementById("method").value = "removeTheme";
 			submitForm();
 		}
@@ -93,7 +94,10 @@
 			<fmt:message key="admin.themes.defaultTheme" />
 		</th>
 		<th>
+			<fmt:message key="admin.themes.type" />
 		</th>
+		<th>
+		</th>
 	</tr>
 	<c:forEach var="theme" items="${themes}" >
 		<tr>
@@ -111,17 +115,27 @@
 					<img src="<lams:LAMSURL/>/images/tick.png" >
 				</c:if>
 			</td>
+			<td>
+				<c:choose>
+					<c:when test="${theme.type==1}">
+						<fmt:message key="admin.themes.html" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="admin.themes.flash" />
+					</c:otherwise>
+				</c:choose>
+			</td>
 			<td align="center">
 
 				<c:choose>
 					<c:when test="${not theme.notEditable}">
 						<img src="<lams:LAMSURL/>/images/edit.gif" 
 							title='<fmt:message key="admin.themes.edit" />'
-							onclick="editTheme('${theme.name}', '${theme.description}', '${theme.imageDirectory}', '${theme.id}', '${theme.currentDefaultTheme}')"
+							onclick="editTheme('${theme.name}', '${theme.description}', '${theme.imageDirectory}', '${theme.themeId}', '${theme.currentDefaultTheme}', '${theme.type}')"
 						>
 						<img src="<lams:LAMSURL/>/images/cross.gif" 
 							title='<fmt:message key="admin.themes.remove" />'
-							onclick="removeTheme('${theme.id}', '${theme.name}')"
+							onclick="removeTheme('${theme.themeId}', '${theme.name}', '${theme.type}')"
 						>
 					</c:when>
 					<c:otherwise>
@@ -176,6 +190,17 @@
 				<html:checkbox property="currentDefaultTheme" styleId="currentDefaultTheme" />
 			</td>
 		</tr>
+		<tr>
+			<td>
+				<fmt:message key="admin.themes.type" />:
+			</td>
+			<td>
+				<html:select property="type" styleId="type">
+					<html:option value="1"><fmt:message key="admin.themes.html" /></html:option>
+					<html:option value="2"><fmt:message key="admin.themes.flash" /></html:option>
+				</html:select>
+			</td>
+		</tr>
 	</table>
 	
 	<br />
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -369,6 +369,7 @@
 label.planner.recent.learning.designs.title=Recently modified Learning Designs
 label.planner.recent.learning.designs.list.empty=No Learning Designs found
 
-label.html.theme  =LAMS Theme
+label.html.htmlTheme  =HTML Theme
+label.html.flashTheme  =Flash Theme
 
 #======= End labels: Exported 266 labels for en AU =====
\ No newline at end of file
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -272,6 +272,7 @@
 label.lamscommunity.notRegistered.1  =Your server is not registered with the LAMS Community so you can not seamlessly import sequences directly into your LAMS server from the community. Ask your system administrator to enable this feature.
 label.lamscommunity.notRegistered.2  =However, you can download and import the sequences manually from the LAMS Community website:
 label.lamscommunity.info  =The LAMS Community is a global online community for all teachers, administrators and developers that use LAMS. Within the various sub-communities, you can access the latest news about LAMS, many different discussion forums, and a repository of shared LAMS sequences.
-label.html.theme  =LAMS Theme
+label.html.htmlTheme  =HTML Theme
+label.html.flashTheme  =Flash Theme
 
 #======= End labels: Exported 266 labels for en AU =====
Index: lams_central/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_central/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -38,7 +38,8 @@
 	<form-property name="lamsCommunityUsername" type="java.lang.String" />
 	<form-property name="disableLamsCommunityUsername" type="java.lang.Boolean" />
 	<form-property name="tutorialsDisabled" type="java.lang.Boolean" />
-	<form-property name="userTheme" type="java.lang.Long" />
+	<form-property name="userCSSTheme" type="java.lang.Long" />
+	<form-property name="userFlashTheme" type="java.lang.Long" />
 </form-bean>
 
 
Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java	(.../UniversalLoginModule.java)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java	(.../UniversalLoginModule.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -52,7 +52,7 @@
 import javax.sql.DataSource;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO;
 import org.lamsfoundation.lams.themes.service.IThemeService;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethodType;
@@ -216,22 +216,38 @@
 		if (isValid) {
 		    UserDTO userDTO = user.getUserDTO();
 
-		    // If the user's theme has been deleted, use the default as fallback
-		    CSSThemeBriefDTO userTheme = userDTO.getHtmlTheme();
-		    if (userTheme != null) {
+		    // If the user's css theme has been deleted, use the default as fallback
+		    CSSThemeBriefDTO userCSSTheme = userDTO.getHtmlTheme();
+		    if (userCSSTheme != null) {
 			boolean themeExists = false;
-			for (CSSThemeVisualElement theme : themeService.getAllThemes()) {
-			    if (userTheme.getId().equals(theme.getId())) {
+			for (Theme theme : themeService.getAllCSSThemes()) {
+			    if (userCSSTheme.getId().equals(theme.getThemeId())) {
 				themeExists = true;
 				break; 
 			    }
 			}
 
 			if (!themeExists) {
-			    userDTO.setHtmlTheme(new CSSThemeBriefDTO(themeService.getDefaultTheme()));
+			    userDTO.setHtmlTheme(new CSSThemeBriefDTO(themeService.getDefaultCSSTheme()));
 			}
 		    }
+		    
+		    // If the user's flash theme has been deleted, use the default as fallback
+		    CSSThemeBriefDTO userFlashTheme = userDTO.getFlashTheme();
+		    if (userFlashTheme != null) {
+			boolean themeExists = false;
+			for (Theme theme : themeService.getAllFlashThemes()) {
+			    if (userFlashTheme.getId().equals(theme.getThemeId())) {
+				themeExists = true;
+				break; 
+			    }
+			}
 
+			if (!themeExists) {
+			    userDTO.setFlashTheme(new CSSThemeBriefDTO(themeService.getDefaultFlashTheme()));
+			}
+		    }
+
 		    HttpSession sharedsession = SessionManager.getSession();
 		    sharedsession.setAttribute(AttributeNames.USER, userDTO);
 		}
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -41,7 +41,7 @@
 import org.lamsfoundation.lams.index.IndexOrgBean;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.lesson.dto.LessonDTO;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.service.IThemeService;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
@@ -210,25 +210,44 @@
 
 	themeService = getThemeService();
 
-	// Get all the themes
-	List<CSSThemeVisualElement> themes = themeService.getAllThemes();
-	request.setAttribute("themes", themes);
+	// Get all the css themes
+	List<Theme> cssThemes = themeService.getAllCSSThemes();
+	request.setAttribute("cssThemes", cssThemes);
 
 	// Check the user theme is still installed
-	Long userSelectedTheme = null;
+	Long userSelectedCSSTheme = null;
 	if (requestor.getHtmlTheme() != null) {
-	    for (CSSThemeVisualElement theme : themes) {
-		if (theme.getId() == requestor.getHtmlTheme().getId()) {
-		    userSelectedTheme = theme.getId();
+	    for (Theme theme : cssThemes) {
+		if (theme.getThemeId() == requestor.getHtmlTheme().getThemeId()) {
+		    userSelectedCSSTheme = theme.getThemeId();
 		}
 	    }
 	}
 	// if still null, use the default 
-	if (userSelectedTheme == null) {
-	    userSelectedTheme = themeService.getDefaultTheme().getId();
+	if (userSelectedCSSTheme == null) {
+	    userSelectedCSSTheme = themeService.getDefaultCSSTheme().getThemeId();
 	}
-	userForm.set("userTheme", userSelectedTheme);
+	userForm.set("userCSSTheme", userSelectedCSSTheme);
+	
+	// Get all the flash themes
+	List<Theme> flashThemes = themeService.getAllFlashThemes();
+	request.setAttribute("flashThemes", flashThemes);
 
+	// Check the user theme is still installed
+	Long userSelectedFlashTheme = null;
+	if (requestor.getHtmlTheme() != null) {
+	    for (Theme theme : flashThemes) {
+		if (theme.getThemeId() == requestor.getFlashTheme().getThemeId()) {
+		    userSelectedFlashTheme = theme.getThemeId();
+		}
+	    }
+	}
+	// if still null, use the default 
+	if (userSelectedFlashTheme == null) {
+	    userSelectedFlashTheme = themeService.getDefaultFlashTheme().getThemeId();
+	}
+	userForm.set("userFlashTheme", userSelectedFlashTheme);
+
 	return mapping.findForward("edit");
     }
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -41,7 +41,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
 import org.hibernate.Hibernate;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -116,9 +116,13 @@
 		(Integer) userForm.get("localeId"));
 	requestor.setLocale(locale);
 
-	CSSThemeVisualElement theme = (CSSThemeVisualElement) getService().findById(CSSThemeVisualElement.class,
-		(Long) userForm.get("userTheme"));
-	requestor.setHtmlTheme(theme);
+	Theme cssTheme = (Theme) getService().findById(Theme.class,
+		(Long) userForm.get("userCSSTheme"));
+	requestor.setHtmlTheme(cssTheme);
+	
+	Theme flashTheme = (Theme) getService().findById(Theme.class,
+		(Long) userForm.get("userFlashTheme"));
+	requestor.setFlashTheme(flashTheme);
 
 	if (userForm.get("disableLamsCommunityUsername") != null
 		&& (Boolean) userForm.get("disableLamsCommunityUsername")) {
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -70,7 +70,8 @@
 	<form-property name="lamsCommunityUsername" type="java.lang.String" />
 	<form-property name="disableLamsCommunityUsername" type="java.lang.Boolean" />
 	<form-property name="tutorialsDisabled" type="java.lang.Boolean" />
-	<form-property name="userTheme" type="java.lang.Long" />
+	<form-property name="userCSSTheme" type="java.lang.Long" />
+	<form-property name="userFlashTheme" type="java.lang.Long" />
 </form-bean>
 
 <!--  uncomment to use wddxPost   
Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -151,15 +151,25 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="align-right"><fmt:message key="label.html.theme"/>:</td>
+		<td class="align-right"><fmt:message key="label.html.htmlTheme"/>:</td>
 		<td>
-		<html:select property="userTheme">
-			<c:forEach items="${themes}" var="theme">
-				<html:option value="${theme.id}">${theme.name}</html:option>
+		<html:select property="userCSSTheme">
+			<c:forEach items="${cssThemes}" var="theme">	
+				<html:option value="${theme.themeId}">${theme.name}</html:option>
 			</c:forEach>
 		</html:select>
 		</td>
 	</tr>
+	<tr>
+		<td class="align-right"><fmt:message key="label.html.flashTheme"/>:</td>
+		<td>
+		<html:select property="userFlashTheme">
+			<c:forEach items="${flashThemes}" var="theme">	
+				<html:option value="${theme.themeId}">${theme.name}</html:option>
+			</c:forEach>
+		</html:select>
+		</td>
+	</tr>
 	
 	<c:if test="${not empty lamsCommunityToken}">
 		<tr>
@@ -258,15 +268,25 @@
 		<td><bean:write name="UserForm" property="fax" /></td>
 	</tr>
 	<tr>
-		<td class="align-right"><fmt:message key="label.html.theme"/>:</td>
+		<td class="align-right"><fmt:message key="label.html.htmlTheme"/>:</td>
 		<td>
-		<html:select property="userTheme">
-			<c:forEach items="${themes}" var="theme">	
-				<html:option value="${theme.id}">${theme.name}</html:option>
+		<html:select property="userCSSTheme">
+			<c:forEach items="${cssThemes}" var="theme">	
+				<html:option value="${theme.themeId}">${theme.name}</html:option>
 			</c:forEach>
 		</html:select>
 		</td>
 	</tr>
+	<tr>
+		<td class="align-right"><fmt:message key="label.html.flashTheme"/>:</td>
+		<td>
+		<html:select property="userFlashTheme">
+			<c:forEach items="${flashThemes}" var="theme">	
+				<html:option value="${theme.themeId}">${theme.name}</html:option>
+			</c:forEach>
+		</html:select>
+		</td>
+	</tr>
 	<c:choose>
 		<c:when test="${serverFlashEnabled}"> 
 			<tr>
Index: lams_common/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/conf/hibernate/mappings/hibernate.cfg.xml	(.../hibernate.cfg.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_common/conf/hibernate/mappings/hibernate.cfg.xml	(.../hibernate.cfg.xml)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -40,9 +40,7 @@
 		<mapping resource="org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml"/>
 		<mapping resource="org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml"/>
 		<mapping resource="org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml"/>
-		<mapping resource="org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml"/>
-		<mapping resource="org/lamsfoundation/lams/themes/CSSStyle.hbm.xml"/>
-		<mapping resource="org/lamsfoundation/lams/themes/CSSProperty.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/themes/Theme.hbm.xml"/>
 		<mapping resource="org/lamsfoundation/lams/usermanagement/Role.hbm.xml"/>
 		<mapping resource="org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml"/>
 		<mapping resource="org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml"/>
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSProperty.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSStyle.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Theme.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Theme.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Theme.hbm.xml	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="org.lamsfoundation.lams.themes.Theme" 
+    table="lams_theme"
+>
+
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_css_theme_ve"
+    </meta>
+
+	<!--  Cache it so that is available to the user records -->
+	<cache usage="transactional" />
+
+    <id
+        name="themeId"
+        type="java.lang.Long"
+        column="theme_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Long"
+            column="theme_ve_id"
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="native" />
+    </id>
+
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="100"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            length="100"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="100"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="100"
+        </meta>    
+    </property>
+   <property
+        name="imageDirectory"
+        type="java.lang.String"
+        column="image_directory"
+        length="100"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="image_directory"
+            length="100"
+        </meta>    
+    </property>
+    <property
+        name="type"
+        type="java.lang.Integer"
+        column="theme_type"
+        length="11"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="theme_type"
+            length="11"
+        </meta>    
+    </property>
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r242af895b7cc36e5f825a4b99862b92a5faa87ed -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 242af895b7cc36e5f825a4b99862b92a5faa87ed)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -364,7 +364,7 @@
     <!-- bi-directional many-to-one association to CSSTheme -->
     <many-to-one
         name="flashTheme"
-        class="org.lamsfoundation.lams.themes.CSSThemeVisualElement"
+        class="org.lamsfoundation.lams.themes.Theme"
         lazy="false"
         not-null="true"
     >
@@ -380,7 +380,7 @@
     <!-- bi-directional many-to-one association to CSSTheme -->
     <many-to-one
         name="htmlTheme"
-        class="org.lamsfoundation.lams.themes.CSSThemeVisualElement"
+        class="org.lamsfoundation.lams.themes.Theme"
         lazy="false"
         not-null="true"
     >
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r242af895b7cc36e5f825a4b99862b92a5faa87ed -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 242af895b7cc36e5f825a4b99862b92a5faa87ed)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -250,45 +250,16 @@
                   REFERENCES lams_supported_locale (locale_id)
 )TYPE=InnoDB;
 
-
-
-CREATE TABLE lams_css_theme_ve (
-       theme_ve_id BIGINT(20) NOT NULL AUTO_INCREMENT
+CREATE TABLE lams_theme (
+       theme_id BIGINT(20) NOT NULL AUTO_INCREMENT
      , name VARCHAR(100) NOT NULL
      , description VARCHAR(100)
-     , parent_id BIGINT(20)
-     , theme_flag TINYINT(1) NOT NULL DEFAULT 0
      , image_directory VARCHAR(100)
-     , PRIMARY KEY (theme_ve_id)
-     , INDEX (parent_id)
-     , CONSTRAINT FK_lams_css_theme_ve_2 FOREIGN KEY (parent_id)
-                  REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+     , theme_type TINYINT(11)
+     , PRIMARY KEY (theme_id)
+     , UNIQUE UQ_name (name)
 )TYPE=InnoDB;
-ALTER TABLE lams_css_theme_ve COMMENT='Stores both the Flash theme and visual element';
 
-CREATE TABLE lams_css_style (
-       style_id BIGINT(20) NOT NULL AUTO_INCREMENT
-     , theme_ve_id BIGINT(20) NOT NULL
-     , PRIMARY KEY (style_id)
-     , INDEX (theme_ve_id)
-     , CONSTRAINT FK_lams_css_style_1 FOREIGN KEY (theme_ve_id)
-                  REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION
-)TYPE=InnoDB;
-ALTER TABLE lams_css_style COMMENT='Groups lams_css_property into a CSSStyleDeclaration.';
-
-CREATE TABLE lams_css_property (
-       property_id BIGINT(20) NOT NULL AUTO_INCREMENT
-     , style_id BIGINT(20) NOT NULL
-     , name VARCHAR(255) NOT NULL
-     , value VARCHAR(100) NOT NULL
-     , style_subset VARCHAR(20)
-     , type TINYINT NOT NULL
-     , PRIMARY KEY (property_id)
-  --   , INDEX (style_id)
-  --   , CONSTRAINT FK_lams_css_property_1 FOREIGN KEY (style_id)
-  --                REFERENCES lams_css_style (style_id) ON DELETE NO ACTION ON UPDATE NO ACTION
-)TYPE=InnoDB;
-
 CREATE TABLE lams_user (
        user_id BIGINT(20) NOT NULL AUTO_INCREMENT
      , login VARCHAR(255) NOT NULL
@@ -333,10 +304,10 @@
                   REFERENCES lams_workspace (workspace_id) ON DELETE NO ACTION ON UPDATE NO ACTION
      , INDEX (flash_theme_id)
      , CONSTRAINT FK_lams_user_4 FOREIGN KEY (flash_theme_id)
-                  REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+                  REFERENCES lams_theme (theme_id) ON DELETE NO ACTION ON UPDATE NO ACTION
      , INDEX (html_theme_id)
      , CONSTRAINT FK_lams_user_5 FOREIGN KEY (html_theme_id)
-                  REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+                  REFERENCES lams_theme (theme_id) ON DELETE NO ACTION ON UPDATE NO ACTION
      , INDEX (locale_id)
      , CONSTRAINT FK_lams_user_6 FOREIGN KEY (locale_id)
                   REFERENCES lams_supported_locale (locale_id) ON DELETE NO ACTION ON UPDATE NO ACTION
Index: lams_common/db/sql/drop_lams_11_tables.sql
===================================================================
diff -u -r00a6e145b37916eb1561ea5c68319b0fc691681b -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/db/sql/drop_lams_11_tables.sql	(.../drop_lams_11_tables.sql)	(revision 00a6e145b37916eb1561ea5c68319b0fc691681b)
+++ lams_common/db/sql/drop_lams_11_tables.sql	(.../drop_lams_11_tables.sql)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -13,9 +13,7 @@
 DROP TABLE IF EXISTS lams_cr_node_version_property;
 DROP TABLE IF EXISTS lams_cr_workspace;
 DROP TABLE IF EXISTS lams_cr_workspace_credential;
-DROP TABLE IF EXISTS lams_css_property;
-DROP TABLE IF EXISTS lams_css_style;
-DROP TABLE IF EXISTS lams_css_theme_ve;
+DROP TABLE IF EXISTS lams__theme;
 DROP TABLE IF EXISTS lams_event_subscriptions;
 DROP TABLE IF EXISTS lams_events;
 DROP TABLE IF EXISTS lams_gate_activity_level;
Index: lams_common/db/sql/insert_lams_users.sql
===================================================================
diff -u -rb9c68da61a40efc2425fb80c0c1e7b06f8fcfe78 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/db/sql/insert_lams_users.sql	(.../insert_lams_users.sql)	(revision b9c68da61a40efc2425fb80c0c1e7b06f8fcfe78)
+++ lams_common/db/sql/insert_lams_users.sql	(.../insert_lams_users.sql)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -3,10 +3,8 @@
 SET FOREIGN_KEY_CHECKS=0;
 
 -- themes and styles 
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES (1, "default", "Default Flash style", null, 1, null);
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES (2, "defaultHTML", "Default HTML style", null, 1, "css");
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES (3, "rams", "RAMS Default Flash style", null, 1, null);
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES  (4,"ramsthemeHTML", "RAMS Default HTML sty;e", null, 1, "ramsthemecss");
+INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (1, "default", "Default Flash style", null, 2);
+INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (2, "defaultHTML", "Default HTML style", "css", 1);
 
 insert into lams_workspace (workspace_id, name, default_fld_id) values(1,'ROOT',1);
 insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(2,'Developers Playpen',2,22);
Index: lams_common/db/sql/insert_rams_users.sql
===================================================================
diff -u -rd89181efec67506914f57c2449036c85cf01094c -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/db/sql/insert_rams_users.sql	(.../insert_rams_users.sql)	(revision d89181efec67506914f57c2449036c85cf01094c)
+++ lams_common/db/sql/insert_rams_users.sql	(.../insert_rams_users.sql)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -3,10 +3,10 @@
 SET FOREIGN_KEY_CHECKS=0;
 
 -- themes and styles 
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES (1, "default", "Default Flash style", null, 1, null);
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES (2, "defaultHTML", "Default HTML style", null, 1, "css");
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES (3, "rams", "RAMS Default Flash style", null, 1, null);
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES  (4,"ramsthemeHTML", "RAMS Default HTML sty;e", null, 1, "ramsthemecss");
+INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (1, "default", "Default Flash style", null, 2);
+INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (2, "defaultHTML", "Default HTML style", "css", 1);
+INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (3, "rams", "RAMS Default Flash style", null, 2);
+INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (4, "ramsthemeHTML", "RAMS Default HTML style", "ramsthemecss", 1);
 
 insert into lams_workspace (workspace_id, name, default_fld_id) values(1,'ROOT',1);
 insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(2,'Developers Playpen',2,22);
Index: lams_common/db/sql/insert_types_data.sql
===================================================================
diff -u -rde0bf3135c724b38aba0592f5be068037ae028c7 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/db/sql/insert_types_data.sql	(.../insert_types_data.sql)	(revision de0bf3135c724b38aba0592f5be068037ae028c7)
+++ lams_common/db/sql/insert_types_data.sql	(.../insert_types_data.sql)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -309,4 +309,4 @@
   (1,'moodle','moodle','moodle','moodle','mdl','http://localhost/moodle/mod/lamstwo/userinfo.php?ts=%timestamp%&un=%username%&hs=%hash%', '', 'http://dummy','\0',7);
 
 -- initialise db version
-INSERT INTO patches VALUES ('lams', 18, NOW(), 'F');
\ No newline at end of file
+INSERT INTO patches VALUES ('lams', 02040000, NOW(), 'F');
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r2dd947ef3812e8d41a9e4be552f54e71ecd1558a -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 2dd947ef3812e8d41a9e4be552f54e71ecd1558a)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -64,9 +64,7 @@
 				<value>classpath:org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml</value>
 				
 				<!-- Theme related mapping files -->
-				<value>classpath:org/lamsfoundation/lams/themes/CSSProperty.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/themes/CSSStyle.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/themes/Theme.hbm.xml</value>
 				
 				<!-- Core Notebook Service related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml</value>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040000.sql
===================================================================
diff -u -ra8b02e2027799d34c76ebd5fa42667c2fd6d74f2 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040000.sql	(.../patch02040000.sql)	(revision a8b02e2027799d34c76ebd5fa42667c2fd6d74f2)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040000.sql	(.../patch02040000.sql)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -2,7 +2,32 @@
 
 SET AUTOCOMMIT = 0;
 
+SET FOREIGN_KEY_CHECKS=0;
 
+-- LDEV-2420 -------
+ALTER TABLE lams_user DROP FOREIGN KEY FK_lams_user_4;
+ALTER TABLE lams_user DROP FOREIGN KEY FK_lams_user_5;
+DROP TABLE lams_css_property;
+DROP TABLE lams_css_style;
+DROP TABLE lams_css_theme_ve;
+SET FOREIGN_KEY_CHECKS=1;
 
+CREATE TABLE lams_theme (
+       theme_id BIGINT(20) NOT NULL AUTO_INCREMENT
+     , name VARCHAR(100) NOT NULL
+     , description VARCHAR(100)
+     , image_directory VARCHAR(100)
+     , theme_type TINYINT(11)
+     , PRIMARY KEY (theme_id)
+     , UNIQUE UQ_name (name)
+)TYPE=InnoDB;
+
+INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (1, "default", "Default Flash style", null, 2);
+INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (2, "defaultHTML", "Default HTML style", "css", 1);
+
+ALTER TABLE lams_user ADD CONSTRAINT FK_lams_user_4 FOREIGN KEY (flash_theme_id) REFERENCES lams_theme (theme_id) ON DELETE NO ACTION ON UPDATE NO ACTION;
+ALTER TABLE lams_user ADD CONSTRAINT FK_lams_user_5 FOREIGN KEY (html_theme_id) REFERENCES lams_theme (theme_id) ON DELETE NO ACTION ON UPDATE NO ACTION;
+--------------------
+
 COMMIT;
 SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml
===================================================================
diff -u -r0983a96e4ff5e060884e4bc9cbc028059302a8e1 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml	(.../localCommonContext.xml)	(revision 0983a96e4ff5e060884e4bc9cbc028059302a8e1)
+++ lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml	(.../localCommonContext.xml)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -96,9 +96,7 @@
 				<value>classpath:org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml</value>
 				
 				<!-- Theme related mapping files -->
-				<value>classpath:org/lamsfoundation/lams/themes/CSSProperty.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/themes/CSSStyle.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/themes/Theme.hbm.xml</value>
 				
 				<!-- Core Notebook Service related mapping files -->
 				<value>classpath:org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml</value>
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/themes/CSSProperty.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/themes/CSSStyle.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/themes/PropertyType.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/themes/Theme.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/themes/Theme.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/Theme.java	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -0,0 +1,135 @@
+/****************************************************************
+ * Copyright (C) 2009 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id$$ */
+package org.lamsfoundation.lams.themes;
+
+/**
+ * @author lfoxton
+ * 
+ * Model for theme whether it be flash, css or other
+ * 
+ * @hibernate.class table="lams_theme"
+ */
+public class Theme {
+
+    public static final int TYPE_CSS = 1;
+    public static final int TYPE_FLASH = 2;
+    
+    /** identifier field */
+    private Long themeId;
+
+    /** persistent field */
+    private String name;
+
+    /** nullable persistent field */
+    private String description;
+    
+    /** persistent field */
+    private String imageDirectory;
+    
+    /** persistent field */
+    private Integer type;
+    
+    /** non-persistent field */
+    private Boolean currentDefaultTheme;
+    
+    /** non-persistent field */
+    private Boolean notEditable;
+
+    /** default constructor */
+    public Theme() {
+    }
+
+    /** 
+     * @hibernate.id generator-class="assigned"  type="java.lang.Long" column="theme_id"   
+     */
+    public Long getThemeId() {
+        return themeId;
+    }
+
+    public void setThemeId(Long themeId) {
+        this.themeId = themeId;
+    }
+
+    /** 
+     *  @hibernate.property column="name" length="100" not-null="true"   
+     */
+    public String getName() {
+        return this.name;
+    }
+
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /** 
+     * @hibernate.property  column="description" length="100"
+     *         
+     */
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /** 
+     * @hibernate.property column="image_directory" length="100"      
+     */
+    public String getImageDirectory() {
+        return this.imageDirectory;
+    }
+
+    public void setImageDirectory(String imageDirectory) {
+        this.imageDirectory = imageDirectory;
+    }
+
+    /**
+     * @hibernate.property column="theme_type" length="11"      
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Boolean getCurrentDefaultTheme() {
+        return currentDefaultTheme;
+    }
+
+    public void setCurrentDefaultTheme(Boolean currentDefaultTheme) {
+        this.currentDefaultTheme = currentDefaultTheme;
+    }
+
+    public Boolean getNotEditable() {
+        return notEditable;
+    }
+
+    public void setNotEditable(Boolean notEditable) {
+        this.notEditable = notEditable;
+    }
+}
Index: lams_common/src/java/org/lamsfoundation/lams/themes/dao/ICSSThemeDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/themes/dao/ICSSThemeDAO.java	(.../ICSSThemeDAO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/dao/ICSSThemeDAO.java	(.../ICSSThemeDAO.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -25,7 +25,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 
 /**
  * This class interacts with Spring's HibernateTemplate to save/delete and
@@ -36,13 +36,17 @@
 public interface ICSSThemeDAO {
     public abstract List getAllThemes();
 
-    public abstract CSSThemeVisualElement getThemeById(Long themeId);
+    public abstract Theme getThemeById(Long themeId);
 
     public abstract List getThemeByName(String name);
 
-    public abstract void saveOrUpdateTheme(CSSThemeVisualElement theme);
+    public abstract void saveOrUpdateTheme(Theme theme);
 
-    public abstract void deleteTheme(CSSThemeVisualElement theme);
+    public abstract void deleteTheme(Theme theme);
 
     public abstract void deleteThemeById(Long themeId);
+
+    public abstract List getAllCSSThemes();
+    
+    public abstract List getAllFlashThemes();
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java	(.../CSSThemeDAO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java	(.../CSSThemeDAO.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -25,64 +25,78 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.dao.ICSSThemeDAO;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
  * This class interacts with Spring's HibernateTemplate to save/delete and
- * retrieve CSSThemeVisualElement and other related objects.
+ * retrieve Theme and other related objects.
  * 
  * @author Fiona Malikoff
-*/
+ */
 public class CSSThemeDAO extends HibernateDaoSupport implements ICSSThemeDAO {
 
-	/** 
-	 * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getAllThemes()
-	 */
-	public List getAllThemes() {
-		return getHibernateTemplate().find("from CSSThemeVisualElement c where c.theme=true");
-	}
+    /**
+     * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getAllThemes()
+     */
+    public List getAllThemes() {
+	return getHibernateTemplate().find("from Theme c");
+    }
 
-	/**
-	 * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getThemeById(java.lang.Long)
-	 */
-	public CSSThemeVisualElement getThemeById(Long themeId) {
-	    String queryString = "from CSSThemeVisualElement c where c.id=?";
-	    List list = getHibernateTemplate().find(queryString,themeId);
-	    if ( list != null && list.size() > 0 )
-			return (CSSThemeVisualElement) list.get(0);
-	    else 
-	        return null;
-	}
+    /**
+     * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getThemeById(java.lang.Long)
+     */
+    public Theme getThemeById(Long themeId) {
+	String queryString = "from Theme c where c.themeId=?";
+	List list = getHibernateTemplate().find(queryString, themeId);
+	if (list != null && list.size() > 0)
+	    return (Theme) list.get(0);
+	else
+	    return null;
+    }
 
-	/** 
-	 * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getThemeByName(java.lang.String)
-	 */
-	public List getThemeByName(String name) {
-		String queryString = "from CSSThemeVisualElement c where c.name=? and c.theme=true";
-		return getHibernateTemplate().find(queryString,name);
-	}
+    /**
+     * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getThemeByName(java.lang.String)
+     */
+    public List getThemeByName(String name) {
+	String queryString = "from Theme c where c.name=?";
+	return getHibernateTemplate().find(queryString, name);
+    }
 
-	/**
-	 * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#saveOrUpdateTheme(org.lamsfoundation.lams.usermanagement.User)
-	 */
-	public void saveOrUpdateTheme(CSSThemeVisualElement theme) {
-		getHibernateTemplate().saveOrUpdate(theme);
-	}
+    /**
+     * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#saveOrUpdateTheme(org.lamsfoundation.lams.usermanagement.User)
+     */
+    public void saveOrUpdateTheme(Theme theme) {
+	getHibernateTemplate().saveOrUpdate(theme);
+    }
 
-	/**
-	 * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#deleteTheme(org.lamsfoundation.lams.usermanagement.User)
-	 */
-	public void deleteTheme(CSSThemeVisualElement theme) {
-		getHibernateTemplate().delete(theme);
-	}
+    /**
+     * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#deleteTheme(org.lamsfoundation.lams.usermanagement.User)
+     */
+    public void deleteTheme(Theme theme) {
+	getHibernateTemplate().delete(theme);
+    }
 
-	/**
-	 * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#deleteUserById(java.lang.Integer)
-	 */
-	public void deleteThemeById(Long themeId) {
-		getHibernateTemplate().delete(getThemeById(themeId));
-	}
+    /**
+     * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#deleteUserById(java.lang.Integer)
+     */
+    public void deleteThemeById(Long themeId) {
+	getHibernateTemplate().delete(getThemeById(themeId));
+    }
 
+    /**
+     * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getAllCSSThemes()
+     */
+    public List getAllCSSThemes() {
+	return getHibernateTemplate().find("from Theme c where c.type=1");
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.themes.dao.ICSSThemeDAO#getAllFlashThemes()
+     */
+    public List getAllFlashThemes() {
+	return getHibernateTemplate().find("from Theme c where c.type=2");
+    }
+
 }
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/themes/dto/CSSStyleDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/themes/dto/CSSThemeBriefDTO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/themes/dto/CSSThemeBriefDTO.java	(.../CSSThemeBriefDTO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/dto/CSSThemeBriefDTO.java	(.../CSSThemeBriefDTO.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -24,7 +24,7 @@
 package org.lamsfoundation.lams.themes.dto;
 
 import org.lamsfoundation.lams.learningdesign.dto.BaseDTO;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 
 /**
  * Contains only the basic details for a theme - name, id, etc. Does not
@@ -51,9 +51,9 @@
     /**
      * Create the DTO from a database object.
      */
-    public CSSThemeBriefDTO(CSSThemeVisualElement theme) {
+    public CSSThemeBriefDTO(Theme theme) {
         if ( theme != null ) {
-    		this.id = theme.getId();
+    		this.id = theme.getThemeId();
     		this.name = theme.getName();
     		this.description = theme.getDescription();
         }
Index: lams_common/src/java/org/lamsfoundation/lams/themes/dto/CSSThemeDTO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/themes/dto/CSSThemeDTO.java	(.../CSSThemeDTO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/dto/CSSThemeDTO.java	(.../CSSThemeDTO.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -32,192 +32,124 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.dto.BaseDTO;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
 
 /**
- * Models the Theme structure that is used to communicate with Flash.
- * Includes all the information from Theme down to each individual property.
- * Based on the native Flash structure for Style objects.
+ * Models the Theme structure that is used to communicate with Flash. Includes
+ * all the information from Theme down to each individual property. Based on the
+ * native Flash structure for Style objects.
  * 
  * @author Fiona Malikoff
  */
 public class CSSThemeDTO extends BaseDTO {
 
-	protected Logger log = Logger.getLogger(CSSThemeDTO.class);	
+    protected Logger log = Logger.getLogger(CSSThemeDTO.class);
 
-	public final static String ID_TAG = "id";
-	public final static String NAME_TAG = "name"; 
-	public final static String DESCRIPTION_TAG = "description";
-	public final static String BASE_STYLE_OBJECT_TAG = "baseStyleObject";
-	public final static String VISUAL_ELEMENTS_TAG = "visualElements";
-	public final static String TEXT_FORMAT_TAG = "_tf";
-	public final static String STYLE_OBJECT_TAG = "styleObject";
+    public final static String ID_TAG = "id";
+    public final static String NAME_TAG = "name";
+    public final static String DESCRIPTION_TAG = "description";
+    public final static String BASE_STYLE_OBJECT_TAG = "baseStyleObject";
+    public final static String VISUAL_ELEMENTS_TAG = "visualElements";
+    public final static String TEXT_FORMAT_TAG = "_tf";
+    public final static String STYLE_OBJECT_TAG = "styleObject";
 
-	/* The variables must have the same names as the tags above, or the WDDX packet will have the 
-	 * wrong tag names when sent to Flash. We can model the visual elements as CSSVisualElementDTO 
-	 * any arbitrary Java class to a hashtable. There is no point modelling the style objects
-	 * as anything but a hashtable, as all they contain are properties.
-	 */
-	private Long id;
-	private String name;
-	private String description;
-	private CSSStyleDTO baseStyleObject;
-	private List visualElements;
-    
+    /*
+     * The variables must have the same names as the tags above, or the WDDX
+     * packet will have the wrong tag names when sent to Flash. We can model the
+     * visual elements as CSSVisualElementDTO any arbitrary Java class to a
+     * hashtable. There is no point modelling the style objects as anything but
+     * a hashtable, as all they contain are properties.
+     */
+    private Long id;
+    private String name;
+    private String description;
+
     /**
      * Create the DTO using the data from Flash
+     * 
      * @throws WDDXProcessorConversionException
      */
     public CSSThemeDTO(Hashtable wddxData) throws WDDXProcessorConversionException {
-        if ( wddxData != null ) {
-    		this.id = WDDXProcessor.convertToLong(wddxData,ID_TAG);
-    		this.name = WDDXProcessor.convertToString(wddxData,NAME_TAG);
-    		this.description = WDDXProcessor.convertToString(wddxData,DESCRIPTION_TAG);
-    		Hashtable so = (Hashtable) wddxData.get(BASE_STYLE_OBJECT_TAG);
-    		if ( so != null ) {
-    		    baseStyleObject = new CSSStyleDTO(so);
-    		}
-    		List ve = (List) wddxData.get(VISUAL_ELEMENTS_TAG);
-    		if ( ve != null ) {
-    		    int numElements = ve.size();
-    		    visualElements = new ArrayList(numElements);
-    		    Iterator iter = ve.iterator();
-    		    while ( iter.hasNext() ) {
-    		        visualElements.add(new CSSVisualElementDTO((Hashtable) iter.next()));
-    		    }
-    		}
-        }
+	if (wddxData != null) {
+	    this.id = WDDXProcessor.convertToLong(wddxData, ID_TAG);
+	    this.name = WDDXProcessor.convertToString(wddxData, NAME_TAG);
+	    this.description = WDDXProcessor.convertToString(wddxData, DESCRIPTION_TAG);
+	}
     }
 
     /**
-     * Create the DTO from a database object. 
+     * Create the DTO from a database object.
      * 
      * @throws ParseException
      * 
      */
-    public CSSThemeDTO (CSSThemeVisualElement theme){
-        if ( theme != null ) {
-            this.id = theme.getId();
-            this.name = theme.getName();
-            this.description = theme.getDescription();
-    		if ( theme.getStyle()!= null ) {
-    		    this.baseStyleObject = new CSSStyleDTO(theme.getStyle());
-    		}
-    		if ( theme.getElements() != null ) {
-    		    int numElements = theme.getElements().size();
-    		    if ( numElements > 0 ) {
-    		        this.visualElements = new ArrayList(numElements);
-    		        Iterator iter = theme.getElements().iterator();
-    		        while ( iter.hasNext() ) {
-    		            CSSThemeVisualElement element = (CSSThemeVisualElement) iter.next();
-    		            if ( element.isTheme() ) {
-    		                log.error("Theme found within another theme. Flash packet currently doesn't support this format. "
-    		                        +" Theme being skipped. "+element);
-    		            } else {
-    		                this.visualElements.add(new CSSVisualElementDTO(element));
-    		            }
-    		        }
-    		    }
-    		}
-        }
+    public CSSThemeDTO(Theme theme) {
+	if (theme != null) {
+	    this.id = theme.getThemeId();
+	    this.name = theme.getName();
+	    this.description = theme.getDescription();
+	}
     }
-    
+
     /**
-     * Creates the database format object from this DTO. Does not look up any 
+     * Creates the database format object from this DTO. Does not look up any
      * existing entries in the database. Does not set the users field.
      * 
-     * Don't call it getCSSTheme, or CSSTheme will be be written out in the 
-     * WDDX packet created from the DTO!
+     * Don't call it getCSSTheme, or CSSTheme will be be written out in the WDDX
+     * packet created from the DTO!
      */
-    public CSSThemeVisualElement createCSSThemeVisualElement() {
-        CSSThemeVisualElement theme = new CSSThemeVisualElement();
-        if ( baseStyleObject != null ) {
-            theme.setStyle(baseStyleObject.createNewCSSStyle());
-        }
-        theme.setDescription(description);
-        theme.setName(name);
-        theme.setId(id);
-        theme.setTheme(true);
-        if ( visualElements != null && visualElements.size() > 0 ) {
-            Iterator iter = visualElements.iterator();
-            while (iter.hasNext()) {
-                CSSVisualElementDTO element = (CSSVisualElementDTO) iter.next();
-                theme.addElement(element.createCSSThemeVisualElement());
-            }
-        }
-        return theme;
+    public Theme createCSSThemeVisualElement() {
+	Theme theme = new Theme();
+	theme.setDescription(description);
+	theme.setName(name);
+	theme.setThemeId(id);
+	return theme;
     }
 
     /**
      * Update an existing CSSTheme object ( probably from the database) with the
-     * current values. Arguably this functionality belongs in the CSSTheme object but
-     * that would confused matters as some of the field copying code would be in 
-     * this object, and other bits would be in the CSSTheme object. Does not
-     * change the user's field.
+     * current values. Arguably this functionality belongs in the CSSTheme
+     * object but that would confused matters as some of the field copying code
+     * would be in this object, and other bits would be in the CSSTheme object.
+     * Does not change the user's field.
      * 
-     * Changes the parameter object (currentTheme) and returns the modified object.
+     * Changes the parameter object (currentTheme) and returns the modified
+     * object.
      */
-    public CSSThemeVisualElement updateCSSTheme(CSSThemeVisualElement currentTheme) {
-        if ( baseStyleObject != null ) {
-            currentTheme.setStyle(baseStyleObject.createNewCSSStyle());
-        } else {
-            currentTheme.setStyle(null);
-        }
-        currentTheme.setDescription(description);
-        currentTheme.setName(name);
-        currentTheme.setId(id);
-        currentTheme.clearElements();
-        if ( visualElements != null && visualElements.size() > 0 ) {
-            Iterator iter = visualElements.iterator();
-            while (iter.hasNext()) {
-                CSSVisualElementDTO element = (CSSVisualElementDTO) iter.next();
-                currentTheme.addElement(element.createCSSThemeVisualElement());
-            }
-        }
-        return currentTheme;
+    public Theme updateCSSTheme(Theme currentTheme) {
+	
+	currentTheme.setDescription(description);
+	currentTheme.setName(name);
+	return currentTheme;
     }
 
+
     /**
-     * @return Returns the baseStyleObject.
-     */
-    public CSSStyleDTO getBaseStyleObject() {
-        return baseStyleObject;
-    }
-    /**
      * @return Returns the description.
      */
     public String getDescription() {
-        return description;
+	return description;
     }
+
     /**
      * @return Returns the id.
      */
     public Long getId() {
-        return id;
+	return id;
     }
+
     /**
      * @return Returns the name.
      */
     public String getName() {
-        return name;
+	return name;
     }
-    /**
-     * @return Returns the visualElements.
-     */
-    public List getVisualElements() {
-        return visualElements;
-    }
-    
+
+
     public String toString() {
-        return new ToStringBuilder(this)
-            .append("id", id)
-            .append("name", name)
-            .append("description", description)
-            .append("baseStyleObject", baseStyleObject)
-            .append("visualElements", visualElements)
-            .toString();
+	return new ToStringBuilder(this).append("id", id).append("name", name).append("description", description).toString();
     }
 
 }
Fisheye: Tag 7998a31f6d7d4f1eef3e866bafef22caa012eb7a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/themes/dto/CSSVisualElementDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/themes/service/IThemeService.java
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/themes/service/IThemeService.java	(.../IThemeService.java)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/service/IThemeService.java	(.../IThemeService.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.exception.ThemeException;
 import org.lamsfoundation.lams.usermanagement.exception.UserException;
 import org.lamsfoundation.lams.util.MessageService;
@@ -82,12 +82,12 @@
 	/**
 	 * Returns a theme
 	 */
-	public CSSThemeVisualElement getTheme(Long themeId);
+	public Theme getTheme(Long themeId);
 
 	/**
 	 * Returns a theme based on the name.
 	 */
-	public CSSThemeVisualElement getTheme(String themeName);
+	public Theme getTheme(String themeName);
 
 	/**
 	 * This method returns a list of all available themes in
@@ -110,9 +110,21 @@
 	 * Get all the installed themes
 	 * @return
 	 */
-	public List<CSSThemeVisualElement> getAllThemes();
+	public List<Theme> getAllThemes();
 	
 	/**
+	 * Get all the installed CSS themes
+	 * @return
+	 */
+	public List<Theme> getAllCSSThemes();
+	
+	/**
+	 * Get all the installed flash themes
+	 * @return
+	 */
+	public List<Theme> getAllFlashThemes();
+	
+	/**
 	 * Remove a theme
 	 * @param themeId
 	 */
@@ -122,12 +134,18 @@
 	 * Saves or updates a theme
 	 * @param theme
 	 */
-	public void saveOrUpdateTheme(CSSThemeVisualElement theme);
+	public void saveOrUpdateTheme(Theme theme);
 	
 	/**
+	 * Returns the default css theme for the server
+	 * @return
+	 */
+	public Theme getDefaultCSSTheme();
+	
+	/**
 	 * Returns the default theme for the server
 	 * @return
 	 */
-	public CSSThemeVisualElement getDefaultTheme();
+	public Theme getDefaultFlashTheme();
 }
 
Index: lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java	(.../ThemeService.java)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java	(.../ThemeService.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -30,7 +30,7 @@
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.dao.ICSSThemeDAO;
 import org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO;
 import org.lamsfoundation.lams.themes.dto.CSSThemeDTO;
@@ -132,8 +132,8 @@
 	    log.debug("Converted Theme packet. Packet was \n" + wddxPacket + "\nDTO is\n" + themeDTO);
 	}
 
-	CSSThemeVisualElement dbTheme = null;
-	CSSThemeVisualElement storedTheme = null;
+	Theme dbTheme = null;
+	Theme storedTheme = null;
 	if (themeDTO.getId() != null) {
 	    // Flash has supplied an id, get the record from the database for update
 	    dbTheme = themeDAO.getThemeById(themeDTO.getId());
@@ -146,7 +146,7 @@
 	}
 
 	themeDAO.saveOrUpdateTheme(storedTheme);
-	flashMessage = new FlashMessage(IThemeService.STORE_THEME_MESSAGE_KEY, storedTheme.getId());
+	flashMessage = new FlashMessage(IThemeService.STORE_THEME_MESSAGE_KEY, storedTheme.getThemeId());
 	return flashMessage.serializeMessage();
     }
 
@@ -160,7 +160,7 @@
      */
     public String getThemeWDDX(Long themeId) throws IOException {
 	FlashMessage flashMessage = null;
-	CSSThemeVisualElement theme = getTheme(themeId);
+	Theme theme = getTheme(themeId);
 	if (theme == null)
 	    flashMessage = FlashMessage.getNoSuchTheme("wddxPacket", themeId);
 	else {
@@ -173,17 +173,17 @@
     /**
      * Returns a theme
      */
-    public CSSThemeVisualElement getTheme(Long themeId) {
+    public Theme getTheme(Long themeId) {
 	return themeDAO.getThemeById(themeId);
     }
 
     /**
      * Returns a theme based on the name.
      */
-    public CSSThemeVisualElement getTheme(String themeName) {
+    public Theme getTheme(String themeName) {
 	List themes = themeDAO.getThemeByName(themeName);
 	if (themes != null && themes.size() > 0)
-	    return (CSSThemeVisualElement) themes.get(0);
+	    return (Theme) themes.get(0);
 	else
 	    return null;
     }
@@ -201,7 +201,7 @@
 	ArrayList<CSSThemeBriefDTO> themeList = new ArrayList<CSSThemeBriefDTO>();
 	Iterator iterator = themes.iterator();
 	while (iterator.hasNext()) {
-	    CSSThemeBriefDTO dto = new CSSThemeBriefDTO((CSSThemeVisualElement) iterator.next());
+	    CSSThemeBriefDTO dto = new CSSThemeBriefDTO((Theme) iterator.next());
 	    themeList.add(dto);
 	}
 	flashMessage = new FlashMessage("getThemes", themeList);
@@ -218,7 +218,7 @@
 	    UserException {
 	FlashMessage flashMessage = null;
 	User user = (User) userManagementService.findById(User.class, userId);
-	CSSThemeVisualElement theme = themeDAO.getThemeById(themeId);
+	Theme theme = themeDAO.getThemeById(themeId);
 
 	if (theme == null)
 	    throw new ThemeException(messageService.getMessage(IThemeService.NO_SUCH_THEME_KEY));
@@ -277,8 +277,8 @@
      * @see org.lamsfoundation.lams.themes.service.IThemeService#getAllThemes()
      */
     @SuppressWarnings("unchecked")
-    public List<CSSThemeVisualElement> getAllThemes(){
-	return (List<CSSThemeVisualElement>)themeDAO.getAllThemes();
+    public List<Theme> getAllThemes(){
+	return (List<Theme>)themeDAO.getAllThemes();
     }
 
     /* (non-Javadoc)
@@ -289,24 +289,51 @@
     }
 
     /* (non-Javadoc)
-     * @see org.lamsfoundation.lams.themes.service.IThemeService#saveOrUpdateTheme(org.lamsfoundation.lams.themes.CSSThemeVisualElement)
+     * @see org.lamsfoundation.lams.themes.service.IThemeService#saveOrUpdateTheme(org.lamsfoundation.lams.themes.Theme)
      */
-    public void saveOrUpdateTheme(CSSThemeVisualElement theme) {
+    public void saveOrUpdateTheme(Theme theme) {
 	themeDAO.saveOrUpdateTheme(theme);
     }
     
     /* (non-Javadoc)
      * @see org.lamsfoundation.lams.themes.service.IThemeService#getDefaultTheme()
      */
-    public CSSThemeVisualElement getDefaultTheme() {
-	List<CSSThemeVisualElement> themes = getAllThemes();
-	for (CSSThemeVisualElement theme : themes) {
+    public Theme getDefaultCSSTheme() {
+	List<Theme> themes = getAllThemes();
+	for (Theme theme : themes) {
 	    if (theme.getName().equals(Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME))); {
 		return theme;
 	    }
 	}
 	
 	return null;
     }
+    
+    /* (non-Javadoc)
+     * @see org.lamsfoundation.lams.themes.service.IThemeService#getDefaultTheme()
+     */
+    public Theme getDefaultFlashTheme() {
+	List<Theme> themes = getAllThemes();
+	for (Theme theme : themes) {
+	    if (theme.getName().equals(Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME))); {
+		return theme;
+	    }
+	}
+	return null;
+    }
 
+    /* (non-Javadoc)
+     * @see org.lamsfoundation.lams.themes.service.IThemeService#getAlCSSThemes()
+     */
+    public List<Theme> getAllCSSThemes() {
+	return themeDAO.getAllCSSThemes();
+    }
+
+    /* (non-Javadoc)
+     * @see org.lamsfoundation.lams.themes.service.IThemeService#getAlFlashThemes()
+     */
+    public List<Theme> getAllFlashThemes() {
+	return themeDAO.getAllFlashThemes();
+    }
+
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r16a173502ea5c23248e95a73afd859ea77d0ac23 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 16a173502ea5c23248e95a73afd859ea77d0ac23)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -35,7 +35,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserFlashDTO;
@@ -125,10 +125,10 @@
     private Set userOrganisations;
 
     /** persistent field */
-    private CSSThemeVisualElement flashTheme;
+    private Theme flashTheme;
 
     /** persistent field */
-    private CSSThemeVisualElement htmlTheme;
+    private Theme htmlTheme;
 
     /** nullable persistent field */
     private String chatId;
@@ -187,7 +187,7 @@
 	    String addressLine2, String addressLine3, String city, String state, String postcode, String country,
 	    String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag,
 	    Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod,
-	    CSSThemeVisualElement flashTheme, CSSThemeVisualElement htmlTheme, Set userOrganisations, String chatId,
+	    Theme flashTheme, Theme htmlTheme, Set userOrganisations, String chatId,
 	    Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons,
 	    Long portraitUuid, Boolean changePassword, Boolean enableFlash, String lamsCommunityToken) {
 	this.login = login;
@@ -527,11 +527,11 @@
      * @hibernate.column name="flash_theme_id"
      * 
      */
-    public CSSThemeVisualElement getFlashTheme() {
+    public Theme getFlashTheme() {
 	return flashTheme;
     }
 
-    public void setFlashTheme(CSSThemeVisualElement flashTheme) {
+    public void setFlashTheme(Theme flashTheme) {
 	this.flashTheme = flashTheme;
     }
 
@@ -540,11 +540,11 @@
      * @hibernate.column name="html_theme_id"
      * 
      */
-    public CSSThemeVisualElement getHtmlTheme() {
+    public Theme getHtmlTheme() {
 	return htmlTheme;
     }
 
-    public void setHtmlTheme(CSSThemeVisualElement htmlTheme) {
+    public void setHtmlTheme(Theme htmlTheme) {
 	this.htmlTheme = htmlTheme;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -r4f33380083bd35fd6d0851de9def290c62ffc3c9 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 4f33380083bd35fd6d0851de9def290c62ffc3c9)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -43,7 +43,6 @@
     private String fckLanguageMapping;
     private String direction;
     private String email;
-    // private CSSThemeVisualElement theme;
     private CSSThemeBriefDTO flashTheme;
     private CSSThemeBriefDTO htmlTheme;
     private TimeZone timeZone;
@@ -56,16 +55,6 @@
     private Set<String> pagesWithDisabledTutorials;
     private Boolean firstLogin;
 
-    // public UserDTO(Integer userID, String firstName, String lastName,
-    // String login, String email, CSSThemeVisualElement theme) {
-    // this.userID = userID;
-    // this.firstName = firstName;
-    // this.lastName = lastName;
-    // this.login = login;
-    // this.email = email;
-    // this.theme = theme;
-    // }
-
     public UserDTO(Integer userID, String firstName, String lastName, String login, String localeLanguage,
 	    String localeCountry, String direction, String email, CSSThemeBriefDTO flashTheme,
 	    CSSThemeBriefDTO htmlTheme, TimeZone timezone, Integer authenticationMethodId, String fckLanguageMapping,
@@ -254,12 +243,4 @@
 	return firstLogin;
     }
 
-    // public CSSThemeVisualElement getTheme() {
-    // return theme;
-    // }
-    //	
-    // public void setTheme(CSSThemeVisualElement theme) {
-    // this.theme = theme;
-    // }
-
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
diff -u -red0cc400ab00e2c188be1f4227532770fec5a6e7 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision ed0cc400ab00e2c188be1f4227532770fec5a6e7)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Vector;
 
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
@@ -399,13 +399,13 @@
 	 * Get default flash theme of server.
 	 * @return default flash theme object
 	 */
-	public CSSThemeVisualElement getDefaultFlashTheme();
+	public Theme getDefaultFlashTheme();
 	
 	/**
 	 * Get default html theme of server.
 	 * @return default html theme object
 	 */
-	public CSSThemeVisualElement getDefaultHtmlTheme();
+	public Theme getDefaultHtmlTheme();
 	
 	public void auditPasswordChanged(User user, String moduleName);
 	
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -42,7 +42,7 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
@@ -1048,16 +1048,16 @@
 	}
     }
 
-    public CSSThemeVisualElement getDefaultFlashTheme() {
+    public Theme getDefaultFlashTheme() {
 	String flashName = Configuration.get(ConfigurationKeys.DEFAULT_FLASH_THEME);
-	List list = findByProperty(CSSThemeVisualElement.class, "name", flashName);
-	return list != null ? (CSSThemeVisualElement) list.get(0) : null;
+	List list = findByProperty(Theme.class, "name", flashName);
+	return list != null ? (Theme) list.get(0) : null;
     }
 
-    public CSSThemeVisualElement getDefaultHtmlTheme() {
+    public Theme getDefaultHtmlTheme() {
 	String htmlName = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
-	List list = findByProperty(CSSThemeVisualElement.class, "name", htmlName);
-	return list != null ? (CSSThemeVisualElement) list.get(0) : null;
+	List list = findByProperty(Theme.class, "name", htmlName);
+	return list != null ? (Theme) list.get(0) : null;
     }
 
     public void auditPasswordChanged(User user, String moduleName) {
Index: lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
===================================================================
diff -u -r903c94bada901b0af715bbaf728ce49fa887c326 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	(.../CSSThemeUtil.java)	(revision 903c94bada901b0af715bbaf728ce49fa887c326)
+++ lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	(.../CSSThemeUtil.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -37,6 +37,7 @@
 
     // private static Logger log = Logger.getLogger(CSSThemeUtil.class);
     public static String DEFAULT_HTML_THEME = "defaultHTML";
+    public static String DEFAULT_FLASH_THEME = "default";
 
     /**
      * Will return a list of stylesheets for the current user. If the user does
Index: lams_common/test/java/org/lamsfoundation/lams/themes/dao/TestCSSThemeDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_common/test/java/org/lamsfoundation/lams/themes/dao/TestCSSThemeDAO.java	(.../TestCSSThemeDAO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/test/java/org/lamsfoundation/lams/themes/dao/TestCSSThemeDAO.java	(.../TestCSSThemeDAO.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -29,9 +29,7 @@
 import java.util.Set;
 
 import org.lamsfoundation.lams.test.AbstractCommonTestCase;
-import org.lamsfoundation.lams.themes.CSSProperty;
-import org.lamsfoundation.lams.themes.CSSStyle;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.dao.hibernate.CSSThemeDAO;
 import org.lamsfoundation.lams.themes.dto.CSSThemeDTO;
 
@@ -72,7 +70,7 @@
     }
 
     public void testGetThemeById() {
-        CSSThemeVisualElement theme = themeDAO.getThemeById(RUBY_THEME_ID);
+        Theme theme = themeDAO.getThemeById(RUBY_THEME_ID);
         assertTrue("Theme returned is Ruby theme",
                 theme!=null && RUBY_THEME_NAME.equals(theme.getName()));
     }
@@ -82,27 +80,22 @@
         assertTrue("At least one theme returned", list != null && list.size() > 0 );
         Iterator iter = list.iterator();
         while (iter.hasNext()) {
-            CSSThemeVisualElement element = (CSSThemeVisualElement) iter.next();
+            Theme element = (Theme) iter.next();
             assertEquals("Theme has correct name (ruby)",RUBY_THEME_NAME,element.getName());
         }
     } 
 
     public void testSaveOrUpdateTheme() {
         try {
             // create a new theme
-            CSSThemeVisualElement theme = saveTheme("testSaveOrUpdateTheme", "testSaveOrUpdateTheme description");
-            Long themeId = theme.getId();
-            CSSStyle baseStyle = theme.getStyle();
-            Set elements = theme.getElements();
-            Iterator iter = elements.iterator();
-            CSSThemeVisualElement element = (CSSThemeVisualElement) iter.next();
+            Theme theme = saveTheme("testSaveOrUpdateTheme", "testSaveOrUpdateTheme description");
+            Long themeId = theme.getThemeId();
 
             // update the theme and check the changes
             theme.setName("testSaveOrUpdateTheme2");
             theme.setDescription("testSaveOrUpdateTheme2 description");
-            element.setName("extendingButton");
             themeDAO.saveOrUpdateTheme(theme);
-            CSSThemeVisualElement dbTheme = themeDAO.getThemeById(themeId);
+            Theme dbTheme = themeDAO.getThemeById(themeId);
             checkTheme("testSaveOrUpdateTheme2", themeId, "testSaveOrUpdateTheme2 description", 
                     "extendingButton", dbTheme);
 
@@ -113,90 +106,64 @@
 
  
     public void testDeleteTheme() {
-        CSSThemeVisualElement theme = null;
+        Theme theme = null;
         try {
             theme = saveTheme("testDeleteTheme",  "testDeleteTheme description");
 	    } catch (ParseException e) {
 	        fail("ParseException thrown"+e.getMessage());
 	    }
-        Long themeId = theme.getId();
+        Long themeId = theme.getThemeId();
 
         themeDAO.deleteTheme(theme);
         themeDAO.getHibernateTemplate().flush();
-        CSSThemeVisualElement dbTheme = themeDAO.getThemeById(themeId);
+        Theme dbTheme = themeDAO.getThemeById(themeId);
         assertNull("Saved theme cannot be retrieved after deletion",dbTheme);
     }
 
     public void testDeleteThemeById() {
-        CSSThemeVisualElement theme = null;
+        Theme theme = null;
         try {
             theme = saveTheme("testDeleteThemeById", "testDeleteThemeById description");
 	    } catch (ParseException e) {
 	        fail("ParseException thrown"+e.getMessage());
 	    }
-        Long themeId = theme.getId();
+        Long themeId = theme.getThemeId();
 
         themeDAO.deleteThemeById(themeId);
         themeDAO.getHibernateTemplate().flush();
-        CSSThemeVisualElement dbTheme = themeDAO.getThemeById(themeId);
+        Theme dbTheme = themeDAO.getThemeById(themeId);
         assertNull("Saved theme cannot be retrieved after deletion",dbTheme);
     }
     
     /* ************* End of tests ***********************************/
     
-    private CSSThemeVisualElement saveTheme(String themeName, String description) throws ParseException {
+    private Theme saveTheme(String themeName, String description) throws ParseException {
         
-        CSSThemeVisualElement theme = createNewTheme(themeName, description, "button");
+        Theme theme = createNewTheme(themeName, description, "button");
         themeDAO.saveOrUpdateTheme(theme);
-        Long themeId = theme.getId();
+        Long themeId = theme.getThemeId();
         themeDAO.getHibernateTemplate().flush();
 
-        CSSThemeVisualElement dbTheme = themeDAO.getThemeById(themeId);
+        Theme dbTheme = themeDAO.getThemeById(themeId);
         assertNotNull("Saved theme can be retrieved",dbTheme);
         checkTheme(themeName, themeId, description, "button", dbTheme);
         assertEquals(themeName, dbTheme.getName());
         return dbTheme;
     }
     
     /* if you change any of the values in the new theme, please change checkTheme to match */
-    private CSSThemeVisualElement createNewTheme(String themeName, String description, String elementName) {
-        
-        CSSThemeVisualElement theme = new CSSThemeVisualElement();
-
+    private Theme createNewTheme(String themeName, String description, String elementName) {     
+        Theme theme = new Theme();
         theme.setDescription(description);
         theme.setName(themeName);
-        theme.setTheme(true);
-
-        CSSStyle baseStyle = new CSSStyle();
-        CSSProperty property = new CSSProperty("borderStyle", "outset", null);
-        baseStyle.addProperty(property);
-        property = new CSSProperty("rollOverColor", new Long(16711680), null);
-        baseStyle.addProperty(property);
-        // try it as a double, as that is what WDDX creates
-        property = new CSSProperty("color", new Double(12452097), CSSThemeDTO.TEXT_FORMAT_TAG);
-        baseStyle.addProperty(property);
-
-        theme.setStyle(baseStyle);
-
-        CSSStyle elementStyle = new CSSStyle();
-        property = new CSSProperty("selectionColor", new Double(16711681), null);
-        elementStyle.addProperty(property);
-        property = new CSSProperty("display", "block", CSSThemeDTO.TEXT_FORMAT_TAG);
-        elementStyle.addProperty(property);
-        
-        CSSThemeVisualElement element = new CSSThemeVisualElement();
+        Theme element = new Theme();
         element.setName(elementName);
-        element.setStyle(elementStyle);
-        element.setTheme(false);
-
-        theme.addElement(element);
-
         return theme;
     }
     
     /* This attempts to check that the correct values have been written to the database. Doesn't really work
      * as it isn't the db object that it is returned - it is the cached Hibernate object. e.g. if the cascades
-     * fail and no CSSThemeVisualElement are written to the database, the tested object contains them anyway!!!!
+     * fail and no Theme are written to the database, the tested object contains them anyway!!!!
      *
      * @param themeName
      * @param themeId
@@ -205,58 +172,11 @@
      * @param theme
      * @throws ParseException
      */
-    private void checkTheme(String themeName, Long themeId, String description, String elementName, CSSThemeVisualElement theme) throws ParseException {
+    private void checkTheme(String themeName, Long themeId, String description, String elementName, Theme theme) throws ParseException {
       
         assertEquals(theme.getDescription(), description);
         assertEquals(theme.getName(),themeName);
-        assertTrue("Theme flag for theme is true", theme.isTheme());
         
-        CSSStyle baseStyle = theme.getStyle();
-        assertNotNull(baseStyle);
-        Set bsproperties = baseStyle.getProperties();
-        assertNotNull(bsproperties);
-        Iterator iter = bsproperties.iterator();
-        while (iter.hasNext()) {
-            CSSProperty property = (CSSProperty) iter.next();
-            if ( "borderStyle".equals(property.getName()) ) {
-                assertEquals(property.getValueAsObject(), "outset");
-                assertNull(property.getStyleSubset());
-            } else if ( "rollOverColor".equals(property.getName()) ) {
-                assertEquals(property.getValueAsObject(), new Long(16711680));
-                assertNull(property.getStyleSubset());
-            } else if ( "color".equals(property.getName()) ) {
-                assertEquals(property.getValueAsObject(), new Double(12452097));
-                assertEquals(property.getStyleSubset(), CSSThemeDTO.TEXT_FORMAT_TAG);
-            } else {
-                fail("Unexpected property in baseStyle "+property);
-            }
-        }
-
-        Set elements = theme.getElements();
-        assertNotNull(elements);
-        iter = elements.iterator();
-        while (iter.hasNext()) {
-            CSSThemeVisualElement element = (CSSThemeVisualElement) iter.next();
-            assertEquals(element.getName(), elementName);
-            assertNull("Description is null",element.getDescription());
-            assertFalse("Theme flag for element is false", element.isTheme());
-            assertNotNull(element.getStyle());
-            assertNotNull(element.getStyle().getProperties());
-            Iterator iter2 = element.getStyle().getProperties().iterator();
-            while (iter2.hasNext()) {
-                CSSProperty property= (CSSProperty) iter2.next();
-	            if ( "selectionColor".equals(property.getName()) ) {
-	                assertEquals(property.getValueAsObject(), new Double(16711681));
-	                assertNull(property.getStyleSubset());
-	            } else if ( "display".equals(property.getName()) ) {
-	                assertEquals(property.getValueAsObject(), "block");
-	                assertEquals(property.getStyleSubset(), CSSThemeDTO.TEXT_FORMAT_TAG);
-	            } else {
-	                fail("Unexpected property in baseStyle "+property);
-	            }
-            }
-        }
-        
     }
     
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
===================================================================
diff -u -r2633c1306f1a9ed0ad7540587f9c2f6eed1fadca -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	(.../ExportPortfolioService.java)	(revision 2633c1306f1a9ed0ad7540587f9c2f6eed1fadca)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	(.../ExportPortfolioService.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -55,7 +55,7 @@
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.service.IThemeService;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
@@ -510,11 +510,11 @@
      * Gets the themes for the current user. This is used to determine the stylesheets included in the export file. We
      * need the full theme, not just the name, so we can get the directory names for the images.
      */
-    public Collection<CSSThemeVisualElement> getUserThemes() {
+    public Collection<Theme> getUserThemes() {
 	List<String> themeNames = CSSThemeUtil.getAllUserThemes();
-	Set<CSSThemeVisualElement> userThemes = new HashSet<CSSThemeVisualElement>();
+	Set<Theme> userThemes = new HashSet<Theme>();
 	for (String themeName : themeNames) {
-	    CSSThemeVisualElement theme = themeService.getTheme(themeName);
+	    Theme theme = themeService.getTheme(themeName);
 	    if (theme != null) {
 		userThemes.add(theme);
 	    }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
===================================================================
diff -u -r623a8b69a67eb91d7e0a31c5f4d15c4fabb9aa6f -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java	(.../IExportPortfolioService.java)	(revision 623a8b69a67eb91d7e0a31c5f4d15c4fabb9aa6f)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java	(.../IExportPortfolioService.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -30,7 +30,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.lamsfoundation.lams.learning.export.Portfolio;
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 /**
  * @author mtruong
@@ -114,6 +114,6 @@
 	 /** Gets the themes for the current user. This is used to determine the stylesheets
 	  * included in the export file. We need the full theme, not just the name, so we can get
 	  * the directory names for the images. */
-	public Collection<CSSThemeVisualElement> getUserThemes();
+	public Collection<Theme> getUserThemes();
 	
 }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
===================================================================
diff -u -r745e0d92ab1ca0494badf67bd32f54d9c7670a87 -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java	(.../CSSBundler.java)	(revision 745e0d92ab1ca0494badf67bd32f54d9c7670a87)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java	(.../CSSBundler.java)	(revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a)
@@ -37,7 +37,7 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
-import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
+import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
@@ -53,19 +53,19 @@
 	String outputDirectory  = null;
 	String centralPath  = null;
 	boolean rtl = false;
-	Collection<CSSThemeVisualElement> themes = null;
+	Collection<Theme> themes = null;
 	List<String> directoriesRequired;
 	
 	/**
  	 * @param centralPath the directory path to the lams-central.war. Assumes that it is an expanded war.
 	 */
-	public CSSBundler(HttpServletRequest request, Cookie[] cookies, String outputDirectory, Collection<CSSThemeVisualElement> themes) {
+	public CSSBundler(HttpServletRequest request, Cookie[] cookies, String outputDirectory, Collection<Theme> themes) {
 		filesToCopy = new HashMap<String,File>();
 		directoriesRequired = new ArrayList<String>();
 		this.request = request;
 		this.cookies = cookies;
 		this.outputDirectory = outputDirectory;
-		this.themes = themes != null ? themes : new ArrayList<CSSThemeVisualElement>();
+		this.themes = themes != null ? themes : new ArrayList<Theme>();
 		
 		this.centralPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR);
 		if ( centralPath == null )  {
@@ -119,7 +119,7 @@
 		
 		String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
 
-		for ( CSSThemeVisualElement theme : themes) {
+		for ( Theme theme : themes) {
 			String themeName = theme.getName();
 			
 			String url = (!rtl)? basePath + "/lams/css/" + themeName + ".css" : basePath + "/lams/css/" + themeName + "_" + RTL_DIR + ".css";
@@ -163,7 +163,7 @@
 		String cssDirectory = outputDirectory+File.separatorChar+"css";
 		directoriesRequired.add(cssDirectory);
 		
-		for ( CSSThemeVisualElement theme : themes) {
+		for ( Theme theme : themes) {
 
 			String themeName = theme.getName();
 			
@@ -190,7 +190,7 @@
 
 	private void setupImageList() {
 
-		for ( CSSThemeVisualElement theme : themes) {
+		for ( Theme theme : themes) {
 
 			String dirName = theme.getImageDirectory();
 			if ( dirName != null ) {