diff --git a/common-sw.nix b/common-sw.nix
index 224fc9f..6b5051b 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -2,26 +2,25 @@
 
 {
   environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
-    gitg
     gmpc
     m4
     openjdk8
     sbt scala
     chromium
     qalculate-gtk
-    speedcrunch
     viewnior
     gnupg
     pass xclip pwgen
     remmina
     ledger
-    hledger
+    # hledger
     # hledger-diff
     cmake ninja
     mpv
     neomutt notmuch
     patchelf
     loc
+    tokei
     ripgrep
     imagemagick
     mercurial
@@ -43,7 +42,7 @@
     ghostscript # for auctex
     aspell
 
-    nodejs-9_x
+    (pkgs.nodejs-10_x or nodejs-9_x)
 
     mediainfo
 
@@ -64,9 +63,8 @@
     z3
     cvc4
     graphviz
+    open-wbo
     # toysolver
-
-    emacsPackages.proofgeneral
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
   nixpkgs.config.packageOverrides = pkgs: with pkgs; let
diff --git a/large-sw.nix b/large-sw.nix
index 7d65c7c..bca6656 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -9,35 +9,22 @@
     inkscape
     jabref
     stable.libreoffice-fresh
+    stablePkgs
     calibre
     goldendict
 
-    qutebrowser
-
-    open-wbo # only in 17.09+
-
     vscode
     llvmPackages_5.clang
 
     stack
 
-    lean
+    elan
     coq
-
-    electrum
+    emacsPackages.proofgeneral
 
     rustup
-    # cargo rustc
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
-  nixpkgs.config.packageOverrides = pkgs: with pkgs; {
-    myemacs = emacs25.override {
-      withGTK2 = false;
-      withGTK3 = true;
-      withXwidgets = true;
-    };
-  };
-
   programs.wireshark = {
     enable = true;
     package = pkgs.wireshark;