Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -ra20bdfc900a1a4696989abf243ce05f023b687fb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml	(.../CSSThemeVisualElement.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml	(.../CSSThemeVisualElement.hbm.xml)	(revision a20bdfc900a1a4696989abf243ce05f023b687fb)
@@ -93,7 +93,7 @@
     >
         <meta attribute="field-description">
                @hibernate.set
-                 lazy="true"
+                 lazy="false"
                  inverse="true"
                  cascade="none"
                 @hibernate.collection-key
@@ -113,7 +113,7 @@
     <!--  change to have more than one style per element, we'll be ready <grin> -->
     <set
         name="styles"
-        lazy="false"
+        lazy="true"
         inverse="true"
 		cascade="all-delete-orphan"
     >
@@ -139,7 +139,7 @@
     <!-- bi-directional one-to-many association to child visual elements (maybe child themes in the future) -->
     <set
         name="elements"
-        lazy="false"
+        lazy="true"
         inverse="true"
 		cascade="all-delete-orphan"
     >
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r36a7a9ea402e41d5fb0b0d456b268cbda664cafd -ra20bdfc900a1a4696989abf243ce05f023b687fb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 36a7a9ea402e41d5fb0b0d456b268cbda664cafd)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision a20bdfc900a1a4696989abf243ce05f023b687fb)
@@ -335,6 +335,7 @@
     <!-- bi-directional many-to-one association to CSSTheme -->
     <many-to-one
         name="theme"
+        lazy="false"
         class="org.lamsfoundation.lams.themes.CSSThemeVisualElement"
         not-null="true"
     >
Index: lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java
===================================================================
diff -u -rf753950c06000a6035b6dc58680d0c47f46e831a -ra20bdfc900a1a4696989abf243ce05f023b687fb
--- lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java	(.../CSSThemeVisualElement.java)	(revision f753950c06000a6035b6dc58680d0c47f46e831a)
+++ lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java	(.../CSSThemeVisualElement.java)	(revision a20bdfc900a1a4696989abf243ce05f023b687fb)
@@ -168,7 +168,7 @@
      * But its easier with Hibernate to make it a uni-directional many to one.
      * 
      * 	  @hibernate.set
-     *       lazy="false"
+     *       lazy="true"
      *       inverse="true"
      *       cascade="all-delete-orphan"
      *
@@ -192,7 +192,7 @@
      * Users who have this theme as their style.
      *  
      *            @hibernate.set
-     *             lazy="true"
+     *             lazy="false"
      *             inverse="true"
      *             cascade="none"
      *            @hibernate.collection-key
@@ -231,7 +231,7 @@
      * The visual elements (or in the future sub-themes) that make up this theme
      *  
      *            @hibernate.set
-     *             lazy="false"
+     *             lazy="true"
      *             inverse="true"
      *             cascade="all-delete-orphan"
      *            @hibernate.collection-key