Merlin's fork from dwm-6.0