diff --git a/profectus-theme/resources/partials/member.declaration.hbs b/profectus-theme/resources/partials/member.declaration.hbs
index aa9d4efb..4746f237 100644
--- a/profectus-theme/resources/partials/member.declaration.hbs
+++ b/profectus-theme/resources/partials/member.declaration.hbs
@@ -48,6 +48,8 @@
 
 {{/each}}
 
+{{> member.sources}}
+
 {{/if}}
 
 {{#if type.declaration.children}}
@@ -90,7 +92,7 @@
 
 {{#when this this.kindString 'eq' 'Enumeration'}}
 
-{{#with this.parent.children}}
+{{#with this.children}}
 
 {{{typeDeclarationMembers}}}
 
diff --git a/profectus-theme/resources/partials/member.hbs b/profectus-theme/resources/partials/member.hbs
index bfaa55ad..a565f683 100644
--- a/profectus-theme/resources/partials/member.hbs
+++ b/profectus-theme/resources/partials/member.hbs
@@ -8,16 +8,39 @@
 
 {{/unless}}
 
+{{#if signatures}}
+
 {{#each signatures}}
 
-{{> member.signature showSources=true }}
+{{> member.signature showSources=false }}
 
 {{/each}}
 
+{{> member.sources}}
+
+{{else}}
+
+{{#if hasGetterOrSetter}}
+
+
 {{> member.getterSetter}}
 
+{{else}}
+
+{{#ifIsReference}}
+
+{{referenceMember}}
+
+{{else}}
+
 {{> member.declaration}}
 
+{{/ifIsReference}}
+
+{{/if}}
+
+{{/if}}
+
 {{#unless @last}}
 {{#unless hasOwnDocument}}
 ___
diff --git a/profectus-theme/resources/partials/member.signature.hbs b/profectus-theme/resources/partials/member.signature.hbs
index 4f49791e..4bef6586 100644
--- a/profectus-theme/resources/partials/member.signature.hbs
+++ b/profectus-theme/resources/partials/member.signature.hbs
@@ -1,3 +1,5 @@
+{{#if comment}}
+
 {{{signatureTitle accessor}}}
 
 {{> comment}}
@@ -101,3 +103,25 @@
 {{> member.sources}}
 
 {{/if}}
+
+{{#if @first}}
+
+{{#unless @last}}
+
+#### Other signatures
+
+{{/unless}}
+
+{{/if}}
+
+{{else}}
+
+{{{signatureTitle accessor}}}
+
+{{#with parameters}}
+
+{{{parameterTable}}}
+
+{{/with}}
+
+{{/if}}