diff --git a/.config/doom/config.el b/.config/doom/config.el
index df5e184c..fa24c72f 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -381,7 +381,7 @@ Your goal is to generate a commit message that follows the kernel Git commit sty
 SUMMARY INSTRUCTIONS:
 - Write a one-line summary of the change, no more than 50 characters.
 - Use the imperative tense (for example, use 'Improve logging output' instead of 'Improved logging' or 'Improves logging').
-- Do not include prefixes like Fix:, Feat:, or Chore: at the beggining of the summary
+- Do not include prefixes like Fix:, Feat:, or Chore: at the beginning of the summary.
 - The summary must not end with a period.
 - Ensure the summary reflects a single, specific, and cohesive purpose.
 
@@ -391,6 +391,7 @@ COMMENT INSTRUCTIONS:
 - Each comment must end with a period.
 - Do not include any paragraphs, introductions, or extra explanations.
 - Do not use backticks (`) anywhere in the summary or comments.
+- Do not use Markdown formatting (e.g., *, **, #, _, or inline code).
 
 THE FILE DIFFS:
 %s
@@ -402,6 +403,7 @@ Now, write the commit message in this exact format:
 - comment2
 - commentN")
 
+
   (magit-gptcommit-status-buffer-setup))
 
 (require 'forge-llm)
@@ -418,6 +420,23 @@ Now, write the commit message in this exact format:
               ("C-TAB" . 'copilot-accept-completion-by-word)
               ("C-<tab>" . 'copilot-accept-completion-by-word)))
 
+(after! aidermacs
+  ;; Set API keys
+  (setenv "ANTHROPIC_API_KEY" anthropic-key)
+  (setenv "OPENAI_API_KEY" openai-key)
+  (setenv "GEMINI_API_KEY" gemini-key)
+
+  ;; General settings
+  (setq aidermacs-use-architect-mode t)
+  (setq aidermacs-auto-commits nil)
+  (setq aidermacs-backend 'vterm)
+  (setq aidermacs-vterm-multiline-newline-key "S-<return>"))
+
+;; Keybinding for Aidermacs menu
+(map! :leader
+      :desc "Aidermacs"
+      "l" #'aidermacs-transient-menu)
+
 (setq plantuml-executable-path "/usr/bin/plantuml")
 (setq plantuml-default-exec-mode 'executable)
 (setq org-plantuml-exec-mode 'plantuml)
diff --git a/.config/doom/config.org b/.config/doom/config.org
index b6215955..0454c58e 100644
--- a/.config/doom/config.org
+++ b/.config/doom/config.org
@@ -597,7 +597,7 @@ Your goal is to generate a commit message that follows the kernel Git commit sty
 SUMMARY INSTRUCTIONS:
 - Write a one-line summary of the change, no more than 50 characters.
 - Use the imperative tense (for example, use 'Improve logging output' instead of 'Improved logging' or 'Improves logging').
-- Do not include prefixes like Fix:, Feat:, or Chore: at the beggining of the summary
+- Do not include prefixes like Fix:, Feat:, or Chore: at the beginning of the summary.
 - The summary must not end with a period.
 - Ensure the summary reflects a single, specific, and cohesive purpose.
 
@@ -607,6 +607,7 @@ COMMENT INSTRUCTIONS:
 - Each comment must end with a period.
 - Do not include any paragraphs, introductions, or extra explanations.
 - Do not use backticks (`) anywhere in the summary or comments.
+- Do not use Markdown formatting (e.g., *, **, #, _, or inline code).
 
 THE FILE DIFFS:
 %s
@@ -618,6 +619,7 @@ Now, write the commit message in this exact format:
 - comment2
 - commentN")
 
+
   (magit-gptcommit-status-buffer-setup))
 #+end_src
 
@@ -648,7 +650,29 @@ Now, write the commit message in this exact format:
               ("C-TAB" . 'copilot-accept-completion-by-word)
               ("C-<tab>" . 'copilot-accept-completion-by-word)))
 #+end_src
+*** Aider
+:PROPERTIES:
+:ID:       42318f75-3a25-44ad-bfeb-d83338045385
+:END:
+#+begin_src emacs-lisp
+(after! aidermacs
+  ;; Set API keys
+  (setenv "ANTHROPIC_API_KEY" anthropic-key)
+  (setenv "OPENAI_API_KEY" openai-key)
+  (setenv "GEMINI_API_KEY" gemini-key)
 
+  ;; General settings
+  (setq aidermacs-use-architect-mode t)
+  (setq aidermacs-auto-commits nil)
+  (setq aidermacs-backend 'vterm)
+  (setq aidermacs-vterm-multiline-newline-key "S-<return>"))
+
+;; Keybinding for Aidermacs menu
+(map! :leader
+      :desc "Aidermacs"
+      "l" #'aidermacs-transient-menu)
+
+#+end_src
 ** Others
 :PROPERTIES:
 :ID:       ccd2e4f2-d58d-4fd3-8d79-1ccd41719122
diff --git a/.config/doom/packages.el b/.config/doom/packages.el
index 4febee1c..f3f548f6 100644
--- a/.config/doom/packages.el
+++ b/.config/doom/packages.el
@@ -77,3 +77,4 @@
   :recipe (:host gitlab :repo "rogs/forge-llm"))
 (package! llm)
 (package! cov)
+(package! aidermacs)