Index: WAeUP_SRP/trunk/profiles/default/layouts/acco_bed_booking.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/acco_bed_booking.xml	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/layouts/acco_bed_booking.xml	(revision 1412)
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
 <object name="acco_bed_reservation" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
  <property name="layout_edit_method"></property>
  <property name="layout_view_method"></property>
- <property name="style_prefix">layout_wo_object</property>
+ <property name="style_prefix">layout_waeup_</property>
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
- <widget name="bed" meta_type="Select Widget">
-  <property name="title">Bed</property>
+ <widget name="bed_letter" meta_type="Select Widget">
+  <property name="title">Bed Letter</property>
   <property name="fields">
-   <element value="bed"/>
+   <element value="bed_letter"/>
   </property>
   <property name="is_required">True</property>
-  <property name="label">Bed</property>
-  <property name="label_edit">Bed</property>
+  <property name="label">Bed Letter</property>
+  <property name="label_edit">Bed Letter</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -49,8 +50,8 @@
  <table>
   <row>
-   <cell name="block_floor_room"/>
+   <cell name="block_room"/>
   </row>
   <row>
-   <cell name="bed"/>
+   <cell name="bed_letter"/>
   </row>
   <row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/acco_hall.xml	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/layouts/acco_hall.xml	(revision 1412)
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
-<object name="accommodation" meta_type="CPS Layout">
+<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
+<object name="acco_hall" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
  <property name="layout_edit_method"></property>
Index: WAeUP_SRP/trunk/profiles/default/layouts/layout.xsl
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/layout.xsl	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/layouts/layout.xsl	(revision 1412)
@@ -13,5 +13,5 @@
       <body>
         <xsl:for-each select="object">
-          <h1><xsl:value-of select="@name"/></h1>
+          <h1>Layout: <xsl:value-of select="@name"/></h1>
         </xsl:for-each>
         <h1>Layout</h1>
@@ -39,4 +39,8 @@
         <h1>Properties</h1>
         <table>
+          <tr>
+            <th>Id</th>
+            <th>Text</th>
+          </tr>
           <xsl:for-each select="object/property">
             <xsl:variable name="color">
@@ -61,24 +65,17 @@
         </table>
         <h1>Widgets</h1>
-        <table>
-          <xsl:for-each select="object/widget">
-            <xsl:variable name="color">
-              <xsl:choose>
-                <xsl:when test="position() mod 2 = 0">
-                  <xsl:text>#ffffff</xsl:text>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:text>#eeeeee</xsl:text>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:variable>
-            <tr style="background-color:{$color}">
-              <th>
-                <xsl:value-of select="@name"/>
-              </th>
-              <td colspan="2">
-                <xsl:value-of select="@meta_type"/>
-              </td>
-            </tr>
+        <xsl:for-each select="object/widget">
+          <xsl:variable name="color">
+            <xsl:choose>
+              <xsl:when test="position() mod 2 = 0">
+                <xsl:text>#ffffff</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>#eeeeee</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:variable>
+          <h3><xsl:value-of select="@name"/> Meta Type: <xsl:value-of select="@meta_type"/></h3>
+          <table>
             <tr style="background-color:{$color}">
               <th colspan="3">
@@ -101,6 +98,6 @@
               </tr>
             </xsl:for-each>
-          </xsl:for-each>
-        </table>
+          </table>
+        </xsl:for-each>
       </body>
     </html>
Index: WAeUP_SRP/trunk/profiles/default/schemas/acco_hall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/acco_hall.xml	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/schemas/acco_hall.xml	(revision 1412)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="schema.xsl"?>
-<object name="accommodation" meta_type="CPS Schema">
+<object name="acco_hall" meta_type="CPS Schema">
   <field name="beds_for_final" meta_type="CPS String List Field"/>
   <field name="beds_for_fresh" meta_type="CPS String List Field"/>
Index: WAeUP_SRP/trunk/profiles/default/schemas/schema.xsl
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/schema.xsl	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/schemas/schema.xsl	(revision 1412)
@@ -14,9 +14,14 @@
         <xsl:for-each select="object">
           <h2>
-            <xsl:value-of select="@name"/>
+            Schema: <xsl:value-of select="@name"/>
           </h2> 
         </xsl:for-each>
         <h1>Fields</h1>
         <table>
+          <tr>
+            <th>Id</th>
+            <th>Type</th>
+            <th>default</th>
+          </tr>
           <xsl:for-each select="object/field">
             <xsl:sort select="@name"
Index: WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml	(revision 1412)
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="types.xsl"?>
 <object name="AccoFolder" meta_type="CPS Flexible Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
@@ -12,5 +13,5 @@
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
-  <element value="Accommodation"/>
+  <element value="AccoHall"/>
  </property>
  <property name="allow_discussion">False</property>
@@ -19,10 +20,7 @@
  <property name="cps_display_as_document_in_listing">True</property>
  <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
  </property>
  <property name="layouts"/>
  <property name="layout_clusters">
-  <element value="metadata:metadata"/>
  </property>
  <property name="flexible_layouts"/>
Index: WAeUP_SRP/trunk/profiles/default/types/AccoHall.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/AccoHall.xml	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/types/AccoHall.xml	(revision 1412)
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="types.xsl"?>
 <object name="AccoHall" meta_type="CPS Flexible Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
Index: WAeUP_SRP/trunk/profiles/default/types/Student.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/Student.xml	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/types/Student.xml	(revision 1412)
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="types.xsl"?>
 <object name="Student" meta_type="CPS Flexible Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 1410)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 1412)
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="../definition.xsl"?>
 <cps-workflow workflow_id="waeup_student_wf"
               title="CPS Workflow Definition"
