Index: lams_admin/web/user.jsp
===================================================================
diff -u -r152c856983e51ee0701ea5061bba1b7c25569679 -r3dbf966d900adefc34cdad501d3c392118451cd9
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 152c856983e51ee0701ea5061bba1b7c25569679)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 3dbf966d900adefc34cdad501d3c392118451cd9)
@@ -146,26 +146,16 @@
 				</tr>				
 				
 				<tr>
-					<td class="align-right"><fmt:message key="label.html.htmlTheme"/>:</td>
+					<td class="align-right"><fmt:message key="label.theme"/>:</td>
 					<td>
-					<html:select property="userCSSTheme">
-						<c:forEach items="${cssThemes}" var="theme">	
+					<html:select property="userTheme">
+						<c:forEach items="${themes}" 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>
-				<tr>
 					<td colspan=2 class="align-right">
 						<html-el:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
 						<html-el:submit styleId="saveButton" styleClass="button"><fmt:message key="admin.save"/></html-el:submit>