diff --git a/modules/editing.el b/modules/editing.el
index 6fa4535..b8b14ed 100644
--- a/modules/editing.el
+++ b/modules/editing.el
@@ -61,15 +61,17 @@
   ;; Volatile highlights - highlight changes caused by undo, yank, etc.
   ;; --------------------------------------------------------------------------
 
-  (use-package volatile-highlights)
-  (volatile-highlights-mode t)
+  (use-package volatile-highlights
+    :init
+    (volatile-highlights-mode t))
 
   ;; --------------------------------------------------------------------------
   ;; Undo tree.  To undo "C-\", to redo "C-_", undo tree "C-x u".
   ;; --------------------------------------------------------------------------
 
-  (use-package undo-tree)
-  (global-undo-tree-mode)
+  (use-package undo-tree
+    :init
+    (global-undo-tree-mode))
 
   ;; --------------------------------------------------------------------------
   ;; Use UTF-8.
diff --git a/modules/helm.el b/modules/helm.el
index e5b4a82..11adf4b 100644
--- a/modules/helm.el
+++ b/modules/helm.el
@@ -28,6 +28,8 @@
 (defun init-packages/init-helm ()
 
   (use-package helm
+    :init
+    (helm-mode 1)
     :bind
     (("C-x C-f" . helm-find-files)
      ("M-x" . helm-M-x)
@@ -119,6 +121,4 @@
 
     )
 
-  (helm-mode 1)
-
   )
diff --git a/modules/parentheses.el b/modules/parentheses.el
index 1696808..fc2d1a7 100644
--- a/modules/parentheses.el
+++ b/modules/parentheses.el
@@ -49,6 +49,9 @@
     (add-hook 'prog-mode-hook 'highlight-parentheses-mode))
 
   (use-package smartparens
+    :init
+    (smartparens-global-mode t)
+    (show-smartparens-global-mode t)
     :config
     (require 'smartparens-config)
 
@@ -109,7 +112,4 @@
      ;; Do not highlight space between parentheses.
      sp-highlight-pair-overlay nil))
 
-  (smartparens-global-mode t)
-  (show-smartparens-global-mode t)
-
   )
diff --git a/modules/programming.el b/modules/programming.el
index 00d2932..c08d8d8 100644
--- a/modules/programming.el
+++ b/modules/programming.el
@@ -43,8 +43,9 @@
   ;; Enable yasnippet.
   ;; --------------------------------------------------------------------------
 
-  (use-package yasnippet)
-  (yas-global-mode 1)
+  (use-package yasnippet
+    :init
+    (yas-global-mode 1))
 
   ;; --------------------------------------------------------------------------
   ;; Automatically indent yanked text in programming mode.
diff --git a/modules/workflow.el b/modules/workflow.el
index a6e2fea..7e7a69e 100644
--- a/modules/workflow.el
+++ b/modules/workflow.el
@@ -31,12 +31,11 @@
   ;; --------------------------------------------------------------------------
 
   (use-package workgroups2
+    :init
+    (workgroups-mode 1)
     :config
     ;; Don't save.  Workgroups are transient to the session.
     (setq wg-emacs-exit-save-behavior           nil)
     (setq wg-workgroups-mode-exit-save-behavior nil))
 
-  ;; Enable workgroups mode.
-  (workgroups-mode 1)
-
   )