diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index afc60e5..8b1fec1 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -171,8 +171,7 @@
 (require 'siren-dockerfile)
 (require 'siren-emacs-lisp)
 (require 'siren-flutter)
-(require 'siren-gitconfig)
-(require 'siren-gitignore)
+(require 'siren-git-modes)
 (require 'siren-golang)
 (require 'siren-groovy)
 (require 'siren-haml)
diff --git a/modules/languages/siren-git-modes.el b/modules/languages/siren-git-modes.el
new file mode 100644
index 0000000..ebce346
--- /dev/null
+++ b/modules/languages/siren-git-modes.el
@@ -0,0 +1,13 @@
+;;; siren-git-modes.el --- jimeh's Emacs Siren: git-modes-mode configuration.
+
+;;; Commentary:
+
+;; Basic configuration for git-modes-mode.
+
+;;; Code:
+
+(use-package git-modes
+  :defer t)
+
+(provide 'siren-git-modes)
+;;; siren-git-modes.el ends here
diff --git a/modules/languages/siren-gitconfig.el b/modules/languages/siren-gitconfig.el
deleted file mode 100644
index 9cd2ac5..0000000
--- a/modules/languages/siren-gitconfig.el
+++ /dev/null
@@ -1,17 +0,0 @@
-;;; siren-gitconfig.el --- jimeh's Emacs Siren: gitconfig-mode configuration.
-
-;;; Commentary:
-
-;; Basic configuration for gitconfig-mode.
-
-;;; Code:
-
-(use-package gitconfig-mode
-  :mode "\\.gitconfig\\'" "gitconfig\\'" "\\.git/config\\'"
-  :hook (gitconfig-mode . siren-gitconfig-mode-setup)
-
-  :init
-  (defun siren-gitconfig-mode-setup ()))
-
-(provide 'siren-gitconfig)
-;;; siren-gitconfig.el ends here
diff --git a/modules/languages/siren-gitignore.el b/modules/languages/siren-gitignore.el
deleted file mode 100644
index ee8e3a2..0000000
--- a/modules/languages/siren-gitignore.el
+++ /dev/null
@@ -1,17 +0,0 @@
-;;; siren-gitignore.el --- jimeh's Emacs Siren: gitignore-mode configuration.
-
-;;; Commentary:
-
-;; Basic configuration for gitignore-mode.
-
-;;; Code:
-
-(use-package gitignore-mode
-  :mode "\\.gitignore" "gitignore\\'"
-  :hook (gitignore-mode . siren-gitignore-mode-setup)
-
-  :init
-  (defun siren-gitignore-mode-setup ()))
-
-(provide 'siren-gitignore)
-;;; siren-gitignore.el ends here
diff --git a/straight/versions/default.el b/straight/versions/default.el
index cfe80b2..74d835e 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -68,7 +68,7 @@
  ("gcmh" . "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9")
  ("ghub" . "192eff9da2c0f61813f3bc9c00913985c1804180")
  ("git-link" . "c4cb0edc92013ae4e3660f94c0c0d4d13fca6ee6")
- ("git-modes" . "433e1c57a63c88855fc41a942e29d7bc8c9c16c7")
+ ("git-modes" . "62fbf2e5b84ca789e7bc2f87939386023b5ba3df")
  ("git-timemachine" . "3381797bcbf906b18dff654a2361032d2d01b4a3")
  ("github-browse-file" . "9742a5183af853788c6ecb83fb7ee0b00d1675ac")
  ("gnu-elpa-mirror" . "a4cb56778914a8d438341173b2312f49b637e59a")