diff --git a/Directory.Build.props b/Directory.Build.props
index 55de1cddb..4f8e3aedd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Package information">
-    <Version>9.1.0-beta1</Version>
+    <Version>9.1.0</Version>
     <Authors>Piranha CMS</Authors>
     <Company>Piranha CMS</Company>
     <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
diff --git a/core/Piranha.AspNetCore/PiranhaMiddleware.cs b/core/Piranha.AspNetCore/PiranhaMiddleware.cs
index d573116ba..c91aee0b5 100644
--- a/core/Piranha.AspNetCore/PiranhaMiddleware.cs
+++ b/core/Piranha.AspNetCore/PiranhaMiddleware.cs
@@ -110,7 +110,7 @@ public override async Task Invoke(HttpContext context, IApi api, IApplicationSer
                     service.Site.Culture = site.Culture;
                     service.Site.Sitemap = await api.Sites.GetSitemapAsync(site.Id);
 
-                    // Set prefered hostname & prefix
+                    // Set preferred hostname & prefix
                     var siteHost = GetMatchingHost(site, hostname);
                     service.Site.Host = siteHost[0];
                     service.Site.SitePrefix = siteHost[1];
@@ -225,7 +225,7 @@ public override async Task Invoke(HttpContext context, IApi api, IApplicationSer
                     {
                         App.PostTypes.GetById(post.TypeId);
 
-                        // Onlyc cache published posts
+                        // Only cache published posts
                         if (post.IsPublished)
                         {
                             service.CurrentPost = post;
diff --git a/core/Piranha.Manager.Localization/Resources/Alias.zh.resx b/core/Piranha.Manager.Localization/Resources/Alias.zh.resx
index 62e0d45b5..7d50c6207 100644
--- a/core/Piranha.Manager.Localization/Resources/Alias.zh.resx
+++ b/core/Piranha.Manager.Localization/Resources/Alias.zh.resx
@@ -13,36 +13,36 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Aliases" xml:space="preserve">
-    <value>别名</value>
+    <value>別名</value>
   </data>
   <data name="Add new alias" xml:space="preserve">
-    <value>添加新别名</value>
+    <value>新增別名</value>
   </data>
   <data name="Alias URL" xml:space="preserve">
-    <value>别名网址</value>
+    <value>別名網址</value>
   </data>
   <data name="Alias URL is mandatory." xml:space="preserve">
-    <value>别名网址必填。</value>
+    <value>別名網址是必填項。</value>
   </data>
   <data name="Redirect URL" xml:space="preserve">
-    <value>重定向网址</value>
+    <value>導向網址</value>
   </data>
   <data name="Redirect URL is mandatory." xml:space="preserve">
-    <value>重定向网址必填。</value>
+    <value>導向網址是必填項。</value>
   </data>
   <data name="Permanent" xml:space="preserve">
     <value>永久</value>
   </data>
   <data name="Are you sure you want to delete this alias?" xml:space="preserve">
-    <value>是否确定删除此别名？</value>
+    <value>是否確定要刪除此別名？</value>
   </data>
   <data name="If the redirect should be permanent" xml:space="preserve">
-    <value>重定向是否永久</value>
+    <value>這個導向網址應該是永久的</value>
   </data>
   <data name="The alias was successfully added to the list" xml:space="preserve">
-    <value>该别名已成功加入列表</value>
+    <value>該別名已加入列表中</value>
   </data>
   <data name="The alias was successfully deleted" xml:space="preserve">
-    <value>该别名已成功删除</value>
+    <value>該別名已成功刪除</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager.Localization/Resources/Content.zh.resx b/core/Piranha.Manager.Localization/Resources/Content.zh.resx
index fb08a6fc7..59f1a2aa8 100644
--- a/core/Piranha.Manager.Localization/Resources/Content.zh.resx
+++ b/core/Piranha.Manager.Localization/Resources/Content.zh.resx
@@ -13,33 +13,33 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Excerpt" xml:space="preserve">
-    <value>摘要</value>
+    <value>摘录</value>
   </data>
   <data name="Meta index" xml:space="preserve">
-    <value>關鍵值索引</value>
+    <value>关键值索引</value>
   </data>
   <data name="Meta follow" xml:space="preserve">
-    <value>關鍵值流程</value>
+    <value>关键值流程</value>
   </data>
   <data name="Meta priority" xml:space="preserve">
-    <value>關鍵值優先</value>
+    <value>关健值优先</value>
   </data>
   <data name="Primary image" xml:space="preserve">
-    <value>主要圖片</value>
+    <value>主要图像</value>
   </data>
   <data name="Search engine priority, compared to other content in the same site." xml:space="preserve">
-    <value>搜尋引擎優先</value>
+    <value>与同一站点中的其他内容相比，搜索引擎优先级。</value>
   </data>
   <data name="The content was successfully deleted" xml:space="preserve">
-    <value>本內容已成功刪除</value>
+    <value>内容已成功删除</value>
   </data>
   <data name="An error occured while deleting the content" xml:space="preserve">
-    <value>刪除內容時發生錯誤</value>
+    <value>删除内容时发生错误</value>
   </data>
   <data name="The content was successfully saved" xml:space="preserve">
-    <value>本內容已成功儲存</value>
+    <value>内容已成功保存</value>
   </data>
   <data name="An error occured while saving the content" xml:space="preserve">
-    <value>儲存內容時發生錯誤</value>
+    <value>保存内容时发生错误</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager.Localization/Resources/General.zh.resx b/core/Piranha.Manager.Localization/Resources/General.zh.resx
index 32589f954..8cdf4cebc 100644
--- a/core/Piranha.Manager.Localization/Resources/General.zh.resx
+++ b/core/Piranha.Manager.Localization/Resources/General.zh.resx
@@ -13,16 +13,16 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Add" xml:space="preserve">
-    <value>添加</value>
+    <value>新增</value>
   </data>
   <data name="Advanced" xml:space="preserve">
-    <value>高级选项</value>
+    <value>進階</value>
   </data>
   <data name="All" xml:space="preserve">
     <value>全部</value>
   </data>
   <data name="An error occurred" xml:space="preserve">
-    <value>发生了一个错误</value>
+    <value>發生錯誤</value>
   </data>
   <data name="Cancel" xml:space="preserve">
     <value>取消</value>
@@ -31,34 +31,34 @@
     <value>内容</value>
   </data>
   <data name="Continue" xml:space="preserve">
-    <value>继续</value>
+    <value>繼續</value>
   </data>
   <data name="Content type" xml:space="preserve">
-    <value>内容类型</value>
+    <value>內容類型</value>
   </data>
   <data name="Copy" xml:space="preserve">
-    <value>拷贝</value>
+    <value>複製</value>
   </data>
   <data name="Culture" xml:space="preserve">
-    <value>语系</value>
+    <value>語系</value>
   </data>
   <data name="Default" xml:space="preserve">
-    <value>默认</value>
+    <value>預設值</value>
   </data>
   <data name="Delete" xml:space="preserve">
-    <value>删除</value>
+    <value>刪除</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>说明</value>
+    <value>說明</value>
   </data>
   <data name="Details" xml:space="preserve">
-    <value>详细信息</value>
+    <value>詳細資料</value>
   </data>
   <data name="Dimensions" xml:space="preserve">
     <value>尺寸</value>
   </data>
   <data name="Download" xml:space="preserve">
-    <value>下载</value>
+    <value>下載</value>
   </data>
   <data name="Draft" xml:space="preserve">
     <value>草稿</value>
@@ -67,103 +67,103 @@
     <value>草稿</value>
   </data>
   <data name="Email address" xml:space="preserve">
-    <value>电子邮件地址</value>
+    <value>電子郵件</value>
   </data>
   <data name="Email address is mandatory." xml:space="preserve">
-    <value>电子邮件地址是必须的。</value>
+    <value>電子郵件是必填項。</value>
   </data>
   <data name="Filename" xml:space="preserve">
-    <value>档名</value>
+    <value>檔案名稱</value>
   </data>
   <data name="Height" xml:space="preserve">
-    <value>高</value>
+    <value>高度</value>
   </data>
   <data name="Edit" xml:space="preserve">
-    <value>编辑</value>
+    <value>編輯</value>
   </data>
   <data name="Empty" xml:space="preserve">
-    <value>空</value>
+    <value>空值</value>
   </data>
   <data name="General" xml:space="preserve">
-    <value>基本</value>
+    <value>一般</value>
   </data>
   <data name="General information" xml:space="preserve">
-    <value>基本讯息</value>
+    <value>基本資訊</value>
   </data>
   <data name="History" xml:space="preserve">
-    <value>历史</value>
+    <value>歷史紀錄</value>
   </data>
   <data name="Internal id" xml:space="preserve">
-    <value>内部 Id</value>
+    <value>內部編號</value>
   </data>
   <data name="Is default" xml:space="preserve">
-    <value>是默认值</value>
+    <value>預設網站</value>
   </data>
   <data name="Language" xml:space="preserve">
-    <value>语系</value>
+    <value>語系</value>
   </data>
   <data name="Languages" xml:space="preserve">
-    <value>语系</value>
+    <value>語系</value>
   </data>
   <data name="Login" xml:space="preserve">
-    <value>登录</value>
+    <value>登入</value>
   </data>
   <data name="Logout" xml:space="preserve">
-    <value>注销</value>
+    <value>登出</value>
   </data>
   <data name="Looks like there's no items here. Click on the button above to get started!" xml:space="preserve">
-    <value>看来这里没有项目，点击上面的按钮开始！</value>
+    <value>目前沒有內容，請點擊上面的按鍵進行操作！</value>
   </data>
   <data name="Looks like there's no items here. Click on the button below to get started!" xml:space="preserve">
-    <value>看来这里没有项目，点击下面的按钮开始！</value>
+    <value>目前沒有內容，請點擊下面的按鍵進行操作！</value>
   </data>
   <data name="Looks like there's no items here. Click on the button to the left to get started!" xml:space="preserve">
-    <value>似乎这里没有项目，点击左边的按钮开始！</value>
+    <value>目前沒有內容，請點擊左邊的按鍵進行操作！</value>
   </data>
   <data name="Main content" xml:space="preserve">
-    <value>主要内容</value>
+    <value>主要內容</value>
   </data>
   <data name="Modified" xml:space="preserve">
-    <value>已修改</value>
+    <value>修改日期</value>
   </data>
   <data name="Name" xml:space="preserve">
-    <value>名称</value>
+    <value>用戶名稱</value>
   </data>
   <data name="Name is mandatory." xml:space="preserve">
-    <value>名称为必填项</value>
+    <value>用戶名稱為必填項。</value>
   </data>
   <data name="Open public URL in new tab" xml:space="preserve">
-    <value>新建标签页打开自定义网址</value>
+    <value>於新分頁開啟自訂網址</value>
   </data>
   <data name="Password" xml:space="preserve">
-    <value>密码</value>
+    <value>密碼</value>
   </data>
   <data name="Permanent" xml:space="preserve">
     <value>永久</value>
   </data>
   <data name="Permissions" xml:space="preserve">
-    <value>权限</value>
+    <value>權限</value>
   </data>
   <data name="Pixels" xml:space="preserve">
     <value>像素</value>
   </data>
   <data name="Preview" xml:space="preserve">
-    <value>预览</value>
+    <value>預覽</value>
   </data>
   <data name="Publish" xml:space="preserve">
-    <value>发布</value>
+    <value>發布</value>
   </data>
   <data name="Publish date" xml:space="preserve">
-    <value>发布日期</value>
+    <value>發布日期</value>
   </data>
   <data name="Redirect" xml:space="preserve">
-    <value>重定向</value>
+    <value>導向</value>
   </data>
   <data name="Redirect Type" xml:space="preserve">
-    <value>重定向类型</value>
+    <value>導向模式</value>
   </data>
   <data name="Revert" xml:space="preserve">
-    <value>还原</value>
+    <value>復原</value>
   </data>
   <data name="Roles" xml:space="preserve">
     <value>角色</value>
@@ -172,87 +172,87 @@
     <value>路由</value>
   </data>
   <data name="Save" xml:space="preserve">
-    <value>保存</value>
+    <value>儲存</value>
   </data>
   <data name="Scheduled" xml:space="preserve">
-    <value>已排程</value>
+    <value>排程日期</value>
   </data>
   <data name="Search..." xml:space="preserve">
-    <value>搜索中...</value>
+    <value>搜尋 ...</value>
   </data>
   <data name="Select block" xml:space="preserve">
-    <value>选择模块...</value>
+    <value>選擇區塊</value>
   </data>
   <data name="Settings" xml:space="preserve">
-    <value>设置</value>
+    <value>設定</value>
   </data>
   <data name="SEO" xml:space="preserve">
-    <value>搜索引擎优化</value>
+    <value>搜尋引擎優化</value>
   </data>
   <data name="Sharing" xml:space="preserve">
-    <value>共享</value>
+    <value>分享</value>
   </data>
   <data name="Size" xml:space="preserve">
     <value>尺寸</value>
   </data>
   <data name="Slug" xml:space="preserve">
-    <value>网址标识</value>
+    <value>網址後綴</value>
   </data>
   <data name="System" xml:space="preserve">
-    <value>系统</value>
+    <value>系統</value>
   </data>
   <data name="Temporary" xml:space="preserve">
-    <value>临时的</value>
+    <value>臨時</value>
   </data>
   <data name="Title" xml:space="preserve">
-    <value>标题</value>
+    <value>標題</value>
   </data>
   <data name="Update" xml:space="preserve">
     <value>更新</value>
   </data>
   <data name="Update password" xml:space="preserve">
-    <value>更新密码</value>
+    <value>更新密碼</value>
   </data>
   <data name="Username" xml:space="preserve">
-    <value>用户名</value>
+    <value>用戶名稱</value>
   </data>
   <data name="Username is mandatory." xml:space="preserve">
-    <value>用户名是必填项</value>
+    <value>用戶名稱為必填項。</value>
   </data>
   <data name="Title is mandatory." xml:space="preserve">
-    <value>名称为必填项</value>
+    <value>標題為必填項。</value>
   </data>
   <data name="Type" xml:space="preserve">
-    <value>类型</value>
+    <value>類型</value>
   </data>
   <data name="Unpublish" xml:space="preserve">
-    <value>取消发布</value>
+    <value>取消發布</value>
   </data>
   <data name="Unpublished" xml:space="preserve">
-    <value>已取消发布</value>
+    <value>未發佈</value>
   </data>
   <data name="Users" xml:space="preserve">
-    <value>用户</value>
+    <value>用戶</value>
   </data>
   <data name="Version" xml:space="preserve">
     <value>版本</value>
   </data>
   <data name="Width" xml:space="preserve">
-    <value>宽度</value>
+    <value>寬度</value>
   </data>
   <data name="Archives and Comments" xml:space="preserve">
-    <value>归档和评论</value>
+    <value>存檔及評論</value>
   </data>
   <data name="Author" xml:space="preserve">
     <value>作者</value>
   </data>
   <data name="Comments" xml:space="preserve">
-    <value>评论</value>
+    <value>評論</value>
   </data>
   <data name="Created" xml:space="preserve">
-    <value>已创建</value>
+    <value>建立日期</value>
   </data>
   <data name="Username and/or password are incorrect." xml:space="preserve">
-    <value>用户名或密码不正确。</value>
+    <value>用戶名稱或密碼不正確</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager.Localization/Resources/Media.zh.resx b/core/Piranha.Manager.Localization/Resources/Media.zh.resx
index 3fd8d3088..a245dda52 100644
--- a/core/Piranha.Manager.Localization/Resources/Media.zh.resx
+++ b/core/Piranha.Manager.Localization/Resources/Media.zh.resx
@@ -13,78 +13,78 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Add folder" xml:space="preserve">
-    <value>创建文件夹</value>
+    <value>新增檔案夾</value>
   </data>
   <data name="Drop files here or click to upload." xml:space="preserve">
-    <value>将文件拖放到此处，或点击上传。</value>
+    <value>將檔案拖至此處，或點擊這裡進行上傳。</value>
   </data>
   <data name="Download media" xml:space="preserve">
-    <value>下载媒体文件</value>
+    <value>下載媒體檔案</value>
   </data>
   <data name="Folder name" xml:space="preserve">
-    <value>文件夹名称</value>
+    <value>資料夾名稱</value>
   </data>
   <data name="Folder name is mandatory." xml:space="preserve">
-    <value>文件夹名称是必填的。</value>
+    <value>名稱為必填項</value>
   </data>
   <data name="Gallery" xml:space="preserve">
-    <value>相册</value>
+    <value>圖庫</value>
   </data>
   <data name="Media" xml:space="preserve">
-    <value>媒体</value>
+    <value>媒體</value>
   </data>
   <data name="Media preview is not available" xml:space="preserve">
-    <value>媒体预览不可用</value>
+    <value>媒體預覽功能未啟用</value>
   </data>
   <data name="Open media in new tab" xml:space="preserve">
-    <value>在新标签中打开媒体</value>
+    <value>新標簽打開鏈接</value>
   </data>
   <data name="Select media" xml:space="preserve">
-    <value>选择媒体</value>
+    <value>選取媒體</value>
   </data>
   <data name="Your browser does not support the video tag." xml:space="preserve">
-    <value>您的浏览器不支持视频标签。</value>
+    <value>您的瀏覽器不支援 HTML5 影片播放標籤。</value>
   </data>
   <data name="List" xml:space="preserve">
     <value>列表</value>
   </data>
   <data name="Preferred aspect" xml:space="preserve">
-    <value>首选尺寸</value>
+    <value>首選尺寸</value>
   </data>
   <data name="Original" xml:space="preserve">
-    <value>原始文件</value>
+    <value>原始</value>
   </data>
   <data name="Landscape" xml:space="preserve">
-    <value>横屏模式</value>
+    <value>橫式</value>
   </data>
   <data name="Portrait" xml:space="preserve">
-    <value>头像</value>
+    <value>直式</value>
   </data>
   <data name="Widescreen" xml:space="preserve">
-    <value>宽屏模式</value>
+    <value>寬螢幕</value>
   </data>
   <data name="Square" xml:space="preserve">
-    <value>方形</value>
+    <value>正方形</value>
   </data>
   <data name="Are you sure you want to delete selected media?" xml:space="preserve">
-    <value>您确定要删除选定的媒体吗？</value>
+    <value>確定要刪除已選擇的媒體?</value>
   </data>
   <data name="Delete selected items" xml:space="preserve">
-    <value>删除选中项目</value>
+    <value>移除所選項目</value>
   </data>
   <data name="Media file was successfully moved." xml:space="preserve">
-    <value>媒体文件已成功移动。</value>
+    <value>檔案已成功移動。</value>
   </data>
   <data name="Media files was successfully moved." xml:space="preserve">
-    <value>媒体文件已成功移动。</value>
+    <value>檔案已成功移動。</value>
   </data>
   <data name="The media file was not found." xml:space="preserve">
-    <value>找不到媒体文件。</value>
+    <value>找不到此檔案。</value>
   </data>
   <data name="The media file was successfully deleted" xml:space="preserve">
-    <value>媒体文件已成功删除</value>
+    <value>檔案刪除成功</value>
   </data>
   <data name="The media files was successfully deleted" xml:space="preserve">
-    <value>媒体文件已成功删除</value>
+    <value>檔案刪除成功</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager.Localization/Resources/Menu.zh.resx b/core/Piranha.Manager.Localization/Resources/Menu.zh.resx
index 7f37a7f5f..a7748e31d 100644
--- a/core/Piranha.Manager.Localization/Resources/Menu.zh.resx
+++ b/core/Piranha.Manager.Localization/Resources/Menu.zh.resx
@@ -16,39 +16,39 @@
     <value>内容</value>
   </data>
   <data name="Settings" xml:space="preserve">
-    <value>设置</value>
+    <value>設定</value>
   </data>
   <data name="System" xml:space="preserve">
-    <value>系统</value>
+    <value>系統</value>
   </data>
   <data name="Pages" xml:space="preserve">
-    <value>网页</value>
+    <value>頁面</value>
   </data>
   <data name="Media" xml:space="preserve">
-    <value>媒体</value>
+    <value>媒體</value>
   </data>
   <data name="Aliases" xml:space="preserve">
-    <value>别名</value>
+    <value>別名</value>
   </data>
   <data name="Sites" xml:space="preserve">
-    <value>站点</value>
+    <value>網站</value>
   </data>
   <data name="Config" xml:space="preserve">
-    <value>配置</value>
+    <value>設置</value>
   </data>
   <data name="Modules" xml:space="preserve">
-    <value>模块</value>
+    <value>模組</value>
   </data>
   <data name="Logout" xml:space="preserve">
-    <value>注销</value>
+    <value>登出</value>
   </data>
   <data name="Comments" xml:space="preserve">
-    <value>评论</value>
+    <value>評論</value>
   </data>
   <data name="Roles" xml:space="preserve">
     <value>角色</value>
   </data>
   <data name="Users" xml:space="preserve">
-    <value>用户</value>
+    <value>用戶</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager.Localization/Resources/Module.zh.resx b/core/Piranha.Manager.Localization/Resources/Module.zh.resx
index 13ad25005..4fb798ca7 100644
--- a/core/Piranha.Manager.Localization/Resources/Module.zh.resx
+++ b/core/Piranha.Manager.Localization/Resources/Module.zh.resx
@@ -13,9 +13,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Modules" xml:space="preserve">
-    <value>模块</value>
+    <value>模組</value>
   </data>
   <data name="Package URL" xml:space="preserve">
-    <value>程序包链接</value>
+    <value>套件程式網址</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager.Localization/Resources/Security.zh.resx b/core/Piranha.Manager.Localization/Resources/Security.zh.resx
index 0b3c98226..1e3442535 100644
--- a/core/Piranha.Manager.Localization/Resources/Security.zh.resx
+++ b/core/Piranha.Manager.Localization/Resources/Security.zh.resx
@@ -13,43 +13,43 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Username is used by another user." xml:space="preserve">
-    <value>用户名已被其他用户使用。</value>
+    <value>用戶名稱已被使用。</value>
   </data>
   <data name="Email address is used by another user." xml:space="preserve">
-    <value>电子邮件地址已被其他用户使用。</value>
+    <value>電子郵件已被使用。</value>
   </data>
   <data name="The user could not be found." xml:space="preserve">
-    <value>找不到用户。</value>
+    <value>找不到該用戶。</value>
   </data>
   <data name="Email address is mandatory." xml:space="preserve">
-    <value>电子邮件地址是必须的。</value>
+    <value>電子郵件是必填項。</value>
   </data>
   <data name="The new passwords does not match." xml:space="preserve">
-    <value>新密码不匹配。</value>
+    <value>輸入的密碼不一致。</value>
   </data>
   <data name="Password is mandatory when creating a new user." xml:space="preserve">
-    <value>创建新用户时必须输入密码。</value>
+    <value>建立新用戶時密碼為必填項。</value>
   </data>
   <data name="The user could not be saved." xml:space="preserve">
-    <value>无法保存用户。</value>
+    <value>該用戶更新失敗。</value>
   </data>
   <data name="User is saved." xml:space="preserve">
-    <value>用户已保存。</value>
+    <value>用戶已儲存。</value>
   </data>
   <data name="Are you sure you want to delete this user?" xml:space="preserve">
-    <value>您确定要删除此用户吗？</value>
+    <value>是否確定要刪除該用戶？</value>
   </data>
   <data name="The user has been deleted." xml:space="preserve">
-    <value>用户已被删除。</value>
+    <value>該用戶已被刪除。</value>
   </data>
   <data name="Can't delete yourself." xml:space="preserve">
-    <value>无法删除您自己。</value>
+    <value>不能刪除自己。</value>
   </data>
 
   <data name="New password" xml:space="preserve">
-    <value>新密码</value>
+    <value>新的密碼</value>
   </data>
   <data name="Confirm password" xml:space="preserve">
-    <value>确认密码</value>
+    <value>確認密碼</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager.Localization/Resources/Site.zh.resx b/core/Piranha.Manager.Localization/Resources/Site.zh.resx
index c89517adb..bc967cc31 100644
--- a/core/Piranha.Manager.Localization/Resources/Site.zh.resx
+++ b/core/Piranha.Manager.Localization/Resources/Site.zh.resx
@@ -13,27 +13,27 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Add site" xml:space="preserve">
-    <value>添加站点</value>
+    <value>新增網站</value>
   </data>
   <data name="Are you really sure?" xml:space="preserve">
-    <value>您确定吗？</value>
+    <value>是否確定要刪除嗎？</value>
   </data>
   <data name="Edit site" xml:space="preserve">
-    <value>编辑站点</value>
+    <value>編輯網站</value>
   </data>
   <data name="Hostnames" xml:space="preserve">
-    <value>主机名</value>
+    <value>主機名稱</value>
   </data>
   <data name="Logo" xml:space="preserve">
-    <value>标识</value>
+    <value>商標</value>
   </data>
   <data name="If this should be the default site of the installation." xml:space="preserve">
-    <value>如果这是安装的默认站点。</value>
+    <value>設置為預設網站。</value>
   </data>
   <data name="Please type in the name of the site to confirm." xml:space="preserve">
-    <value>请输入站点名称以确认。</value>
+    <value>請確認本網站的名稱。</value>
   </data>
   <data name="ConfirmDelete" xml:space="preserve">
-    <value>这个动作将 &lt;strong>不能&lt;/strong> 回复，将永久删除 {{ title }} 站点及所有 &lt;strong>页面&lt;/strong>、&lt;strong>存档&lt;/strong>及 &lt;strong>帖子&lt;/strong> 內容。</value>
+    <value>這個動作&lt;strong>不能&lt;/strong>被回復，將永久刪除 {{ title }} 網站及所有&lt;strong>頁面&lt;/strong>、&lt;strong>存檔&lt;/strong>及&lt;strong>貼文&lt;/strong>內容。</value>
   </data>
 </root>
diff --git a/core/Piranha.Manager/Controllers/CommentApiController.cs b/core/Piranha.Manager/Controllers/CommentApiController.cs
index 58673b031..c6ec6be81 100644
--- a/core/Piranha.Manager/Controllers/CommentApiController.cs
+++ b/core/Piranha.Manager/Controllers/CommentApiController.cs
@@ -18,7 +18,7 @@
 namespace Piranha.Manager.Controllers
 {
     /// <summary>
-    /// Api controller for alias management.
+    /// Api controller for comment management.
     /// </summary>
     [Area("Manager")]
     [Route("manager/api/comment")]
diff --git a/core/Piranha.Manager/Controllers/ConfigApiController.cs b/core/Piranha.Manager/Controllers/ConfigApiController.cs
index 7ac3ce116..c7d1b83a0 100644
--- a/core/Piranha.Manager/Controllers/ConfigApiController.cs
+++ b/core/Piranha.Manager/Controllers/ConfigApiController.cs
@@ -16,7 +16,7 @@
 namespace Piranha.Manager.Controllers
 {
     /// <summary>
-    /// Api controller for alias management.
+    /// Api controller for config management.
     /// </summary>
     [Area("Manager")]
     [Route("manager/api/config")]
diff --git a/core/Piranha.Manager/Controllers/LanguageApiController.cs b/core/Piranha.Manager/Controllers/LanguageApiController.cs
index c0c55f8f9..1bed97259 100644
--- a/core/Piranha.Manager/Controllers/LanguageApiController.cs
+++ b/core/Piranha.Manager/Controllers/LanguageApiController.cs
@@ -19,7 +19,7 @@
 namespace Piranha.Manager.Controllers
 {
     /// <summary>
-    /// Api controller for alias management.
+    /// Api controller for language management.
     /// </summary>
     [Area("Manager")]
     [Route("manager/api/language")]
diff --git a/core/Piranha.Manager/Controllers/MediaApiController.cs b/core/Piranha.Manager/Controllers/MediaApiController.cs
index ed8698802..fa6779884 100644
--- a/core/Piranha.Manager/Controllers/MediaApiController.cs
+++ b/core/Piranha.Manager/Controllers/MediaApiController.cs
@@ -22,7 +22,7 @@
 namespace Piranha.Manager.Controllers
 {
     /// <summary>
-    /// Api controller for alias management.
+    /// Api controller for media management.
     /// </summary>
     [Area("Manager")]
     [Route("manager/api/media")]
@@ -61,7 +61,7 @@ public async Task<IActionResult> Get(Guid id)
         /// <summary>
         /// Gets the image url for the specified dimensions.
         /// </summary>
-        /// <param name="id">The unqie id</param>
+        /// <param name="id">The unique id</param>
         /// <param name="width">The optional width</param>
         /// <param name="height">The optional height</param>
         /// <returns>The public url</returns>
@@ -109,7 +109,7 @@ public async Task<IActionResult> SaveMeta(MediaListModel.MediaItem model)
                 return Ok(new StatusMessage
                 {
                     Type = StatusMessage.Success,
-                    Body = _localizer.Media["The meta information was succesfully updated"]
+                    Body = _localizer.Media["The meta information was successfully updated"]
                 });
             }
             else
diff --git a/core/Piranha.Manager/Controllers/ModuleApiController.cs b/core/Piranha.Manager/Controllers/ModuleApiController.cs
index 19e5fe72a..e9abb1c01 100644
--- a/core/Piranha.Manager/Controllers/ModuleApiController.cs
+++ b/core/Piranha.Manager/Controllers/ModuleApiController.cs
@@ -17,7 +17,7 @@
 namespace Piranha.Manager.Controllers
 {
     /// <summary>
-    /// Api controller for alias management.
+    /// Api controller for module management.
     /// </summary>
     [Area("Manager")]
     [Route("manager/api/module")]
diff --git a/core/Piranha.Manager/Controllers/PostApiController.cs b/core/Piranha.Manager/Controllers/PostApiController.cs
index d20301558..3feef652e 100644
--- a/core/Piranha.Manager/Controllers/PostApiController.cs
+++ b/core/Piranha.Manager/Controllers/PostApiController.cs
@@ -20,7 +20,7 @@
 namespace Piranha.Manager.Controllers
 {
     /// <summary>
-    /// Api controller for page management.
+    /// Api controller for post management.
     /// </summary>
     [Area("Manager")]
     [Route("manager/api/post")]
diff --git a/core/Piranha.Manager/Models/MediaListModel.cs b/core/Piranha.Manager/Models/MediaListModel.cs
index ad2b35091..227bbbe4c 100644
--- a/core/Piranha.Manager/Models/MediaListModel.cs
+++ b/core/Piranha.Manager/Models/MediaListModel.cs
@@ -140,7 +140,7 @@ public class MediaItem
         public Guid? CurrentFolderId { get; set; }
 
         /// <summary>
-        /// Gets/sets the optinal folder name
+        /// Gets/sets the optional folder name
         /// </summary>
         public string CurrentFolderName { get; set; }
 
diff --git a/core/Piranha.Manager/Module.cs b/core/Piranha.Manager/Module.cs
index 3133eb07a..e29812826 100644
--- a/core/Piranha.Manager/Module.cs
+++ b/core/Piranha.Manager/Module.cs
@@ -51,7 +51,7 @@ public sealed class Module : IModule
             new PermissionItem { Name = Permission.PagesDelete, Title = "Delete Pages", Category = "Pages" },
             new PermissionItem { Name = Permission.PagesEdit, Title = "Edit Pages", Category = "Pages" },
             new PermissionItem { Name = Permission.PagesPublish, Title = "Publish Pages", Category = "Pages" },
-            new PermissionItem { Name = Permission.PagesSave, Title = "Pages - Save", Category = "Pages" },
+            new PermissionItem { Name = Permission.PagesSave, Title = "Save Pages", Category = "Pages" },
             new PermissionItem { Name = Permission.Posts, Title = "List Posts", Category = "Posts" },
             new PermissionItem { Name = Permission.PostsAdd, Title = "Add Posts", Category = "Posts" },
             new PermissionItem { Name = Permission.PostsDelete, Title = "Delete Posts", Category = "Posts" },
diff --git a/core/Piranha.Manager/Piranha.Manager.csproj b/core/Piranha.Manager/Piranha.Manager.csproj
index 7b29910b8..c129dfe31 100644
--- a/core/Piranha.Manager/Piranha.Manager.csproj
+++ b/core/Piranha.Manager/Piranha.Manager.csproj
@@ -7,6 +7,10 @@
     <Description>Manager panel for Piranha CMS for AspNetCore</Description>
   </PropertyGroup>
 
+  <PropertyGroup Label="Package information">
+    <Version>9.1.1</Version>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
diff --git a/core/Piranha.Manager/Services/PageService.cs b/core/Piranha.Manager/Services/PageService.cs
index 49b8ab285..9c09ee993 100644
--- a/core/Piranha.Manager/Services/PageService.cs
+++ b/core/Piranha.Manager/Services/PageService.cs
@@ -77,7 +77,7 @@ public async Task<PageListModel> GetList()
         }
 
         /// <summary>
-        /// Gets the hierachical page structure for the specified site.
+        /// Gets the hierarchical page structure for the specified site.
         /// </summary>
         /// <param name="siteId">The site id</param>
         /// <returns>The structure</returns>
diff --git a/core/Piranha/Extend/ContentGroupAttribute.cs b/core/Piranha/Extend/ContentGroupAttribute.cs
index 5fcb132a9..ca9bfbfb4 100644
--- a/core/Piranha/Extend/ContentGroupAttribute.cs
+++ b/core/Piranha/Extend/ContentGroupAttribute.cs
@@ -34,7 +34,7 @@ public string Title
 
                 if (string.IsNullOrWhiteSpace(Id))
                 {
-                    Id = Utils.GenerateInteralId(value);
+                    Id = Utils.GenerateInternalId(value);
                 }
             }
         }
diff --git a/core/Piranha/Piranha.csproj b/core/Piranha/Piranha.csproj
index 229f1d75e..c84ef48a4 100644
--- a/core/Piranha/Piranha.csproj
+++ b/core/Piranha/Piranha.csproj
@@ -6,6 +6,10 @@
     <Description>Core package for Piranha CMS for .NET Core</Description>
   </PropertyGroup>
 
+  <PropertyGroup Label="Package information">
+    <Version>9.1.1</Version>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
diff --git a/core/Piranha/Repositories/ILanguageRespository.cs b/core/Piranha/Repositories/ILanguageRespository.cs
index 56146585c..dfbce2672 100644
--- a/core/Piranha/Repositories/ILanguageRespository.cs
+++ b/core/Piranha/Repositories/ILanguageRespository.cs
@@ -31,9 +31,9 @@ public interface ILanguageRepository
         Task<Language> GetById(Guid id);
 
         /// <summary>
-        /// Gets the default side.
+        /// Gets the default model.
         /// </summary>
-        /// <returns>The modell</returns>
+        /// <returns>The model</returns>
         Task<Language> GetDefault();
 
         /// <summary>
diff --git a/core/Piranha/Repositories/IMediaRepository.cs b/core/Piranha/Repositories/IMediaRepository.cs
index 7932e4be0..693bb7c20 100644
--- a/core/Piranha/Repositories/IMediaRepository.cs
+++ b/core/Piranha/Repositories/IMediaRepository.cs
@@ -61,7 +61,7 @@ public interface IMediaRepository
         Task<MediaFolder> GetFolderById(Guid id);
 
         /// <summary>
-        /// Gets the hierachical media structure.
+        /// Gets the hierarchical media structure.
         /// </summary>
         /// <returns>The media structure</returns>
         Task<MediaStructure> GetStructure();
diff --git a/core/Piranha/Services/ContentService.cs b/core/Piranha/Services/ContentService.cs
index ab3cc7ffb..ccdb56be7 100644
--- a/core/Piranha/Services/ContentService.cs
+++ b/core/Piranha/Services/ContentService.cs
@@ -221,6 +221,13 @@ public Task<TranslationSummary> GetTranslationStatusByGroupAsync(string groupId)
         /// <param name="languageId">The optional language id</param>
         public async Task SaveAsync<T>(T model, Guid? languageId = null) where T : GenericContent
         {
+            // Make sure we have valid content type
+            var type = App.ContentTypes.GetById(model.TypeId);
+            if (type == null)
+            {
+                throw new ValidationException("Content type is missing");
+            }
+
             // Make sure we have an Id
             if (model.Id == Guid.Empty)
             {
@@ -238,11 +245,14 @@ public async Task SaveAsync<T>(T model, Guid? languageId = null) where T : Gener
             Validator.ValidateObject(model, context, true);
 
             // Ensure category
-            if (model is ICategorizedContent categorizedModel)
+            if (type.UseCategory)
             {
-                if (categorizedModel.Category == null || (string.IsNullOrWhiteSpace(categorizedModel.Category.Title) && string.IsNullOrWhiteSpace(categorizedModel.Category.Slug)))
+                if (model is ICategorizedContent categorizedModel)
                 {
-                    throw new ValidationException("The Category field is required");
+                    if (categorizedModel.Category == null || (string.IsNullOrWhiteSpace(categorizedModel.Category.Title) && string.IsNullOrWhiteSpace(categorizedModel.Category.Slug)))
+                    {
+                        throw new ValidationException("The Category field is required");
+                    }
                 }
             }
 
diff --git a/core/Piranha/Services/ISiteService.cs b/core/Piranha/Services/ISiteService.cs
index 48309d767..0e52dced7 100644
--- a/core/Piranha/Services/ISiteService.cs
+++ b/core/Piranha/Services/ISiteService.cs
@@ -47,7 +47,7 @@ public interface ISiteService
         /// <summary>
         /// Gets the default side.
         /// </summary>
-        /// <returns>The modell, or NULL if it doesnt exist</returns>
+        /// <returns>The model, or NULL if it doesnt exist</returns>
         Task<Site> GetDefaultAsync();
 
         /// <summary>
@@ -66,7 +66,7 @@ public interface ISiteService
         Task<T> GetContentByIdAsync<T>(Guid id) where T : SiteContent<T>;
 
         /// <summary>
-        /// Gets the hierachical sitemap structure.
+        /// Gets the hierarchical sitemap structure.
         /// </summary>
         /// <param name="id">The optional site id</param>
         /// <param name="onlyPublished">If only published items should be included</param>
diff --git a/core/Piranha/Services/LanguageService.cs b/core/Piranha/Services/LanguageService.cs
index 5562b40c3..6bb54605b 100644
--- a/core/Piranha/Services/LanguageService.cs
+++ b/core/Piranha/Services/LanguageService.cs
@@ -119,7 +119,7 @@ public async Task SaveAsync(Language model)
             {
                 // Make sure we have a default site
                 var def = await _repo.GetDefault().ConfigureAwait(false);
-                if (def == null || def.Id == model.Id)
+                if (def == null || def.Id == model.Id)
                     model.IsDefault = true;
             }
 
diff --git a/core/Piranha/Services/SiteService.cs b/core/Piranha/Services/SiteService.cs
index 044f8474f..e71630ca8 100644
--- a/core/Piranha/Services/SiteService.cs
+++ b/core/Piranha/Services/SiteService.cs
@@ -244,7 +244,7 @@ public async Task<T> GetContentByIdAsync<T>(Guid id) where T : SiteContent<T>
         }
 
         /// <summary>
-        /// Gets the hierachical sitemap structure.
+        /// Gets the hierarchical sitemap structure.
         /// </summary>
         /// <param name="id">The optional site id</param>
         /// <param name="onlyPublished">If only published items should be included</param>
@@ -307,7 +307,7 @@ public async Task SaveAsync(Site model)
             // Ensure InternalId
             if (string.IsNullOrWhiteSpace(model.InternalId))
             {
-                model.InternalId = Utils.GenerateInteralId(model.Title);
+                model.InternalId = Utils.GenerateInternalId(model.Title);
             }
 
             // Ensure InternalId uniqueness
diff --git a/core/Piranha/Utils.cs b/core/Piranha/Utils.cs
index b35195d8f..b8427aff9 100644
--- a/core/Piranha/Utils.cs
+++ b/core/Piranha/Utils.cs
@@ -119,7 +119,7 @@ public static string GenerateSlug(string str, bool hierarchical = true)
         /// </summary>
         /// <param name="str">The string</param>
         /// <returns>The internal id</returns>
-        public static string GenerateInteralId(string str)
+        public static string GenerateInternalId(string str)
         {
             var ti = new CultureInfo("en-US", false).TextInfo;
             return ti.ToTitleCase(GenerateSlug(str).Replace('-', ' ')).Replace(" ", "");
diff --git a/data/Piranha.Data.EF/Db.cs b/data/Piranha.Data.EF/Db.cs
index 0ca98e20f..debb6e67e 100644
--- a/data/Piranha.Data.EF/Db.cs
+++ b/data/Piranha.Data.EF/Db.cs
@@ -23,7 +23,7 @@ public abstract class Db<T> : DbContext, IDb where T : Db<T>
         private static volatile bool IsInitialized = false;
 
         /// <summary>
-        /// The object mutext used for initializing the context.
+        /// The object mutex used for initializing the context.
         /// </summary>
         private static readonly object Mutex = new object();
 
diff --git a/data/Piranha.Data.EF/Piranha.Data.EF.csproj b/data/Piranha.Data.EF/Piranha.Data.EF.csproj
index eed93b2c4..f21098cc1 100644
--- a/data/Piranha.Data.EF/Piranha.Data.EF.csproj
+++ b/data/Piranha.Data.EF/Piranha.Data.EF.csproj
@@ -6,6 +6,10 @@
     <Description>Data components for Entity Framework Core</Description>
   </PropertyGroup>
 
+  <PropertyGroup Label="Package information">
+    <Version>9.1.1</Version>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
diff --git a/data/Piranha.Data.EF/Repositories/ContentRepository.cs b/data/Piranha.Data.EF/Repositories/ContentRepository.cs
index 850564c6c..eb6f6785b 100644
--- a/data/Piranha.Data.EF/Repositories/ContentRepository.cs
+++ b/data/Piranha.Data.EF/Repositories/ContentRepository.cs
@@ -203,89 +203,95 @@ public async Task Save<T>(T model, Guid languageId) where T : Models.GenericCont
             if (type != null)
             {
                 // Ensure category
-                if (model is Models.ICategorizedContent categorized)
+                if (type.UseCategory)
                 {
-                    var category = await _db.Taxonomies
-                        .FirstOrDefaultAsync(c => c.Id == categorized.Category.Id)
-                        .ConfigureAwait(false);
-
-                    if (category == null)
+                    if (model is Models.ICategorizedContent categorized)
                     {
-                        if (!string.IsNullOrWhiteSpace(categorized.Category.Slug))
-                        {
-                            category = await _db.Taxonomies
-                                .FirstOrDefaultAsync(c => c.GroupId == type.Group && c.Slug == categorized.Category.Slug && c.Type == TaxonomyType.Category)
-                                .ConfigureAwait(false);
-                        }
-                        if (category == null && !string.IsNullOrWhiteSpace(categorized.Category.Title))
-                        {
-                            category = await _db.Taxonomies
-                                .FirstOrDefaultAsync(c => c.GroupId == type.Group && c.Title == categorized.Category.Title && c.Type == TaxonomyType.Category)
-                                .ConfigureAwait(false);
-                        }
-
-                        if (category == null)
-                        {
-                            category = new Taxonomy
-                            {
-                                Id = categorized.Category.Id != Guid.Empty ? categorized.Category.Id : Guid.NewGuid(),
-                                GroupId = type.Group,
-                                Type = TaxonomyType.Category,
-                                Title = categorized.Category.Title,
-                                Slug = Utils.GenerateSlug(categorized.Category.Title),
-                                Created = DateTime.Now,
-                                LastModified = DateTime.Now
-                            };
-                            await _db.Taxonomies.AddAsync(category).ConfigureAwait(false);
-                        }
-                        categorized.Category.Id = category.Id;
-                        categorized.Category.Title = category.Title;
-                        categorized.Category.Slug = category.Slug;
-                    }
-                }
-
-                // Ensure tags
-                if (model is Models.ITaggedContent tagged)
-                {
-                    foreach (var t in tagged.Tags)
-                    {
-                        var tag = await _db.Taxonomies
-                            .FirstOrDefaultAsync(tg => tg.Id == t.Id)
+                        var category = await _db.Taxonomies
+                            .FirstOrDefaultAsync(c => c.Id == categorized.Category.Id)
                             .ConfigureAwait(false);
 
-                        if (tag == null)
+                        if (category == null)
                         {
-                            if (!string.IsNullOrWhiteSpace(t.Slug))
+                            if (!string.IsNullOrWhiteSpace(categorized.Category.Slug))
                             {
-                                tag = await _db.Taxonomies
-                                    .FirstOrDefaultAsync(tg => tg.GroupId == type.Group && tg.Slug == t.Slug && tg.Type == TaxonomyType.Tag)
+                                category = await _db.Taxonomies
+                                    .FirstOrDefaultAsync(c => c.GroupId == type.Group && c.Slug == categorized.Category.Slug && c.Type == TaxonomyType.Category)
                                     .ConfigureAwait(false);
                             }
-                            if (tag == null && !string.IsNullOrWhiteSpace(t.Title))
+                            if (category == null && !string.IsNullOrWhiteSpace(categorized.Category.Title))
                             {
-                                tag = await _db.Taxonomies
-                                    .FirstOrDefaultAsync(tg => tg.GroupId == type.Group && tg.Title == t.Title && tg.Type == TaxonomyType.Tag)
+                                category = await _db.Taxonomies
+                                    .FirstOrDefaultAsync(c => c.GroupId == type.Group && c.Title == categorized.Category.Title && c.Type == TaxonomyType.Category)
                                     .ConfigureAwait(false);
                             }
 
-                            if (tag == null)
+                            if (category == null)
                             {
-                                tag = new Taxonomy
+                                category = new Taxonomy
                                 {
-                                    Id = t.Id != Guid.Empty ? t.Id : Guid.NewGuid(),
+                                    Id = categorized.Category.Id != Guid.Empty ? categorized.Category.Id : Guid.NewGuid(),
                                     GroupId = type.Group,
-                                    Type = TaxonomyType.Tag,
-                                    Title = t.Title,
-                                    Slug = Utils.GenerateSlug(t.Title),
+                                    Type = TaxonomyType.Category,
+                                    Title = categorized.Category.Title,
+                                    Slug = Utils.GenerateSlug(categorized.Category.Title),
                                     Created = DateTime.Now,
                                     LastModified = DateTime.Now
                                 };
-                                await _db.Taxonomies.AddAsync(tag).ConfigureAwait(false);
+                                await _db.Taxonomies.AddAsync(category).ConfigureAwait(false);
+                            }
+                            categorized.Category.Id = category.Id;
+                            categorized.Category.Title = category.Title;
+                            categorized.Category.Slug = category.Slug;
+                        }
+                    }
+                }
+
+                // Ensure tags
+                if (type.UseTags)
+                {
+                    if (model is Models.ITaggedContent tagged)
+                    {
+                        foreach (var t in tagged.Tags)
+                        {
+                            var tag = await _db.Taxonomies
+                                .FirstOrDefaultAsync(tg => tg.Id == t.Id)
+                                .ConfigureAwait(false);
+
+                            if (tag == null)
+                            {
+                                if (!string.IsNullOrWhiteSpace(t.Slug))
+                                {
+                                    tag = await _db.Taxonomies
+                                        .FirstOrDefaultAsync(tg => tg.GroupId == type.Group && tg.Slug == t.Slug && tg.Type == TaxonomyType.Tag)
+                                        .ConfigureAwait(false);
+                                }
+                                if (tag == null && !string.IsNullOrWhiteSpace(t.Title))
+                                {
+                                    tag = await _db.Taxonomies
+                                        .FirstOrDefaultAsync(tg => tg.GroupId == type.Group && tg.Title == t.Title && tg.Type == TaxonomyType.Tag)
+                                        .ConfigureAwait(false);
+                                }
+
+                                if (tag == null)
+                                {
+                                    tag = new Taxonomy
+                                    {
+                                        Id = t.Id != Guid.Empty ? t.Id : Guid.NewGuid(),
+                                        GroupId = type.Group,
+                                        Type = TaxonomyType.Tag,
+                                        Title = t.Title,
+                                        Slug = Utils.GenerateSlug(t.Title),
+                                        Created = DateTime.Now,
+                                        LastModified = DateTime.Now
+                                    };
+                                    await _db.Taxonomies.AddAsync(tag).ConfigureAwait(false);
+                                }
+                                t.Id = tag.Id;
                             }
-                            t.Id = tag.Id;
+                            t.Title = tag.Title;
+                            t.Slug = tag.Slug;
                         }
-                        t.Title = tag.Title;
-                        t.Slug = tag.Slug;
                     }
                 }
 
@@ -329,33 +335,36 @@ public async Task Save<T>(T model, Guid languageId) where T : Models.GenericCont
                     }
                 }
 
-                if (model is Models.ITaggedContent taggedModel)
+                if (type.UseTags)
                 {
-                    // Remove tags
-                    var removedTags = new List<ContentTaxonomy>();
-                    foreach (var tag in content.Tags)
+                    if (model is Models.ITaggedContent taggedModel)
                     {
-                        if (!taggedModel.Tags.Any(t => t.Id == tag.TaxonomyId))
+                        // Remove tags
+                        var removedTags = new List<ContentTaxonomy>();
+                        foreach (var tag in content.Tags)
                         {
-                            removedTags.Add(tag);
+                            if (!taggedModel.Tags.Any(t => t.Id == tag.TaxonomyId))
+                            {
+                                removedTags.Add(tag);
+                            }
+                        }
+                        foreach (var removed in removedTags)
+                        {
+                            content.Tags.Remove(removed);
                         }
-                    }
-                    foreach (var removed in removedTags)
-                    {
-                        content.Tags.Remove(removed);
-                    }
 
-                    // Add tags
-                    foreach (var tag in taggedModel.Tags)
-                    {
-                        if (!content.Tags.Any(t => t.ContentId == content.Id && t.TaxonomyId == tag.Id))
+                        // Add tags
+                        foreach (var tag in taggedModel.Tags)
                         {
-                            var contentTaxonomy = new ContentTaxonomy
+                            if (!content.Tags.Any(t => t.ContentId == content.Id && t.TaxonomyId == tag.Id))
                             {
-                                ContentId = content.Id,
-                                TaxonomyId = tag.Id
-                            };
-                            content.Tags.Add(contentTaxonomy);
+                                var contentTaxonomy = new ContentTaxonomy
+                                {
+                                    ContentId = content.Id,
+                                    TaxonomyId = tag.Id
+                                };
+                                content.Tags.Add(contentTaxonomy);
+                            }
                         }
                     }
                 }
diff --git a/data/Piranha.Data.EF/Repositories/LanguageRepository.cs b/data/Piranha.Data.EF/Repositories/LanguageRepository.cs
index 0e5e8837b..8554bdc70 100644
--- a/data/Piranha.Data.EF/Repositories/LanguageRepository.cs
+++ b/data/Piranha.Data.EF/Repositories/LanguageRepository.cs
@@ -72,9 +72,9 @@ public async Task<Language> GetById(Guid id)
         }
 
         /// <summary>
-        /// Gets the default side.
+        /// Gets the default model.
         /// </summary>
-        /// <returns>The modell</returns>
+        /// <returns>The model</returns>
         public async Task<Language> GetDefault()
         {
             return await _db.Languages
diff --git a/data/Piranha.Data.EF/Services/ContentService.cs b/data/Piranha.Data.EF/Services/ContentService.cs
index 659c4ce30..043dd0e79 100644
--- a/data/Piranha.Data.EF/Services/ContentService.cs
+++ b/data/Piranha.Data.EF/Services/ContentService.cs
@@ -220,7 +220,17 @@ public TContent Transform<T>(T model, Models.ContentTypeBase type, TContent dest
             {
                 if (content is ICategorized categorizedContent)
                 {
-                    categorizedContent.CategoryId = categorized.Category.Id;
+                    if (type is Models.ContentType contentType)
+                    {
+                        if (contentType.UseCategory)
+                        {
+                            categorizedContent.CategoryId = categorized.Category.Id;
+                        }
+                    }
+                    else
+                    {
+                        categorizedContent.CategoryId = categorized.Category.Id;
+                    }
                 }
             }
 
diff --git a/examples/RazorWeb/Models/Content/Banner.cs b/examples/RazorWeb/Models/Content/Banner.cs
index 18cf7fa7e..1084443ea 100644
--- a/examples/RazorWeb/Models/Content/Banner.cs
+++ b/examples/RazorWeb/Models/Content/Banner.cs
@@ -13,13 +13,9 @@
 
 namespace RazorWeb.Models
 {
-    [ContentGroup(Title = "Banners", Icon = "fas fa-star", IsHidden = true)]
-    public abstract class Banner<T> : Content<T>, ICategorizedContent
+    [ContentGroup(Title = "Banners", Icon = "fas fa-star")]
+    public abstract class Banner<T> : Content<T>
         where T : Banner<T>
     {
-        /// <summary>
-        /// Gets/sets the banner category.
-        /// </summary>
-        public Taxonomy Category { get; set; }
     }
 }
\ No newline at end of file
diff --git a/examples/RazorWeb/Seed.cs b/examples/RazorWeb/Seed.cs
index df1bd9110..9d160c4a4 100644
--- a/examples/RazorWeb/Seed.cs
+++ b/examples/RazorWeb/Seed.cs
@@ -360,14 +360,12 @@ await api.Media.SaveAsync(new Piranha.Models.StreamMediaContent
                 // Add a banner
                 var banner = await Models.ImageBanner.CreateAsync(api);
                 banner.Title = "Welcome to Piranha";
-                banner.Category = "Images";
                 banner.PrimaryImage = images[0].id;
                 banner.Excerpt = "This is a descriptive text";
                 await api.Content.SaveAsync(banner);
 
                 // Translate the banner to another language
                 banner.Title = "Välkommen till Piranha";
-                banner.Category = "Bilder";
                 banner.Excerpt = "Det här är en beskrivande text";
                 await api.Content.SaveAsync(banner, lang2Id);
             }
diff --git a/identity/Piranha.AspNetCore.Identity/Controllers/UserController.cs b/identity/Piranha.AspNetCore.Identity/Controllers/UserController.cs
index b2a25aa66..ce9d69ce2 100644
--- a/identity/Piranha.AspNetCore.Identity/Controllers/UserController.cs
+++ b/identity/Piranha.AspNetCore.Identity/Controllers/UserController.cs
@@ -238,7 +238,7 @@ public async Task<IActionResult> Save([FromBody] UserEditModel model)
         /// <param name="id">The user id</param>
         [HttpGet]
         [Route("/manager/user/delete/{id:Guid}")]
-        [Authorize(Policy = Permissions.UsersSave)]
+        [Authorize(Policy = Permissions.UsersDelete)]
         public async Task<IActionResult> Delete(Guid id)
         {
 
diff --git a/test/Piranha.Tests/Utils/InternalId.cs b/test/Piranha.Tests/Utils/InternalId.cs
index 760b7d699..907bb033e 100644
--- a/test/Piranha.Tests/Utils/InternalId.cs
+++ b/test/Piranha.Tests/Utils/InternalId.cs
@@ -14,9 +14,10 @@ namespace Piranha.Tests.Utils
 {
     public class InternalId
     {
+        //corrected to GenerateInternalId
         [Fact]
         public void ToTitleCase() {
-            Assert.Equal("MyTestValue", Piranha.Utils.GenerateInteralId("mY test vAlUE"));
+            Assert.Equal("MyTestValue", Piranha.Utils.GenerateInternalId("mY test vAlUE"));
         }
     }
 }