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>