diff --git a/rekahsoft-gnu/packages/emacs-xyz.scm b/rekahsoft-gnu/packages/emacs-xyz.scm
index 52f83eb..d6fda59 100644
--- a/rekahsoft-gnu/packages/emacs-xyz.scm
+++ b/rekahsoft-gnu/packages/emacs-xyz.scm
@@ -36,22 +36,24 @@
 ;;;
 
 (define-public emacs-treemacs-20201225
-  (package
-    (inherit emacs-treemacs)
-    (version "6b045fd585421ab3c9e1185c2508d34af700490b")
-    (name "emacs-treemacs-20201225")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/Alexander-Miller/treemacs")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj"))))
-    (arguments (substitute-keyword-arguments (package-arguments emacs-treemacs)
-                 ((#:phases phases)
-                  `(alist-delete 'check ,phases))))))
+  (let ((commit "6b045fd585421ab3c9e1185c2508d34af700490b")
+        (revision "1"))
+    (package
+      (inherit emacs-treemacs)
+      (version (git-version "2.8.0" revision commit))
+      (name "emacs-treemacs-20201225")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/Alexander-Miller/treemacs")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj"))))
+      (arguments (substitute-keyword-arguments (package-arguments emacs-treemacs)
+                   ((#:phases phases)
+                    `(alist-delete 'check ,phases)))))))
 
 (define-public emacs-treemacs-extra-20201225
   (package
@@ -75,41 +77,45 @@
                (copy-recursively "../extra" ".")))))))))
 
 (define-public emacs-all-the-icons-20201225
-  (package
-   (inherit emacs-all-the-icons)
-   (version "6917b08f64dd8487e23769433d6cb9ba11f4152f")
-   (name "emacs-all-the-icons-20201225")
-   (source (origin
-            (method git-fetch)
-            (uri (git-reference
-                  (url "https://github.com/domtronn/all-the-icons.el")
-                  (commit version)))
-            (file-name (git-file-name name version))
-            (sha256
-             (base32
-              "0jzpil1k5brg4dvy0fxibbwwb2hkni5fkxng4n0wfv6099b2zc68"))))))
+  (let ((commit "6917b08f64dd8487e23769433d6cb9ba11f4152f")
+        (revision "1"))
+    (package
+      (inherit emacs-all-the-icons)
+      (version (git-version "4.0.1" revision commit))
+      (name "emacs-all-the-icons-20201225")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/domtronn/all-the-icons.el")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0jzpil1k5brg4dvy0fxibbwwb2hkni5fkxng4n0wfv6099b2zc68")))))))
 
 (define-public emacs-doom-themes-20201225
-  (package
-   (inherit emacs-doom-themes)
-   (version "3761dfce75144e49789b6576e187acd82e2731ee")
-   (name "emacs-doom-themes-20201225")
-   (source (origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/hlissner/emacs-doom-themes")
-                   (commit version)))
-             (file-name (git-file-name name version))
-             (sha256
-              (base32 "0a0lz9kkaaxj2r8xkcgyczz9pxq5hb4kd8mivqxmcj9572xs6v1r"))))
-   (arguments
-     (substitute-keyword-arguments
-         (package-arguments emacs-doom-themes)
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (add-after 'unpack 'remove-broken-themes
-             (lambda _
-               (delete-file "themes/doom-plain-theme.el")))))))))
+  (let ((commit "3761dfce75144e49789b6576e187acd82e2731ee")
+        (revision "1"))
+    (package
+      (inherit emacs-doom-themes)
+      (version (git-version "2.1.6" revision commit))
+      (name "emacs-doom-themes-20201225")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/hlissner/emacs-doom-themes")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32 "0a0lz9kkaaxj2r8xkcgyczz9pxq5hb4kd8mivqxmcj9572xs6v1r"))))
+      (arguments
+       (substitute-keyword-arguments
+           (package-arguments emacs-doom-themes)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (add-after 'unpack 'remove-broken-themes
+               (lambda _
+                 (delete-file "themes/doom-plain-theme.el"))))))))))
 
 (define-public emacs-helm-tramp
   (package
@@ -530,60 +536,62 @@ See perspective.el on github: https://github.com/nex3/perspective-el
     (license license:gpl3+)))
 
 (define-public emacs-helm-rg
-  (package
-    (name "emacs-helm-rg")
-    (version "ee0a3c09da0c843715344919400ab0a0190cc9dc")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/cosmicexplorer/helm-rg")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0m4l894345n0zkbgl0ar4c93v8pyrhblk9zbrjrdr9cfz40bx2kd"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  ((guix build emacs-build-system) #:prefix emacs:)
-                  (guix build utils)
-                  (srfi srfi-1))
-       #:imported-modules (,@%gnu-build-system-modules
-                           (guix build emacs-build-system)
-                           (guix build emacs-utils))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
-           (lambda _
-             (invoke "make" "compile-all")
-             #t))
-         (replace 'check
-           (lambda _
-             (invoke "make" "test-noninteractive")
-             #t))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (target (string-append out "/share/emacs/site-lisp")))
-               (mkdir-p target)
-               (for-each
-                (lambda (f) (install-file f target))
-                (filter (lambda (f)
-                          (not (or (string-contains f "test")
-                                (string-contains f "checkdoc"))))
-                        (find-files "." "\\.elc?$"))))))
-         (add-after 'install 'make-autoloads
-             (assoc-ref emacs:%standard-phases 'make-autoloads))
-         (delete 'strip))))
-    (native-inputs
-     `(("emacs" ,emacs-minimal)))
-    (propagated-inputs
-     `(("emacs-dash" ,emacs-dash)
-       ("emacs-helm" ,emacs-helm)))
-    (home-page
-     "https://github.com/cosmicexplorer/helm-rg")
-    (synopsis "Helm interface to ripgrep")
-    (description
-     "Helm interface for ripgrep.")
-    (license license:gpl3+)))
+  (let ((commit "ee0a3c09da0c843715344919400ab0a0190cc9dc")
+        (revision "1"))
+    (package
+      (name "emacs-helm-rg")
+      (version (git-version "0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/cosmicexplorer/helm-rg")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0m4l894345n0zkbgl0ar4c93v8pyrhblk9zbrjrdr9cfz40bx2kd"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:modules ((guix build gnu-build-system)
+                    ((guix build emacs-build-system) #:prefix emacs:)
+                    (guix build utils)
+                    (srfi srfi-1))
+                   #:imported-modules (,@%gnu-build-system-modules
+                                       (guix build emacs-build-system)
+                                       (guix build emacs-utils))
+                   #:phases
+                   (modify-phases %standard-phases
+                     (delete 'configure)
+                     (replace 'build
+                       (lambda _
+                         (invoke "make" "compile-all")
+                         #t))
+                     (replace 'check
+                       (lambda _
+                         (invoke "make" "test-noninteractive")
+                         #t))
+                     (replace 'install
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         (let* ((out (assoc-ref outputs "out"))
+                                (target (string-append out "/share/emacs/site-lisp")))
+                           (mkdir-p target)
+                           (for-each
+                            (lambda (f) (install-file f target))
+                            (filter (lambda (f)
+                                      (not (or (string-contains f "test")
+                                            (string-contains f "checkdoc"))))
+                                    (find-files "." "\\.elc?$"))))))
+                     (add-after 'install 'make-autoloads
+                       (assoc-ref emacs:%standard-phases 'make-autoloads))
+                     (delete 'strip))))
+      (native-inputs
+       `(("emacs" ,emacs-minimal)))
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-helm" ,emacs-helm)))
+      (home-page
+       "https://github.com/cosmicexplorer/helm-rg")
+      (synopsis "Helm interface to ripgrep")
+      (description
+       "Helm interface for ripgrep.")
+      (license license:gpl3+))))