diff --git a/docs/en/UI/Angular/Theme-Configurations.md b/docs/en/UI/Angular/Theme-Configurations.md
new file mode 100644
index 00000000000..85d22040df3
--- /dev/null
+++ b/docs/en/UI/Angular/Theme-Configurations.md
@@ -0,0 +1,3 @@
+# Angular UI: Theme Configurations
+
+> This document is in draft version.
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs
index 33c22377731..7d6844f7141 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs
@@ -235,6 +235,12 @@ private void ConfigureThemeOptions(ProjectBuildArgs args, string templateVersion
         if (args.Theme.HasValue)
         {
             Logger.LogInformation("Theme: " + args.Theme);
+
+            if (args.UiFramework == UiFramework.Angular && (args.Theme != AppTemplate.DefaultTheme || args.Theme != AppProTemplate.DefaultTheme))
+            {
+                Logger.LogWarning("You may need to make some additional changes for this theme. " +
+                                  "See the documentation for more information: https://docs.abp.io/en/abp/latest/UI/Angular/Theme-Configurations");
+            }
         }
 
         if(args.ThemeStyle.HasValue)