diff --git a/app/MindWork AI Studio/Chat/ChatRole.cs b/app/MindWork AI Studio/Chat/ChatRole.cs
index d292b71b..85a3c51d 100644
--- a/app/MindWork AI Studio/Chat/ChatRole.cs	
+++ b/app/MindWork AI Studio/Chat/ChatRole.cs	
@@ -14,68 +14,4 @@ public enum ChatRole
     USER,
     AI,
     AGENT,
-}
-
-/// <summary>
-/// Extensions for the ChatRole enum.
-/// </summary>
-public static class ExtensionsChatRole
-{
-    private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(ChatRole).Namespace, nameof(ChatRole));
-    
-    /// <summary>
-    /// Returns the name of the role.
-    /// </summary>
-    /// <param name="role">The role.</param>
-    /// <returns>The name of the role.</returns>
-    public static string ToName(this ChatRole role) => role switch
-    {
-        ChatRole.SYSTEM => TB("System"),
-        ChatRole.USER => TB("You"),
-        ChatRole.AI => TB("AI"),
-        
-        _ => TB("Unknown"),
-    };
-    
-    /// <summary>
-    /// Returns the color of the role.
-    /// </summary>
-    /// <param name="role">The role.</param>
-    /// <returns>The color of the role.</returns>
-    public static Color ToColor(this ChatRole role) => role switch
-    {
-        ChatRole.SYSTEM => Color.Info,
-        ChatRole.USER => Color.Primary,
-        ChatRole.AI => Color.Tertiary,
-        
-        _ => Color.Error,
-    };
-    
-    /// <summary>
-    /// Returns the icon of the role.
-    /// </summary>
-    /// <param name="role">The role.</param>
-    /// <returns>The icon of the role.</returns>
-    public static string ToIcon(this ChatRole role) => role switch
-    {
-        ChatRole.SYSTEM => Icons.Material.Filled.Settings,
-        ChatRole.USER => Icons.Material.Filled.Person,
-        ChatRole.AI => Icons.Material.Filled.AutoAwesome,
-        
-        _ => Icons.Material.Filled.Help,
-    };
-    
-    /// <summary>
-    /// Returns the specific name of the role for the chat template.
-    /// </summary>
-    /// <param name="role">The role.</param>
-    /// <returns>The name of the role.</returns>
-    public static string ToChatTemplateName(this ChatRole role) => role switch
-    {
-        ChatRole.SYSTEM => TB("System"),
-        ChatRole.USER => TB("User"),
-        ChatRole.AI => TB("Assistant"),
-        
-        _ => TB("Unknown"),
-    };
 }
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Chat/ChatRoleExtensions.cs b/app/MindWork AI Studio/Chat/ChatRoleExtensions.cs
new file mode 100644
index 00000000..40987d09
--- /dev/null
+++ b/app/MindWork AI Studio/Chat/ChatRoleExtensions.cs	
@@ -0,0 +1,75 @@
+using AIStudio.Tools.PluginSystem;
+
+namespace AIStudio.Chat;
+
+public static class ChatRoleExtensions
+{
+    private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(ChatRoleExtensions).Namespace, nameof(ChatRoleExtensions));
+    
+    /// <summary>
+    /// Returns the name of the role.
+    /// </summary>
+    /// <param name="role">The role.</param>
+    /// <returns>The name of the role.</returns>
+    public static string ToName(this ChatRole role) => role switch
+    {
+        ChatRole.SYSTEM => TB("System"),
+        ChatRole.USER => TB("You"),
+        ChatRole.AI => TB("AI"),
+        
+        _ => TB("Unknown"),
+    };
+    
+    /// <summary>
+    /// Returns the color of the role.
+    /// </summary>
+    /// <param name="role">The role.</param>
+    /// <returns>The color of the role.</returns>
+    public static Color ToColor(this ChatRole role) => role switch
+    {
+        ChatRole.SYSTEM => Color.Info,
+        ChatRole.USER => Color.Primary,
+        ChatRole.AI => Color.Tertiary,
+        
+        _ => Color.Error,
+    };
+    
+    /// <summary>
+    /// Returns the icon of the role.
+    /// </summary>
+    /// <param name="role">The role.</param>
+    /// <returns>The icon of the role.</returns>
+    public static string ToIcon(this ChatRole role) => role switch
+    {
+        ChatRole.SYSTEM => Icons.Material.Filled.Settings,
+        ChatRole.USER => Icons.Material.Filled.Person,
+        ChatRole.AI => Icons.Material.Filled.AutoAwesome,
+        
+        _ => Icons.Material.Filled.Help,
+    };
+
+    /// <summary>
+    /// Returns the specific name of the role for the chat template.
+    /// </summary>
+    /// <param name="role">The role.</param>
+    /// <returns>The name of the role.</returns>
+    public static string ToChatTemplateName(this ChatRole role) => role switch
+    {
+        ChatRole.SYSTEM => TB("System"),
+        ChatRole.USER => TB("User"),
+        ChatRole.AI => TB("Assistant"),
+
+        _ => TB("Unknown"),
+    };
+    
+    /// <summary>
+    /// Selects the next role for a chat template.
+    /// </summary>
+    /// <param name="currentRole">The current role.</param>
+    /// <returns>The next role for the chat template.</returns>
+    public static ChatRole SelectNextRoleForTemplate(this ChatRole currentRole) => currentRole switch
+    {
+        ChatRole.USER => ChatRole.AI,
+        _ => ChatRole.USER,
+    };
+}
\ No newline at end of file