diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 342aaf47..41a782dc 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -23,7 +23,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     needs: build
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.npmignore b/.npmignore
index 2eb67ec2..57774602 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,3 +1,4 @@
 .travis.yml
 .notes
 .github/
+.code-workspace
\ No newline at end of file
diff --git a/generators/app/templates/ci/exist.yml b/generators/app/templates/ci/exist.yml
index d7d37b28..9078ae32 100644
--- a/generators/app/templates/ci/exist.yml
+++ b/generators/app/templates/ci/exist.yml
@@ -86,7 +86,7 @@ jobs:
   #   name: Release
   #   runs-on: ubuntu-latest
   #   needs: build
-  #   if: github.ref == 'refs/heads/master'
+  #   if: github.ref == 'refs/heads/main'
   #   steps:
   #     - name: Checkout
   #       uses: actions/checkout@v2
diff --git a/generators/app/templates/github/__gitignore__ b/generators/app/templates/github/__gitignore__
index 9376a56e..bf967942 100644
--- a/generators/app/templates/github/__gitignore__
+++ b/generators/app/templates/github/__gitignore__
@@ -72,12 +72,10 @@ query-results
 .env
 .yo-rc.json
 node_modules/
-coverage
+coverage/
 build/
 bower_components/
-.idea
 reports/
-*.code-workspace
 
 # =========================
 # tei-pub (gulp)
@@ -85,3 +83,83 @@ reports/
 webtest/bin
 webtest/reports
 webtest/errorShots
+
+##############################
+## Java
+##############################
+.mtj.tmp/
+*.class
+*.jar
+*.war
+*.ear
+*.nar
+hs_err_pid*
+
+##############################
+## Maven
+##############################
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+pom.xml.bak
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+##############################
+## Gradle
+##############################
+bin/
+build/
+.gradle
+.gradletasknamecache
+gradle-app.setting
+!gradle-wrapper.jar
+
+##############################
+## IntelliJ
+##############################
+out/
+.idea/
+.idea_modules/
+*.iml
+*.ipr
+*.iws
+
+##############################
+## Eclipse
+##############################
+.settings/
+bin/
+tmp/
+.metadata
+.classpath
+.project
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.loadpath
+.factorypath
+
+##############################
+## NetBeans
+##############################
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+##############################
+## Visual Studio Code
+##############################
+.vscode/
+.code-workspace
diff --git a/generators/app/templates/github/readme.md b/generators/app/templates/github/readme.md
index 70c4f634..d2fe3f4b 100644
--- a/generators/app/templates/github/readme.md
+++ b/generators/app/templates/github/readme.md
@@ -104,6 +104,6 @@ You can take a look at the [Contribution guidelines for this project](.github/CO
 [release-img]: https://img.shields.io/badge/release-<%- version %>-green.svg
 [release-url]: https://github.com/<%- ghuser %>/<%- title %>/releases/latest
 <%_ if (ci == 'travis') { %>
-[travis-image]: https://travis-ci.com/<%- ghuser %>/<%- title %>.svg?branch=master
+[travis-image]: https://travis-ci.com/<%- ghuser %>/<%- title %>.svg?branch=main
 [travis-url]: https://travis-ci.com/<%- ghuser %>/<%- title %>
 <% } -%>
\ No newline at end of file
diff --git a/generators/app/templates/pages/index.html b/generators/app/templates/pages/index.html
index 3384ebac..8a467625 100755
--- a/generators/app/templates/pages/index.html
+++ b/generators/app/templates/pages/index.html
@@ -9,7 +9,13 @@
     <h1 data-template="config:app-title">Generated page</h1>
   <% if(apptype == 'plain'){ %>
   </div><% } else { %><% } %>
-    <div class="row">
+  <div class="alert alert-success">
+    <p>
+      This is the entry page into your application and was generated by yeoman. It uses HTML templates for a clean separation of HTML views and application logic.</p>
+    <p>To add your own template functions, start by editing the XQuery module:
+      <pre>app.xql</pre>.</p>
+  </div>  
+  <div class="row">
       <div class="col-md-6">
         <p>The page template uses the <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> CSS library for the page layout.</p>
       </div>
diff --git a/generators/app/templates/specs/mocha/app_spec.js b/generators/app/templates/specs/mocha/app_spec.js
index 9b2184a5..52405883 100644
--- a/generators/app/templates/specs/mocha/app_spec.js
+++ b/generators/app/templates/specs/mocha/app_spec.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-var */
 'use strict'
 
 const chai = require('chai')