Add Unite support
Consolidate settings