diff --git a/app/MindWork AI Studio/Chat/ChatThread.cs b/app/MindWork AI Studio/Chat/ChatThread.cs
index ceb3041a..5b02397f 100644
--- a/app/MindWork AI Studio/Chat/ChatThread.cs	
+++ b/app/MindWork AI Studio/Chat/ChatThread.cs	
@@ -29,6 +29,11 @@ public sealed record ChatThread
     /// Specifies the profile selected for the chat thread.
     /// </summary>
     public string SelectedProfile { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// Specifies the profile selected for the chat thread.
+    /// </summary>
+    public string SelectedChatTemplate { get; set; } = string.Empty;
 
     /// <summary>
     /// The data source options for this chat thread.
@@ -69,6 +74,8 @@ public sealed record ChatThread
     /// The content blocks of the chat thread.
     /// </summary>
     public List<ContentBlock> Blocks { get; init; } = [];
+    
+    private bool allowProfile = true;
 
     /// <summary>
     /// Prepares the system prompt for the chat thread.
@@ -84,16 +91,50 @@ public sealed record ChatThread
     /// <returns>The prepared system prompt.</returns>
     public string PrepareSystemPrompt(SettingsManager settingsManager, ChatThread chatThread, ILogger logger)
     {
+        
+        //
+        // Prepare the prompts using the chatTemplate:
+        //
+        string systemPromptTextWithChatTemplate;
+        var logMessage = $"Using no chat template for chat thread '{chatThread.Name}'.";
+        if (string.IsNullOrWhiteSpace(chatThread.SelectedChatTemplate))
+            systemPromptTextWithChatTemplate = chatThread.SystemPrompt;
+        else
+        {
+            if(!Guid.TryParse(chatThread.SelectedChatTemplate, out var chatTeamplateId))
+                systemPromptTextWithChatTemplate = chatThread.SystemPrompt;
+            else
+            {
+                if(chatThread.SelectedChatTemplate == ChatTemplate.NO_CHATTEMPLATE.Id || chatTeamplateId == Guid.Empty)
+                    systemPromptTextWithChatTemplate = chatThread.SystemPrompt;
+                else
+                {
+                    var chatTemplate = settingsManager.ConfigurationData.ChatTemplates.FirstOrDefault(x => x.Id == chatThread.SelectedChatTemplate);
+                    if(chatTemplate == default)
+                        systemPromptTextWithChatTemplate = chatThread.SystemPrompt;
+                    else
+                    {
+                        logMessage = $"Using chat template '{chatTemplate.Name}' for chat thread '{chatThread.Name}'.";
+                        this.allowProfile = chatTemplate.AllowProfileUsage;
+                        systemPromptTextWithChatTemplate = $"""
+                                                            {chatTemplate.ToSystemPrompt()}
+                                                            """;
+                    }
+                }
+            }
+        }
+        logger.LogInformation(logMessage);
+        
         var isAugmentedDataAvailable = !string.IsNullOrWhiteSpace(chatThread.AugmentedData);
         var systemPromptWithAugmentedData = isAugmentedDataAvailable switch
         {
             true => $"""
-                     {chatThread.SystemPrompt}
+                     {systemPromptTextWithChatTemplate}
                      
                      {chatThread.AugmentedData}
                      """,
 
-            false => chatThread.SystemPrompt,
+            false => systemPromptTextWithChatTemplate,
         };
         
         if(isAugmentedDataAvailable)
@@ -101,12 +142,13 @@ public sealed record ChatThread
         else
             logger.LogInformation("No augmented data is available for the chat thread.");
         
+        
         //
         // Prepare the system prompt:
         //
         string systemPromptText;
-        var logMessage = $"Using no profile for chat thread '{chatThread.Name}'.";
-        if (string.IsNullOrWhiteSpace(chatThread.SelectedProfile))
+        logMessage = $"Using no profile for chat thread '{chatThread.Name}'.";
+        if ((string.IsNullOrWhiteSpace(chatThread.SelectedProfile)) || (this.allowProfile is false))
             systemPromptText = systemPromptWithAugmentedData;
         else
         {
diff --git a/app/MindWork AI Studio/Components/ChatComponent.razor b/app/MindWork AI Studio/Components/ChatComponent.razor
index 8973f9ac..fb1b2768 100644
--- a/app/MindWork AI Studio/Components/ChatComponent.razor	
+++ b/app/MindWork AI Studio/Components/ChatComponent.razor	
@@ -108,6 +108,7 @@
             }
 
             <ProfileSelection CurrentProfile="@this.currentProfile" CurrentProfileChanged="@this.ProfileWasChanged"/>
+            <ChatTemplateSelection CurrentChatTemplate="@this.currentChatTemplate" CurrentChatTemplateChanged="@this.ChatTemplateWasChanged"/>
             
             @if (PreviewFeatures.PRE_RAG_2024.IsEnabled(this.SettingsManager))
             {
diff --git a/app/MindWork AI Studio/Components/ChatComponent.razor.cs b/app/MindWork AI Studio/Components/ChatComponent.razor.cs
index b1b9e2f0..5fce1335 100644
--- a/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
+++ b/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
@@ -46,6 +46,7 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
     private DataSourceSelection? dataSourceSelectionComponent;
     private DataSourceOptions earlyDataSourceOptions = new();
     private Profile currentProfile = Profile.NO_PROFILE;
+    private ChatTemplate currentChatTemplate = ChatTemplate.NO_CHATTEMPLATE;
     private bool hasUnsavedChanges;
     private bool mustScrollToBottomAfterRender;
     private InnerScrolling scrollingArea = null!;
@@ -77,6 +78,9 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
         // Get the preselected profile:
         this.currentProfile = this.SettingsManager.GetPreselectedProfile(Tools.Components.CHAT);
         
+        // Get the preselected chat template:
+        // this.currentChatTemplate = this.SettingsManager.GetPreselectedChatTemplate(Tools.Components.CHAT); // TODO
+        
         //
         // Check for deferred messages of the kind 'SEND_TO_CHAT',
         // aka the user sends an assistant result to the chat:
@@ -320,6 +324,20 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
         
         await this.ChatThreadChanged.InvokeAsync(this.ChatThread);
     }
+    
+    private async Task ChatTemplateWasChanged(ChatTemplate chatTemplate)
+    {
+        this.currentChatTemplate = chatTemplate;
+        if(this.ChatThread is null)
+            return;
+
+        this.ChatThread = this.ChatThread with
+        {
+            SelectedChatTemplate = this.currentChatTemplate.Id,
+        };
+        
+        await this.ChatThreadChanged.InvokeAsync(this.ChatThread);
+    }
 
     private IReadOnlyList<DataSourceAgentSelected> GetAgentSelectedDataSources()
     {
@@ -415,6 +433,7 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
             {
                 SelectedProvider = this.Provider.Id,
                 SelectedProfile = this.currentProfile.Id,
+                SelectedChatTemplate = this.currentChatTemplate.Id,
                 SystemPrompt = SystemPrompts.DEFAULT,
                 WorkspaceId = this.currentWorkspaceId,
                 ChatId = Guid.NewGuid(),
@@ -432,9 +451,10 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
             if (string.IsNullOrWhiteSpace(this.ChatThread.Name))
                 this.ChatThread.Name = this.ExtractThreadName(this.userInput);
             
-            // Update provider and profile:
+            // Update provider, profile and chat template:
             this.ChatThread.SelectedProvider = this.Provider.Id;
             this.ChatThread.SelectedProfile = this.currentProfile.Id;
+            this.ChatThread.SelectedChatTemplate = this.currentChatTemplate.Id;
         }
 
         var time = DateTimeOffset.Now;
@@ -645,6 +665,7 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
             {
                 SelectedProvider = this.Provider.Id,
                 SelectedProfile = this.currentProfile.Id,
+                SelectedChatTemplate = this.currentChatTemplate.Id,
                 SystemPrompt = SystemPrompts.DEFAULT,
                 WorkspaceId = this.currentWorkspaceId,
                 ChatId = Guid.NewGuid(),
@@ -756,6 +777,7 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
     {
         var chatProvider = this.ChatThread?.SelectedProvider;
         var chatProfile = this.ChatThread?.SelectedProfile;
+        var chatChatTemplate = this.ChatThread?.SelectedChatTemplate;
 
         switch (this.SettingsManager.ConfigurationData.Chat.LoadingProviderBehavior)
         {
@@ -783,6 +805,14 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
             if(this.currentProfile == default)
                 this.currentProfile = Profile.NO_PROFILE;
         }
+        
+        // Try to select the chat template:
+        if (!string.IsNullOrWhiteSpace(chatChatTemplate))
+        {
+            this.currentChatTemplate = this.SettingsManager.ConfigurationData.ChatTemplates.FirstOrDefault(x => x.Id == chatChatTemplate);
+            if(this.currentChatTemplate == default)
+                this.currentChatTemplate = ChatTemplate.NO_CHATTEMPLATE;
+        }
     }
 
     private async Task ToggleWorkspaceOverlay()
diff --git a/app/MindWork AI Studio/Components/ChatTemplateSelection.razor b/app/MindWork AI Studio/Components/ChatTemplateSelection.razor
new file mode 100644
index 00000000..f20b2fbb
--- /dev/null
+++ b/app/MindWork AI Studio/Components/ChatTemplateSelection.razor	
@@ -0,0 +1,11 @@
+@inherits MSGComponentBase
+<MudTooltip Text="@T("You can switch between your chat templates here")" Placement="Placement.Top">
+    <MudMenu TransformOrigin="@Origin.BottomLeft" AnchorOrigin="Origin.TopLeft" StartIcon="@Icons.Material.Filled.Person4" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="@this.CurrentChatTemplate.Name" Variant="Variant.Filled" Color="Color.Default" Class="@this.MarginClass">
+        @foreach (var chatTemplate in this.SettingsManager.ConfigurationData.ChatTemplates.GetAllChatTemplates())
+        {
+            <MudMenuItem OnClick="() => this.SelectionChanged(chatTemplate)">
+                @chatTemplate.Name
+            </MudMenuItem>
+        }
+    </MudMenu>
+</MudTooltip>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/ChatTemplateSelection.razor.cs b/app/MindWork AI Studio/Components/ChatTemplateSelection.razor.cs
new file mode 100644
index 00000000..28d4f75b
--- /dev/null
+++ b/app/MindWork AI Studio/Components/ChatTemplateSelection.razor.cs	
@@ -0,0 +1,28 @@
+using AIStudio.Settings;
+
+using Microsoft.AspNetCore.Components;
+
+namespace AIStudio.Components;
+
+public partial class ChatTemplateSelection : MSGComponentBase
+{
+    [Parameter]
+    public ChatTemplate CurrentChatTemplate { get; set; } = ChatTemplate.NO_CHATTEMPLATE;
+    
+    [Parameter]
+    public EventCallback<ChatTemplate> CurrentChatTemplateChanged { get; set; }
+
+    [Parameter]
+    public string MarginLeft { get; set; } = "ml-3";
+
+    [Parameter]
+    public string MarginRight { get; set; } = string.Empty;
+    
+    private string MarginClass => $"{this.MarginLeft} {this.MarginRight}";
+    
+    private async Task SelectionChanged(ChatTemplate chatTemplate)
+    {
+        this.CurrentChatTemplate = chatTemplate;
+        await this.CurrentChatTemplateChanged.InvokeAsync(chatTemplate);
+    }
+}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelChatTemplates.razor b/app/MindWork AI Studio/Components/Settings/SettingsPanelChatTemplates.razor
index 5cf040db..e77788bf 100644
--- a/app/MindWork AI Studio/Components/Settings/SettingsPanelChatTemplates.razor	
+++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelChatTemplates.razor	
@@ -15,7 +15,7 @@
         <ColGroup>
             <col style="width: 3em;"/>
             <col/>
-            <col style="width: 40em;"/>
+            <col style="width: 20em;"/>
         </ColGroup>
         <HeaderContent>
             <MudTh>#</MudTh>
diff --git a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor
index 7f2a728d..fbfaa710 100644
--- a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor	
@@ -46,14 +46,12 @@
                 Lines="6"
                 AutoGrow="@true"
                 MaxLines="12"
-                MaxLength="444"
-                Counter="444"
                 Class="mb-3"
                 UserAttributes="@SPELLCHECK_ATTRIBUTES"
                 HelperText="@T("Tell the AI your system prompt.")"
             />
             
-            <MudSwitch @bind-Value="allowProfile" Color="Color.Primary" Label="@T("Allow using profiles together with this chat template?")"/>
+            <MudSwitch @bind-Value="allowProfileUsage" Color="Color.Primary" Label="@T("Allow using profiles together with this chat template?")"/>
             
             <MudText> What should you know about the additional messages? TODO</MudText>
             
@@ -73,16 +71,20 @@
                 </HeaderContent>
                 <RowTemplate>
                     <MudTd DataLabel="@T("Role")">@context.Role</MudTd>
-                    <MudTd DataLabel="@T("Message")">@context.Content</MudTd>
+                    <MudTd DataLabel="@T("Message")">
+                        @(context.Content is ContentText textContent ? textContent.Text : context.Content?.ToString())
+                    </MudTd>
                     <MudTd style="text-align: center">
                         <MudIconButton Icon="@Icons.Material.Filled.Add"
-                                       Color="Color.Success"
+                                       Color="Color.Primary"
                                        Size="Size.Small"
-                                       OnClick="@(() => AddNewMessageBelow(context))"/>
+                                       OnClick="@(() => AddNewMessageBelow(context))"
+                                       Variant="Variant.Filled"/>
                         <MudIconButton Icon="@Icons.Material.Filled.Delete"
                                        Color="Color.Error"
                                        Size="Size.Small"
-                                       OnClick="@(() => RemoveMessage(context))"/>
+                                       OnClick="@(() => RemoveMessage(context))"
+                                       Variant="Variant.Filled"/>
                     </MudTd>
                 </RowTemplate>
                 <RowEditingTemplate>
@@ -90,24 +92,12 @@
                         <MudSelect Label="Role" @bind-Value="context.Role" Required>
                             @foreach (var role in availableRoles)
                             {
-                                <MudSelectItem Value="@role">@role</MudSelectItem>
+                                <MudSelectItem Value="@role">@role.ToName()</MudSelectItem>
                             }
                         </MudSelect>
                     </MudTd>
                     <MudTd DataLabel="Message">
-                        <MudTextField Label="Your message" AutoGrow="true" MaxLines="10" @bind-Value="context.Content.As<ContentText>()!.Text" Required />
-                    </MudTd>
-                    <MudTd style="text-align: center">
-                        <MudIconButton Icon="@Icons.Material.Filled.Add" 
-                                       Color="Color.Success" 
-                                       Size="Size.Small" 
-                                       OnClick="@(() => AddNewMessageBelow(context))"
-                        />
-                        <MudIconButton Icon="@Icons.Material.Filled.Delete" 
-                                       Color="Color.Error" 
-                                       Size="Size.Small" 
-                                       OnClick="@(() => RemoveMessage(context))"
-                        />
+                        <MudTextField Label="Your message" AutoGrow="true" @bind-Value="context.Content.As<ContentText>()!.Text" Required />
                     </MudTd>
                 </RowEditingTemplate>
                 <PagerContent>
diff --git a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor.cs
index b17cba59..e5c6ca96 100644
--- a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor.cs	
@@ -62,7 +62,7 @@ public partial class ChatTemplateDialog : MSGComponentBase
     // private readonly List<ContentBlock> additionalMessagesEntries = [];
     // private readonly List<string> availableRoles = ["User", "Assistant"];
     private readonly IEnumerable<ChatRole> availableRoles = ChatRoles.ChatTemplateRoles().ToArray();
-    private bool allowProfile = true;
+    private bool allowProfileUsage = true;
     
     // We get the form reference from Blazor code to validate it manually:
     private MudForm form = null!;
@@ -75,6 +75,7 @@ public partial class ChatTemplateDialog : MSGComponentBase
         Name = this.DataName,
         SystemPrompt = this.DataSystemPrompt,
         AdditionalMessages = this.AdditionalMessages,
+        AllowProfileUsage = allowProfileUsage,
     };
 
     private void RemoveMessage(ContentBlock item)
diff --git a/app/MindWork AI Studio/Settings/ChatTemplate.cs b/app/MindWork AI Studio/Settings/ChatTemplate.cs
index 72dbf953..4484b338 100644
--- a/app/MindWork AI Studio/Settings/ChatTemplate.cs	
+++ b/app/MindWork AI Studio/Settings/ChatTemplate.cs	
@@ -3,7 +3,7 @@ using AIStudio.Tools.PluginSystem;
 
 namespace AIStudio.Settings;
 
-public readonly record struct ChatTemplate(uint Num, string Id, string Name, string SystemPrompt, List<ContentBlock> AdditionalMessages)
+public readonly record struct ChatTemplate(uint Num, string Id, string Name, string SystemPrompt, List<ContentBlock> AdditionalMessages, bool AllowProfileUsage)
 {
     private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(ChatTemplate).Namespace, nameof(ChatTemplate));
     
@@ -14,6 +14,7 @@ public readonly record struct ChatTemplate(uint Num, string Id, string Name, str
         Id = Guid.Empty.ToString(),
         Num = uint.MaxValue,
         AdditionalMessages = [],
+        AllowProfileUsage = true,
     };
     
     #region Overrides of ValueType
diff --git a/app/MindWork AI Studio/Tools/ChatTemplateExtensions.cs b/app/MindWork AI Studio/Tools/ChatTemplateExtensions.cs
new file mode 100644
index 00000000..b7b2f183
--- /dev/null
+++ b/app/MindWork AI Studio/Tools/ChatTemplateExtensions.cs	
@@ -0,0 +1,13 @@
+using AIStudio.Settings;
+
+namespace AIStudio.Tools;
+
+public static class ChatTemplateExtensions
+{
+    public static IEnumerable<ChatTemplate> GetAllChatTemplates(this IEnumerable<ChatTemplate> chatTemplates)
+    {
+        yield return ChatTemplate.NO_CHATTEMPLATE;
+        foreach (var chatTemplate in chatTemplates)
+            yield return chatTemplate;
+    }
+}
\ No newline at end of file