diff --git a/options.conf b/options.conf
index 8e90747..09323ac 100644
--- a/options.conf
+++ b/options.conf
@@ -15,7 +15,7 @@
 
 # opengl, video, X
 */* dri opengl sdl -wayland xv xvmc X
-*/* video_drivers: nouveau intel vesa
+*/* video_drivers: nouveau
 
 # image formats
 */* apng exif gif jpeg jpeg2k png svg tiff wmf
@@ -31,7 +31,7 @@
 */* x86_cpu_features: aes avx mmxext mmx popcnt sse sse2 ssse3 sse4.1 sse4.2
 
 # build options
-*/* build_options: symbols=strip jobs=8 -optional_tests -recommended_tests -expensive_tests
+*/* build_options: jobs=8 -optional_tests -recommended_tests -expensive_tests
 
 # targets
 */* targets: x86_64-pc-linux-gnu
diff --git a/options.conf.d/development.conf b/options.conf.d/development.conf
index 626358b..b71e91d 100644
--- a/options.conf.d/development.conf
+++ b/options.conf.d/development.conf
@@ -1,8 +1,18 @@
 dev-util/cunit ncurses
 
 # ghc
+dev-lang/ghc llvm
 sys-libs/ncurses compat-libs
 
+# haskell
+*/* profile hscolour
+dev-haskell/* doc
+#dev-lang/ghc doc
+dev-haskell/haddock-api -doc -profile
+#dev-haskell/* build_options: optional_tests recommended_tests expensive_tests
+dev-haskell/hspec-discover -profile
+dev-haskell/hspec -profile
+
 
 dev-scm/git tk
 
@@ -14,6 +24,14 @@ dev-lang/swig perl
 # latex
 app-text/texlive-core xetex
 
+# leksah
+net-libs/webkit media
+
 # rust
 dev-lang/llvm static
 dev-lang/rust internal-llvm
+
+# emacs
+app-editors/emacs freetype xim
+app-editors/emacs providers: gtk3
+
diff --git a/options.conf.d/laptop.conf b/options.conf.d/laptop.conf
new file mode 100644
index 0000000..a6cc81a
--- /dev/null
+++ b/options.conf.d/laptop.conf
@@ -0,0 +1,3 @@
+*/* video_drivers: intel vesa
+
+*/* build_options: symbols=strip
diff --git a/options.conf.d/non-laptop.conf b/options.conf.d/non-laptop.conf
new file mode 100644
index 0000000..7314cde
--- /dev/null
+++ b/options.conf.d/non-laptop.conf
@@ -0,0 +1,5 @@
+*/* x86_cpu_features: avx2 fma sse3
+
+*/* build_options: symbols=split
+
+*/* targets: i686-pc-linux-gnu
diff --git a/package_mask.conf b/package_mask.conf
index 020e3a9..ea12b4e 100644
--- a/package_mask.conf
+++ b/package_mask.conf
@@ -5,7 +5,7 @@
 >=sys-apps/iproute2-3.19
 
 # steam
->x11-drivers/nvidia-drivers-358.17
+>x11-drivers/nvidia-drivers-364.20
 
 >=dev-lang/node-5
 
diff --git a/repository.template b/repository.template
index fc18ac8..7f005b5 100644
--- a/repository.template
+++ b/repository.template
@@ -1,3 +1,3 @@
 format = %{repository_template_format}
 location = /var/db/paludis/repositories/%{repository_template_name}
-sync = %{repository_template_sync} local: git+file:///home/hasufell/repositories/%{repository_template_name}
+sync = %{repository_template_sync}
diff --git a/sets/desktop.conf b/sets/desktop.conf
index 24b2685..522da1a 100644
--- a/sets/desktop.conf
+++ b/sets/desktop.conf
@@ -44,7 +44,6 @@
 * x11-apps/spacefm
 * sys-apps/udevil
 
-* x11-apps/gsynaptics
 * x11-apps/xbindkeys
 * x11-apps/xdotool
 * x11-apps/xhost
@@ -56,7 +55,6 @@
 * x11-drivers/xf86-input-keyboard
 * x11-drivers/xf86-input-mouse
 * x11-drivers/xf86-video-nouveau
-* x11-misc/cbatticon
 * x11-misc/dmenu
 * x11-misc/zim
 * x11-utils/xclip
@@ -70,3 +68,5 @@
 * app-office/libreoffice
 
 * sci-apps/galculator
+
+* x11-apps/xkill
diff --git a/sets/development.conf b/sets/development.conf
index c0086bc..bdf3979 100644
--- a/sets/development.conf
+++ b/sets/development.conf
@@ -1,5 +1,6 @@
 # exherbo
 * app-vim/exheres-syntax
+#* app-emacs/exheres-mode
 #* dev-util/exherbo-cabal
 
 # haskell
@@ -9,6 +10,7 @@
 * dev-haskell/haddock
 
 # VCSes and VCS-tools
+* dev-scm/mercurial
 * dev-util/tig
 
 # C
@@ -41,6 +43,10 @@
 # vim
 * dev-util/ctags
 
+# documentation
+* app-doc/doxygen
+* media-gfx/graphviz
+
 # java
 * virtual/jdk
 
@@ -55,6 +61,23 @@
 * dev-lang/scala-bin
 * dev-scala/sbt
 
+# erlang
+* dev-erlang/rebar
+* dev-lang/erlang
+
+# leksah
+#* net-libs/webkit:3.0
+
+# js
+* dev-lang/node
+
+
+# java
+* virtual/jdk
+
+# font
+* fonts/FiraCode
+
 # fstar
 * dev-lang/fstar
 * dev-lang/fsharp
diff --git a/sets/games.conf b/sets/games.conf
index 59170f0..3fb6a12 100644
--- a/sets/games.conf
+++ b/sets/games.conf
@@ -9,7 +9,6 @@
 * games-engines/openmw
 * games-engines/renpy
 * games-engines/renpy:6.99
-#* games-roguelike/FTL
 * games-roguelike/dungeon-crawl-stone-soup
 #* games-roguelike/tome4
 #* games-rpg/arx-libertatis
diff --git a/sets/laptop.conf b/sets/laptop.conf
new file mode 100644
index 0000000..ef27c5f
--- /dev/null
+++ b/sets/laptop.conf
@@ -0,0 +1,12 @@
+# laptop specific stuff
+
+* firmware/linux-firmware
+* x11-apps/gsynaptics
+* x11-misc/cbatticon
+
+# networkmanager
+* net-apps/NetworkManager
+* net-apps/NetworkManager-openvpn
+* net-apps/NetworkManager-pptp
+* net-apps/NetworkManager-vpnc
+* net-misc/NetworkManager-openconnect
diff --git a/sets/mysystem.conf b/sets/mysystem.conf
index 63ae296..9ca211d 100644
--- a/sets/mysystem.conf
+++ b/sets/mysystem.conf
@@ -10,7 +10,6 @@
 * app-text/wgetpaste
 * dev-lang/clang
 * dev-util/debootstrap
-* firmware/linux-firmware
 * net-misc/htpdate
 * sys-apps/busybox
 * sys-apps/etckeeper
diff --git a/sets/networking.conf b/sets/networking.conf
index 99e0b2d..88f814c 100644
--- a/sets/networking.conf
+++ b/sets/networking.conf
@@ -1,25 +1,13 @@
 * net-analyzer/tcpdump
 * net-analyzer/traceroute
 * net-analyzer/wireshark
-#* net-dns/bind-tools
 * net-firewall/iptables
 * net-fs/samba
 * net-mail/swaks
-#* net-misc/dhcpcd
 * net-misc/iputils
-#* net-misc/netifrc
 * net-misc/tor
 * net-scanner/nmap
-#* sys-apps/ethtool
 * sys-apps/net-tools
-#* virtual/dhcp-client
-
-# networkmanager
-* net-apps/NetworkManager
-* net-apps/NetworkManager-openvpn
-* net-apps/NetworkManager-pptp
-* net-apps/NetworkManager-vpnc
-* net-misc/NetworkManager-openconnect
 
 # other
 * net-utils/macchanger
diff --git a/sets/non-laptop.conf b/sets/non-laptop.conf
new file mode 100644
index 0000000..c0ebf86
--- /dev/null
+++ b/sets/non-laptop.conf
@@ -0,0 +1,20 @@
+* games-action/openclonk
+* games-arcade/duckmarines
+* games-arcade/hawkthorne-journey
+* games-arcade/mari0
+* games-arcade/mrrescue
+* games-arcade/notpacman
+* games-arcade/nottetris2
+* games-arcade/opensonic
+* games-arcade/orthorobot
+* games-engines/stratagus
+* games-fps/eduke32
+* games-fps/sauerbraten
+* games-fps/urbanterror
+* games-fps/warsow
+* games-fps/xonotic
+
+* net-misc/dhcpcd
+* net-misc/netifrc
+* sys-apps/ethtool
+* virtual/dhcp-client