Tidied configuration, added separate/combined profiles