Add more groups
Abstract window selector
Add window-delete