diff --git a/dist/commit1.hbs b/dist/commit1.hbs
index 641c2f3..28d9293 100644
--- a/dist/commit1.hbs
+++ b/dist/commit1.hbs
@@ -1,15 +1,22 @@
-*{{#if scope}} **{{scope}}:**
-{{~/if}} {{#if subject}}
-  {{~subject}}
-{{~else}}
-  {{~header}}
-{{~/if}}
+* {{header}}
 
-{{~!-- commit link --}}{{~#if hash}} {{#if @root.linkReferences~}}
-  ([{{shortHash}}]({{commitUrlFormat}}))
+{{~!-- commit link --}} {{#if @root.linkReferences~}}
+  ([{{hash}}](
+  {{~#if @root.repository}}
+    {{~#if @root.host}}
+      {{~@root.host}}/
+    {{~/if}}
+    {{~#if @root.owner}}
+      {{~@root.owner}}/
+    {{~/if}}
+    {{~@root.repository}}
+  {{~else}}
+    {{~@root.repoUrl}}
+  {{~/if}}/
+  {{~@root.commit}}/{{hash}}))
 {{~else}}
-  {{~shortHash}}
-{{~/if}}{{~/if}}
+  {{~hash}}
+{{~/if}}
 
 {{~!-- commit references --}}
 {{~#if references~}}
@@ -19,12 +26,31 @@
     {{~#if this.owner}}
       {{~this.owner}}/
     {{~/if}}
-    {{~this.repository}}{{this.prefix}}{{this.issue}}]({{issueUrlFormat}})
+    {{~this.repository}}#{{this.issue}}](
+    {{~#if @root.repository}}
+      {{~#if @root.host}}
+        {{~@root.host}}/
+      {{~/if}}
+      {{~#if this.repository}}
+        {{~#if this.owner}}
+          {{~this.owner}}/
+        {{~/if}}
+        {{~this.repository}}
+      {{~else}}
+        {{~#if @root.owner}}
+          {{~@root.owner}}/
+        {{~/if}}
+          {{~@root.repository}}
+        {{~/if}}
+    {{~else}}
+      {{~@root.repoUrl}}
+    {{~/if}}/
+    {{~@root.issue}}/{{this.issue}})
   {{~else}}
     {{~#if this.owner}}
       {{~this.owner}}/
     {{~/if}}
-    {{~this.repository}}{{this.prefix}}{{this.issue}}
+    {{~this.repository}}#{{this.issue}}
   {{~/if}}{{/each}}
 {{~/if}}
 
diff --git a/dist/commit2.hbs b/dist/commit2.hbs
index 28d9293..641c2f3 100644
--- a/dist/commit2.hbs
+++ b/dist/commit2.hbs
@@ -1,23 +1,16 @@
-* {{header}}
-
-{{~!-- commit link --}} {{#if @root.linkReferences~}}
-  ([{{hash}}](
-  {{~#if @root.repository}}
-    {{~#if @root.host}}
-      {{~@root.host}}/
-    {{~/if}}
-    {{~#if @root.owner}}
-      {{~@root.owner}}/
-    {{~/if}}
-    {{~@root.repository}}
-  {{~else}}
-    {{~@root.repoUrl}}
-  {{~/if}}/
-  {{~@root.commit}}/{{hash}}))
+*{{#if scope}} **{{scope}}:**
+{{~/if}} {{#if subject}}
+  {{~subject}}
 {{~else}}
-  {{~hash}}
+  {{~header}}
 {{~/if}}
 
+{{~!-- commit link --}}{{~#if hash}} {{#if @root.linkReferences~}}
+  ([{{shortHash}}]({{commitUrlFormat}}))
+{{~else}}
+  {{~shortHash}}
+{{~/if}}{{~/if}}
+
 {{~!-- commit references --}}
 {{~#if references~}}
   , closes
@@ -26,31 +19,12 @@
     {{~#if this.owner}}
       {{~this.owner}}/
     {{~/if}}
-    {{~this.repository}}#{{this.issue}}](
-    {{~#if @root.repository}}
-      {{~#if @root.host}}
-        {{~@root.host}}/
-      {{~/if}}
-      {{~#if this.repository}}
-        {{~#if this.owner}}
-          {{~this.owner}}/
-        {{~/if}}
-        {{~this.repository}}
-      {{~else}}
-        {{~#if @root.owner}}
-          {{~@root.owner}}/
-        {{~/if}}
-          {{~@root.repository}}
-        {{~/if}}
-    {{~else}}
-      {{~@root.repoUrl}}
-    {{~/if}}/
-    {{~@root.issue}}/{{this.issue}})
+    {{~this.repository}}{{this.prefix}}{{this.issue}}]({{issueUrlFormat}})
   {{~else}}
     {{~#if this.owner}}
       {{~this.owner}}/
     {{~/if}}
-    {{~this.repository}}#{{this.issue}}
+    {{~this.repository}}{{this.prefix}}{{this.issue}}
   {{~/if}}{{/each}}
 {{~/if}}
 
diff --git a/dist/footer.hbs b/dist/footer.hbs
index e69de29..dca482f 100644
--- a/dist/footer.hbs
+++ b/dist/footer.hbs
@@ -0,0 +1,10 @@
+{{#if noteGroups}}
+{{#each noteGroups}}
+
+### {{title}}
+
+{{#each notes}}
+* {{text}}
+{{/each}}
+{{/each}}
+{{/if}}
diff --git a/dist/footer1.hbs b/dist/footer1.hbs
index dca482f..e69de29 100644
--- a/dist/footer1.hbs
+++ b/dist/footer1.hbs
@@ -1,10 +0,0 @@
-{{#if noteGroups}}
-{{#each noteGroups}}
-
-### {{title}}
-
-{{#each notes}}
-* {{text}}
-{{/each}}
-{{/each}}
-{{/if}}
diff --git a/dist/header1.hbs b/dist/header1.hbs
index a4d6ec4..49f5607 100644
--- a/dist/header1.hbs
+++ b/dist/header1.hbs
@@ -1,13 +1,9 @@
-{{#if isPatch~}}
-  ###
-{{~else~}}
-  ##
-{{~/if}} {{#if @root.linkCompare~}}
-  [{{version}}]({{compareUrlFormat}})
-{{~else}}
-  {{~version}}
-{{~/if}}
-{{~#if title}} "{{title}}"
-{{~/if}}
-{{~#if date}} ({{date}})
-{{/if}}
+## {{#if isPatch~}} <small>
+  {{~/if~}} {{version}}
+  {{~#if title}} "{{title}}"
+  {{~/if~}}
+  {{~#if date}} ({{date}})
+  {{~/if~}}
+  {{~#if isPatch~}} </small>
+  {{~/if}}
+
diff --git a/dist/header2.hbs b/dist/header2.hbs
index 49f5607..a4d6ec4 100644
--- a/dist/header2.hbs
+++ b/dist/header2.hbs
@@ -1,9 +1,13 @@
-## {{#if isPatch~}} <small>
-  {{~/if~}} {{version}}
-  {{~#if title}} "{{title}}"
-  {{~/if~}}
-  {{~#if date}} ({{date}})
-  {{~/if~}}
-  {{~#if isPatch~}} </small>
-  {{~/if}}
-
+{{#if isPatch~}}
+  ###
+{{~else~}}
+  ##
+{{~/if}} {{#if @root.linkCompare~}}
+  [{{version}}]({{compareUrlFormat}})
+{{~else}}
+  {{~version}}
+{{~/if}}
+{{~#if title}} "{{title}}"
+{{~/if}}
+{{~#if date}} ({{date}})
+{{/if}}
diff --git a/dist/index.js b/dist/index.js
index 5ebc981..0ee6f55 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -9489,10 +9489,10 @@ module.exports = function (config) {
   })
 
   return Q.all([
-    readFile(__nccwpck_require__.ab + "template1.hbs", 'utf-8'),
-    readFile(__nccwpck_require__.ab + "header1.hbs", 'utf-8'),
-    readFile(__nccwpck_require__.ab + "commit1.hbs", 'utf-8'),
-    readFile(__nccwpck_require__.ab + "footer.hbs", 'utf-8')
+    readFile(__nccwpck_require__.ab + "template2.hbs", 'utf-8'),
+    readFile(__nccwpck_require__.ab + "header2.hbs", 'utf-8'),
+    readFile(__nccwpck_require__.ab + "commit2.hbs", 'utf-8'),
+    readFile(__nccwpck_require__.ab + "footer1.hbs", 'utf-8')
   ])
     .spread((template, header, commit, footer) => {
       const writerOpts = getWriterOpts(config)
@@ -9704,10 +9704,10 @@ function conventionalChangelogWriterInit (context, options) {
     includeDetails: false,
     ignoreReverted: true,
     doFlush: true,
-    mainTemplate: readFileSync(__nccwpck_require__.ab + "template2.hbs", 'utf-8'),
-    headerPartial: readFileSync(__nccwpck_require__.ab + "header2.hbs", 'utf-8'),
-    commitPartial: readFileSync(__nccwpck_require__.ab + "commit2.hbs", 'utf-8'),
-    footerPartial: readFileSync(__nccwpck_require__.ab + "footer1.hbs", 'utf-8')
+    mainTemplate: readFileSync(__nccwpck_require__.ab + "template1.hbs", 'utf-8'),
+    headerPartial: readFileSync(__nccwpck_require__.ab + "header1.hbs", 'utf-8'),
+    commitPartial: readFileSync(__nccwpck_require__.ab + "commit1.hbs", 'utf-8'),
+    footerPartial: readFileSync(__nccwpck_require__.ab + "footer.hbs", 'utf-8')
   }, options)
 
   if ((!_.isFunction(options.transform) && _.isObject(options.transform)) || _.isUndefined(options.transform)) {
diff --git a/dist/template1.hbs b/dist/template1.hbs
index 3b194f0..2c1349a 100644
--- a/dist/template1.hbs
+++ b/dist/template1.hbs
@@ -1,23 +1,11 @@
 {{> header}}
 
-{{#if noteGroups}}
-{{#each noteGroups}}
-
-### ⚠ {{title}}
-
-{{#each notes}}
-* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}}
-{{/each}}
-{{/each}}
-{{/if}}
 {{#each commitGroups}}
-
-{{#if title}}
-### {{title}}
-
-{{/if}}
 {{#each commits}}
 {{> commit root=@root}}
 {{/each}}
-
 {{/each}}
+
+{{> footer}}
+
+
diff --git a/dist/template2.hbs b/dist/template2.hbs
index 2c1349a..3b194f0 100644
--- a/dist/template2.hbs
+++ b/dist/template2.hbs
@@ -1,11 +1,23 @@
 {{> header}}
 
+{{#if noteGroups}}
+{{#each noteGroups}}
+
+### ⚠ {{title}}
+
+{{#each notes}}
+* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}}
+{{/each}}
+{{/each}}
+{{/if}}
 {{#each commitGroups}}
+
+{{#if title}}
+### {{title}}
+
+{{/if}}
 {{#each commits}}
 {{> commit root=@root}}
 {{/each}}
+
 {{/each}}
-
-{{> footer}}
-
-