oni-yasnippet: Move all snippets to ‘oni-yasnippet’

There is no real point in having them all separate. Having them all in a single
place makes them much easier to manage.

99 files changed, 35 insertions, 337 deletions

diff --git a/oni-bats/oni-bats.el b/oni-bats.el
index 2c2b9f7..eaaea14 100644
--- a/oni-bats/oni-bats.el
+++ b/oni-bats.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1201.134023
-;; Package-Requires: (bats-mode oni-sh oni-yasnippet)
+;; Version: 2026.0527.002728
+;; Package-Requires: (bats-mode oni-sh)
 
 ;; 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
@@ -34,7 +34,6 @@
 
 (require 'autoinsert)
 (require 'oni-sh)
-(require 'yasnippet)
 
 (defconst oni-bats-root
   (file-name-directory
@@ -42,29 +41,15 @@
        (buffer-file-name)))
   "The directory where ‘oni-bats’ was loaded from.")
 
-(defconst oni-bats-snippets-dir
-  (expand-file-name "snippets" oni-bats-root)
-  "The directory where ‘oni-bats’ stores its snippets.")
-
 (defun oni-bats-disable-shfmt-on-save-mode ()
   "Disable ‘shfmt-on-save-mode’."
   (shfmt-on-save-mode -1))
 
-(defun oni-bats-snippets-initialize ()
-  "Initialize the snippets for ‘oni-bats’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-bats-snippets-dir t))
-  (yas-load-directory oni-bats-snippets-dir))
-
 (add-hook 'bats-mode-hook #'oni-bats-disable-shfmt-on-save-mode)
 
 ;;;###autoload
 (with-eval-after-load 'autoinsert
   (add-to-list 'auto-insert-alist '(bats-mode nil "#!/usr/bin/env bats\n\n")))
 
-(with-eval-after-load 'bats-mode
-  (with-eval-after-load 'yasnippet
-    (oni-bats-snippets-initialize)))
-
 (provide 'oni-bats)
 ;;; oni-bats.el ends here
diff --git a/oni-bats/Eldev b/oni-bats/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-bats/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-conf/oni-conf.el b/oni-conf.el
index b3787cb..787d6fc 100644
--- a/oni-conf/oni-conf.el
+++ b/oni-conf.el
@@ -4,8 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1201.134001
-;; Package-Requires: (oni-yasnippet)
+;; Version: 2026.0527.002815
 
 ;; 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
@@ -26,24 +25,12 @@
 
 ;;; Code:
 
-(require 'yasnippet)
-
 (defconst oni-conf-root
   (file-name-directory
    (or load-file-name
        (buffer-file-name)))
   "The directory where ‘oni-conf’ was loaded from.")
 
-(defconst oni-conf-snippets-dir
-  (expand-file-name "snippets" oni-conf-root)
-  "The directory where ‘oni-conf’ stores its snippets.")
-
-(defun oni-conf-snippets-initialize ()
-  "Initialize the snippets for ‘oni-conf’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-conf-snippets-dir t))
-  (yas-load-directory oni-conf-snippets-dir))
-
 (defun oni-conf--auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments."
   (setq-local comment-auto-fill-only-comments t)
@@ -54,9 +41,5 @@
 ;;;###autoload
 (add-to-list 'auto-mode-alist `(,(rx ".service" string-end) . conf-mode))
 
-(with-eval-after-load 'conf-mode
-  (with-eval-after-load 'yasnippet
-    (oni-conf-snippets-initialize)))
-
 (provide 'oni-conf)
 ;;; oni-conf.el ends here
diff --git a/oni-conf/Eldev b/oni-conf/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-conf/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-csharp/oni-csharp.el b/oni-csharp.el
index 8451d93..09e4e0a 100644
--- a/oni-csharp/oni-csharp.el
+++ b/oni-csharp.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0525.001714
-;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-yasnippet oni-hydra oni-lsp oni-smartparens)
+;; Version: 2026.0527.002902
+;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-hydra oni-lsp oni-smartparens)
 
 ;; 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
@@ -29,7 +29,6 @@
 (require 'company)
 (require 'csharp-mode)
 (require 'hydra)
-(require 'yasnippet)
 
 (defconst oni-csharp-root
   (file-name-directory
@@ -37,10 +36,6 @@
        (buffer-file-name)))
   "The directory where ‘oni-csharp’ was loaded from.")
 
-(defconst oni-csharp-snippets-dir
-  (expand-file-name "snippets" oni-csharp-root)
-  "The directory where ‘oni-csharp’ stores its snippets.")
-
 (defcustom oni-csharp-devenv-executable
   "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\Common7\\IDE\\devenv.com\""
   "The location of the devenv.com executable."
@@ -83,12 +78,6 @@ _cs_: Solution
   (setq-local comment-auto-fill-only-comments t)
   (auto-fill-mode))
 
-(defun oni-csharp-snippets-initialize ()
-  "Initialize the snippets for ‘oni-csharp’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-csharp-snippets-dir t))
-  (yas-load-directory oni-csharp-snippets-dir))
-
 (defun oni-csharp--update-style ()
   "Set style rules according to personal (or recommended) preference."
   (c-set-offset 'arglist-intro '+)
@@ -151,10 +140,6 @@ _cs_: Solution
                       (group "error" (one-or-more any)))
                  1 (2 . 4) (3 . 5) 2 6)))
 
-(with-eval-after-load 'csharp-mode
-  (with-eval-after-load 'yasnippet
-    (oni-csharp-snippets-initialize)))
-
 ;;; Solution mode
 
 (defun oni-csharp-collect-project-names ()
diff --git a/oni-csharp/Eldev b/oni-csharp/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-csharp/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-css/oni-css.el b/oni-css.el
index cf58284..91fc11b 100644
--- a/oni-css/oni-css.el
+++ b/oni-css.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2025.0617.123504
-;; Package-Requires: (oni-company oni-hydra rainbow-mode oni-yasnippet prettier-js)
+;; Version: 2026.0527.003008
+;; Package-Requires: (oni-company oni-hydra rainbow-mode prettier-js)
 
 ;; 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
@@ -29,7 +29,6 @@
 (require 'align)
 (require 'css-mode)
 (require 'hydra)
-(require 'yasnippet)
 
 (eval-when-compile
   (require 'compile)
@@ -41,10 +40,6 @@
        (buffer-file-name)))
   "The directory where ‘oni-css’ was loaded from.")
 
-(defconst oni-css-snippets-dir
-  (expand-file-name "snippets" oni-css-root)
-  "The directory where ‘oni-css’ stores its snippets.")
-
 (defun oni-css-property-important-p ()
   "Return whether or not the current property is important."
   (save-excursion
@@ -60,12 +55,6 @@
       (when (re-search-backward ";" (line-beginning-position) :noerror)
         (insert " !important")))))
 
-(defun oni-css-snippets-initialize ()
-  "Initialize the snippets for ‘oni-css’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-css-snippets-dir t))
-  (yas-load-directory oni-css-snippets-dir))
-
 (defun oni-css-remove-important ()
   "Remove the important flag from the property on the current line."
   (interactive)
@@ -165,9 +154,5 @@
 (with-eval-after-load 'grep
   (add-to-list 'grep-files-aliases '("css" . "*.css *.less *.sass *.scss")))
 
-(with-eval-after-load 'css-mode
-  (with-eval-after-load 'yasnippet
-    (oni-css-snippets-initialize)))
-
 (provide 'oni-css)
 ;;; oni-css.el ends here
diff --git a/oni-css/Eldev b/oni-css/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-css/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-elisp/oni-elisp.el b/oni-elisp.el
index 2c4122c..152061d 100644
--- a/oni-elisp/oni-elisp.el
+++ b/oni-elisp.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2024.1101.071725
-;; Package-Requires: (oni-company oni-flycheck oni-paredit oni-yasnippet oni-hydra rainbow-delimiters nameless erefactor flycheck-relint elisp-format)
+;; Version: 2026.0527.003032
+;; Package-Requires: (oni-company oni-flycheck oni-paredit oni-hydra rainbow-delimiters nameless erefactor flycheck-relint elisp-format)
 
 ;; 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
@@ -29,7 +29,6 @@
 (require 'checkdoc)
 (require 'flycheck-relint)
 (require 'hydra)
-(require 'yasnippet)
 
 (let ((byte-compile-not-obsolete-funcs '(preceding-sexp)))
   (require 'erefactor))
@@ -42,10 +41,6 @@
        (buffer-file-name)))
   "The directory where ‘oni-elisp’ was loaded from.")
 
-(defconst oni-elisp-snippets-dir
-  (expand-file-name "snippets" oni-elisp-root)
-  "The directory where ‘oni-elisp’ stores its snippets.")
-
 (font-lock-add-keywords
  'emacs-lisp-mode
  `((,(rx symbol-start
@@ -57,12 +52,6 @@
          symbol-end)
     1 font-lock-constant-face)))
 
-(defun oni-elisp-snippets-initialize ()
-  "Initialize the snippets for ‘oni-elisp’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-elisp-snippets-dir t))
-  (yas-load-directory oni-elisp-snippets-dir))
-
 (defun oni-elisp-auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments and inhibit for Package-Requires."
   (setq-local comment-auto-fill-only-comments t)
@@ -130,10 +119,6 @@ _eb_: Buffer
                (slot . 0)
                (window-height . 0.33)))
 
-(with-eval-after-load 'elisp-mode
-  (with-eval-after-load 'yasnippet
-    (oni-elisp-snippets-initialize)))
-
 (flycheck-relint-setup)
 
 (add-hook 'emacs-lisp-mode-hook 'checkdoc-minor-mode)
diff --git a/oni-elisp/Eldev b/oni-elisp/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-elisp/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-haml/oni-haml.el b/oni-haml.el
index 98b3322..fee9c1d 100644
--- a/oni-haml/oni-haml.el
+++ b/oni-haml.el
@@ -4,8 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1201.134032
-;; Package-Requires: (oni-yasnippet)
+;; Version: 2026.0527.003052
 
 ;; 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
@@ -26,24 +25,12 @@
 
 ;;; Code:
 
-(require 'yasnippet)
-
 (defconst oni-haml-root
   (file-name-directory
    (or load-file-name
        (buffer-file-name)))
   "The directory where ‘oni-haml’ was loaded from.")
 
-(defconst oni-haml-snippets-dir
-  (expand-file-name "snippets" oni-haml-root)
-  "The directory where ‘oni-haml’ stores its snippets.")
-
-(defun oni-haml-snippets-initialize ()
-  "Initialize the snippets for ‘oni-haml’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-haml-snippets-dir t))
-  (yas-load-directory oni-haml-snippets-dir))
-
 (defun oni-haml--auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments."
   (setq-local comment-auto-fill-only-comments t)
@@ -51,9 +38,5 @@
 
 (add-hook 'haml-mode-hook 'oni-haml--auto-fill-mode)
 
-(with-eval-after-load 'haml-mode
-  (with-eval-after-load 'yasnippet
-    (oni-haml-snippets-initialize)))
-
 (provide 'oni-haml)
 ;;; oni-haml.el ends here
diff --git a/oni-haml/Eldev b/oni-haml/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-haml/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-html/oni-html.el b/oni-html.el
index 68318ae..f06f8a5 100644
--- a/oni-html/oni-html.el
+++ b/oni-html.el
@@ -4,8 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1201.134113
-;; Package-Requires: (oni-yasnippet)
+;; Version: 2026.0527.003123
 
 ;; 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
@@ -26,24 +25,12 @@
 
 ;;; Code:
 
-(require 'yasnippet)
-
 (defconst oni-html-root
   (file-name-directory
    (or load-file-name
        (buffer-file-name)))
   "The directory where ‘oni-html’ was loaded from.")
 
-(defconst oni-html-snippets-dir
-  (expand-file-name "snippets" oni-html-root)
-  "The directory where ‘oni-html’ stores its snippets.")
-
-(defun oni-html-snippets-initialize ()
-  "Initialize the snippets for ‘oni-html’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-html-snippets-dir t))
-  (yas-load-directory oni-html-snippets-dir))
-
 (defun oni-html--auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments."
   (setq-local comment-auto-fill-only-comments t)
@@ -52,9 +39,5 @@
 (add-hook 'html-mode-hook 'electric-pair-local-mode)
 (add-hook 'html-mode-hook 'oni-html--auto-fill-mode)
 
-(with-eval-after-load 'sgml-mode
-  (with-eval-after-load 'yasnippet
-    (oni-html-snippets-initialize)))
-
 (provide 'oni-html)
 ;;; oni-html.el ends here
diff --git a/oni-html/Eldev b/oni-html/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-html/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-nxml/oni-nxml.el b/oni-nxml.el
index 4ecce90..4e97269 100644
--- a/oni-nxml/oni-nxml.el
+++ b/oni-nxml.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1201.134152
-;; Package-Requires: (oni-yasnippet reformatter)
+;; Version: 2026.0527.003150
+;; Package-Requires: (reformatter)
 
 ;; 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
@@ -26,24 +26,12 @@
 
 ;;; Code:
 
-(require 'yasnippet)
-
 (defconst oni-nxml-root
   (file-name-directory
    (or load-file-name
        (buffer-file-name)))
   "The directory where ‘oni-nxml’ was loaded from.")
 
-(defconst oni-nxml-snippets-dir
-  (expand-file-name "snippets" oni-nxml-root)
-  "The directory where ‘oni-nxml’ stores its snippets.")
-
-(defun oni-nxml-snippets-initialize ()
-  "Initialize the snippets for ‘oni-nxml’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-nxml-snippets-dir t))
-  (yas-load-directory oni-nxml-snippets-dir))
-
 (defun oni-nxml--auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments."
   (setq-local comment-auto-fill-only-comments t)
@@ -61,9 +49,5 @@
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.proj\\'" . nxml-mode))
 
-(with-eval-after-load 'nxml-mode
-  (with-eval-after-load 'yasnippet
-    (oni-nxml-snippets-initialize)))
-
 (provide 'oni-nxml)
 ;;; oni-nxml.el ends here
diff --git a/oni-nxml/Eldev b/oni-nxml/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-nxml/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-python/oni-python.el b/oni-python.el
index 9e8c9c2..c261899 100644
--- a/oni-python/oni-python.el
+++ b/oni-python.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2024.0621.092608
-;; Package-Requires: (oni-yasnippet oni-company oni-flycheck oni-hydra oni-lsp rainbow-delimiters reformatter)
+;; Version: 2026.0527.003213
+;; Package-Requires: (oni-company oni-flycheck oni-hydra oni-lsp rainbow-delimiters reformatter)
 
 ;; 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
@@ -39,7 +39,6 @@
 (require 'python)
 (require 'reformatter)
 (require 'whitespace)
-(require 'yasnippet)
 
 ;; Don't mind if treesit can't be loaded, maybe this Emacs doesn't have it.
 (require 'treesit nil t)
@@ -52,10 +51,6 @@
        (buffer-file-name)))
   "The directory where ‘oni-python’ was loaded from.")
 
-(defconst oni-python-snippets-dir
-  (expand-file-name "snippets" oni-python-root)
-  "The directory where ‘oni-python’ stores its snippets.")
-
 (defun oni-python-set-fill-column ()
   "Set the `fill-column' and `comment-fill-column' for the current buffer.
 
@@ -63,12 +58,6 @@ The values are taken from the PEP8 coding standard for Python."
   (setq-local fill-column 80)
   (setq-local comment-fill-column 72))
 
-(defun oni-python-snippets-initialize ()
-  "Initialize the snippets for ‘oni-python’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-python-snippets-dir))
-  (yas-load-directory oni-python-snippets-dir))
-
 (defun oni-python-whitespace-mode ()
   "Set the `whitespace-style' to show the relevat whitespace.
 In Python buffers it should show any tabs being used and and used
@@ -107,9 +96,5 @@ for indentation."
   (add-to-list 'major-mode-remap-alist '(python-mode . python-ts-mode))
   (oni-python--enable-hooks 'python-ts-mode-hook))
 
-(with-eval-after-load 'python
-  (with-eval-after-load 'yasnippet
-    (oni-python-snippets-initialize)))
-
 (provide 'oni-python)
 ;;; oni-python.el ends here
diff --git a/oni-python/Eldev b/oni-python/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-python/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-ruby/oni-ruby.el b/oni-ruby.el
index 056a2a6..04ccab9 100644
--- a/oni-ruby/oni-ruby.el
+++ b/oni-ruby.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1201.134041
-;; Package-Requires: (ruby-mode oni-yasnippet)
+;; Version: 2026.0527.003231
+;; Package-Requires: (ruby-mode)
 
 ;; 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
@@ -26,24 +26,12 @@
 
 ;;; Code:
 
-(require 'yasnippet)
-
 (defconst oni-ruby-root
   (file-name-directory
    (or load-file-name
        (buffer-file-name)))
   "The directory where ‘oni-ruby’ was loaded from.")
 
-(defconst oni-ruby-snippets-dir
-  (expand-file-name "snippets" oni-ruby-root)
-  "The directory where ‘oni-ruby’ stores its snippets.")
-
-(defun oni-ruby-snippets-initialize ()
-  "Initialize the snippets for ‘oni-ruby’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-ruby-snippets-dir))
-  (yas-load-directory oni-ruby-snippets-dir))
-
 (defun oni-ruby--auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments."
   (setq-local comment-auto-fill-only-comments t)
@@ -54,9 +42,5 @@
 (add-hook 'ruby-mode-hook 'electric-pair-local-mode)
 (add-hook 'ruby-mode-hook 'oni-ruby--auto-fill-mode)
 
-(with-eval-after-load 'ruby-mode
-  (with-eval-after-load 'yasnippet
-    (oni-ruby-snippets-initialize)))
-
 (provide 'oni-ruby)
 ;;; oni-ruby.el ends here
diff --git a/oni-ruby/Eldev b/oni-ruby/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-ruby/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-twig/oni-twig.el b/oni-twig.el
index ed147bf..5f569d8 100644
--- a/oni-twig/oni-twig.el
+++ b/oni-twig.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1201.134109
-;; Package-Requires: (twig-mode oni-yasnippet)
+;; Version: 2026.0527.003251
+;; Package-Requires: (twig-mode)
 
 ;; 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
@@ -26,24 +26,12 @@
 
 ;;; Code:
 
-(require 'yasnippet)
-
 (defconst oni-twig-root
   (file-name-directory
    (or load-file-name
        (buffer-file-name)))
   "The directory where ‘oni-twig’ was loaded from.")
 
-(defconst oni-twig-snippets-dir
-  (expand-file-name "snippets" oni-twig-root)
-  "The directory where ‘oni-twig’ stores its snippets.")
-
-(defun oni-twig-snippets-initialize ()
-  "Initialize the snippets for ‘oni-twig’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-twig-snippets-dir))
-  (yas-load-directory oni-twig-snippets-dir))
-
 (defun oni-twig--auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments."
   (setq-local comment-auto-fill-only-comments t)
@@ -51,9 +39,5 @@
 
 (add-hook 'twig-mode-hook 'oni-twig--auto-fill-mode)
 
-(with-eval-after-load 'twig-mode
-  (with-eval-after-load 'yasnippet
-    (oni-twig-snippets-initialize)))
-
 (provide 'oni-twig)
 ;;; oni-twig.el ends here
diff --git a/oni-twig/Eldev b/oni-twig/Eldev
deleted file mode 100644
index 1ba3134..0000000
--- a/oni-twig/Eldev
+++ /dev/null
@@ -1,13 +0,0 @@
-; -*- mode: emacs-lisp; lexical-binding: t -*-
-
-;; Uncomment some calls below as needed for your project.
-(eldev-use-package-archive 'gnu-elpa)
-;(eldev-use-package-archive 'nongnu-elpa)
-(eldev-use-package-archive 'melpa)
-(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
-
-(eldev-use-plugin 'autoloads)
-
-(setf eldev-files-to-package
-      `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
diff --git a/oni-yasnippet.el b/oni-yasnippet/oni-yasnippet.el
index 584d909..11e96f7 100644
--- a/oni-yasnippet.el
+++ b/oni-yasnippet/oni-yasnippet.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.1212.085307
+;; Version: 2026.0528.021141
 ;; Package-Requires: (yasnippet yasnippet-snippets diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,20 @@
 (require 'yasnippet)
 (require 'diminish)
 
+(defconst oni-yasnippet-root
+  (file-name-directory
+   (or load-file-name
+       (buffer-file-name)))
+  "The directory where ‘oni-yasnippet’ was loaded from.")
+
+(defconst oni-yasnippet-snippets-dir
+  (expand-file-name "snippets" oni-yasnippet-root))
+
+(defun oni-yasnippet-snippets-initialize ()
+  "Initialize the snippets for ‘oni-yasnippet’."
+  (when (boundp 'yas-snippet-dirs)
+    (add-to-list 'yas-snippet-dirs oni-yasnippet-snippets-dir t)))
+
 (defun oni-yasnippet-remove-snippet-by-name (name mode)
   "Remove the snippet NAME from MODE's snippet tables."
   (and-let* ((mode-table (gethash mode yas--tables))
@@ -57,6 +71,7 @@
 (define-key yas-minor-mode-map (kbd "SPC") yas-maybe-expand)
 (define-key yas-minor-mode-map (kbd "TAB") nil)
 
+(add-hook 'yas-minor-mode-hook #'oni-yasnippet-snippets-initialize)
 (add-hook 'yas-after-reload-hook #'oni-yasnippet-cleanup-snippets)
 
 (provide 'oni-yasnippet)
diff --git a/oni-bats/snippets/bats-mode/test b/oni-yasnippet/snippets/bats-mode/test
index 8a2f028..8a2f028 100644
--- a/oni-bats/snippets/bats-mode/test
+++ b/oni-yasnippet/snippets/bats-mode/test
diff --git a/oni-conf/snippets/conf-mode/section b/oni-yasnippet/snippets/conf-mode/section
index 496e4fd..496e4fd 100644
--- a/oni-conf/snippets/conf-mode/section
+++ b/oni-yasnippet/snippets/conf-mode/section
diff --git a/oni-csharp/snippets/csharp-mode/testm b/oni-yasnippet/snippets/csharp-mode/testm
index 4bd243d..4bd243d 100644
--- a/oni-csharp/snippets/csharp-mode/testm
+++ b/oni-yasnippet/snippets/csharp-mode/testm
diff --git a/oni-css/snippets/css-mode/box-shadow b/oni-yasnippet/snippets/css-mode/box-shadow
index 82fe9d5..82fe9d5 100644
--- a/oni-css/snippets/css-mode/box-shadow
+++ b/oni-yasnippet/snippets/css-mode/box-shadow
diff --git a/oni-elisp/snippets/emacs-lisp-mode/cookie b/oni-yasnippet/snippets/emacs-lisp-mode/cookie
index 6fafd3c..6fafd3c 100644
--- a/oni-elisp/snippets/emacs-lisp-mode/cookie
+++ b/oni-yasnippet/snippets/emacs-lisp-mode/cookie
diff --git a/oni-elisp/snippets/emacs-lisp-mode/depends-on b/oni-yasnippet/snippets/emacs-lisp-mode/depends-on
index 4f99d92..4f99d92 100644
--- a/oni-elisp/snippets/emacs-lisp-mode/depends-on
+++ b/oni-yasnippet/snippets/emacs-lisp-mode/depends-on
diff --git a/oni-elisp/snippets/emacs-lisp-mode/depends-on-git b/oni-yasnippet/snippets/emacs-lisp-mode/depends-on-git
index 1da2f31..1da2f31 100644
--- a/oni-elisp/snippets/emacs-lisp-mode/depends-on-git
+++ b/oni-yasnippet/snippets/emacs-lisp-mode/depends-on-git
diff --git a/oni-elisp/snippets/emacs-lisp-mode/face b/oni-yasnippet/snippets/emacs-lisp-mode/face
index 9fdbbb2..9fdbbb2 100644
--- a/oni-elisp/snippets/emacs-lisp-mode/face
+++ b/oni-yasnippet/snippets/emacs-lisp-mode/face
diff --git a/oni-haml/snippets/haml-mode/faq b/oni-yasnippet/snippets/haml-mode/faq
index 4d1a9e2..4d1a9e2 100644
--- a/oni-haml/snippets/haml-mode/faq
+++ b/oni-yasnippet/snippets/haml-mode/faq
diff --git a/oni-html/snippets/html-mode/block b/oni-yasnippet/snippets/html-mode/block
index 6510011..6510011 100644
--- a/oni-html/snippets/html-mode/block
+++ b/oni-yasnippet/snippets/html-mode/block
diff --git a/oni-html/snippets/html-mode/for b/oni-yasnippet/snippets/html-mode/for
index 01d9c44..01d9c44 100644
--- a/oni-html/snippets/html-mode/for
+++ b/oni-yasnippet/snippets/html-mode/for
diff --git a/oni-html/snippets/html-mode/generic-block b/oni-yasnippet/snippets/html-mode/generic-block
index 82d40c7..82d40c7 100644
--- a/oni-html/snippets/html-mode/generic-block
+++ b/oni-yasnippet/snippets/html-mode/generic-block
diff --git a/oni-html/snippets/html-mode/script b/oni-yasnippet/snippets/html-mode/script
index e50dbf5..e50dbf5 100644
--- a/oni-html/snippets/html-mode/script
+++ b/oni-yasnippet/snippets/html-mode/script
diff --git a/oni-html/snippets/html-mode/trans-with-cap b/oni-yasnippet/snippets/html-mode/trans-with-cap
index 4f20a33..4f20a33 100644
--- a/oni-html/snippets/html-mode/trans-with-cap
+++ b/oni-yasnippet/snippets/html-mode/trans-with-cap
diff --git a/oni-csharp/snippets/nxml-mode/Import b/oni-yasnippet/snippets/nxml-mode/Import
index bddbf3f..bddbf3f 100644
--- a/oni-csharp/snippets/nxml-mode/Import
+++ b/oni-yasnippet/snippets/nxml-mode/Import
diff --git a/oni-nxml/snippets/nxml-mode/pencil-property b/oni-yasnippet/snippets/nxml-mode/pencil-property
index 7fafcb8..7fafcb8 100644
--- a/oni-nxml/snippets/nxml-mode/pencil-property
+++ b/oni-yasnippet/snippets/nxml-mode/pencil-property
diff --git a/oni-nxml/snippets/nxml-mode/pencil-property-value b/oni-yasnippet/snippets/nxml-mode/pencil-property-value
index 5da3d10..5da3d10 100644
--- a/oni-nxml/snippets/nxml-mode/pencil-property-value
+++ b/oni-yasnippet/snippets/nxml-mode/pencil-property-value
diff --git a/oni-nxml/snippets/nxml-mode/pencil-shortcut b/oni-yasnippet/snippets/nxml-mode/pencil-shortcut
index e760d27..e760d27 100644
--- a/oni-nxml/snippets/nxml-mode/pencil-shortcut
+++ b/oni-yasnippet/snippets/nxml-mode/pencil-shortcut
diff --git a/oni-org/snippets/org-mode/codeblock b/oni-yasnippet/snippets/org-mode/codeblock
index a200b08..a200b08 100644
--- a/oni-org/snippets/org-mode/codeblock
+++ b/oni-yasnippet/snippets/org-mode/codeblock
diff --git a/oni-org/snippets/org-mode/heading b/oni-yasnippet/snippets/org-mode/heading
index a472f06..a472f06 100644
--- a/oni-org/snippets/org-mode/heading
+++ b/oni-yasnippet/snippets/org-mode/heading
diff --git a/oni-org/snippets/org-mode/project b/oni-yasnippet/snippets/org-mode/project
index 269d655..269d655 100644
--- a/oni-org/snippets/org-mode/project
+++ b/oni-yasnippet/snippets/org-mode/project
diff --git a/oni-org/snippets/org-mode/snippet b/oni-yasnippet/snippets/org-mode/snippet
index 67f15d5..67f15d5 100644
--- a/oni-org/snippets/org-mode/snippet
+++ b/oni-yasnippet/snippets/org-mode/snippet
diff --git a/oni-org/snippets/org-mode/task b/oni-yasnippet/snippets/org-mode/task
index af229d1..af229d1 100644
--- a/oni-org/snippets/org-mode/task
+++ b/oni-yasnippet/snippets/org-mode/task
diff --git a/oni-php/snippets/php-mode/arrow-function b/oni-yasnippet/snippets/php-mode/arrow-function
index 3b44e01..3b44e01 100644
--- a/oni-php/snippets/php-mode/arrow-function
+++ b/oni-yasnippet/snippets/php-mode/arrow-function
diff --git a/oni-php/snippets/php-mode/casts b/oni-yasnippet/snippets/php-mode/casts
index 2850d72..2850d72 100644
--- a/oni-php/snippets/php-mode/casts
+++ b/oni-yasnippet/snippets/php-mode/casts
diff --git a/oni-php/snippets/php-mode/class b/oni-yasnippet/snippets/php-mode/class
index 26a58a1..26a58a1 100644
--- a/oni-php/snippets/php-mode/class
+++ b/oni-yasnippet/snippets/php-mode/class
diff --git a/oni-php/snippets/php-mode/constructor b/oni-yasnippet/snippets/php-mode/constructor
index f919e6c..f919e6c 100644
--- a/oni-php/snippets/php-mode/constructor
+++ b/oni-yasnippet/snippets/php-mode/constructor
diff --git a/oni-php/snippets/php-mode/factory b/oni-yasnippet/snippets/php-mode/factory
index 534f227..534f227 100644
--- a/oni-php/snippets/php-mode/factory
+++ b/oni-yasnippet/snippets/php-mode/factory
diff --git a/oni-php/snippets/php-mode/for b/oni-yasnippet/snippets/php-mode/for
index 1adae91..1adae91 100644
--- a/oni-php/snippets/php-mode/for
+++ b/oni-yasnippet/snippets/php-mode/for
diff --git a/oni-php/snippets/php-mode/function-expression b/oni-yasnippet/snippets/php-mode/function-expression
index fa59b03..fa59b03 100644
--- a/oni-php/snippets/php-mode/function-expression
+++ b/oni-yasnippet/snippets/php-mode/function-expression
diff --git a/oni-php/snippets/php-mode/function-statement b/oni-yasnippet/snippets/php-mode/function-statement
index 9c44aef..9c44aef 100644
--- a/oni-php/snippets/php-mode/function-statement
+++ b/oni-yasnippet/snippets/php-mode/function-statement
diff --git a/oni-php/snippets/php-mode/if-statement b/oni-yasnippet/snippets/php-mode/if-statement
index 6033e3a..6033e3a 100644
--- a/oni-php/snippets/php-mode/if-statement
+++ b/oni-yasnippet/snippets/php-mode/if-statement
diff --git a/oni-php/snippets/php-mode/logger-debug b/oni-yasnippet/snippets/php-mode/logger-debug
index d0e0b7e..d0e0b7e 100644
--- a/oni-php/snippets/php-mode/logger-debug
+++ b/oni-yasnippet/snippets/php-mode/logger-debug
diff --git a/oni-php/snippets/php-mode/logger-error b/oni-yasnippet/snippets/php-mode/logger-error
index 19344aa..19344aa 100644
--- a/oni-php/snippets/php-mode/logger-error
+++ b/oni-yasnippet/snippets/php-mode/logger-error
diff --git a/oni-php/snippets/php-mode/logger-info b/oni-yasnippet/snippets/php-mode/logger-info
index 9491d24..9491d24 100644
--- a/oni-php/snippets/php-mode/logger-info
+++ b/oni-yasnippet/snippets/php-mode/logger-info
diff --git a/oni-php/snippets/php-mode/logger-warning b/oni-yasnippet/snippets/php-mode/logger-warning
index 3945490..3945490 100644
--- a/oni-php/snippets/php-mode/logger-warning
+++ b/oni-yasnippet/snippets/php-mode/logger-warning
diff --git a/oni-php/snippets/php-mode/mark-test-skipped b/oni-yasnippet/snippets/php-mode/mark-test-skipped
index ce4761d..ce4761d 100644
--- a/oni-php/snippets/php-mode/mark-test-skipped
+++ b/oni-yasnippet/snippets/php-mode/mark-test-skipped
diff --git a/oni-php/snippets/php-mode/namespace b/oni-yasnippet/snippets/php-mode/namespace
index 7a5b5e1..7a5b5e1 100644
--- a/oni-php/snippets/php-mode/namespace
+++ b/oni-yasnippet/snippets/php-mode/namespace
diff --git a/oni-php/snippets/php-mode/php b/oni-yasnippet/snippets/php-mode/php
index 12f7492..12f7492 100644
--- a/oni-php/snippets/php-mode/php
+++ b/oni-yasnippet/snippets/php-mode/php
diff --git a/oni-php/snippets/php-mode/phpstan-ignore b/oni-yasnippet/snippets/php-mode/phpstan-ignore
index 91439ba..91439ba 100644
--- a/oni-php/snippets/php-mode/phpstan-ignore
+++ b/oni-yasnippet/snippets/php-mode/phpstan-ignore
diff --git a/oni-php/snippets/php-mode/strict-types b/oni-yasnippet/snippets/php-mode/strict-types
index bdcf3f9..bdcf3f9 100644
--- a/oni-php/snippets/php-mode/strict-types
+++ b/oni-yasnippet/snippets/php-mode/strict-types
diff --git a/oni-php/snippets/php-mode/test-class b/oni-yasnippet/snippets/php-mode/test-class
index de3bd3f..de3bd3f 100644
--- a/oni-php/snippets/php-mode/test-class
+++ b/oni-yasnippet/snippets/php-mode/test-class
diff --git a/oni-php/snippets/php-mode/test-comment b/oni-yasnippet/snippets/php-mode/test-comment
index b1c9dfb..b1c9dfb 100644
--- a/oni-php/snippets/php-mode/test-comment
+++ b/oni-yasnippet/snippets/php-mode/test-comment
diff --git a/oni-php/snippets/php-mode/test-name b/oni-yasnippet/snippets/php-mode/test-name
index 2b9d72b..2b9d72b 100644
--- a/oni-php/snippets/php-mode/test-name
+++ b/oni-yasnippet/snippets/php-mode/test-name
diff --git a/oni-php/snippets/php-mode/todo-comment b/oni-yasnippet/snippets/php-mode/todo-comment
index a079ce8..a079ce8 100644
--- a/oni-php/snippets/php-mode/todo-comment
+++ b/oni-yasnippet/snippets/php-mode/todo-comment
diff --git a/oni-php/snippets/php-mode/var b/oni-yasnippet/snippets/php-mode/var
index ce2b8fc..ce2b8fc 100644
--- a/oni-php/snippets/php-mode/var
+++ b/oni-yasnippet/snippets/php-mode/var
diff --git a/oni-php/snippets/php-mode/wpheader.php b/oni-yasnippet/snippets/php-mode/wpheader.php
index 2c70f93..2c70f93 100644
--- a/oni-php/snippets/php-mode/wpheader.php
+++ b/oni-yasnippet/snippets/php-mode/wpheader.php
diff --git a/oni-php/snippets/php-ts-mode/.yas-parents b/oni-yasnippet/snippets/php-ts-mode/.yas-parents
index 00d75e1..00d75e1 100644
--- a/oni-php/snippets/php-ts-mode/.yas-parents
+++ b/oni-yasnippet/snippets/php-ts-mode/.yas-parents
diff --git a/oni-python/snippets/python-mode/defm_empty b/oni-yasnippet/snippets/python-mode/defm_empty
index baa976e..baa976e 100644
--- a/oni-python/snippets/python-mode/defm_empty
+++ b/oni-yasnippet/snippets/python-mode/defm_empty
diff --git a/oni-python/snippets/python-mode/form b/oni-yasnippet/snippets/python-mode/form
index 225d5e4..225d5e4 100644
--- a/oni-python/snippets/python-mode/form
+++ b/oni-yasnippet/snippets/python-mode/form
diff --git a/oni-python/snippets/python-mode/form_valid b/oni-yasnippet/snippets/python-mode/form_valid
index c5a7e58..c5a7e58 100644
--- a/oni-python/snippets/python-mode/form_valid
+++ b/oni-yasnippet/snippets/python-mode/form_valid
diff --git a/oni-python/snippets/python-mode/form_valid_with_return b/oni-yasnippet/snippets/python-mode/form_valid_with_return
index fac23bc..fac23bc 100644
--- a/oni-python/snippets/python-mode/form_valid_with_return
+++ b/oni-yasnippet/snippets/python-mode/form_valid_with_return
diff --git a/oni-python/snippets/python-mode/import_from b/oni-yasnippet/snippets/python-mode/import_from
index d9cc4e2..d9cc4e2 100644
--- a/oni-python/snippets/python-mode/import_from
+++ b/oni-yasnippet/snippets/python-mode/import_from
diff --git a/oni-python/snippets/python-mode/method b/oni-yasnippet/snippets/python-mode/method
index 7c033cf..7c033cf 100644
--- a/oni-python/snippets/python-mode/method
+++ b/oni-yasnippet/snippets/python-mode/method
diff --git a/oni-python/snippets/python-mode/permission_guard b/oni-yasnippet/snippets/python-mode/permission_guard
index ab53895..ab53895 100644
--- a/oni-python/snippets/python-mode/permission_guard
+++ b/oni-yasnippet/snippets/python-mode/permission_guard
diff --git a/oni-python/snippets/python-mode/url b/oni-yasnippet/snippets/python-mode/url
index 00ade72..00ade72 100644
--- a/oni-python/snippets/python-mode/url
+++ b/oni-yasnippet/snippets/python-mode/url
diff --git a/oni-ruby/snippets/ruby-mode/ProductSeed b/oni-yasnippet/snippets/ruby-mode/ProductSeed
index 7e836c2..7e836c2 100644
--- a/oni-ruby/snippets/ruby-mode/ProductSeed
+++ b/oni-yasnippet/snippets/ruby-mode/ProductSeed
diff --git a/oni-ruby/snippets/ruby-mode/ProductSeedHW b/oni-yasnippet/snippets/ruby-mode/ProductSeedHW
index 843b32e..843b32e 100644
--- a/oni-ruby/snippets/ruby-mode/ProductSeedHW
+++ b/oni-yasnippet/snippets/ruby-mode/ProductSeedHW
diff --git a/oni-ruby/snippets/ruby-mode/ProductSeedHWGroup b/oni-yasnippet/snippets/ruby-mode/ProductSeedHWGroup
index 25594c5..25594c5 100644
--- a/oni-ruby/snippets/ruby-mode/ProductSeedHWGroup
+++ b/oni-yasnippet/snippets/ruby-mode/ProductSeedHWGroup
diff --git a/oni-ruby/snippets/ruby-mode/describe b/oni-yasnippet/snippets/ruby-mode/describe
index acd3a6b..acd3a6b 100644
--- a/oni-ruby/snippets/ruby-mode/describe
+++ b/oni-yasnippet/snippets/ruby-mode/describe
diff --git a/oni-ruby/snippets/ruby-mode/do b/oni-yasnippet/snippets/ruby-mode/do
index 3c556fc..3c556fc 100644
--- a/oni-ruby/snippets/ruby-mode/do
+++ b/oni-yasnippet/snippets/ruby-mode/do
diff --git a/oni-ruby/snippets/ruby-mode/factory b/oni-yasnippet/snippets/ruby-mode/factory
index 619b2e5..619b2e5 100644
--- a/oni-ruby/snippets/ruby-mode/factory
+++ b/oni-yasnippet/snippets/ruby-mode/factory
diff --git a/oni-ruby/snippets/ruby-mode/fill_in b/oni-yasnippet/snippets/ruby-mode/fill_in
index 854b029..854b029 100644
--- a/oni-ruby/snippets/ruby-mode/fill_in
+++ b/oni-yasnippet/snippets/ruby-mode/fill_in
diff --git a/oni-ruby/snippets/ruby-mode/mod b/oni-yasnippet/snippets/ruby-mode/mod
index 9af7d23..9af7d23 100644
--- a/oni-ruby/snippets/ruby-mode/mod
+++ b/oni-yasnippet/snippets/ruby-mode/mod
diff --git a/oni-ruby/snippets/ruby-mode/reduce b/oni-yasnippet/snippets/ruby-mode/reduce
index 3d4bfe4..3d4bfe4 100644
--- a/oni-ruby/snippets/ruby-mode/reduce
+++ b/oni-yasnippet/snippets/ruby-mode/reduce
diff --git a/oni-twig/snippets/twig-mode/_self b/oni-yasnippet/snippets/twig-mode/_self
index c441690..c441690 100644
--- a/oni-twig/snippets/twig-mode/_self
+++ b/oni-yasnippet/snippets/twig-mode/_self
diff --git a/oni-twig/snippets/twig-mode/blk b/oni-yasnippet/snippets/twig-mode/blk
index bb100a3..bb100a3 100644
--- a/oni-twig/snippets/twig-mode/blk
+++ b/oni-yasnippet/snippets/twig-mode/blk
diff --git a/oni-twig/snippets/twig-mode/def b/oni-yasnippet/snippets/twig-mode/def
index 78dead4..78dead4 100644
--- a/oni-twig/snippets/twig-mode/def
+++ b/oni-yasnippet/snippets/twig-mode/def
diff --git a/oni-twig/snippets/twig-mode/ext b/oni-yasnippet/snippets/twig-mode/ext
index 501cae8..501cae8 100644
--- a/oni-twig/snippets/twig-mode/ext
+++ b/oni-yasnippet/snippets/twig-mode/ext
diff --git a/oni-twig/snippets/twig-mode/for b/oni-yasnippet/snippets/twig-mode/for
index 01c0cc5..01c0cc5 100644
--- a/oni-twig/snippets/twig-mode/for
+++ b/oni-yasnippet/snippets/twig-mode/for
diff --git a/oni-twig/snippets/twig-mode/if b/oni-yasnippet/snippets/twig-mode/if
index a9385d9..a9385d9 100644
--- a/oni-twig/snippets/twig-mode/if
+++ b/oni-yasnippet/snippets/twig-mode/if
diff --git a/oni-twig/snippets/twig-mode/ife b/oni-yasnippet/snippets/twig-mode/ife
index a4d18f3..a4d18f3 100644
--- a/oni-twig/snippets/twig-mode/ife
+++ b/oni-yasnippet/snippets/twig-mode/ife
diff --git a/oni-twig/snippets/twig-mode/iif b/oni-yasnippet/snippets/twig-mode/iif
index df26b61..df26b61 100644
--- a/oni-twig/snippets/twig-mode/iif
+++ b/oni-yasnippet/snippets/twig-mode/iif
diff --git a/oni-twig/snippets/twig-mode/imp b/oni-yasnippet/snippets/twig-mode/imp
index 01ceb69..01ceb69 100644
--- a/oni-twig/snippets/twig-mode/imp
+++ b/oni-yasnippet/snippets/twig-mode/imp
diff --git a/oni-twig/snippets/twig-mode/mac b/oni-yasnippet/snippets/twig-mode/mac
index d4e480a..d4e480a 100644
--- a/oni-twig/snippets/twig-mode/mac
+++ b/oni-yasnippet/snippets/twig-mode/mac
diff --git a/oni-twig/snippets/twig-mode/set b/oni-yasnippet/snippets/twig-mode/set
index 715c828..715c828 100644
--- a/oni-twig/snippets/twig-mode/set
+++ b/oni-yasnippet/snippets/twig-mode/set