Improved unicorn configs