Unity among the quotes! And small Config refactor