Cleaning up hlwm config
various updates