More cleanup done and added HLWM rules