diff --git a/pkgs/pkgsets.nix b/pkgs/pkgsets.nix
index 9e87459..40b201f 100644
--- a/pkgs/pkgsets.nix
+++ b/pkgs/pkgsets.nix
@@ -79,7 +79,7 @@ let
     ( aspellWithDicts   (d: with d; [ de en en-computers en-science ] ))
   ];
 
-  emacs = stablepkgs.emacsWithPackages (epkgs: with epkgs; [
+  emacs = gitpkgs.emacsWithPackages (epkgs: with epkgs; [
     /* Theming */
     solarized-theme color-theme-sanityinc-tomorrow moe-theme powerline moody minions
     /*General Stuff */
@@ -114,7 +114,7 @@ let
     yaml-mode
     company
     # Irony is currently broken.
-    # /* C/C++ */ irony company-irony  company-irony-c-headers flycheck-irony clang-format pkgs.clang-tools
+    /* C/C++ */ irony company-irony  company-irony-c-headers flycheck-irony clang-format pkgs.clang-tools
     /* Haskell */ haskell-mode flycheck-haskell
     /* Org */ org org-ref pdf-tools org-bullets org-caldav
     /* Rust */ rust-mode flycheck-rust racer
@@ -145,7 +145,7 @@ let
     fetchmail
     isync
     mailutils
-    mu
+    gitpkgs.mu
     pandoc
     postfix
   ];
@@ -265,7 +265,6 @@ let
     gnome3.gnome-terminal
     gnome3.gvfs
     gvfs
-    gitpkgs.krita gitpkgs.gmic_krita_qt
     oneko
     pcmanfm lxmenu-data shared_mime_info
     pavucontrol