Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -r3dbf966d900adefc34cdad501d3c392118451cd9
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 3dbf966d900adefc34cdad501d3c392118451cd9)
@@ -147,25 +147,15 @@
 		</td>
 	</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" disabled="${!profileEditEnabled}" >
-			<c:forEach items="${cssThemes}" var="theme">	
+		<html:select property="userTheme" disabled="${!profileEditEnabled}" >
+			<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" disabled="${!profileEditEnabled}" >
-			<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>
@@ -264,41 +254,16 @@
 		<td><bean:write name="UserForm" property="fax" /></td>
 	</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" disabled="${!profileEditEnabled}" >
-			<c:forEach items="${cssThemes}" var="theme">	
+		<html:select property="userTheme" disabled="${!profileEditEnabled}" >
+			<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" disabled="${!profileEditEnabled}" >
-			<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>
-			<td class="align-right"><fmt:message key="label.enable.flash"/>:<bean:write name="UserForm" property="enableFlash" /></td>
-			<td><html:select property="enableFlash" disabled="${!profileEditEnabled}" >
-				<html:option value="true"><fmt:message key="label.yes"/></html:option>
-				<html:option value="false"><fmt:message key="label.no"/></html:option>
-				</html:select>
-			</td>
-			</tr>
-		</c:when>
-		<c:otherwise>
-			<html:hidden property="enableFlash" />
-		</c:otherwise>
-	</c:choose>
-	<tr>
 		<td class="align-right"><fmt:message key="label.language"/>:</td>
 		<td>
 			<c:set var="localeId"><bean:write name="UserForm" property="localeId" /></c:set>
@@ -331,7 +296,6 @@
 	</tr>
 </c:if>
 	
-	
 	</table>
 			</div>