From 956627cc46d38b3651273e2251a5728fdd887228 Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <godfrey4763@gmail.com>
Date: Mon, 21 Oct 2024 10:03:41 -0500
Subject: [PATCH 01/12] Update to OSLog

Update all print and OS_log calls to OSLog.
---
 PPPC Utility.xcodeproj/project.pbxproj        |   8 +-
 Resources/Base.lproj/Main.storyboard          | 228 +++++++++---------
 Source/Extensions/LoggerExtensions.swift      |  24 ++
 Source/Model/Model.swift                      |  11 +-
 Source/Model/PPPCServicesManager.swift        |   6 +-
 Source/Networking/UploadManager.swift         |  18 +-
 Source/SwiftUI/UploadInfoView.swift           |   9 +-
 .../View Controllers/SaveViewController.swift |  13 +-
 .../TCCProfileViewController.swift            |  12 +-
 9 files changed, 186 insertions(+), 143 deletions(-)
 create mode 100644 Source/Extensions/LoggerExtensions.swift

diff --git a/PPPC Utility.xcodeproj/project.pbxproj b/PPPC Utility.xcodeproj/project.pbxproj
index a2deafc..660a02b 100644
--- a/PPPC Utility.xcodeproj/project.pbxproj	
+++ b/PPPC Utility.xcodeproj/project.pbxproj	
@@ -38,6 +38,7 @@
 		6EC40A16214ECF1E00BE4F17 /* SaveViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EC40A15214ECF1E00BE4F17 /* SaveViewController.swift */; };
 		6EC40A1C214EF87800BE4F17 /* SigningIdentity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EC40A1B214EF87800BE4F17 /* SigningIdentity.swift */; };
 		71061E54246106C800822D35 /* LoadExecutableError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71061E53246106C800822D35 /* LoadExecutableError.swift */; };
+		A149C78D2CC68FBF00E0789E /* LoggerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A149C78C2CC68FA100E0789E /* LoggerExtensions.swift */; };
 		B5E09548250BCCFC00A40409 /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E09547250BCCFC00A40409 /* Alert.swift */; };
 		C01BEDBA28636F57001B0B3B /* SemanticVersionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C01BEDB928636F57001B0B3B /* SemanticVersionTests.swift */; };
 		C03270BA28636330008B38E0 /* SemanticVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03270B928636330008B38E0 /* SemanticVersion.swift */; };
@@ -110,6 +111,7 @@
 		6EC40A1B214EF87800BE4F17 /* SigningIdentity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SigningIdentity.swift; sourceTree = "<group>"; };
 		71061E53246106C800822D35 /* LoadExecutableError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadExecutableError.swift; sourceTree = "<group>"; };
 		97227C6726248CD7000F26C1 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
+		A149C78C2CC68FA100E0789E /* LoggerExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggerExtensions.swift; sourceTree = "<group>"; };
 		B5E09547250BCCFC00A40409 /* Alert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = "<group>"; };
 		C01BEDB928636F57001B0B3B /* SemanticVersionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SemanticVersionTests.swift; sourceTree = "<group>"; };
 		C03270B928636330008B38E0 /* SemanticVersion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SemanticVersion.swift; sourceTree = "<group>"; };
@@ -163,6 +165,7 @@
 		5F90EBDB2319931100738D09 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				A149C78C2CC68FA100E0789E /* LoggerExtensions.swift */,
 				5F90EBDC2319934F00738D09 /* ArrayExtensions.swift */,
 				345B01D523FDBF55008838B6 /* TCCProfileExtensions.swift */,
 			);
@@ -509,6 +512,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				34DED4D623FDDB2B00C53FB9 /* TCCProfileConfigurationPanel.swift in Sources */,
+				A149C78D2CC68FBF00E0789E /* LoggerExtensions.swift in Sources */,
 				5F90EBE12319970500738D09 /* TCCProfileImporter.swift in Sources */,
 				5F95AE1623158F03002E0A22 /* SwiftyCMSDecoder.swift in Sources */,
 				C03270C028636397008B38E0 /* Networking.swift in Sources */,
@@ -743,7 +747,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "1.4.0";
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jamf.opensource.pppcutility;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -766,7 +770,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "1.4.0";
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jamf.opensource.pppcutility;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Resources/Base.lproj/Main.storyboard b/Resources/Base.lproj/Main.storyboard
index 7b15d80..76e1e55 100644
--- a/Resources/Base.lproj/Main.storyboard
+++ b/Resources/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -701,12 +701,12 @@
         <scene sceneID="4dI-AJ-0EB">
             <objects>
                 <viewController title="PPPC Utility" id="ZfI-PN-mks" customClass="TCCProfileViewController" customModule="PPPC_Utility" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" id="bKS-CN-KZi">
-                        <rect key="frame" x="0.0" y="0.0" width="1236" height="800"/>
+                    <view key="view" misplaced="YES" id="bKS-CN-KZi">
+                        <rect key="frame" x="0.0" y="0.0" width="1294" height="800"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="96P-n0-YO3">
-                                <rect key="frame" x="232" y="684" width="1004" height="96"/>
+                                <rect key="frame" x="232" y="684" width="1178" height="96"/>
                                 <subviews>
                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tCz-dw-VgH">
                                         <rect key="frame" x="0.0" y="0.0" width="96" height="96"/>
@@ -720,7 +720,7 @@
                                         </connections>
                                     </imageView>
                                     <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JSo-Ex-mKB">
-                                        <rect key="frame" x="104" y="9" width="900" height="87"/>
+                                        <rect key="frame" x="104" y="9" width="1074" height="87"/>
                                         <subviews>
                                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="4l7-bY-QUr">
                                                 <rect key="frame" x="-2" y="58" width="211" height="29"/>
@@ -745,7 +745,7 @@
                                                 </connections>
                                             </textField>
                                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="bEE-Oo-wyb">
-                                                <rect key="frame" x="-2" y="0.0" width="889" height="28"/>
+                                                <rect key="frame" x="-2" y="0.0" width="1063" height="28"/>
                                                 <textFieldCell key="cell" truncatesLastVisibleLine="YES" selectable="YES" id="3f9-Xq-tJZ">
                                                     <font key="font" metaFont="systemLight" size="11"/>
                                                     <string key="title">identifier "com.jamfsoftware.jamf" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "483DWKW443"</string>
@@ -791,19 +791,19 @@
                                 </customSpacing>
                             </stackView>
                             <scrollView borderType="line" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="03S-CM-lPV">
-                                <rect key="frame" x="232" y="90" width="487" height="559"/>
+                                <rect key="frame" x="232" y="90" width="574" height="559"/>
                                 <clipView key="contentView" copiesOnScroll="NO" id="ziG-1X-dvc" customClass="FlippedClipView" customModule="PPPC_Utility" customModuleProvider="target">
-                                    <rect key="frame" x="1" y="1" width="485" height="557"/>
+                                    <rect key="frame" x="1" y="1" width="572" height="557"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kz4-ht-2cC">
-                                            <rect key="frame" x="-139" y="-443" width="485" height="1000"/>
+                                            <rect key="frame" x="-226" y="-443" width="572" height="1000"/>
                                             <subviews>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZGr-iF-K0I" userLabel="Accessibility Stack View">
-                                                    <rect key="frame" x="0.0" y="950" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="950" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bkw-k8-kxM">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Accessibility:" id="7g4-bu-8ad">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -811,7 +811,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SEh-52-ueo">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="gnT-HC-9jQ" id="RH6-uh-B0i">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -829,7 +829,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LCo-0b-3VH" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="xX5-Qm-Hbt">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -858,10 +858,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xxW-i4-8Ul" userLabel="Admin Files Stack View">
-                                                    <rect key="frame" x="0.0" y="900" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="900" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YqG-2a-LjM">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Admin Files:" id="dZt-BP-e9Y">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -869,7 +869,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PgW-Ff-mhx">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="dd4-ok-ZNg" id="b3m-j7-PsZ">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -887,7 +887,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pLo-RM-uFJ" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="ycO-Hz-ef1">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -916,10 +916,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Go-DV-ssf">
-                                                    <rect key="frame" x="0.0" y="850" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="850" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nGq-tk-4FO">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Calendars:" id="XMX-Bo-y4c">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -927,7 +927,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bSe-hT-Ah8">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="QYY-1f-X7h" id="hmE-fk-BwT">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -947,7 +947,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tva-g6-iKu" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="cKG-aV-y4I">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -976,10 +976,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LPV-zN-38T" userLabel="Camera Stack View">
-                                                    <rect key="frame" x="0.0" y="800" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="800" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xmP-OB-ADb">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Camera:" id="979-ZI-5SX">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -987,7 +987,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X7j-DP-dKk">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="F7s-dB-ccu" id="oLo-5v-B40">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1004,7 +1004,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K84-eC-N2o" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="Ygh-HU-Hd8">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1033,10 +1033,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9iO-vL-Pwi" userLabel="Address Book Stack View">
-                                                    <rect key="frame" x="0.0" y="750" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="750" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fwE-q7-wGs">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Contacts:" id="LpH-qV-2cA">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1044,7 +1044,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kIP-RZ-a35">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="jNh-R9-M22" id="uZP-tO-4EJ">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1065,7 +1065,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9ei-Pc-bwm" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="fdO-ZY-waE">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1095,10 +1095,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HAW-s8-s0x">
-                                                    <rect key="frame" x="0.0" y="700" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="700" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3DS-i5-rT9">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Desktop Folder:" id="Fec-rg-Gn1">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1106,7 +1106,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JIN-BO-Fp8">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="FMM-ro-V8b" id="VMH-px-qdz">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1123,7 +1123,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="o2Q-LB-gdz" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="kBI-qQ-5K5">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1152,10 +1152,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pYo-Lq-NzH" userLabel="Documents Folder Stack View">
-                                                    <rect key="frame" x="0.0" y="650" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="650" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sSA-ZV-lYH">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Documents Folder:" id="D0w-Hq-kpn">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1163,7 +1163,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YNV-Zn-1jp">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="PaS-xa-UD8" id="ulk-2T-V0g">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1180,7 +1180,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AWQ-jY-FwH" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="ISy-Xs-hDX">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1209,10 +1209,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FlL-qy-KET">
-                                                    <rect key="frame" x="0.0" y="600" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="600" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xMN-Jt-QPv">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Downloads Folder:" id="BNO-0A-q85">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1220,7 +1220,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gXX-Zm-0bB">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="NIk-oX-DQf" id="6j7-Dt-umk">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1237,7 +1237,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Ve-3n-a7B" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="Dlw-02-OX0">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1266,10 +1266,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="woU-j8-E1d" userLabel="File Provider Stack View">
-                                                    <rect key="frame" x="0.0" y="550" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="550" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="99h-fH-EoJ">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="File Provider:" id="zcl-kP-VRA">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1277,7 +1277,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lZv-w5-rrd">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="FIX-n3-lFP" id="0vX-YX-QTC">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1294,7 +1294,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dRq-MC-7oj" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="ctB-5D-aCL">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1323,10 +1323,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PKW-Wz-1vE">
-                                                    <rect key="frame" x="0.0" y="500" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="500" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VVZ-4w-pac">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Full Disk Access:" id="V29-FR-cfE">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1334,7 +1334,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="58v-wg-6Ru">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="mSA-L6-7QG" id="PMl-Ow-o0m">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1352,7 +1352,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="URO-T0-544" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="TL1-WR-vaO">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1381,10 +1381,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Law-1x-mbw">
-                                                    <rect key="frame" x="0.0" y="450" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="450" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2AH-a5-Lqb" userLabel="Input Monitoring:">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Input Monitoring:" id="Ze0-2e-eEp" userLabel="Input Monitoring:">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1392,7 +1392,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ouS-wx-aBC">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="V86-LK-5LV" id="9DJ-7D-6AW">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1409,7 +1409,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mFT-P4-Kyb" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="6xj-pM-fzL">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1438,10 +1438,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ARp-oy-MF9" userLabel="Media Library Stack View">
-                                                    <rect key="frame" x="0.0" y="400" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="400" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="A89-LG-pOK">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Media Library:" id="4c9-rY-Uz6">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1449,7 +1449,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n1N-Hx-bP6">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="4ie-PV-k4r" id="aQd-c0-COU">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1466,7 +1466,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="91q-Dn-Rxu" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="GLm-u3-5ib">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1495,10 +1495,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gu9-0B-Z7P">
-                                                    <rect key="frame" x="0.0" y="350" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="350" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0j7-Vk-jJg">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Microphone:" id="zOF-fr-IeZ">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1506,7 +1506,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="C7K-fV-5UL">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="8jN-pb-jTw" id="87t-Yf-7J1">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1523,7 +1523,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Qr-Q4-FYc" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="QO6-6x-cc8">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1552,10 +1552,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fWh-0P-IiR" userLabel="Network Volumes Stack View">
-                                                    <rect key="frame" x="0.0" y="300" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="300" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LHa-uF-1av">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Network Volumes:" id="32o-b1-htW">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1563,7 +1563,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uD1-1Z-8OR">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Wlc-5b-ZH6" id="3Yo-n3-2Cq">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1580,7 +1580,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b55-kc-gGA" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="OxH-4z-VDn">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1609,10 +1609,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y7D-bh-b5J">
-                                                    <rect key="frame" x="0.0" y="250" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="250" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="alU-2I-Ju7">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Photos:" id="7Vv-e5-aQo">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1620,7 +1620,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VcX-fg-HsO">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="xHC-HW-yVt" id="6Us-f3-jyq">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1638,7 +1638,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Q9j-J1-clR" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="x9V-Ag-6n6">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1667,10 +1667,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M89-Vw-gT3">
-                                                    <rect key="frame" x="0.0" y="200" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="200" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nZv-Mi-ER1">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Post Events:" id="foz-yP-g6I">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1678,7 +1678,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EAK-oq-60p">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="49Y-CL-Jmr" id="BTV-ls-Zns">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1696,7 +1696,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7Jz-IY-UoU" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="fh8-8D-vkU">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1725,10 +1725,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fYW-uZ-C2b" userLabel="Reminders Stack View">
-                                                    <rect key="frame" x="0.0" y="150" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="150" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UbP-7E-gab">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Reminders:" id="npq-nc-TUY">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1736,7 +1736,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6su-LE-zAT">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="JMO-rX-lHD" id="Fk2-Us-Q2u">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1754,7 +1754,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="A1b-sQ-vR9" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="Ljv-l8-oye">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1783,10 +1783,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vzO-oY-aP0">
-                                                    <rect key="frame" x="0.0" y="100" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="100" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ddi-gN-7lS">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Removable Volumes:" id="HZO-Vv-fHb">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1794,7 +1794,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="27r-Jg-Rxp">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="bLI-tr-vzf" id="ZxY-Qi-hwN">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1811,7 +1811,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tmm-2R-ETS" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="pr7-fl-X5A">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1840,10 +1840,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kPv-Tl-c0b">
-                                                    <rect key="frame" x="0.0" y="50" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="50" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="o5Q-No-Cpy" userLabel="Screen Recording:">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Screen Recording:" id="OZp-QI-a9L" userLabel="Screen Recording:">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1851,7 +1851,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mSS-FZ-Sk0">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="4xV-9U-FNf" id="Oe4-s2-JcM">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1868,7 +1868,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="36m-yh-kC6" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="R8E-jj-lfX">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -1897,10 +1897,10 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="thb-Gy-Auo" userLabel="Speech Recognition Stack View">
-                                                    <rect key="frame" x="0.0" y="0.0" width="485" height="50"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="572" height="50"/>
                                                     <subviews>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q76-IZ-qo2">
-                                                            <rect key="frame" x="8" y="17" width="228" height="16"/>
+                                                            <rect key="frame" x="8" y="17" width="315" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Speech Recognition:" id="N6t-0N-wFj">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1908,7 +1908,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Bc-Aj-hsp">
-                                                            <rect key="frame" x="239" y="-4" width="212" height="55"/>
+                                                            <rect key="frame" x="326" y="-4" width="212" height="55"/>
                                                             <popUpButtonCell key="cell" type="push" title="-" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="gwx-us-L0W" id="Dx3-v9-nfb">
                                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="menu"/>
@@ -1925,7 +1925,7 @@
                                                             </connections>
                                                         </popUpButton>
                                                         <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="B5K-Rg-tlf" customClass="InfoButton" customModule="PPPC_Utility" customModuleProvider="target">
-                                                            <rect key="frame" x="452" y="11" width="25" height="25"/>
+                                                            <rect key="frame" x="539" y="11" width="25" height="25"/>
                                                             <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" inset="2" id="o7q-ij-eTY">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
@@ -2067,16 +2067,16 @@
                                     </constraints>
                                 </clipView>
                                 <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="KLE-vO-NH9">
-                                    <rect key="frame" x="1" y="542" width="485" height="16"/>
+                                    <rect key="frame" x="1" y="542" width="572" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.99548532731376971" horizontal="NO" id="emx-h0-Wbi">
-                                    <rect key="frame" x="470" y="1" width="16" height="557"/>
+                                    <rect key="frame" x="557" y="1" width="16" height="557"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                             </scrollView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zBr-K2-oEH">
-                                <rect key="frame" x="732" y="654" width="99" height="19"/>
+                                <rect key="frame" x="819" y="654" width="99" height="19"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Apple Events" id="5J4-U2-de8">
                                     <font key="font" metaFont="system" size="16"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -2084,19 +2084,19 @@
                                 </textFieldCell>
                             </textField>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="50" horizontalPageScroll="10" verticalLineScroll="50" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5hq-Rl-ues">
-                                <rect key="frame" x="734" y="90" width="487" height="559"/>
+                                <rect key="frame" x="821" y="90" width="574" height="559"/>
                                 <clipView key="contentView" id="8q0-zv-vzm">
-                                    <rect key="frame" x="1" y="1" width="485" height="557"/>
+                                    <rect key="frame" x="1" y="1" width="572" height="557"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="48" usesAutomaticRowHeights="YES" viewBased="YES" id="dDB-re-qJn">
-                                            <rect key="frame" x="0.0" y="0.0" width="485" height="557"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="572" height="557"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="473" minWidth="40" maxWidth="1000" id="ci3-gO-OVp">
+                                                <tableColumn width="444" minWidth="40" maxWidth="1000" id="ci3-gO-OVp">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -2108,8 +2108,8 @@
                                                     </textFieldCell>
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
-                                                        <tableCellView id="fZw-oC-AdH">
-                                                            <rect key="frame" x="1" y="1" width="482" height="48"/>
+                                                        <tableCellView misplaced="YES" id="fZw-oC-AdH">
+                                                            <rect key="frame" x="1" y="1" width="453" height="48"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" placeholderIntrinsicWidth="466" placeholderIntrinsicHeight="48" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WbE-xX-Aeu">
@@ -2204,7 +2204,7 @@
                                 </scroller>
                             </scrollView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wba-mI-3Kz">
-                                <rect key="frame" x="1147" y="13" width="78" height="32"/>
+                                <rect key="frame" x="1321" y="13" width="78" height="32"/>
                                 <buttonCell key="cell" type="push" title="Upload" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="r6T-OO-bYf">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -2215,7 +2215,7 @@
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gwb-6x-mB1">
-                                <rect key="frame" x="1085" y="13" width="64" height="32"/>
+                                <rect key="frame" x="1259" y="13" width="64" height="32"/>
                                 <buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ifp-GF-Tf3">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -2246,7 +2246,7 @@
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="186" minWidth="40" maxWidth="1000" id="oNB-rR-rpb">
+                                                <tableColumn width="157" minWidth="40" maxWidth="1000" id="oNB-rR-rpb">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -2259,10 +2259,10 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView translatesAutoresizingMaskIntoConstraints="NO" id="tCx-7E-F20">
-                                                            <rect key="frame" x="1" y="1" width="195" height="52"/>
+                                                            <rect key="frame" x="1" y="1" width="184" height="52"/>
                                                             <subviews>
                                                                 <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J9w-FR-5v2">
-                                                                    <rect key="frame" x="8" y="2" width="179" height="48"/>
+                                                                    <rect key="frame" x="8" y="2" width="168" height="48"/>
                                                                     <subviews>
                                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Oeh-iM-54P">
                                                                             <rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
@@ -2276,7 +2276,7 @@
                                                                             </connections>
                                                                         </imageView>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jaN-VW-ctt">
-                                                                            <rect key="frame" x="54" y="16" width="127" height="16"/>
+                                                                            <rect key="frame" x="54" y="16" width="116" height="16"/>
                                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Application Name" id="kO0-5G-Fsl">
                                                                                 <font key="font" metaFont="systemSemibold" size="13"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -2327,7 +2327,7 @@
                                 </scroller>
                             </scrollView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v8I-Mx-BrF">
-                                <rect key="frame" x="764" y="60" width="21" height="23"/>
+                                <rect key="frame" x="851" y="60" width="21" height="23"/>
                                 <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cb2-uy-Yd2">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -2342,7 +2342,7 @@
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RsL-5g-N88">
-                                <rect key="frame" x="735" y="60" width="21" height="23"/>
+                                <rect key="frame" x="822" y="60" width="21" height="23"/>
                                 <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="uMZ-yT-Obu">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -2398,13 +2398,13 @@
                                 </textFieldCell>
                             </textField>
                             <switch horizontalHuggingPriority="750" verticalHuggingPriority="750" baseWritingDirection="leftToRight" alignment="left" translatesAutoresizingMaskIntoConstraints="NO" id="SiC-OP-K6P">
-                                <rect key="frame" x="1176" y="652" width="42" height="25"/>
+                                <rect key="frame" x="1350" y="652" width="42" height="25"/>
                                 <connections>
                                     <action selector="toggleAuthorizationKeyUsage:" target="ZfI-PN-mks" id="8uJ-TA-vPn"/>
                                 </connections>
                             </switch>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P4p-7C-knr">
-                                <rect key="frame" x="1054" y="656" width="123" height="15"/>
+                                <rect key="frame" x="1228" y="656" width="123" height="15"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Big Sur Compatibility" id="22F-cE-hwd">
                                     <font key="font" metaFont="cellTitle"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -2412,7 +2412,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jIB-Ce-nfY">
-                                <rect key="frame" x="1013" y="13" width="74" height="32"/>
+                                <rect key="frame" x="1187" y="13" width="74" height="32"/>
                                 <buttonCell key="cell" type="push" title="Import" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="dRT-sQ-hbk">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -2639,7 +2639,7 @@
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="186" minWidth="40" maxWidth="1000" id="iR9-ex-Cme">
+                                                <tableColumn width="157" minWidth="40" maxWidth="1000" id="iR9-ex-Cme">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -2652,10 +2652,10 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView translatesAutoresizingMaskIntoConstraints="NO" id="bpa-5L-1M7">
-                                                            <rect key="frame" x="1" y="1" width="195" height="52"/>
+                                                            <rect key="frame" x="1" y="1" width="166" height="52"/>
                                                             <subviews>
                                                                 <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Z6B-9I-xcC">
-                                                                    <rect key="frame" x="8" y="2" width="179" height="48"/>
+                                                                    <rect key="frame" x="8" y="2" width="150" height="48"/>
                                                                     <subviews>
                                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7aI-n0-Kag">
                                                                             <rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
@@ -2671,7 +2671,7 @@
                                                                             </connections>
                                                                         </imageView>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5my-7G-rm8">
-                                                                            <rect key="frame" x="56" y="16" width="123" height="16"/>
+                                                                            <rect key="frame" x="56" y="16" width="94" height="16"/>
                                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" drawsBackground="YES" id="1CA-OS-iQk">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
diff --git a/Source/Extensions/LoggerExtensions.swift b/Source/Extensions/LoggerExtensions.swift
new file mode 100644
index 0000000..4976364
--- /dev/null
+++ b/Source/Extensions/LoggerExtensions.swift
@@ -0,0 +1,24 @@
+//
+//  LoggerExtensions.swift
+//  PPPC Utility
+//
+//  Created by Skyler Godfrey on 10/21/24.
+//  Copyright © 2024 Jamf. All rights reserved.
+//
+
+// This extension simplifies the logger instance creation by calling the bundle Id
+// and pre-declaring categories. Currently the predefined categories match the
+// class name. 
+
+import OSLog
+
+extension Logger {
+    static let subsystem = Bundle.main.bundleIdentifier!
+    static let TCCProfileViewController = Logger(subsystem: subsystem, category: "TCCProfileViewController")
+    static let PPPCServicesManager = Logger(subsystem: subsystem, category: "PPPCServicesManager")
+    static let Model = Logger(subsystem: subsystem, category: "Model")
+    static let SaveViewController = Logger(subsystem: subsystem, category: "SaveViewController")
+    static let Main = Logger(subsystem: subsystem, category: "Main")
+    static let UploadInfoView = Logger(subsystem: subsystem, category: "UploadInfoView")
+    static let UploadManager = Logger(subsystem: subsystem, category: "UploadManager")
+}
diff --git a/Source/Model/Model.swift b/Source/Model/Model.swift
index 6c71f41..6e06e1b 100644
--- a/Source/Model/Model.swift
+++ b/Source/Model/Model.swift
@@ -26,6 +26,7 @@
 //
 
 import Cocoa
+import OSLog
 
 @objc class Model: NSObject {
 
@@ -35,6 +36,8 @@ import Cocoa
     @objc dynamic static let shared = Model()
     @objc dynamic var identities: [SigningIdentity] = []
     @objc dynamic var selectedExecutables: [Executable] = []
+    
+    let logger = Logger.Model
 
     func getAppleEventChoices(executable: Executable) -> [Executable] {
         var executables: [Executable] = []
@@ -44,7 +47,7 @@ import Cocoa
             case .success(let executable):
                 executables.append(executable)
             case .failure(let error):
-                print(error)
+                self.logger.error("\(error)")
             }
         }
 
@@ -53,7 +56,7 @@ import Cocoa
             case .success(let executable):
                 executables.append(executable)
             case .failure(let error):
-                print(error)
+                self.logger.error("\(error)")
             }
         }
 
@@ -62,7 +65,7 @@ import Cocoa
             case .success(let executable):
                 executables.append(executable)
             case .failure(let error):
-                print(error)
+                self.logger.error("\(error)")
             }
         }
 
@@ -290,7 +293,7 @@ extension Model {
             case .success(let goodExecutable):
                 executable = goodExecutable
             case .failure(let error):
-                print(error)
+                self.logger.error("\(error)")
             }
         }
 
diff --git a/Source/Model/PPPCServicesManager.swift b/Source/Model/PPPCServicesManager.swift
index cd63169..8804ef6 100644
--- a/Source/Model/PPPCServicesManager.swift
+++ b/Source/Model/PPPCServicesManager.swift
@@ -26,9 +26,13 @@
 //
 
 import Foundation
+import OSLog
 
 class PPPCServicesManager {
+    
     typealias MDMServiceKey = String
+    
+    let logger = Logger.PPPCServicesManager
 
     static let shared = PPPCServicesManager()
 
@@ -50,7 +54,7 @@ class PPPCServicesManager {
                 hashed[service.mdmKey] = service
             }
         } catch {
-            print("Error loading PPPCServices.json: \(error)")
+            logger.error("Error loading PPPCServices.json: \(error)")
         }
 
         allServices = hashed
diff --git a/Source/Networking/UploadManager.swift b/Source/Networking/UploadManager.swift
index 9a75e91..fecd27a 100644
--- a/Source/Networking/UploadManager.swift
+++ b/Source/Networking/UploadManager.swift
@@ -7,10 +7,12 @@
 //
 
 import Foundation
-import os.log
+import OSLog
 
 struct UploadManager {
 	let serverURL: String
+    
+    let logger = Logger.UploadManager
 
 	struct VerificationInfo {
 		let mustSign: Bool
@@ -22,7 +24,7 @@ struct UploadManager {
 	}
 
 	func verifyConnection(authManager: NetworkAuthManager, completionHandler: @escaping (Result<VerificationInfo, VerificationError>) -> Void) {
-		os_log("Checking connection to Jamf Pro server", type: .default)
+        logger.info("Checking connection to Jamf Pro server")
 
 		Task {
 			let networking = JamfProAPIClient(serverUrlString: serverURL, tokenManager: authManager)
@@ -38,10 +40,10 @@ struct UploadManager {
 
 				result = .success(VerificationInfo(mustSign: mustSign, organization: orgName))
 			} catch is AuthError {
-				os_log("Invalid credentials.", type: .default)
+                logger.error("Invalid credentials.")
 				result = .failure(VerificationError.anyError("Invalid credentials."))
 			} catch {
-				os_log("Jamf Pro server is unavailable.", type: .default)
+                logger.error("Jamf Pro server is unavailable.")
 				result = .failure(VerificationError.anyError("Jamf Pro server is unavailable."))
 			}
 
@@ -50,14 +52,14 @@ struct UploadManager {
 	}
 
 	func upload(profile: TCCProfile, authMgr: NetworkAuthManager, siteInfo: (String, String)?, signingIdentity: SigningIdentity?, completionHandler: @escaping (Error?) -> Void) {
-		os_log("Uploading profile: %{public}s", profile.displayName)
+        logger.info("Uploading profile: \(profile.displayName)")
 
 		let networking = JamfProAPIClient(serverUrlString: serverURL, tokenManager: authMgr)
 		Task {
 			let success: Error?
 			var identity: SecIdentity?
 			if let signingIdentity = signingIdentity {
-				os_log("Signing profile with \(signingIdentity.displayName)")
+                logger.info("Signing profile with \(signingIdentity.displayName)")
 				identity = signingIdentity.reference
 			}
 
@@ -67,9 +69,9 @@ struct UploadManager {
 				_ = try await networking.upload(computerConfigProfile: profileData)
 
 				success = nil
-				os_log("Uploaded successfully")
+                logger.info("Uploaded successfully")
 			} catch {
-				os_log("Error creating or uploading profile: %s", type: .error, error.localizedDescription)
+                logger.error("Error creating or uploading profile: \(error.localizedDescription)")
 				success = error
 			}
 
diff --git a/Source/SwiftUI/UploadInfoView.swift b/Source/SwiftUI/UploadInfoView.swift
index a02b20e..6abf89f 100644
--- a/Source/SwiftUI/UploadInfoView.swift
+++ b/Source/SwiftUI/UploadInfoView.swift
@@ -5,7 +5,7 @@
 //  SPDX-License-Identifier: MIT
 //  Copyright (c) 2023 Jamf Software
 
-import os.log
+import OSLog
 import SwiftUI
 
 struct UploadInfoView: View {
@@ -37,6 +37,8 @@ struct UploadInfoView: View {
 	@State private var useSite: Bool = false
 	@State private var siteId: Int = -1
 	@State private var siteName: String = ""
+    
+    let logger = Logger.UploadInfoView
 
 	/// The type of authentication the user wants to use.
 	///
@@ -171,7 +173,7 @@ struct UploadInfoView: View {
 
 	private func warning(_ info: StaticString, shouldDisplay: Bool) {
 		if shouldDisplay {
-			os_log(info, type: .default)
+            logger.info("\(info)")
 			warningInfo = "\(info)"
 		}
 	}
@@ -288,8 +290,7 @@ struct UploadInfoView: View {
 															password: password,
 															server: serverURL)
 					} catch {
-						os_log("Failed to save credentials with error: %s",
-							   type: .error, error.localizedDescription)
+                        logger.error("Failed to save credentials with error: \(error.localizedDescription)")
 					}
 				}
 				// Future on macOS 12+: focus on Payload Name field
diff --git a/Source/View Controllers/SaveViewController.swift b/Source/View Controllers/SaveViewController.swift
index 57744b2..c1a4e12 100644
--- a/Source/View Controllers/SaveViewController.swift	
+++ b/Source/View Controllers/SaveViewController.swift	
@@ -26,6 +26,7 @@
 //
 
 import Cocoa
+import OSLog
 
 class SaveViewController: NSViewController {
 
@@ -57,6 +58,8 @@ class SaveViewController: NSViewController {
     @IBOutlet weak var identitiesPopUp: NSPopUpButton!
     @IBOutlet var identitiesPopUpAC: NSArrayController!
     @IBOutlet weak var saveButton: NSButton!
+    
+    let logger = Logger.SaveViewController
 
     var defaultsController = NSUserDefaultsController.shared
 
@@ -96,7 +99,7 @@ class SaveViewController: NSViewController {
             identities.insert(SigningIdentity(name: "Not signed", reference: nil), at: 0)
             identitiesPopUpAC.add(contentsOf: identities)
         } catch {
-            print("Error loading identities: \(error)")
+            logger.error("Error loading identities: \(error)")
         }
 
         loadImportedTCCProfileInfo()
@@ -125,7 +128,7 @@ class SaveViewController: NSViewController {
     }
 
     func saveTo(url: URL) {
-        print("Saving to \(url)")
+        logger.info("Saving to \(url)")
         let model = Model.shared
         let profile = model.exportProfile(organization: organizationLabel.stringValue,
                                           identifier: payloadIdentifier,
@@ -134,13 +137,13 @@ class SaveViewController: NSViewController {
         do {
             var outputData = try profile.xmlData()
             if let identity = identitiesPopUpAC.selectedObjects.first as? SigningIdentity, let ref = identity.reference {
-                print("Signing profile with \(identity.displayName)")
+                logger.info("Signing profile with \(identity.displayName)")
                 outputData = try SecurityWrapper.sign(data: outputData, using: ref)
             }
             try outputData.write(to: url)
-            print("Saved successfully")
+            logger.info("Saved successfully")
         } catch {
-            print("Error: \(error)")
+            logger.error("Error: \(error)")
         }
         self.dismiss(nil)
     }
diff --git a/Source/View Controllers/TCCProfileViewController.swift b/Source/View Controllers/TCCProfileViewController.swift
index 4b62fe5..b47f8ef 100644
--- a/Source/View Controllers/TCCProfileViewController.swift	
+++ b/Source/View Controllers/TCCProfileViewController.swift	
@@ -26,7 +26,7 @@
 //
 
 import Cocoa
-import os.log
+import OSLog
 import SwiftUI
 
 enum TCCProfileDisplayValue: String {
@@ -144,6 +144,8 @@ class TCCProfileViewController: NSViewController {
             self.insertIntoAppleEvents($0)
         }
     }
+    
+    let logger = Logger.TCCProfileViewController
 
     private func toggleAuthorizationKey(theSwitch: NSSwitch, showAlert: Bool) {
         switch theSwitch.state {
@@ -182,7 +184,7 @@ class TCCProfileViewController: NSViewController {
 			identities = try SecurityWrapper.loadSigningIdentities()
 		} catch {
 			identities = []
-			os_log("Error loading identities: %s", type: .error, error.localizedDescription)
+            logger.error("Error loading identities: \(error.localizedDescription)")
 		}
 
 		let uploadView = UploadInfoView(signingIdentities: identities) {
@@ -254,7 +256,7 @@ class TCCProfileViewController: NSViewController {
                             block(executable)
                         case .failure(let error):
                             self?.showAlert(error, for: window)
-                            print(error)
+                            self?.logger.error("\(error)")
                         }
                     }
                 }
@@ -416,7 +418,7 @@ class TCCProfileViewController: NSViewController {
                         self?.insertIntoAppleEvents(executable)
                     case .failure(let error):
                         self?.showAlert(error, for: window)
-                        print(error)
+                        self?.logger.error("\(error)")
                     }
                 }
             }
@@ -479,7 +481,7 @@ extension TCCProfileViewController: NSTableViewDataSource {
                     }
                 case .failure(let error):
                     self?.showAlert(error, for: window)
-                    print(error)
+                    self?.logger.error("\(error)")
                 }
             }
         }

From 5e6164796315678c2fe2e7841f98396bcc1ef94f Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:40:28 -0500
Subject: [PATCH 02/12] Update Source/Networking/UploadManager.swift

Co-authored-by: Kyle Hammond <kyle.snowmint@gmail.com>
---
 Source/Networking/UploadManager.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Networking/UploadManager.swift b/Source/Networking/UploadManager.swift
index fecd27a..4300587 100644
--- a/Source/Networking/UploadManager.swift
+++ b/Source/Networking/UploadManager.swift
@@ -52,7 +52,7 @@ struct UploadManager {
 	}
 
 	func upload(profile: TCCProfile, authMgr: NetworkAuthManager, siteInfo: (String, String)?, signingIdentity: SigningIdentity?, completionHandler: @escaping (Error?) -> Void) {
-        logger.info("Uploading profile: \(profile.displayName)")
+        logger.info("Uploading profile: \(profile.displayName, privacy: .public)")
 
 		let networking = JamfProAPIClient(serverUrlString: serverURL, tokenManager: authMgr)
 		Task {

From 30fdba21a2baf20e471186b1b9dc9fa1dce63429 Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:59:14 -0500
Subject: [PATCH 03/12] Update LoggerExtensions.swift

---
 Source/Extensions/LoggerExtensions.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/Extensions/LoggerExtensions.swift b/Source/Extensions/LoggerExtensions.swift
index 4976364..b91e54d 100644
--- a/Source/Extensions/LoggerExtensions.swift
+++ b/Source/Extensions/LoggerExtensions.swift
@@ -18,7 +18,6 @@ extension Logger {
     static let PPPCServicesManager = Logger(subsystem: subsystem, category: "PPPCServicesManager")
     static let Model = Logger(subsystem: subsystem, category: "Model")
     static let SaveViewController = Logger(subsystem: subsystem, category: "SaveViewController")
-    static let Main = Logger(subsystem: subsystem, category: "Main")
     static let UploadInfoView = Logger(subsystem: subsystem, category: "UploadInfoView")
     static let UploadManager = Logger(subsystem: subsystem, category: "UploadManager")
 }

From 2c636e044ecad4ef90bb0f30e2e35e954bc5d149 Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Mon, 21 Oct 2024 22:43:54 -0500
Subject: [PATCH 04/12] Update SaveViewController.swift

---
 Source/View Controllers/SaveViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/View Controllers/SaveViewController.swift b/Source/View Controllers/SaveViewController.swift
index c1a4e12..8075ec0 100644
--- a/Source/View Controllers/SaveViewController.swift	
+++ b/Source/View Controllers/SaveViewController.swift	
@@ -128,7 +128,7 @@ class SaveViewController: NSViewController {
     }
 
     func saveTo(url: URL) {
-        logger.info("Saving to \(url)")
+        logger.info("Saving to \(url, privacy: .public)")
         let model = Model.shared
         let profile = model.exportProfile(organization: organizationLabel.stringValue,
                                           identifier: payloadIdentifier,

From ceb462772a3a8e5d3052773b3a6608fee07685c6 Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:04:40 -0500
Subject: [PATCH 05/12] Update Model.swift

---
 Source/Model/Model.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Model/Model.swift b/Source/Model/Model.swift
index 6e06e1b..7600d15 100644
--- a/Source/Model/Model.swift
+++ b/Source/Model/Model.swift
@@ -36,7 +36,7 @@ import OSLog
     @objc dynamic static let shared = Model()
     @objc dynamic var identities: [SigningIdentity] = []
     @objc dynamic var selectedExecutables: [Executable] = []
-    
+
     let logger = Logger.Model
 
     func getAppleEventChoices(executable: Executable) -> [Executable] {

From f16f513fe711cc86817090a71dcdb825cd15053f Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:05:21 -0500
Subject: [PATCH 06/12] Update PPPCServicesManager.swift

---
 Source/Model/PPPCServicesManager.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Model/PPPCServicesManager.swift b/Source/Model/PPPCServicesManager.swift
index 8804ef6..0f5306b 100644
--- a/Source/Model/PPPCServicesManager.swift
+++ b/Source/Model/PPPCServicesManager.swift
@@ -29,9 +29,9 @@ import Foundation
 import OSLog
 
 class PPPCServicesManager {
-    
+
     typealias MDMServiceKey = String
-    
+
     let logger = Logger.PPPCServicesManager
 
     static let shared = PPPCServicesManager()

From c17cbbe16afce206e735512a6580f2f7fdea1c0e Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:05:43 -0500
Subject: [PATCH 07/12] Update UploadManager.swift

---
 Source/Networking/UploadManager.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Networking/UploadManager.swift b/Source/Networking/UploadManager.swift
index 4300587..e7d3246 100644
--- a/Source/Networking/UploadManager.swift
+++ b/Source/Networking/UploadManager.swift
@@ -11,7 +11,7 @@ import OSLog
 
 struct UploadManager {
 	let serverURL: String
-    
+
     let logger = Logger.UploadManager
 
 	struct VerificationInfo {

From fe45a7849c5ab6c795a6f3d364240297c03e174f Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:06:29 -0500
Subject: [PATCH 08/12] Update UploadInfoView.swift

---
 Source/SwiftUI/UploadInfoView.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SwiftUI/UploadInfoView.swift b/Source/SwiftUI/UploadInfoView.swift
index 6abf89f..18cdc98 100644
--- a/Source/SwiftUI/UploadInfoView.swift
+++ b/Source/SwiftUI/UploadInfoView.swift
@@ -37,8 +37,8 @@ struct UploadInfoView: View {
 	@State private var useSite: Bool = false
 	@State private var siteId: Int = -1
 	@State private var siteName: String = ""
-    
-    let logger = Logger.UploadInfoView
+
+    	let logger = Logger.UploadInfoView
 
 	/// The type of authentication the user wants to use.
 	///

From fd0885fa5f5c51a8d63143fdf0b440787e7ddbc9 Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:06:56 -0500
Subject: [PATCH 09/12] Update SaveViewController.swift

---
 Source/View Controllers/SaveViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/View Controllers/SaveViewController.swift b/Source/View Controllers/SaveViewController.swift
index 8075ec0..c2d6081 100644
--- a/Source/View Controllers/SaveViewController.swift	
+++ b/Source/View Controllers/SaveViewController.swift	
@@ -58,7 +58,7 @@ class SaveViewController: NSViewController {
     @IBOutlet weak var identitiesPopUp: NSPopUpButton!
     @IBOutlet var identitiesPopUpAC: NSArrayController!
     @IBOutlet weak var saveButton: NSButton!
-    
+
     let logger = Logger.SaveViewController
 
     var defaultsController = NSUserDefaultsController.shared

From d458ebac9174af94eefc279ef0b089e2a171d77b Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:07:20 -0500
Subject: [PATCH 10/12] Update TCCProfileViewController.swift

---
 Source/View Controllers/TCCProfileViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/View Controllers/TCCProfileViewController.swift b/Source/View Controllers/TCCProfileViewController.swift
index b47f8ef..521108d 100644
--- a/Source/View Controllers/TCCProfileViewController.swift	
+++ b/Source/View Controllers/TCCProfileViewController.swift	
@@ -144,7 +144,7 @@ class TCCProfileViewController: NSViewController {
             self.insertIntoAppleEvents($0)
         }
     }
-    
+
     let logger = Logger.TCCProfileViewController
 
     private func toggleAuthorizationKey(theSwitch: NSSwitch, showAlert: Bool) {

From 82a61626543aeb278e0d50135dac4993b7179051 Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <152727792+SkylerGodfrey@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:35:24 -0500
Subject: [PATCH 11/12] Update NetworkAuthManager.swift

Made data call non-optional to address swiftLint error Non-optional String -> Data Conversion.
---
 Source/Networking/NetworkAuthManager.swift | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Source/Networking/NetworkAuthManager.swift b/Source/Networking/NetworkAuthManager.swift
index b45f74b..3e43b02 100644
--- a/Source/Networking/NetworkAuthManager.swift
+++ b/Source/Networking/NetworkAuthManager.swift
@@ -121,11 +121,9 @@ actor NetworkAuthManager {
     /// - Returns: The encoded data string for use with Basic Auth.
     nonisolated func basicAuthString() throws -> String {
 		guard case .basicAuth(let username, let password) = authInfo,
-			  !username.isEmpty && !password.isEmpty,
-              let result = "\(username):\(password)".data(using: .utf8)?.base64EncodedString(),
-              !result.isEmpty else {
+			  !username.isEmpty && !password.isEmpty else {
             throw AuthError.invalidUsernamePassword
         }
-        return result
+        return Data("\(username):\(password)".utf8).base64EncodedString()
     }
 }

From dcb51c91647689551eb9fd77067a80bb527bd639 Mon Sep 17 00:00:00 2001
From: SkylerGodfrey <godfrey4763@gmail.com>
Date: Wed, 30 Oct 2024 13:02:46 -0500
Subject: [PATCH 12/12] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bae8504..81b4616 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Connection to Jamf Pro can now use client credentials with Jamf Pro v10.49+ ([Issue #120](https://github.com/jamf/PPPC-Utility/issues/120)) [@macblazer](https://github.com/macblazer).
 
 ### Changed
+- Update print and os_log calls to the modern OSLog class calls for updated logging. ([Issue #112](https://github.com/jamf/PPPC-Utility/issues/112)) [@SkylerGodfrey](https://github.com/SkylerGodfrey)
 - Now using [Haversack](https://github.com/jamf/Haversack) for simplified access to the keychain ([Issue #124](https://github.com/jamf/PPPC-Utility/issues/124)) [@macblazer](https://github.com/macblazer).
 - PPPC Utility now requires macOS 11+ to run.  It can still produce profiles usable on older versions of macOS.