diff --git a/README.md b/README.md
index 88e0a39b..4a148a64 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,22 @@
-Documize is an open source modern, lightweight and comprehensive alternative to Confluence and other such solutions.
+Documize Community is an open source modern, lightweight alternative to Confluence and other similar solutions.
 
 - Built for technical and non-technical users
 - Designed to unify both customer-facing and internal documentation
 - Organization through labels, spaces and categories
-- No fee-charging marketplace
 
 It's built with Golang + EmberJS and compiled down to a single executable binary for Linux, Windows and macOS.
 
 All you need to provide is PostgreSQL, Microsoft SQL Server or any MySQL variant.
 
-![Documize](screenshot-1.png "Documize")
+![Documize Community](screenshot-1.png "Documize Community")
 
 ## Latest Release
 
-[Community Edition: v4.0.0](https://github.com/documize/community/releases)
+[Community edition: v4.0.0](https://github.com/documize/community/releases)
 
-[Enterprise Edition: v4.0.0](https://www.documize.com/downloads)
+[Community+ edition: v4.0.0](https://www.documize.com/community/downloads)
+
+The Community+ edition is our enterprise-ready offering with customer support and advanced capabilities.
 
 ## OS Support
 
@@ -36,17 +37,17 @@ For all database types, Full-Text Search support (FTS) is mandatory.
 
 ## Browser Support
 
-- Chrome
 - Firefox
+- Chrome
 - Safari
+- Microsoft Edge (v42+)
 - Brave
 - Vivaldi
 - Opera
-- Microsoft Edge (v42+)
 
 ## Technology Stack
 
-- Go (v1.16.2)
+- Go (v1.17.2)
 - Ember JS (v3.12.0)
 
 ## Authentication Options
@@ -72,6 +73,6 @@ We aim to respond within two working days!
 
 <https://documize.com>
 
-This software (Documize Community Edition) is licensed under GNU AGPL v3 <http://www.gnu.org/licenses/agpl-3.0.en.html>. You can operate outside the AGPL restrictions by purchasing Documize Enterprise Edition and obtaining a commercial license by contacting <sales@documize.com>. Documize® is a registered trade mark of Documize Inc.
+This software (Documize Community Edition) is licensed under GNU AGPL v3 <http://www.gnu.org/licenses/agpl-3.0.en.html>. You can operate outside the AGPL restrictions by purchasing Documize Community+ edition and obtaining a commercial license by contacting <sales@documize.com>. Documize® is a registered trade mark of Documize Inc.
 
 Documize uses other open source components and we acknowledge them in [NOTICES](NOTICES.md)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 323a43b1..fac05770 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
 
   app:
     image: debian:latest
-    command: /bin/sh -c "apt-get -qq update && apt-get -qq install -y wget && wget https://documize.s3-eu-west-1.amazonaws.com/downloads/documize-enterprise-linux-amd64 && chmod 777 ./documize-enterprise-linux-amd64 && ./documize-enterprise-linux-amd64"
+    command: /bin/sh -c "apt-get -qq update && apt-get -qq install -y wget && wget https://documize.s3-eu-west-1.amazonaws.com/downloads/documize-community-plus-linux-amd64 && chmod 777 ./documize-community-plus-linux-amd64 && ./documize-community-plus-linux-amd64"
     depends_on:
       - db
     ports:
diff --git a/domain/document/export.go b/domain/document/export.go
index dbf619ee..720cbc34 100644
--- a/domain/document/export.go
+++ b/domain/document/export.go
@@ -83,7 +83,7 @@ func BuildExport(ctx domain.RequestContext, s store.Store, spec exportSpec) (htm
 	export.WriteString(`<meta charset="utf-8">`)
 	export.WriteString(`<meta http-equiv="X-UA-Compatible" content="IE=edge">`)
 	export.WriteString("<title>")
-	export.WriteString("Documize Export")
+	export.WriteString("Documize Community Export")
 	export.WriteString("</title>")
 	export.WriteString("<style>")
 	export.WriteString(baseCSS)
@@ -96,7 +96,7 @@ func BuildExport(ctx domain.RequestContext, s store.Store, spec exportSpec) (htm
 
 	// Show title and timestamp.
 	generated := time.Now().UTC().Format(time.ANSIC)
-	export.WriteString(fmt.Sprintf("<h1 class='export-h1'>%s</h1>", "Documize Export"))
+	export.WriteString(fmt.Sprintf("<h1 class='export-h1'>%s</h1>", "Documize Community Export"))
 	export.WriteString(fmt.Sprintf("<div class='export-stamp'>%v</div>", generated))
 
 	// Spit out table of contents.
@@ -419,7 +419,7 @@ const (
         font-size: 1.1rem;
         font-weight; normal;
     }
-	
+
 	.section-heading > .page-header {
 		margin: 2rem 0 2rem 0 !important;
 	}
diff --git a/domain/mail/email.html b/domain/mail/email.html
index e16a1fb3..770af545 100644
--- a/domain/mail/email.html
+++ b/domain/mail/email.html
@@ -3,7 +3,7 @@
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Your Documize Invitation</title>
+<title>Your Documize Community Invitation</title>
 
 
 <style type="text/css">
@@ -64,7 +64,7 @@ background-color: #f6f6f6;
 				<table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background: #fff; margin: 0; padding: 0; border: 1px solid #e9e9e9;">
 					<tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
 						<td class="alert alert-warning" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; color: #fff; font-weight: 500; text-align: center; border-radius: 3px 3px 0 0; background: #1b75bb; margin: 0; padding: 20px;" align="center" valign="top">
-							{{.Inviter}} has invited you to use Documize
+							{{.Inviter}} has invited you to use Documize Community
 						</td>
 					</tr>
 					<tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; margin: 0; padding: 0;">
@@ -72,7 +72,7 @@ background-color: #f6f6f6;
 							<table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
 								<tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
 									<td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										Documize provides easy access to all your Word documents so everyone can find and edit documents - no more network drives.
+										Documize Community provides easy access to all your Word documents so everyone can find and edit documents - no more network drives.
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; margin: 0; padding: 0;">
diff --git a/domain/mail/invite-existing-user.html b/domain/mail/invite-existing-user.html
index 6827197e..3bad4055 100644
--- a/domain/mail/invite-existing-user.html
+++ b/domain/mail/invite-existing-user.html
@@ -59,7 +59,7 @@ background-color: #f6f6f6;
                 <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background: #fff; margin: 0; padding: 0; border: 1px solid #e9e9e9;">
                     <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                         <td class="alert alert-warning" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; color: #fff; font-weight: 500; text-align: center; border-radius: 3px 3px 0 0; background: #1b75bb; margin: 0; padding: 20px;" align="center" valign="top">
-                            {{.Inviter}} has invited you to their Documize account
+                            {{.Inviter}} has invited you to their Documize Community account
                         </td>
                     </tr>
                     <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; margin: 0; padding: 0;">
@@ -67,7 +67,7 @@ background-color: #f6f6f6;
                             <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                     <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-                                        Documize provides secure and easy access to all your documentation so everyone can find and edit the same thing.
+                                        Documize Community provides secure and easy access to all your documentation so everyone can find and edit the same thing.
                                     </td>
                                 </tr>
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
diff --git a/domain/mail/invite-new-user.html b/domain/mail/invite-new-user.html
index b88392f2..cc79c2e1 100644
--- a/domain/mail/invite-new-user.html
+++ b/domain/mail/invite-new-user.html
@@ -59,7 +59,7 @@ background-color: #f6f6f6;
                 <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background: #fff; margin: 0; padding: 0; border: 1px solid #e9e9e9;">
                     <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                         <td class="alert alert-warning" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; color: #fff; font-weight: 500; text-align: center; border-radius: 3px 3px 0 0; background: #1b75bb; margin: 0; padding: 20px;" align="center" valign="top">
-                            {{.Inviter}} has invited you to Documize
+                            {{.Inviter}} has invited you to Documize Community
                         </td>
                     </tr>
                     <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; margin: 0; padding: 0;">
@@ -67,7 +67,7 @@ background-color: #f6f6f6;
                             <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                     <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-                                        Documize provides secure and easy access to all your documentation so everyone can find and edit the same thing.
+                                        Documize Community provides secure and easy access to all your documentation so everyone can find and edit the same thing.
                                     </td>
                                 </tr>
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; margin: 0; padding: 0;">
diff --git a/domain/mail/password-reset.html b/domain/mail/password-reset.html
index d9febd5e..e20f0a08 100644
--- a/domain/mail/password-reset.html
+++ b/domain/mail/password-reset.html
@@ -61,7 +61,7 @@ background-color: #f6f6f6;
                 <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background: #fff; margin: 0; padding: 0; border: 1px solid #e9e9e9;">
                     <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                         <td class="alert alert-warning" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; color: #fff; font-weight: 500; text-align: center; border-radius: 3px 3px 0 0; background: #1b75bb; margin: 0; padding: 20px;" align="center" valign="top">
-                            Your Documize password reset request
+                            Your Documize Community password reset request
                         </td>
                     </tr>
                     <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; margin: 0; padding: 0;">
@@ -69,7 +69,7 @@ background-color: #f6f6f6;
                             <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                                     <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-                                        Someone has requested to reset your Documize password. If this was you, then please click below to specify a new password.
+                                        Someone has requested to reset your Documize Community password. If this was you, then please click below to specify a new password.
                                     </td>
                                 </tr>
                                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; margin: 0; padding: 0;">
diff --git a/domain/mail/share-space-new-user.html b/domain/mail/share-space-new-user.html
index 04564606..feb6b1fd 100644
--- a/domain/mail/share-space-new-user.html
+++ b/domain/mail/share-space-new-user.html
@@ -61,7 +61,7 @@ background-color: #f6f6f6;
         <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background: #fff; margin: 0; padding: 0; border: 1px solid #e9e9e9;">
           <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
             <td class="alert alert-warning" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; color: #fff; font-weight: 500; text-align: center; border-radius: 3px 3px 0 0; background: #1b75bb; margin: 0; padding: 20px;" align="center" valign="top">
-              {{.Inviter}} has shared {{.Folder}} with you on Documize
+              {{.Inviter}} has shared {{.Folder}} with you on Documize Community
             </td>
           </tr>
           <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; margin: 0; padding: 0;">
@@ -76,7 +76,7 @@ background-color: #f6f6f6;
                 </tr>
                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
                   <td class="content-block" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-                    Documize provides secure and easy access to all your documentation so everyone can find and edit the same thing.
+                    Documize Community provides secure and easy access to all your documentation so everyone can find and edit the same thing.
                   </td>
                 </tr>
                 <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0; padding: 0;">
diff --git a/domain/mail/space.go b/domain/mail/space.go
index 99e04ef6..df3320e9 100644
--- a/domain/mail/space.go
+++ b/domain/mail/space.go
@@ -81,7 +81,7 @@ func (m *Mailer) ShareSpaceNewUser(recipient, inviterName, inviterEmail, url, sp
 	}
 
 	em := smtp.EmailMessage{}
-	em.Subject = fmt.Sprintf("%s has shared %s with you on Documize", inviterName, space)
+	em.Subject = fmt.Sprintf("%s has shared %s with you on Documize Community", inviterName, space)
 	em.ToEmail = recipient
 	em.ToName = recipient
 	em.ReplyTo = inviterEmail
diff --git a/domain/mail/user.go b/domain/mail/user.go
index 708c3507..e5d14f57 100644
--- a/domain/mail/user.go
+++ b/domain/mail/user.go
@@ -28,7 +28,7 @@ func (m *Mailer) InviteNewUser(recipient, inviterName, inviterEmail, url, userna
 	}
 
 	em := smtp.EmailMessage{}
-	em.Subject = fmt.Sprintf("%s has invited you to Documize", inviterName)
+	em.Subject = fmt.Sprintf("%s has invited you to Documize Community", inviterName)
 	em.ToEmail = recipient
 	em.ToName = recipient
 	em.ReplyTo = inviterEmail
@@ -81,7 +81,7 @@ func (m *Mailer) InviteExistingUser(recipient, inviterName, inviterEmail, url st
 	}
 
 	em := smtp.EmailMessage{}
-	em.Subject = fmt.Sprintf("%s has invited you to their Documize account", inviterName)
+	em.Subject = fmt.Sprintf("%s has invited you to their Documize Community account", inviterName)
 	em.ToEmail = recipient
 	em.ToName = recipient
 	em.ReplyTo = inviterEmail
@@ -125,7 +125,7 @@ func (m *Mailer) PasswordReset(recipient, url string) {
 	m.Initialize()
 
 	em := smtp.EmailMessage{}
-	em.Subject = "Documize password reset request"
+	em.Subject = "Documize Community password reset request"
 	em.ToEmail = recipient
 	em.ToName = recipient
 
diff --git a/domain/product.go b/domain/product.go
index 3d6a6762..58c78fac 100644
--- a/domain/product.go
+++ b/domain/product.go
@@ -41,22 +41,7 @@ const (
 	CommunityEdition Edition = "Community"
 
 	// EnterpriseEdition is proprietary closed-source product.
-	EnterpriseEdition Edition = "Enterprise"
-
-	// PackageEssentials provides core capabilities.
-	PackageEssentials Package = "Essentials"
-
-	// PackageAdvanced provides analytics, reporting,
-	// content lifecycle, content verisoning, and audit logs.
-	PackageAdvanced Package = "Advanced"
-
-	// PackagePremium provides actions, feedback capture,
-	// approvals workflow, secure external sharing.
-	PackagePremium Package = "Premium"
-
-	// PackageDataCenter provides multi-tenanting
-	// and a bunch of professional services.
-	PackageDataCenter Package = "Data Center"
+	EnterpriseEdition Edition = "Community+"
 
 	// PlanCloud represents *.documize.com hosting.
 	PlanCloud Plan = "Cloud"
diff --git a/edition/boot/runtime.go b/edition/boot/runtime.go
index 94491003..0025688b 100644
--- a/edition/boot/runtime.go
+++ b/edition/boot/runtime.go
@@ -62,7 +62,7 @@ func InitRuntime(r *env.Runtime, s *store.Store) bool {
 		storage.SetSQLServerProvider(r, s)
 	default:
 		r.Log.Infof("Unsupported database type: %s", r.Flags.DBType)
-		r.Log.Info("Documize supports the following database types: mysql mariadb percona postgresql sqlserver")
+		r.Log.Info("Documize Community supports the following database types: mysql mariadb percona postgresql sqlserver")
 		os.Exit(1)
 		return false
 	}
diff --git a/edition/community.go b/edition/community.go
index 60ed6964..6d1f4ca5 100644
--- a/edition/community.go
+++ b/edition/community.go
@@ -39,14 +39,14 @@ func main() {
 	// Specify the product edition.
 	rt.Product = domain.Product{}
 	rt.Product.Major = "4"
-	rt.Product.Minor = "0"
+	rt.Product.Minor = "1"
 	rt.Product.Patch = "0"
-	rt.Product.Revision = "210907143905"
+	rt.Product.Revision = "211103113945"
 	rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
 	rt.Product.Edition = domain.CommunityEdition
-	rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)
+	rt.Product.Title = "Community"
 
-	rt.Log.Info(fmt.Sprintf("Product: %s version %s (build %s)", rt.Product.Title, rt.Product.Version, rt.Product.Revision))
+	rt.Log.Info(fmt.Sprintf("Documize %s v%s (build %s)", rt.Product.Title, rt.Product.Version, rt.Product.Revision))
 
 	// Locate static assets.
 	rt.Assets = embeddedFiles
diff --git a/gui/app/constants/constants.js b/gui/app/constants/constants.js
index 05550ce8..a221524d 100644
--- a/gui/app/constants/constants.js
+++ b/gui/app/constants/constants.js
@@ -160,18 +160,6 @@ let constants = EmberObject.extend({
 		// PackageEssentials provides core capabilities.
 		PackageEssentials:  "Essentials",
 
-		// PackageAdvanced provides analytics, reporting,
-		// content lifecycle, content verisoning, and audit logs.
-		PackageAdvanced: "Advanced",
-
-		// PackagePremium provides actions, feedback capture,
-		// approvals workflow, secure external sharing.
-		PackagePremium: "Premium",
-
-		// PackageDataCenter provides multi-tenanting
-		// and a bunch of professional services.
-		PackageDataCenter: "Data Center",
-
 		// PlanCloud represents *.documize.com hosting.
 		PlanCloud: "Cloud",
 
diff --git a/gui/app/index.html b/gui/app/index.html
index 836bd5b7..edf0e556 100644
--- a/gui/app/index.html
+++ b/gui/app/index.html
@@ -9,7 +9,7 @@
 		<meta property="dbhash" content="{{.DBhash}}" />
 		<meta property="edition" content="{{.Edition}}" />
 		<meta name="author" content="Documize" />
-		<meta name="description" content="Documize">
+		<meta name="description" content="Documize Community">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 		<link rel="manifest" href="/manifest.json">
 		<link rel="shortcut icon" href="/favicon.ico?v=2" />
diff --git a/gui/app/pods/customize/general/template.hbs b/gui/app/pods/customize/general/template.hbs
index 2d69d0a8..f700a201 100644
--- a/gui/app/pods/customize/general/template.hbs
+++ b/gui/app/pods/customize/general/template.hbs
@@ -1,6 +1,6 @@
 {{layout/logo-heading
 	title="General"
-	desc="Options to help you customize Documize"
+	desc="Options to help you customize Documize Community"
 	icon=constants.Icon.Settings}}
 
 {{customize/general-settings model=model
diff --git a/gui/app/pods/customize/notice/template.hbs b/gui/app/pods/customize/notice/template.hbs
index d5bd2c5e..1f678c0d 100644
--- a/gui/app/pods/customize/notice/template.hbs
+++ b/gui/app/pods/customize/notice/template.hbs
@@ -1,6 +1,6 @@
 {{layout/logo-heading
     title="Third Party Notices"
-    desc="Documize utilizes open source libraries and components from third parties"
+    desc="Documize Community utilizes open source libraries and components from third parties"
     icon=constants.Icon.Announce}}
 
 <pre>
diff --git a/gui/app/pods/customize/product/template.hbs b/gui/app/pods/customize/product/template.hbs
index dca14e74..ad74abbf 100644
--- a/gui/app/pods/customize/product/template.hbs
+++ b/gui/app/pods/customize/product/template.hbs
@@ -1,6 +1,6 @@
 {{layout/logo-heading
-	title="Documize Changelog"
-	desc=(concat "You are running "appMeta.edition " Edition " appMeta.version " (build " appMeta.revision ")")
+	title="Changelog"
+	desc=(concat "You are running Documize " appMeta.edition " " appMeta.version " (build " appMeta.revision ")")
 	icon=constants.Icon.Announce}}
 
-{{customize/change-log}}
\ No newline at end of file
+{{customize/change-log}}
diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs
index 47ad02bc..f7fe24ac 100644
--- a/gui/app/pods/customize/template.hbs
+++ b/gui/app/pods/customize/template.hbs
@@ -3,7 +3,7 @@
 	<div class="zone-1" />
 	<div class="zone-2">
 		<div class="label color-gray-700">
-			Documize {{appMeta.edition}} Edition {{appMeta.version}} (build {{appMeta.revision}})
+			Documize {{appMeta.edition}} {{appMeta.version}} (build {{appMeta.revision}})
 		</div>
 	</div>
 	<div class="zone-3" />
diff --git a/gui/app/pods/folders/template.hbs b/gui/app/pods/folders/template.hbs
index 6e3b4578..da6c224a 100644
--- a/gui/app/pods/folders/template.hbs
+++ b/gui/app/pods/folders/template.hbs
@@ -12,7 +12,7 @@
 				{{/if}}
 				{{#if session.isAdmin}}
 					{{ui/ui-toolbar-icon icon=constants.Icon.Settings color=constants.Color.Green
-						tooltip="Documize settings" linkTo="customize"}}
+						tooltip="Documize Community settings" linkTo="customize"}}
 				{{/if}}
 			{{/ui/ui-toolbar}}
 		{{/if}}
diff --git a/gui/app/services/app-meta.js b/gui/app/services/app-meta.js
index 8986a5e9..d15e286f 100644
--- a/gui/app/services/app-meta.js
+++ b/gui/app/services/app-meta.js
@@ -62,7 +62,7 @@ export default Service.extend({
 		if (isInSetupMode) {
 			let edition = document.head.querySelector("[property=edition]");
 			this.setProperties({
-				title: htmlSafe("Documize Setup"),
+				title: htmlSafe("Documize Community Setup"),
 				allowAnonymousAccess: true,
 				setupMode: true,
 				edition: !_.isNull(edition) ? edition : 'Community'
diff --git a/gui/app/styles/core/news.scss b/gui/app/styles/core/news.scss
index 7bd0680b..b264fb98 100644
--- a/gui/app/styles/core/news.scss
+++ b/gui/app/styles/core/news.scss
@@ -2,11 +2,6 @@
 	text-align: left;
 
 	> .update-status {
-		padding: 25px;
-		background-color: map-get($yellow-shades, 100);
-		border: 1px solid map-get($yellow-shades, 300);
-		@include border-radius(16px);
-
 		> .title {
 			font-weight: bold;
 			font-size: 1.5rem;
diff --git a/gui/app/templates/components/customize/auth-settings.hbs b/gui/app/templates/components/customize/auth-settings.hbs
index 4809bdc3..33adf10b 100644
--- a/gui/app/templates/components/customize/auth-settings.hbs
+++ b/gui/app/templates/components/customize/auth-settings.hbs
@@ -59,7 +59,7 @@
 			<div class="form-group">
 				<label for="keycloak-group">Keycloak Group ID (Optional)</label>
 				{{input id="keycloak-group" type="text" value=keycloakConfig.group class="form-control"}}
-				<small class="form-text text-muted">If you want to sync users in a particular Group (e.g. "Documize Users"), provide the Group ID (e.g. 511d8b61-1ec8-45f6-bc8d-5de64d54c9d2)</small>
+				<small class="form-text text-muted">If you want to sync users in a particular Group (e.g. "Documize Community Users"), provide the Group ID (e.g. 511d8b61-1ec8-45f6-bc8d-5de64d54c9d2)</small>
 			</div>
 			<div class="form-group">
 				<label for="keycloak-admin-user">Keycloak Username</label>
diff --git a/gui/app/templates/components/customize/backup-restore.hbs b/gui/app/templates/components/customize/backup-restore.hbs
index 81ae4e17..3a40dbef 100644
--- a/gui/app/templates/components/customize/backup-restore.hbs
+++ b/gui/app/templates/components/customize/backup-restore.hbs
@@ -3,18 +3,17 @@
 		<div class="backup-zone">
 			{{#if session.isGlobalAdmin}}
 				<p>
-					Documize is a multi-tenanted application enabling both "tech.mycompany.com" and "sales.mycompany.com" to run using the same executable/database.
-					As a Documize <b>Global Administrator</b>, you will be performing a complete system-wide backup across all tenants.
-					A Documize <b>Tenant Administrator</b> can login to perform a tenant-level backup (e.g. marketing.mycompany.com).
+					Documize Community is a multi-tenanted application enabling both "tech.mycompany.com" and "sales.mycompany.com" to run using the same executable/database.
+					As a Documize Community <b>Global Administrator</b>, you will be performing a complete system-wide backup across all tenants.
+					The Documize Community <b>Tenant Administrator</b> can login to perform a tenant-level backup (e.g. marketing.mycompany.com).
 				</p>
 			{{else}}
 				<p>
-					Documize is a multi-tenanted application enabling both "tech.mycompany.com" and "sales.mycompany.com" to run using the same executable/database.
-					A Documize <b>Global Administrator</b>, you will be performing a complete system-wide backup across all tenants.
-					As a Documize <b>Tenant Administrator</b> you can perform a tenant-level backup (e.g. marketing.mycompany.com).
+					Documize Community is a multi-tenanted application enabling both "tech.mycompany.com" and "sales.mycompany.com" to run using the same executable/database.
+					A Documize Community <b>Global Administrator</b>, you will be performing a complete system-wide backup across all tenants.
+					As a Documize Community <b>Tenant Administrator</b> you can perform a tenant-level backup (e.g. marketing.mycompany.com).
 				</p>
 			{{/if}}
-			<p>Please use a Tenant Backup when migrating between self-host and Documize Cloud hosting.</p>
 			<p>It can take <b>several minutes</b> to complete the backup process &mdash; please be patient while the backup operation is in progress.</p>
 
 			<div class="margin-top-30 margin-bottom-20">
@@ -44,7 +43,7 @@
 	<div class="backup-restore">
 		<div class="restore-zone">
 			{{#if session.isGlobalAdmin}}
-				<p>Restore from a <b>system backup</b> should only be performed on an <b>empty Documize database.</b></p>
+				<p>Restore from a <b>system backup</b> should only be performed on an <b>empty Documize Community database.</b></p>
 			{{/if}}
 			<p>Restore operation will <b>re-create</b> users, groups, permissions, spaces, categories and content.</p>
 			<p>It can take <b>several minutes</b> to complete the restore process &mdash; please be patient while the restore operation is in progress.</p>
@@ -79,7 +78,7 @@
 					<div class="form-group">
 						<label for="delete-space-name">Please type RESTORE to commence the process</label>
 						{{input type="text" id="confirm-restore" class="form-control mousetrap" placeholder="Please type RESTORE" value=confirmRestore}}
-						<small class="form-text text-muted">You should only restore to an empty Documize instance</small>
+						<small class="form-text text-muted">You should only restore to an empty Documize Community instance</small>
 					</div>
 				</form>
 			</div>
@@ -90,4 +89,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/gui/app/templates/components/customize/change-log.hbs b/gui/app/templates/components/customize/change-log.hbs
index a2474022..f340af1d 100644
--- a/gui/app/templates/components/customize/change-log.hbs
+++ b/gui/app/templates/components/customize/change-log.hbs
@@ -1,32 +1,13 @@
 <div class="product-update">
 	<div class="update-status">
 		{{#if appMeta.updateAvailable }}
-			<a  class="title" href="https://www.documize.com/downloads">Documize product update is available :)</a>
+			<a  class="title" href="https://www.documize.com/community/downloads">Product update is available :)</a>
 			<p class="instructions">
-				To upgrade, replace existing binary and restart Documize. Migrate between Community and Enterprise editions seamlessly.
+				To upgrade, replace existing binary and restart Documize Community.
 			</p>
-		{{else}}
-			<div class="title">Product Downloads</div>
+			<Ui::UiSpacer @size="400" />
 		{{/if}}
-		<div class="links">
-			<p>
-				<span class="edition-name">Community Edition {{appMeta.communityLatest}}</span>&nbsp;&nbsp;&nbsp;
-				<a class="link" href="https://documize.s3-eu-west-1.amazonaws.com/downloads/documize-community-windows-amd64.exe">Windows</a>&nbsp;&middot;
-				<a class="link" href="https://documize.s3-eu-west-1.amazonaws.com/downloads/documize-community-linux-amd64">Linux</a>&nbsp;&middot;
-				<a class="link" href="https://documize.s3-eu-west-1.amazonaws.com/downloads/documize-community-darwin-amd64">macOS</a>&nbsp;
-			</p>
-			<p>
-				<span class="edition-name">Enterprise Edition {{appMeta.enterpriseLatest}}</span>&nbsp;&nbsp;&nbsp;
-				<a class="link" href="https://documize.s3-eu-west-1.amazonaws.com/downloads/documize-enterprise-windows-amd64.exe">Windows</a>&nbsp;&middot;
-				<a class="link" href="https://documize.s3-eu-west-1.amazonaws.com/downloads/documize-enterprise-linux-amd64">Linux</a>&nbsp;&middot;
-				<a class="link" href="https://documize.s3-eu-west-1.amazonaws.com/downloads/documize-enterprise-darwin-amd64">macOS</a>&nbsp;
-			</p>
-			<small class="color-gray-500 margin-top-20">
-				Documize utilizes {{#link-to "customize.notice" class="color-gray-600"}}third party{{/link-to}} open source components
-			</small>
-		</div>
 	</div>
-	<Ui::UiSpacer @size="400" />
 	<div class="change-log">
 		{{{changelog}}}
 	</div>
diff --git a/gui/app/templates/components/customize/general-settings.hbs b/gui/app/templates/components/customize/general-settings.hbs
index e34ea862..b8144045 100644
--- a/gui/app/templates/components/customize/general-settings.hbs
+++ b/gui/app/templates/components/customize/general-settings.hbs
@@ -2,14 +2,14 @@
 	<div class="form-group">
 		<label for="siteTitle">Site Name</label>
 		{{focus-input id="siteTitle" type="text" value=model.general.title class=(if hasTitleInputError "form-control is-invalid" "form-control")}}
-		<small class="form-text text-muted">Provide short title for this Documize instance</small>
+		<small class="form-text text-muted">Provide short title for this Documize Community instance</small>
 	</div>
 	<div class="form-group">
 		<label id="siteMessage">Site Message</label>
 		<div id="editor-message" class="wysiwyg wysiwyg-editor">
 			{{{model.general.message}}}
 		</div>
-		<small class="form-text text-muted">Provide short message explaining this Documize instance</small>
+		<small class="form-text text-muted">Provide short message explaining this Documize Community instance</small>
 	</div>
 	<div class="form-group">
 		<label>Site Theme</label>
diff --git a/gui/app/templates/components/setup/documize-setup.hbs b/gui/app/templates/components/setup/documize-setup.hbs
index 8e1d388b..ea09e557 100644
--- a/gui/app/templates/components/setup/documize-setup.hbs
+++ b/gui/app/templates/components/setup/documize-setup.hbs
@@ -1,5 +1,5 @@
 <div class="installer">
-	<img src="/assets/img/setup/logo-purple.png" srcset="/assets/img/setup/logo-purple@2x.png" alt="Documize Setup" style="width: 250px; height: 76px;">
+	<img src="/assets/img/setup/logo-purple.png" srcset="/assets/img/setup/logo-purple@2x.png" alt="Documize Community Setup" style="width: 250px; height: 76px;">
 	<Ui::UiSpacer @size="300" />
 	<h1 class="color-theme-700">Setup</h1>
 	<p class="color-gray-800">