diff --git a/lisp/icejam-agent-shell.el b/lisp/icejam-agent-shell.el
new file mode 100644
index 0000000..f129cf9
--- /dev/null
+++ b/lisp/icejam-agent-shell.el
@@ -0,0 +1,32 @@
+;;; icejam-agent-shell.el --- summary -*- lexical-binding: t; -*-
+
+;; Author: Maciej Szlosarczyk
+;; Maintainer: Maciej Szlosarczyk
+;; Version: 0.1-snapshot
+
+;;; Commentary:
+
+;;; Agent stuff
+
+;;; Code:
+(declare-function agent-shell-make-environment-variables 'agent-shell)
+
+(use-package agent-shell
+  :ensure t
+  ;; Install this only on MacOS. On Linux you want to do it manually.
+  :if (eq system-type 'darwin)
+  :ensure-system-package
+  ((claude-agent-acp . "npm install -g @zed-industries/claude-agent-acp"))
+  :config
+  (setopt agent-shell-anthropic-claude-environment
+          (agent-shell-make-environment-variables :inherit-env t))
+  (setopt agent-shell-opencode-environment
+          (agent-shell-make-environment-variables
+           :inherit-env t
+           "GOOGLE_CLOUD_PROJECT" "mv-ai-architecture"))
+  (setopt
+   agent-shell-opencode-default-model-id
+   "google-vertex-anthropic/claude-sonnet-4-6@default"))
+
+(provide 'icejam-agent-shell)
+;;; icejam-agent-shell.el ends here
diff --git a/lisp/icejam-aider.el b/lisp/icejam-aider.el
deleted file mode 100644
index b6295a2..0000000
--- a/lisp/icejam-aider.el
+++ /dev/null
@@ -1,37 +0,0 @@
-;;; icejam-aider.el --- summary -*- lexical-binding: t; -*-
-
-;; Author: Maciej Szlosarczyk
-;; Maintainer: Maciej Szlosarczyk
-;; Version: 0.1-snapshot
-
-;;; Commentary:
-
-;;; Copilot and other GPT stuff
-
-;;; Code:
-(use-package aidermacs :ensure (:host github :repo "MatthewZMD/aidermacs")
-  :defer t
-  :config
-  ;; (setenv "OLLAMA_API_BASE" "http://127.0.0.1:11434")
-  (setenv "OLLAMA_API_BASE" "http://192.168.88.13:11434")
-  (setopt aidermacs-default-chat-mode 'architect)
-  (setopt aidermacs-default-model "ollama_chat/qwen3-coder:30b")
-  (setopt aider-extra-args (list "--model"
-                                 "ollama_chat/qwen3-coder:30b"
-                                 "--no-auto-commits"
-                                 "--no-analytics"
-                                 "--no-gitignore")))
-
-(declare-function agent-shell-make-environment-variables 'agent-shell)
-
-(use-package agent-shell
-  :ensure t
-  :ensure-system-package
-  ;; Add agent installation configs here
-  ((claude-agent-acp . "npm install -g @zed-industries/claude-agent-acp"))
-  :config
-  (setopt agent-shell-anthropic-claude-environment
-          (agent-shell-make-environment-variables :inherit-env t)))
-
-(provide 'icejam-aider)
-;;; icejam-aider.el ends here
diff --git a/lisp/icejam-custom-init.el b/lisp/icejam-custom-init.el
index bbddf40..e9370ef 100644
--- a/lisp/icejam-custom-init.el
+++ b/lisp/icejam-custom-init.el
@@ -100,7 +100,7 @@
 (use-package icejam-transient :ensure nil)
 (use-package icejam-prog-mode :ensure nil)
 (use-package icejam-complete-at-point :ensure nil)
-(use-package icejam-aider :ensure nil)
+(use-package icejam-agent-shell :ensure nil)
 (use-package icejam-flycheck :ensure nil)
 (use-package icejam-ispell :ensure nil)
 (use-package icejam-deft :ensure nil)
diff --git a/lisp/icejam-eglot.el b/lisp/icejam-eglot.el
index 6f2f95f..bd838a4 100644
--- a/lisp/icejam-eglot.el
+++ b/lisp/icejam-eglot.el
@@ -4,7 +4,7 @@
 ;;; Code:
 
 (use-package eldoc-box
-  :ensure (:host github :repo "casouri/eldoc-box" :ref "595262ec8ff56e8f86ef77d8e69339e84117e5f0")
+  :ensure (:host github :repo "casouri/eldoc-box")
   :hook ((emacs-lisp-mode . eldoc-box-hover-at-point-mode)
          (eglot--managed-mode . eldoc-box-hover-at-point-mode))
   :custom-face
diff --git a/lisp/langs/icejam-lang-python.el b/lisp/langs/icejam-lang-python.el
index b205d8b..ef3a9a1 100644
--- a/lisp/langs/icejam-lang-python.el
+++ b/lisp/langs/icejam-lang-python.el
@@ -26,6 +26,9 @@
 (add-to-list
  'icejam-language-transient-alist '(python-mode . icejam-python-lang-menu))
 
+;; Python template language
+(use-package jinja2-mode :ensure t :defer t)
+
 (defun icejam-lang-activate-python-mode ()
   "Activate python mode."
   (eglot-ensure)