Clean up and add 2bwm support