diff --git a/scaffold-metawidget/src/main/resources/org/metawidget/metawidget.xml b/scaffold-metawidget/src/main/resources/org/metawidget/metawidget.xml
index 1ddacd3ce0..6129b97fc1 100644
--- a/scaffold-metawidget/src/main/resources/org/metawidget/metawidget.xml
+++ b/scaffold-metawidget/src/main/resources/org/metawidget/metawidget.xml
@@ -3,77 +3,47 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://metawidget.org http://metawidget.org/xsd/metawidget-1.0.xsd" version="1.0">
 
+	<!-- This file configures the Java Server Faces Metawidget. For full -->
+	<!-- documentation on Metawidget, visit http://metawidget.org        -->
+	
 	<htmlMetawidget xmlns="java:org.metawidget.faces.component.html">
-		<inspector>		
+	
+		<!-- Inspectors inspect back-end metadata -->
+		
+		<inspector>
+			<!-- compositeInspector collates the results from multiple inspectors -->
 			<compositeInspector xmlns="java:org.metawidget.inspector.composite" config="CompositeInspectorConfig">
 				<inspectors>
 					<array>
-						<propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype"/>
-						<metawidgetAnnotationInspector xmlns="java:org.metawidget.inspector.annotation"/>
-						<java5Inspector xmlns="java:org.metawidget.inspector.java5"/>
-						<facesInspector xmlns="java:org.metawidget.inspector.faces"/>
-						
-						<jpaInspector xmlns="java:org.metawidget.inspector.jpa" config="JpaInspectorConfig">
-						
+						<!-- propertyTypeInspector inspects types -->
+						<propertyTypeInspector xmlns="java:org.metawidget.inspector.propertytype" />
+						<!-- metawidgetAnnotationInspector inspects annotations such as @UiComesAfter -->
+						<metawidgetAnnotationInspector xmlns="java:org.metawidget.inspector.annotation" config="org.metawidget.inspector.impl.BaseObjectInspectorConfig">
 							<propertyStyle>
-								<javaBeanPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.javabean" config="JavaBeanPropertyStyleConfig">
+								<!-- Seam Forge puts its annotations on private fields -->
+								<javaBeanPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.javabean" id="forgeStyle" config="JavaBeanPropertyStyleConfig">
 									<privateFieldConvention>
 										<format>{0}</format>
 									</privateFieldConvention>								
 								</javaBeanPropertyStyle>
+							</propertyStyle>						
+						</metawidgetAnnotationInspector>
+						<!-- java5Inspector inspects enums and generics -->
+						<java5Inspector xmlns="java:org.metawidget.inspector.java5"/>
+						<!-- jpaInspector inspects JPA annotations -->
+						<jpaInspector xmlns="java:org.metawidget.inspector.jpa" config="JpaInspectorConfig">
+							<propertyStyle>
+								<javaBeanPropertyStyle refId="forgeStyle"/>
 							</propertyStyle>
-							
 						</jpaInspector>
-						
-						<!-- Only if using Bean Validation
-						<beanValidationInspector xmlns=\"java:org.metawidget.inspector.beanvalidation\">
-                        -->
-
-							<!-- Only if you want to annotate the private fields, not the getters
-							<propertyStyle>
-								<javaBeanPropertyStyle xmlns="java:org.metawidget.inspector.impl.propertystyle.javabean" config="JavaBeanPropertyStyleConfig">
-									<privateFieldConvention>
-										<format>{0}</format>
-									</privateFieldConvention>								
-								</javaBeanPropertyStyle>
-							</propertyStyle> -->
-						
-						<!-- 
-                        </beanValidationInspector 
-                        -->
-
+						<!-- To add more inspectors for more technologies, such as Bean Validation, visit http://metawidget.org -->
 					</array>
 				</inspectors>
 			</compositeInspector>
 		</inspector>
 		
-		<widgetBuilder>
-			<compositeWidgetBuilder xmlns="java:org.metawidget.widgetbuilder.composite" config="CompositeWidgetBuilderConfig">
-				<widgetBuilders>
-					<array>
-						<overriddenWidgetBuilder xmlns="java:org.metawidget.faces.component.widgetbuilder"/>
-						<readOnlyWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder"/>
-						
-						<!-- Only if using RichFaces
-						
-						<richFacesWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder.richfaces"/>-->
-						
-						<htmlWidgetBuilder xmlns="java:org.metawidget.faces.component.html.widgetbuilder" config="HtmlWidgetBuilderConfig"/>
-					</array>
-				</widgetBuilders>
-			</compositeWidgetBuilder>
-		</widgetBuilder>
-		
-		<!-- Only if using RichFaces
+		<!-- To add support for more technologies, such as RichFaces, visit http://metawidget.org -->
 		
-		<layout>
-			<tabPanelLayoutDecorator xmlns="java:org.metawidget.faces.component.html.layout.richfaces" config="TabPanelLayoutDecoratorConfig">
-				<layout>
-					<simpleLayout xmlns="java:org.metawidget.faces.component.layout"/>
-				</layout>
-			</tabPanelLayoutDecorator>
-		</layout>
-      -->
 	</htmlMetawidget>
 
 </metawidget>
\ No newline at end of file