diff --git a/docs/src/docs/index.tmpl b/docs/src/docs/index.tmpl
index 9943012c..2fa641c0 100644
--- a/docs/src/docs/index.tmpl
+++ b/docs/src/docs/index.tmpl
@@ -73,7 +73,7 @@ img {
 				</tr>
 				<tr>
 					<td class="propName">Grails Version</td>
-					<td>3.0.0 > *</td>
+					<td>4.0.x > *</td>
 				</tr>
 				<tr>
 					<td class="propName">Author</td>
@@ -84,7 +84,16 @@ img {
 
 		<hr />
 
-		<h2>Current Documentation</h2>
+		<h2>Current Documentation (4.0.x)</h2>
+		<ul>
+			<li><a href="/grails-spring-security-ui/@VERSION@/index.html">User guide</a></li>
+			<li><a href="/grails-spring-security-ui/@VERSION@/spring-security-ui-@VERSION@.pdf">User guide PDF</a></li>
+			<li><a href="/grails-spring-security-ui/@VERSION@/spring-security-ui-@VERSION@.epub">User guide EPUB</a></li>
+			<!-- <li><a href="/grails-spring-security-ui/@VERSION@/spring-security-ui-@VERSION@.mobi">User guide MOBI (Kindle)</a></li> -->
+		</ul>
+
+
+		<h2>3.0.x Documentation</h2>
 		<ul>
 			<li><a href="/grails-spring-security-ui/v3/index.html">User guide</a></li>
 			<li><a href="/grails-spring-security-ui/v3/spring-security-ui-@VERSION@.pdf">User guide PDF</a></li>
@@ -92,6 +101,7 @@ img {
 			<!-- <li><a href="/grails-spring-security-ui/v3/spring-security-ui-@VERSION@.mobi">User guide MOBI (Kindle)</a></li> -->
 		</ul>
 
+
 		<h2>Documentation (version 1.0.x)</h2>
 		<ul>
 			<li><a href="/grails-spring-security-ui/v1/index.html">User guide</a></li>
diff --git a/docs/src/docs/introduction.adoc b/docs/src/docs/introduction.adoc
index 9926b35b..02cf2cdd 100644
--- a/docs/src/docs/introduction.adoc
+++ b/docs/src/docs/introduction.adoc
@@ -22,7 +22,7 @@ dependencies {
    ...
 ----
 
-NOTE: Master branch is for Grails 4, which uses Spring Security 5.1.2 and Spring 5
+NOTE: Master branch is for Grails 4, which uses Spring Security 5 and Spring 5
 See the spring-security-core plugin for details such as how password encodings have changed (salts).
 
 NOTE: Version 3.1.x is only compatible with Grails 3.3.x or higher.
@@ -43,6 +43,8 @@ Also be sure to update the versions when new releases are available.
 
 === Release History
 
+* Apr 9, 2019
+** 4.0.0.M1 release
 * Feb 14, 2018
 ** 3.1.2 release
 * Sep 27, 2017
diff --git a/docs/src/docs/persistentCookie.adoc b/docs/src/docs/persistentCookie.adoc
index 3ad433c1..6f9b96ba 100644
--- a/docs/src/docs/persistentCookie.adoc
+++ b/docs/src/docs/persistentCookie.adoc
@@ -1,7 +1,7 @@
 [[persistentCookie]]
 == Persistent Cookie Management
 
-Persistent cookies aren't enabled by default - you must enable them by running the `s2-create-persistent-token` script. See https://grails-plugins.github.io/grails-spring-security-core/v3/index.html#rememberMeCookie[the Spring Security Core plugin documentation] for details about this feature.
+Persistent cookies aren't enabled by default - you must enable them by running the `s2-create-persistent-token` script. See https://grails-plugins.github.io/grails-spring-security-core/@VERSION@/index.html#rememberMeCookie[the Spring Security Core plugin documentation] for details about this feature.
 
 The Persistent Logins menu is only shown if this feature is enabled.
 
diff --git a/docs/src/docs/user.adoc b/docs/src/docs/user.adoc
index 56f79620..67c99b5b 100644
--- a/docs/src/docs/user.adoc
+++ b/docs/src/docs/user.adoc
@@ -21,7 +21,7 @@ image::user_edit.png[]
 
 You can update any of the attributes or delete the User. You can see that there's a "Login as user" button here - that is only shown if you're authenticated with a User who is granted `ROLE_SWITCH_USER` (this role name can be configured in `application.groovy`):
 
-This allows you to temporarily assume the identity of another User (see https://grails-plugins.github.io/grails-spring-security-core/v3/index.html#switchUser[the Spring Security Core plugin documentation] for more information about switch-user). The "Logged in as ..." information in the top right of the screen will change to show that you're running as another User and provide a link to switch back. The role name `ROLE_SWITCH_USER` is the default but you can change the value with the `grails.plugin.springsecurity.ui.switchUserRoleName` setting in application.groovy.
+This allows you to temporarily assume the identity of another User (see https://grails-plugins.github.io/grails-spring-security-core/@VERSION@/index.html#switchUser[the Spring Security Core plugin documentation] for more information about switch-user). The "Logged in as ..." information in the top right of the screen will change to show that you're running as another User and provide a link to switch back. The role name `ROLE_SWITCH_USER` is the default but you can change the value with the `grails.plugin.springsecurity.ui.switchUserRoleName` setting in application.groovy.
 
 If you click the Roles tab you can see the roles granted to this User and can click through to its edit page:
 
diff --git a/examples/extended/build.gradle b/examples/extended/build.gradle
index 69cbf45a..0dd864fa 100644
--- a/examples/extended/build.gradle
+++ b/examples/extended/build.gradle
@@ -76,16 +76,10 @@ dependencies {
     compile "org.grails.plugins:mail:$mailVesion"
 
 
-    compile("org.grails.plugins:spring-security-acl:4.0.0.BUILD-SNAPSHOT") {
+    compile("org.grails.plugins:spring-security-acl:4.0.0.M1") {
         exclude group: 'org.grails.plugins', module: 'spring-security-core'
     }
-
-/*
-    compile("org.grails.plugins:spring-security-acl:3.1.2") {
-        exclude group: 'org.grails.plugins', module: 'spring-security-core'
-    }
-*/
-
+    
     compile project(":spring-security-ui")
 }
 
diff --git a/examples/extended/gradle.properties b/examples/extended/gradle.properties
index 4fda5c68..4eb0acf8 100644
--- a/examples/extended/gradle.properties
+++ b/examples/extended/gradle.properties
@@ -1,7 +1,7 @@
 grailsVersion=4.0.0.M2
-gormVersion=7.0.0.BUILD-SNAPSHOT
+gormVersion=7.0.0.RC2
 gradleWrapperVersion=4.9
-mailVesion=2.0.0.RC6
+mailVesion=2.0.0
 hibernateCoreVresion=
 springSecurityAclVersion=5.1.2.RELEASE
 hibernateCoreVersion=5.3.7.Final
\ No newline at end of file
diff --git a/examples/simple/gradle.properties b/examples/simple/gradle.properties
index e78db1eb..8eac7c98 100644
--- a/examples/simple/gradle.properties
+++ b/examples/simple/gradle.properties
@@ -1,5 +1,5 @@
 grailsVersion=4.0.0.M2
-gormVersion=7.0.0.BUILD-SNAPSHOT
+gormVersion=7.0.0.RC2
 gradleWrapperVersion=4.9
 mailVesion=2.0.0.RC6
 springSecurityAclVersion=5.1.2.RELEASE
diff --git a/gradle.properties b/gradle.properties
index 439c7700..b0d32533 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-projectVersion=4.0.0.BUILD-SNAPSHOT
+projectVersion=4.0.0.TEST
 title=Spring Security UI Plugin
 authors=Burt Beckwith
 projectDesc=Provides CRUD screens and other user management workflows.
@@ -10,7 +10,7 @@ vcsUrl=https://github.com/grails-plugins/grails-spring-security-ui
 websiteUrl=https://github.com/grails-plugins/grails-spring-security-ui
 issueTrackerUrl=https://github.com/grails-plugins/grails-spring-security-ui/issues
 grailsVersion=4.0.0.M2
-gormVersion=7.0.0.BUILD-SNAPSHOT
+gormVersion=7.0.0.RC2
 gradleWrapperVersion=4.9
 assetPipelineVersion=2.14.3
 dumbsterVersion=1.6
@@ -18,5 +18,5 @@ mailVersion=2.0.0.RC6
 springSecurityAclVersion=5.1.2.RELEASE
 chromeDriverVersion=2.40
 geckoDriverVersion=0.21.0
-springSecurityCoreVersion=4.0.0.BUILD-SNAPSHOT
+springSecurityCoreVersion=4.0.0.M1
 springSecurityVersion=5.1.2.RELEASE
\ No newline at end of file
diff --git a/gradle/grailsPublish.gradle b/gradle/grailsPublish.gradle
index 39358e4d..38a08556 100644
--- a/gradle/grailsPublish.gradle
+++ b/gradle/grailsPublish.gradle
@@ -17,7 +17,7 @@ grailsPublish {
     }
     issueTrackerUrl = project.hasProperty('issueTrackerUrl') ? project.issueTrackerUrl : "https://github.com/grails-plugins/$project.name/issues"
     vcsUrl = project.hasProperty('vcsUrl') ? project.vcsUrl : "https://github.com/grails-plugins/$project.name"
-    title = 'Grails spring-security-core plugin'
+    title = 'Grails spring-security-ui plugin'
     desc = ''
     developers = [burtbeckwith:"Burt Beckwith"]
 }
\ No newline at end of file