diff --git a/portage/sets/bleh b/portage/sets/bleh
deleted file mode 100644
index 8b13789..0000000
--- a/portage/sets/bleh
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/portage/sets/development b/portage/sets/development
index a8e8052..2398af1 100644
--- a/portage/sets/development
+++ b/portage/sets/development
@@ -34,6 +34,7 @@ app-vim/pgn-syntax
 app-vim/selinux-syntax
 app-vim/simple-bookmarks
 app-vim/solarized
+app-vim/tagbar
 app-vim/taglist
 app-vim/tt2-syntax
 app-vim/udev-syntax
@@ -45,7 +46,7 @@ app-vim/wikipedia-syntax
 app-vim/xquery-syntax
 app-vim/xsl-syntax
 app-vim/youcompleteme
-dev-embedded/gnome-avrdude
+app-vim/scala-syntax
 #dev-lang/lazarus
 dev-python/jedi
 #dev-util/a8
@@ -54,10 +55,83 @@ dev-python/jedi
 dev-util/cloc
 dev-util/cunit
 dev-util/ddd
-dev-util/devhelp
+#* dev-util/devhelp
 #dev-util/geany
 #dev-util/geany-plugins
 #dev-util/monodevelop
 dev-util/nemiver
 #dev-util/ninja-ide
 dev-util/splint
+
+# haskell
+##* dev-haskell/haddock
+##* dev-haskell/hscolour
+##* dev-haskell/haskell-src-meta
+##* dev-haskell/haskell-src
+##* dev-haskell/haskell-src-exts
+# * dev-haskell/hasktags # in haskell-overlay
+# * app-vim/haskellmode # in haskell-overlay
+# * app-emacs/ghc-mod # in haskell-overlay
+#* dev-haskell/tuple
+#* dev-haskell/lens
+#* dev-haskell/monadrandom
+# * app-portage/hackport # # in haskell-overlay
+#* dev-haskell/polynomial
+##* dev-haskell/scan
+#* dev-haskell/base64-bytestring
+#* dev-haskell/haskell-platform
+#* dev-haskell/arithmoi
+#* dev-haskell/gloss
+#* dev-haskell/diagrams
+#* dev-haskell/diagrams-contrib
+#* dev-haskell/diagrams-gtk
+#* dev-haskell/diagrams-svg
+##* dev-haskell/cabal-install
+#* dev-haskell/glade
+# * dev-haskell/pointful # # in haskell-overlay
+# * dev-haskell/pointfree # # in haskell-overlay
+#* dev-haskell/linear
+#* dev-haskell/ac-vector
+#* dev-haskell/ac-angle
+
+dev-util/glade
+
+# latex
+app-office/texmaker
+app-text/texlive
+dev-tex/minted
+dev-tex/latex-beamer
+# provides lineno, needed by minted: ebuild bug
+dev-texlive/texlive-humanities
+dev-texlive/texlive-xetex
+
+
+# misc
+dev-util/indent
+dev-util/valgrind
+dev-util/strace
+dev-util/checkbashisms
+dev-util/meld
+sys-devel/gdb
+
+
+# languages
+dev-lang/go
+dev-lang/ghc
+dev-lang/gprolog
+
+# liquidhaskell
+sci-mathematics/z3
+
+app-i18n/poedit
+
+
+# vcs
+dev-vcs/tig
+dev-vcs/bzr
+dev-vcs/git-cola
+dev-vcs/hg-git
+dev-vcs/mercurial
+dev-vcs/tortoisehg
+dev-vcs/git
+
diff --git a/portage/sets/games b/portage/sets/games
index 6082340..457d046 100644
--- a/portage/sets/games
+++ b/portage/sets/games
@@ -1,19 +1,18 @@
-app-emulation/wine
-app-emulation/winetricks
 #dev-games/higan-ananke
 #games-action/awesomenauts
 #games-action/beathazardultra
 games-action/brutal-legend
 #games-action/chromium-bsu
-games-action/cs2d
+#* games-action/cs2d
 #games-action/hotline-miami
 #games-action/intrusion2
+games-action/minetest
 #games-action/minetest_build
 games-action/minetest_game
 #games-action/minetest_survival
 #games-action/openastromenace
-#games-action/openclonk
-games-action/solar2
+#* games-action/openclonk
+#* games-action/solar2
 games-action/supertuxkart
 #games-action/super-hexagon
 #games-action/swordandsworcery
@@ -24,47 +23,61 @@ games-action/trosh
 games-arcade/commandergenius
 #games-arcade/dynamitejack
 games-arcade/mari0
-#games-arcade/notpacman
-#games-arcade/nottetris2
+games-arcade/notpacman
+games-arcade/nottetris2
 games-arcade/opensonic
-#games-arcade/retrobattle
+games-arcade/retrobattle
 games-arcade/supertux
 games-board/awale
 games-board/capicity
 #games-board/cockatrice
+#* games-board/eboard
 games-board/pioneers
 games-board/pychess
 games-board/pysolfc
 games-board/xmahjongg
-games-emulation/dosbox
-#games-emulation/epsxe
+#* games-emulation/epsxe
 games-emulation/gambatte
 #games-emulation/higan
-games-emulation/mupen64plus
-games-emulation/vbam
-games-emulation/zsnes
+#* games-emulation/mupen64plus
+#* games-emulation/psemu-gpupetemesagl
+#* games-emulation/psemu-gpupetexgl2
+#* games-emulation/psemu-padxwin
+#* games-emulation/psemu-peopssoftgpu
+#* games-emulation/psemu-peopsspu
+#* games-emulation/vbam
+#games-emulation/zsnes
 games-engines/gemrb
+games-engines/love:0.7
 games-engines/love:0.8
+games-engines/love:0.9
+games-engines/love:0
 games-engines/odamex
 games-engines/openmw
 games-engines/renpy
-games-engines/renpy:6.14
+#* games-engines/renpy:6.14
 games-engines/renpy:6.15
 games-engines/renpy:6.16
 games-engines/renpy:6.17
+games-engines/renpy:6.18
+games-engines/renpy:6.99
 games-engines/residualvm
 games-engines/scummvm
 #games-fps/doomsday
+games-fps/duke3d-data
 games-fps/eduke32
 games-fps/freedoom
 games-fps/quake3
-games-fps/sauerbraten
+#* games-fps/sauerbraten
 #games-fps/turtlearena
-games-fps/unvanquished
-games-fps/urbanterror
+#* games-fps/unvanquished
+#* games-fps/urbanterror
 games-fps/warsow
+#* games-fps/xonotic
 #games-kids/crayon-physics
+games-misc/autumns-journey
 games-misc/cowsay
+#* games-misc/doge
 games-misc/dont-starve
 games-misc/fortune-mod
 games-misc/fortune-mod-chucknorris
@@ -72,9 +85,9 @@ games-misc/fortune-mod-firefly
 games-misc/fortune-mod-futurama
 games-misc/fortune-mod-starwars
 games-misc/fortune-mod-tao
-#games-misc/katawa-shoujo
+#* games-misc/katawa-shoujo
 #games-misc/little-inferno
-games-misc/lolcat
+#* games-misc/lolcat
 #games-misc/papers-please
 #games-puzzle/bastet
 games-puzzle/larry
@@ -85,46 +98,52 @@ games-puzzle/splice
 games-puzzle/tiny-and-big
 games-roguelike/FTL
 games-roguelike/stone-soup
-games-roguelike/tome4
+#* games-roguelike/tome4
+games-rpg/a-bird-story
 games-rpg/arx-fatalis-data
 games-rpg/arx-libertatis
 games-rpg/avadon
+games-rpg/baldurs-gate-ee
+games-rpg/baldurs-gate-2-ee
 #games-rpg/bastion
 #games-rpg/dear-esther
 #games-rpg/dungeon-defenders
 games-rpg/flare
 games-rpg/grimrock
 games-rpg/kqlives
-games-rpg/mana
-games-rpg/manaplus
-games-rpg/morrowind-data
+#* games-rpg/mana
+#* games-rpg/manaplus
+#* games-rpg/morrowind-data
 games-rpg/penumbra-collection
+games-rpg/pillars-of-eternity
 games-rpg/sumwars
-games-rpg/tmw
+#* games-rpg/tmw
 games-rpg/to-the-moon
 games-rpg/valyriatear
-games-rpg/zsdx
-games-rpg/zsxd
+games-rpg/wasteland2
+#* games-rpg/zsdx
+#* games-rpg/zsxd
 games-strategy/0ad
 #games-strategy/defcon-demo
 games-strategy/dunelegacy
 games-strategy/freeciv
 #games-strategy/freecol
-games-strategy/freeorion
+#* games-strategy/freeorion
 games-strategy/freeserf
 games-strategy/freesynd
-games-strategy/hedgewars
+#* games-strategy/hedgewars
 games-strategy/ja2-stracciatella
 #games-strategy/opendungeons
 games-strategy/openra
 games-strategy/s25rttr
 #games-strategy/ufo-ai
-games-strategy/uqm
+#* games-strategy/uqm
 #games-strategy/wargus
 games-strategy/wesnoth
 #games-strategy/widelands
 games-strategy/zod-engine
-games-util/desurium-meta
+#* games-util/desurium-meta
 games-util/joystick
-games-util/osavul
+#* games-util/lutris
+#* games-util/osavul
 #games-util/xgamer
diff --git a/portage/sets/optional b/portage/sets/optional
index 44dd355..7c6e41d 100644
--- a/portage/sets/optional
+++ b/portage/sets/optional
@@ -7,15 +7,16 @@ net-fs/davfs2
 dev-python/pyliblzma
 
 # for sftp access to tahoe-lafs node
-dev-python/twisted-conch
+#* dev-python/twisted-conch
 
 # youtube-viewer
-dev-perl/Text-CharWidth
-dev-perl/LWP-Protocol-https
-dev-perl/TermReadKey
-dev-perl/Term-ReadLine-Gnu
-dev-perl/Text-CharWidth
-dev-perl/XML-Fast
-net-misc/gcap
-virtual/perl-File-Temp
-virtual/perl-Scalar-List-Utils
+#* dev-perl/Text-CharWidth
+#* dev-perl/LWP-Protocol-https
+#* dev-perl/TermReadKey
+#* dev-perl/Term-ReadLine-Gnu
+#* dev-perl/Text-CharWidth
+#* dev-perl/XML-Fast
+#* net-misc/gcap
+#* virtual/perl-File-Temp
+#* virtual/perl-Scalar-List-Utils
+
diff --git a/portage/sets/steam b/portage/sets/steam
index 6b582eb..e0ab3d8 100644
--- a/portage/sets/steam
+++ b/portage/sets/steam
@@ -1,9 +1,44 @@
->=app-emulation/emul-linux-x86-baselibs-20121028[development]
->=app-emulation/emul-linux-x86-gtklibs-20121028[development]
->=app-emulation/emul-linux-x86-opengl-20121028[development]
->=app-emulation/emul-linux-x86-sdl-20121028[development]
->=app-emulation/emul-linux-x86-soundlibs-20121028[development]
->=app-emulation/emul-linux-x86-xlibs-20121028[development]
->=sys-devel/gcc-4.6.0[multilib]
->=sys-libs/glibc-2.15[multilib]
+# mandatory!
+dev-libs/glib:2
+dev-libs/libgcrypt
+dev-libs/nspr
+dev-libs/nss
+gnome-base/gconf
+media-libs/alsa-lib
+media-libs/fontconfig
+media-libs/freetype:2
+media-libs/libjpeg-turbo
+media-libs/libogg
+media-libs/libpng:1.2
+media-libs/libsdl
+media-libs/libtheora
+media-libs/libvorbis
+media-libs/libtxc_dxtn
+media-libs/openal
+net-misc/curl
+net-print/cups
+sys-apps/dbus
+>=sys-devel/gcc-4.6.0
+>=sys-libs/glibc-2.15
+>=sys-libs/zlib-1.2.4
+virtual/libusb:1
 virtual/opengl
+x11-libs/cairo
+x11-libs/gdk-pixbuf
+x11-libs/gtk+:2
+x11-libs/libX11
+x11-libs/libXext
+x11-libs/libXfixes
+x11-libs/libXi
+x11-libs/libXrandr
+x11-libs/libXrender
+x11-libs/pango
+x11-libs/pixman
+
+# texture compression
+media-libs/libtxc_dxtn
+
+# optional
+? media-sound/pulseaudio
+? net-misc/networkmanager
+? x11-misc/xdg-user-dirs
diff --git a/portage/sets/test b/portage/sets/test
deleted file mode 100644
index 96db182..0000000
--- a/portage/sets/test
+++ /dev/null
@@ -1,5 +0,0 @@
-#app-emulation/vboxgtk
-dev-lua/luvit
-media-gfx/pornview
-www-misc/profile-sync-daemon
-#x11-misc/sunflower