diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContentAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContentAppService.cs
deleted file mode 100644
index ec2b9bcf42..0000000000
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContentAppService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-
-namespace Volo.CmsKit.Contents;
-
-public interface IContentAppService : IApplicationService
-{
-    Task<List<ContentFragment>> ParseAsync(string content);
-}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentAppService.cs
deleted file mode 100644
index a227f31e18..0000000000
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentAppService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Volo.Abp.GlobalFeatures;
-using Volo.CmsKit.GlobalFeatures;
-
-namespace Volo.CmsKit.Contents;
-
-[RequiresGlobalFeature(typeof(PagesFeature))]
-public class ContentAppService : CmsKitAppServiceBase, IContentAppService
-{
-    protected ContentParser ContentParser { get; }
-
-    public ContentAppService(ContentParser contentParser)
-    {
-        ContentParser = contentParser;
-    }
-
-    public async Task<List<ContentFragment>> ParseAsync(string content)
-    {
-        return await ContentParser.ParseAsync(content);
-    }
-}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewViewComponent.cs
index 987c404e31..2251f6d0cd 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewViewComponent.cs
@@ -6,21 +6,22 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.CmsKit.Contents;
+using Volo.CmsKit.Web.Contents;
 
 namespace Volo.CmsKit.Web.Pages.CmsKit.Components.ContentPreview;
 
 public class ContentPreviewViewComponent : AbpViewComponent
 {
-    protected IContentAppService ContentAppService { get; }
+    protected ContentParser ContentParser { get; }
 
-    public ContentPreviewViewComponent(IContentAppService contentAppService)
+    public ContentPreviewViewComponent(ContentParser contentParser)
     {
-        ContentAppService = contentAppService;
+        ContentParser = contentParser;
     }
 
     public virtual async Task<IViewComponentResult> InvokeAsync(string content)
     {
-        var fragments = await ContentAppService.ParseAsync(content);
+        var fragments = await ContentParser.ParseAsync(content);
 
         return View("~/Pages/CmsKit/Components/ContentPreview/Default.cshtml", new DefaultContentDto
         {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs
index b41057f397..5041406bd0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs
@@ -37,7 +37,7 @@ public class BlogPostPublicAppService : CmsKitPublicAppServiceBase, IBlogPostPub
 
         var blogPost = await BlogPostRepository.GetBySlugAsync(blog.Id, blogPostSlug);
 
-        return ObjectMapper.Map<BlogPost, BlogPostPublicDto>(blogPost);
+        return ObjectMapper.Map<BlogPost, BlogPostCommonDto>(blogPost);
     }
 
     public virtual async Task<PagedResultDto<BlogPostCommonDto>> GetListAsync([NotNull] string blogSlug, BlogPostGetListInput input)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
index 6a138847c7..92620743ff 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
@@ -32,7 +32,7 @@ public class PublicApplicationAutoMapperProfile : Profile
 
         CreateMap<Page, PageDto>();
         
-        CreateMap<BlogPost, BlogPostPublicDto>();
+        CreateMap<BlogPost, BlogPostCommonDto>();
 
         CreateMap<MenuItem, MenuItemDto>();
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
index 88d7398fcf..d5dc5a0be8 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
@@ -9,7 +9,7 @@
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags
-@using Volo.CmsKit.Public.Web.Renderers
+@using Volo.CmsKit.Web.Renderers
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs
 @using Volo.CmsKit.Contents
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs
index 34a27677c4..87630f9bd0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs
@@ -49,7 +49,7 @@ public class BlogPostModel : CmsKitPublicPageModelBase
     public virtual async Task<IActionResult> OnGetAsync()
     {
         var blogPostPublicDto = await BlogPostPublicAppService.GetAsync(BlogSlug, BlogPostSlug);
-        ViewModel = ObjectMapper.Map<BlogPostPublicDto, BlogPostViewModel>(blogPostPublicDto);
+        ViewModel = ObjectMapper.Map<BlogPostCommonDto, BlogPostViewModel>(blogPostPublicDto);
         if (ViewModel == null)
         {
             return NotFound();
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPostViewModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPostViewModel.cs
index ff154b6a7b..789d2687fc 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPostViewModel.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPostViewModel.cs
@@ -3,12 +3,11 @@ using System.Collections.Generic;
 using AutoMapper;
 using Volo.Abp.Application.Dtos;
 using Volo.CmsKit.Contents;
-using Volo.CmsKit.Public.Blogs;
 using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs;
 
-[AutoMap(typeof(BlogPostPublicDto), ReverseMap = true)]
+[AutoMap(typeof(BlogPostCommonDto), ReverseMap = true)]
 public class BlogPostViewModel : AuditedEntityDto<Guid>
 {
     public Guid BlogId { get; set; }