diff --git a/dspace/config/xmlui.xconf b/dspace/config/xmlui.xconf
index ea40b3e9d3..fc106938a5 100644
--- a/dspace/config/xmlui.xconf
+++ b/dspace/config/xmlui.xconf
@@ -64,29 +64,69 @@
             BrowseArtifacts, SearchArtifacts
             <aspect name="Artifact Browser" path="resource://aspects/ArtifactBrowser/" />
         -->
-        <aspect name="Versioning Aspect" path="resource://aspects/Versioning/" />
+
+        <!-- =====================
+             Item Level Versioning
+             ===================== -->
+        <!-- To enable Item Level Versioning features, uncomment this aspect. -->
+        <!--<aspect name="Versioning Aspect" path="resource://aspects/Versioning/" />-->
+        
+        <!-- =====================
+             Base Features/Aspects
+             ===================== -->
+        <!-- Base DSpace XMLUI Aspects for Display, Browse, Search, Admin, Login and Submission -->
         <aspect name="Displaying Artifacts" path="resource://aspects/ViewArtifacts/" />
         <aspect name="Browsing Artifacts" path="resource://aspects/BrowseArtifacts/" />
         <aspect name="Searching Artifacts" path="resource://aspects/SearchArtifacts/" />
         <aspect name="Administration" path="resource://aspects/Administrative/" />
         <aspect name="E-Person" path="resource://aspects/EPerson/" />
         <aspect name="Submission and Workflow" path="resource://aspects/Submission/" />
-	    <aspect name="Statistics" path="resource://aspects/Statistics/" />
-	    <aspect name="Statistics - Elastic Search" path="resource://aspects/StatisticsElasticSearch/" />
-	    <aspect name="Original Workflow" path="resource://aspects/Workflow/" />
-	    <!--<aspect name="XMLWorkflow" path="resource://aspects/XMLWorkflow/" />-->
+
+        <!-- ========================
+             Usage Statistics Engines
+             ======================== -->
+        <!-- By default, DSpace uses a Statistics engine based on SOLR -->
+        <aspect name="Statistics" path="resource://aspects/Statistics/" />
+
+        <!-- If you prefer to use "Elastic Search" Statistics, you can uncomment the below
+             aspect and COMMENT OUT the default "Statistics" aspect above -->
+        <!-- <aspect name="Statistics - Elastic Search" path="resource://aspects/StatisticsElasticSearch/" /> -->
+
+        <!-- =========================
+             Approval Workflow Systems
+             ========================= -->
+        <!-- By default, DSpace uses a legacy 3-step approval workflow for new submissions -->
+        <aspect name="Original Workflow" path="resource://aspects/Workflow/" />
+
+        <!-- If you prefer, a Configurable XML-based Workflow is available. To enable it, you can
+             uncomment the below aspect an comment out the "Original Workflow" aspect above.
+             PLEASE NOTE: in order to use the configurable workflow you must also run the
+             database migration scripts as detailed in the DSpace Documentation -->
+        <!-- <aspect name="XMLWorkflow" path="resource://aspects/XMLWorkflow/" /> -->
+
+        <!-- ==============
+             Search Engines
+             ============== -->
+        <!-- By default, DSpace uses a basic (Lucene based) search engine (see SearchArtifacts aspect above) -->
         <!--
-            To enable Discovery, uncomment this Aspect that will enable it
-            within your existing XMLUI
-            Also make sure to comment the SearchArtifacts aspect
-            as leaving it on together with discovery will cause UI overlap issues
-            <aspect name="Discovery" path="resource://aspects/Discovery/" />
+            To enable Discovery (faceted/filtered search), uncomment this aspect.
+            Also make sure to comment out the above 'SearchArtifacts' aspect 
+            (in the "Basic Features/Aspects" group) as leaving it on together
+            with Discovery will cause UI overlap issues
         -->
-        <!--<aspect name="SwordClient" path="resource://aspects/SwordClient/" />-->
+        <!-- <aspect name="Discovery" path="resource://aspects/Discovery/" /> -->
+
+        <!-- ==============
+             SWORDv1 Client
+             ============== -->
+        <!-- DSpace also comes with an option SWORD Client aspect, which allows
+             you to submit content FROM your DSpace TO another SWORD-enabled repository.
+             To enable this feature, uncomment the aspect below. -->
+        <!-- <aspect name="SwordClient" path="resource://aspects/SwordClient/" /> -->
 
         <!--
-            This aspect tests the various possible DRI features, 
-            it helps a theme developer create themes 
+            This demo aspect tests the various possible DRI features.
+            It may be useful to developers in developing new aspects or themes.
         -->
         <!-- <aspect name="XML Tests" path="resource://aspects/XMLTest/"/> -->
     </aspects>
@@ -131,8 +171,8 @@
         <!-- Classic theme, inspired by the JSP UI -->
         <!-- <theme name="Classic" regex=".*" path="Classic/" /> -->
 
-        <!-- Table based browse display -->
-        <!-- <theme name="Table Theme" regex=".*" path="TableTheme/" /> -->
+        <!-- The Kubrick theme -->
+        <!-- <theme name="Kubrick" regex=".*" path="Kubrick/" /> -->
 
     </themes>
 </xmlui>