diff --git a/user-manifest.scm b/user-manifest.scm
index 73f1720..03cf974 100644
--- a/user-manifest.scm
+++ b/user-manifest.scm
@@ -1,9 +1,10 @@
 (specifications->manifest
  '("emacs" "emacs-magit" "emacs-auctex" "emacs-geiser" "emacs-slime"
    "emacs-use-package" "emacs-neotree" "emacs-paredit" "emacs-ivy"
-   "emacs-helm" "emacs-helm-gtags" "emacs-helm-swoop" "emacs-helm-descbinds" "emacs-helm-ls-git" "emacs-helm-unicode"
+   "emacs-helm" "emacs-helm-gtags" "emacs-helm-tramp" "emacs-helm-swoop"
+   "emacs-helm-descbinds" "emacs-helm-ls-git" "emacs-helm-unicode" "emacs-helm-exwm"
    "emacs-ag" "emacs-yasnippet" "emacs-yasnippet-snippets" "emacs-helm-c-yasnippet"
-   "emacs-yasnippet-snippets" "emacs-auto-yasnippet" "emacs-undo-tree"
+   "emacs-auto-yasnippet" "emacs-undo-tree"
 
    "emacs-restclient" "emacs-rainbow-identifiers" "emacs-rainbow-delimiters" "emacs-highlight-sexp"
    "emacs-isearch+" "emacs-org" "emacs-org-web-tools" "emacs-org-mind-map"
@@ -16,17 +17,23 @@
    "emacs-fill-column-indicator"
    "emacs-dired-hacks"
 
+   "emacs-elpher"
+
    "emacs-all-the-icons"
 
+   "emacs-scribble-mode"
+
+   ;; TODO: Package hash mismatch
+   ;;"emacs-hamlet-mode"
+
    ;; Packages that are not yet upstream
-   "z" "fzf" "spaceship-prompt" "zsh-autosuggestions"
+   "sh-z" "fzf" "spaceship-prompt" "zsh-autosuggestions"
    "emacs-doom-themes" "emacs-doom-modeline" "emacs-rebox2"
-   "emacs-multi-term" "emacs-ac-geiser" "emacs-highlight-indent-guides"
+;;  "emacs-ac-geiser"
+   "emacs-vterm" "emacs-multi-term" "emacs-highlight-indent-guides"
    "emacs-ibuffer-vc" "emacs-highlight-parentheses" "emacs-intel-hex-mode"
    "emacs-quack" "emacs-mu4e-maildirs-extension"
 
-   "emacs-scribble-mode"
-
    "emacs-projectile"
    "emacs-helm-projectile"
 
@@ -51,19 +58,31 @@
    "beets" "youtube-dl" "ncmpcpp"
 
    "git" "openssh" "direnv"
-   "texlive" "graphviz"
+   "texlive"
 
    "kitty" "dunst"
    "rofi"
 
+   "ungoogled-chromium"
    "icecat" "mpv"
 
    "rhash"
 
-   "xlsfonts"
+   ;; Fonts that I may or maynot need
+   "font-terminus" "font-fira-code" "font-dejavu" "gs-fonts"
 
    "terraform" "terraform-provider-aws"
 
+   "glibc-locales"
+
+   ;; ;; Xorg
+   "xinit" "xorg-server" "xf86-input-libinput" "xf86-video-fbdev"
+   "xrandr" "xsetroot" "setxkbmap" "xrdb" "xlsfonts"
+   "xkbcomp" "xkeyboard-config" "mesa"
+
+   ;; Guix
+   "graphviz"
+
    ;; TODO: kicad currently broken (wxwidgets does not build)
    ;; "kicad" "kicad-library" "kicad-symbols" "gtkwave"