Merge with latest Demon config

and use wn instead of eff