revamp

Signed-off-by: Mattias Andrée <maandree@operamail.com>
hide wish list til later

Signed-off-by: Mattias Andrée <maandree@operamail.com>