Index: lams_admin/web/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.29.2.2 -r1.29.2.3
--- lams_admin/web/user.jsp	10 Nov 2014 17:10:40 -0000	1.29.2.2
+++ lams_admin/web/user.jsp	16 Mar 2016 12:12:40 -0000	1.29.2.3
@@ -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>