Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -rc70a627b8b3db554d8990ae30f43ae87047abea6 -r68fdd810d9d632c62421bc5e67b87f054ce2337f
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision c70a627b8b3db554d8990ae30f43ae87047abea6)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 68fdd810d9d632c62421bc5e67b87f054ce2337f)
@@ -359,7 +359,7 @@
     </many-to-one>
     <!-- bi-directional many-to-one association to CSSTheme -->
     <many-to-one
-        name="theme"
+        name="flashTheme"
         lazy="false"
         class="org.lamsfoundation.lams.themes.CSSThemeVisualElement"
         not-null="true"
@@ -372,6 +372,21 @@
         <column name="flash_theme_id" />
     </many-to-one>
     
+    <!-- bi-directional many-to-one association to CSSTheme -->
+    <many-to-one
+        name="htmlTheme"
+        lazy="false"
+        class="org.lamsfoundation.lams.themes.CSSThemeVisualElement"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="html_theme_id"         
+        </meta>
+        <column name="html_theme_id" />
+    </many-to-one>
+    
 	<!-- bi-directional one-to-many association to LearnerProgress -->
     <set
         name="learnerProgresses"
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r720f3fd7963c7a311e80bbd8da5b71da3f4871cf -r68fdd810d9d632c62421bc5e67b87f054ce2337f
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 720f3fd7963c7a311e80bbd8da5b71da3f4871cf)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 68fdd810d9d632c62421bc5e67b87f054ce2337f)
@@ -97,7 +97,10 @@
     private Organisation baseOrganisation;
     
     /** persistent field */
-    private CSSThemeVisualElement theme;
+    private CSSThemeVisualElement flashTheme;
+    
+    /** persistent field */
+    private CSSThemeVisualElement htmlTheme;
 
     /** persistent field */
     private Set learnerProgresses;
@@ -115,7 +118,7 @@
     private Set lessons;
     
     /** full constructor */
-    public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String country, String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, CSSThemeVisualElement theme, Set userOrganisations, Organisation baseOrganisation, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons) {
+    public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, 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, Organisation baseOrganisation, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons) {
         this.login = login;
         this.password = password;
         this.title = title;
@@ -136,7 +139,8 @@
         this.createDate = createDate;
         this.workspace = workspace;
         this.authenticationMethod = authenticationMethod;
-        this.theme = theme;
+        this.flashTheme = flashTheme;
+        this.htmlTheme = htmlTheme;
         this.userOrganisations = userOrganisations;
         this.baseOrganisation = baseOrganisation;
         this.learnerProgresses = learnerProgresses;
@@ -475,19 +479,35 @@
     /** 
      *            @hibernate.many-to-one
      *             not-null="false"
-     *            @hibernate.column name="theme_id"         
+     *            @hibernate.column name="flash_theme_id"         
      *         
      */
-    public CSSThemeVisualElement getTheme() {
-        return this.theme;
+    public CSSThemeVisualElement getFlashTheme() {
+        return this.flashTheme;
     }
-
-    public void setTheme(CSSThemeVisualElement theme) {
-        this.theme = theme;
+    
+    public void setFlashTheme(CSSThemeVisualElement flashTheme) {
+        this.flashTheme = flashTheme;
     }
     
+    
     /** 
      *            @hibernate.many-to-one
+     *             not-null="false"
+     *            @hibernate.column name="html_theme_id"         
+     *         
+     */
+    public CSSThemeVisualElement getHtmlTheme() {
+        return this.htmlTheme;
+    }
+    
+    public void setHtmlTheme(CSSThemeVisualElement htmlTheme) {
+        this.htmlTheme = htmlTheme;
+    }
+    
+    
+    /** 
+     *            @hibernate.many-to-one
      *             not-null="true"
      *            @hibernate.column name="base_organisation_id"         
      *         
@@ -647,7 +667,8 @@
 							this.localeLanguage,
 							this.localeCountry,
 							this.email,
-							new CSSThemeBriefDTO(this.theme));
+							new CSSThemeBriefDTO(this.flashTheme),
+							new CSSThemeBriefDTO(this.htmlTheme));
     }
 	
 	/**This method checks whether user is a member of the 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -r074d6f6113741bca4ef0c43b094a63776d172989 -r68fdd810d9d632c62421bc5e67b87f054ce2337f
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 074d6f6113741bca4ef0c43b094a63776d172989)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 68fdd810d9d632c62421bc5e67b87f054ce2337f)
@@ -36,8 +36,8 @@
 	private String localeCountry;
     private String email;
    // private CSSThemeVisualElement theme;
-    private CSSThemeBriefDTO theme;
-	
+    private CSSThemeBriefDTO flashTheme;
+    private CSSThemeBriefDTO htmlTheme;
 
 //	public UserDTO(Integer userID, String firstName, String lastName,
 //			String login, String email, CSSThemeVisualElement theme) {		
@@ -51,15 +51,16 @@
 	
 	public UserDTO(Integer userID, String firstName, String lastName,
 			String login, String localeLanguage, 
-			String localeCountry, String email, CSSThemeBriefDTO theme) {		
+			String localeCountry, String email, CSSThemeBriefDTO flashTheme, CSSThemeBriefDTO htmlTheme) {		
 		this.userID = userID;
 		this.firstName = firstName;
 		this.lastName = lastName;
 		this.login = login;
 		this.localeCountry = localeCountry;
 		this.localeLanguage = localeLanguage;
 		this.email = email;
-		this.theme = theme;
+		this.flashTheme = flashTheme;
+		this.htmlTheme = htmlTheme;
 	}
 	
 	/**
@@ -108,16 +109,24 @@
 	}
 
 
-	public CSSThemeBriefDTO getTheme() {
-		return theme;
+	public CSSThemeBriefDTO getFlashTheme() {
+		return flashTheme;
 	}
 
 
-	public void setTheme(CSSThemeBriefDTO theme) {
-		this.theme = theme;
+	public void setFlashTheme(CSSThemeBriefDTO flashTheme) {
+		this.flashTheme = flashTheme;
 	}
 
+	public CSSThemeBriefDTO getHtmlTheme() {
+		return htmlTheme;
+	}
 
+
+	public void setHtmlTheme(CSSThemeBriefDTO htmlTheme) {
+		this.htmlTheme = htmlTheme;
+	}
+	
 	public String getEmail() {
 		return email;
 	}