diff --git a/lisp/fg42/deps.el b/lisp/fg42/deps.el
index 87101ad..65228bd 100644
--- a/lisp/fg42/deps.el
+++ b/lisp/fg42/deps.el
@@ -120,6 +120,7 @@
  marginalia
  nerd-icons
  forge
+ svg-tag-mode
  consult)
 
 (provide 'fg42/deps)
diff --git a/lisp/fg42/editor.el b/lisp/fg42/editor.el
index 2e22db7..d109a6e 100644
--- a/lisp/fg42/editor.el
+++ b/lisp/fg42/editor.el
@@ -35,7 +35,8 @@
   (require 'fg42/git)
   (require 'fg42/wm)
   (require 'fg42/org)
-  (require 'fg42/minibuffer))
+  (require 'fg42/minibuffer)
+  (require 'fg42/graphics))
 
 (require 'server)
 (require 'fg42/modeline)
@@ -130,20 +131,12 @@ contextual information."
     :init
     (setq epa-pinentry-mode 'loopback))
 
-  ;; (use! imenu
-  ;;   "The Imenu facility offers a way to find the major definitions in a file by name."
-  ;;   :bind (("M-i" . imenu)))
-
   (use! imenu-list
     "his Emacs minor-mode creates an automatically updated buffer
  called `Ilist' that is populated with the current buffer's imenu entries.
  The `Ilist' buffer is typically shown as a sidebar (Emacs vertically splits the window)."
     :bind  (("C-'" . imenu-list-smart-toggle)))
 
-  (use! emojify
-    "Adds support for emojis to `FG42'"
-    :hook (emacs-startup . global-emojify-mode))
-
   (use! discover
     "Adds support for the discover.el `https://github.com/mickeynp/discover.el'.")
 
@@ -186,15 +179,6 @@ contextual information."
       :config
       (global-display-line-numbers-mode 1)))
 
-  (use! all-the-icons
-    "A utility package to collect various Icon Fonts and propertize them within
-Emacs."
-    :if (display-graphic-p))
-
-  (use! nerd-icons
-    "A utility package to collect various Icon Fonts and propertize them within
-Emacs."
-    :if (display-graphic-p))
 
   (use! yasnippet
     "A Snippet is a template system for Emacs. "
diff --git a/lisp/fg42/graphics.el b/lisp/fg42/graphics.el
new file mode 100644
index 0000000..7dcbf17
--- /dev/null
+++ b/lisp/fg42/graphics.el
@@ -0,0 +1,55 @@
+;;; FG42 --- The mighty editor for the emacsians -*- lexical-binding: t; -*-
+;;
+;; Copyright (c) 2010-2024 Sameer Rahmani <lxsameer@gnu.org>
+;;
+;; Author: Sameer Rahmani <lxsameer@gnu.org>
+;; URL: https://devheroes.codes/FG42/FG42
+;; Version: 4.0.0
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;
+;;; Commentary:
+;;; Code:
+(eval-when-compile
+  (require 'fpkg))
+
+(use! emojify
+  "Adds support for emojis to `FG42'"
+  :if (display-graphic-p)
+  :hook (emacs-startup . global-emojify-mode))
+
+(use! all-the-icons
+  "A utility package to collect various Icon Fonts and propertize them within
+Emacs."
+  :if (display-graphic-p))
+
+(use! nerd-icons
+  "A utility package to collect various Icon Fonts and propertize them within
+Emacs."
+  :if (display-graphic-p))
+
+
+(use! svg-tag-mode
+  "A minor mode to replace keywords or regular expression with SVG tags."
+  :if (display-graphic-p)
+  :commands global-svg-tag-mode
+  :config
+  (setq svg-tag-tags
+        '(("\\(:[A-Z]+:\\)" . ((lambda (tag)
+                                 (svg-tag-make tag :beg 1 :end -1))))
+          (":TODO " . ((lambda (tag) (svg-tag-make tag)))))))
+
+
+(provide 'fg42/graphics)
+;;; graphics.el ends here
diff --git a/lisp/fg42/minibuffer.el b/lisp/fg42/minibuffer.el
index 2374bfd..2bdef3e 100644
--- a/lisp/fg42/minibuffer.el
+++ b/lisp/fg42/minibuffer.el
@@ -85,7 +85,7 @@ match all of the components in any order."
   "Consult provides search and navigation commands based on the Emacs completion
  function completing-read. "
   ;; C-c bindings in `mode-specific-map'
-  :bind  (("M-x" . consult-mode-command)
+  :bind  (("C-c M-x" . consult-mode-command)
           ("C-c h" . consult-history)
           ("C-c k" . consult-kmacro)
           ("C-c m" . consult-man)